Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/rolify/resource.rb

.travis.yml

@@ -1,13 +1,14 @@
 rvm:
   - 1.9.3
-  - 2.0.0 
-  - 2.1.0
-  - rbx
+  - 2.0.0
+  - 2.1.1
+  - rbx-2
   - jruby-19mode
 
 gemfile:
   - gemfiles/Gemfile.rails-3.2
   - gemfiles/Gemfile.rails-4.0
+  - gemfiles/Gemfile.rails-4.1
 
 env:
   - ADAPTER=active_record
@@ -16,10 +17,7 @@ env:
 services: mongodb
 
 matrix:
+  fast_finish: true
   exclude:
-    - rvm: rbx
-      gemfile: gemfiles/Gemfile.rails-3.2 
-      env: ADAPTER=mongoid
-    - rvm: rbx
-      gemfile: gemfiles/Gemfile.rails-4.0 
-      env: ADAPTER=mongoid
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.rails-4.1

README.md

@@ -1,4 +1,4 @@
-# rolify [![Gem Version](https://badge.fury.io/rb/rolify.png)](http://badge.fury.io/rb/rolify) [![build status](https://secure.travis-ci.org/EppO/rolify.png)](http://travis-ci.org/EppO/rolify) [![dependency status](https://gemnasium.com/EppO/rolify.png)](https://gemnasium.com/EppO/rolify) [![Code Climate](https://codeclimate.com/github/EppO/rolify.png)](https://codeclimate.com/github/EppO/rolify) [![Coverage Status](https://coveralls.io/repos/EppO/rolify/badge.png?branch=master)](https://coveralls.io/r/EppO/rolify)
+# rolify [![Gem Version](https://badge.fury.io/rb/rolify.png)](http://badge.fury.io/rb/rolify) [![build status](https://secure.travis-ci.org/RolifyCommunity/rolify.png)](http://travis-ci.org/RolifyCommunity/rolify) [![dependency status](https://gemnasium.com/EppO/rolify.png)](https://gemnasium.com/EppO/rolify) [![Code Climate](https://codeclimate.com/github/EppO/rolify.png)](https://codeclimate.com/github/EppO/rolify) [![Coverage Status](https://coveralls.io/repos/EppO/rolify/badge.png?branch=master)](https://coveralls.io/r/EppO/rolify)
 
 
 Very simple Roles library without any authorization enforcement supporting scope on resource object.

gemfiles/Gemfile.rails-3.2

@@ -1,20 +1,19 @@
 source "https://rubygems.org"
 
 platforms :rbx do
-  gem 'racc'
-  gem 'rubysl', '~> 2.0'
   gem 'psych'
-  gem 'json'
   gem 'rubinius-coverage', '~> 2.0'
-  gem 'rubysl-test-unit'
 end
 
 group :test do
+  gem 'railties', '~> 3.2', '< 4.0'
   case ENV["ADAPTER"]
   when nil, "active_record"
     gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0.rc", :platform => "jruby"
-    gem "sqlite3", :platform => "ruby"
-    gem "activerecord", ">= 3.2.0", :require => "active_record"
+    #Fix sqlite3 version for rbx until rubinus is updated
+    #https://github.com/travis-ci/travis-ci/issues/2006
+    gem "sqlite3", "1.3.8", :platform => "ruby"
+    gem "activerecord", "~> 3.2.0", :require => "active_record"
   when "mongoid"
     gem "mongoid", ">= 3.1"
     gem "bson_ext", :platform => "ruby"
@@ -25,4 +24,4 @@ group :test do
   gem 'coveralls', :require => false
 end
 
-gemspec :path => '../'
+gemspec :path => '../'

gemfiles/Gemfile.rails-4.0

@@ -1,16 +1,12 @@
 source "https://rubygems.org"
 
 platforms :rbx do
-  gem 'racc'
-  gem 'rubysl', '~> 2.0'
   gem 'psych'
-  gem 'json'
   gem 'rubinius-coverage', '~> 2.0'
-  gem 'rubysl-test-unit'
 end
 
 group :test do
-  gem "rails", "~> 4.0.1"
+  gem "railties", "~> 4.0.1", '< 4.1'
   gem "ammeter"
   gem "rake"
   gem "rspec"
@@ -24,11 +20,13 @@ group :test do
   when nil, "active_record"
     gem "activerecord", "~> 4.0.1", :require => "active_record"
     gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.5", :platform => "jruby"
-    gem "sqlite3", :platform => "ruby"
+    #Fix sqlite3 version for rbx until rubinus is updated
+    #https://github.com/travis-ci/travis-ci/issues/2006
+    gem "sqlite3", "1.3.8", :platform => "ruby"
   when "mongoid"
     gem "mongoid", github: 'mongoid/mongoid'
     gem "bson_ext", :platform => "ruby"
   else
     raise "Unknown model adapter: #{ENV["ADAPTER"]}"
   end
-end
+end

gemfiles/Gemfile.rails-4.1

@@ -0,0 +1,36 @@
+source "https://rubygems.org"
+
+platforms :rbx do
+  gem 'psych'
+  gem 'rubinius-coverage', '~> 2.0'
+end
+
+group :test do
+  gem 'rails', github: 'rails/rails', branch: '4-1-stable'
+  # There is currently an active record bug in Rails 4.1.0, this is a workaround until 4.1.1 is released
+  # See https://github.com/rails/rails/issues/13648
+  # Without this patch, Resource.with_role(:role, User.first).count throws an SQL syntax exception
+  #gem "railties", "~> 4.1.0"
+  gem "ammeter"
+  gem "rake"
+  gem "rspec"
+  gem "rspec-rails"
+  gem "fuubar"
+  gem "bundler"
+
+  gem 'coveralls', :require => false
+
+  case ENV["ADAPTER"]
+  when nil, "active_record"
+    gem "activerecord", "~> 4.1.0", :require => "active_record"
+    gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.5", :platform => "jruby"
+    #Fix sqlite3 version for rbx until rubinus is updated
+    #https://github.com/travis-ci/travis-ci/issues/2006
+    gem "sqlite3", "1.3.8", :platform => "ruby"
+  when "mongoid"
+    gem "mongoid", github: 'mongoid/mongoid'
+    gem "bson_ext", :platform => "ruby"
+  else
+    raise "Unknown model adapter: #{ENV["ADAPTER"]}"
+  end
+end

lib/generators/active_record/rolify_generator.rb

@@ -17,7 +17,7 @@ def inject_role_class
       end
 
       def copy_rolify_migration
-        migration_template "migration.rb", "db/migrate/rolify_create_#{table_name}"
+        migration_template "migration.rb", "db/migrate/rolify_create_#{table_name}.rb"
       end
 
       def join_table
@@ -47,4 +47,4 @@ def model_content
       end
     end
   end
-end
+end

lib/rolify/adapters/active_record/resource_adapter.rb

@@ -12,7 +12,7 @@ def resources_find(roles_table, relation, role_name)
       end
 
       def in(relation, user, role_names)
-        roles = user.roles.where(:name => role_names).select(:id)
+        roles = user.roles.where(:name => role_names).select("#{quote(role_class.table_name)}.#{role_class.primary_key}")
         relation.where("#{quote(role_class.table_name)}.#{role_class.primary_key} IN (?) AND ((resource_id = #{quote(relation.table_name)}.#{relation.primary_key}) OR (resource_id IS NULL))", roles)
       end
 

lib/rolify/resource.rb

@@ -19,7 +19,7 @@ def with_role(role_name, user = nil)
           role_name = role_name.to_s
         end
         klass = class_with_adapter
-        resources = klass.adapter.resources_find(klass.role_table_name, self, role_name)
+        resources = klass.adapter.resources_find(klass.role_table_name, self, role_name).select(:id)
         user ? klass.adapter.in(resources, user, role_name) : resources
       end
       alias :with_roles :with_role

lib/rolify/role.rb

@@ -9,8 +9,8 @@ def self.included(base)
     end
 
     def add_role(role_name, resource = nil)
-      role = self.class.adapter.find_or_create_by(role_name.to_s, 
-                                                  (resource.is_a?(Class) ? resource.to_s : resource.class.name if resource), 
+      role = self.class.adapter.find_or_create_by(role_name.to_s,
+                                                  (resource.is_a?(Class) ? resource.to_s : resource.class.name if resource),
                                                   (resource.id if resource && !resource.is_a?(Class)))
 
       if !roles.include?(role)
@@ -23,6 +23,12 @@ def add_role(role_name, resource = nil)
     deprecate :has_role, :add_role
 
     def has_role?(role_name, resource = nil)
+      @r_map ||= {}
+      role_n_resource = role_name.to_s + resource.to_s
+      @r_map[role_n_resource].nil? ? @r_map[role_n_resource] = has_role_helper(role_name, resource) : @r_map[role_n_resource]
+    end
+
+    def has_role_helper(role_name, resource = nil)
       if new_record?
         self.roles.detect { |r| r.name == role_name.to_s && (r.resource == resource || resource.nil?) }.present?
       else

lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "3.4.0"
+  VERSION = "3.5.0"
 end

spec/rolify/shared_examples/shared_examples_for_roles.rb

@@ -90,9 +90,14 @@
     end
 
     subject { user }
-    
+
     it { should have_role :admin }
-    it { should have_role :moderator, Forum.first }    
+    it { should have_role :admin, Forum }
+    it { should have_role :admin, :any }
+    it { should have_role :moderator, Forum.first }
+    it { should have_role :moderator, :any }
+    it { should_not have_role :moderator }
+    it { should_not have_role :moderator, Forum }
     it { subject.has_any_role?(:admin).should be_true }
   end