rolify 3.4.0 → 3.4.1

data/.travis.yml

@@ -1,13 +1,9 @@
+language: ruby
+
 rvm:
-  - 1.9.3
-  - 2.0.0 
-  - 2.1.0
-  - rbx
-  - jruby-19mode
+  - 2.1.2
 
-gemfile:
-  - gemfiles/Gemfile.rails-3.2
-  - gemfiles/Gemfile.rails-4.0
+script: bundle exec rake
 
 env:
   - ADAPTER=active_record
@@ -15,11 +11,31 @@ env:
 
 services: mongodb
 
-matrix:
-  exclude:
-    - rvm: rbx
-      gemfile: gemfiles/Gemfile.rails-3.2 
-      env: ADAPTER=mongoid
-    - rvm: rbx
-      gemfile: gemfiles/Gemfile.rails-4.0 
-      env: ADAPTER=mongoid
+# language: ruby
+#
+# rvm:
+#   - 1.9.3
+#   - 2.0.0
+#   - 2.1.1
+#   - 2.1.2
+#   - rbx-2
+#   - jruby-19mode
+#
+# script: bundle exec rake
+#
+# gemfile:
+#   - gemfiles/Gemfile.rails-3.2
+#   - gemfiles/Gemfile.rails-4.0
+#   - gemfiles/Gemfile.rails-4.1
+#
+# env:
+#   - ADAPTER=active_record
+#   - ADAPTER=mongoid
+#
+# services: mongodb
+#
+# matrix:
+#   fast_finish: true
+#   exclude:
+#     - rvm: 1.9.3
+#       gemfile: gemfiles/Gemfile.rails-4.1

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+= 3.4.1 (Sep 07, 2014)
+* Fixed issue with migrations being generated without a file extension.
+* Updated spec tests to work with Travis CI on Ruby up to 2.1.2 and Rails 4.1.x
+* Made it possible for inheritance of resources.
+* Fixed small bugs throughout project.
+
 = 3.4 (Jan 28, 2014)
 * fixed an initializer bug preventing the rails app to boot
 * enhanced documentation regarding <tt>with_role</tt> method (thanks to @vicomte)

data/Gemfile

@@ -12,8 +12,10 @@ group :test do
   else
     raise "Unknown model adapter: #{ENV["ADAPTER"]}"
   end
-  
+
   gem 'coveralls', :require => false
+  gem 'its'
+  gem 'pry'
 end
 
-gemspec
+gemspec

data/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.

data/Rakefile

@@ -7,17 +7,17 @@ Bundler::GemHelper.install_tasks
 Coveralls::RakeTask.new
 
 RSpec::Core::RakeTask.new(:generators) do |task|
-  task.pattern = "spec/generators/**/*_spec.rb"
+  task.pattern = 'spec/generators/**/*_spec.rb'
 end
 
 RSpec::Core::RakeTask.new(:rolify) do |task|
-  task.pattern = "spec/rolify/**/*_spec.rb"
+  task.pattern = 'spec/rolify/**/*_spec.rb'
 end
 
 task :default => [ :spec, 'coveralls:push' ]
 
-desc "Run all specs"
-task "spec" do
+desc 'Run all specs'
+task 'spec' do
   Rake::Task['generators'].invoke
   return_code1 = $?.exitstatus
   Rake::Task['rolify'].invoke
@@ -25,10 +25,10 @@ task "spec" do
   fail if return_code1 != 0 || return_code2 != 0
 end
 
-desc "Run specs for all adapters"
+desc 'Run specs for all adapters'
 task :spec_all do
   %w[active_record mongoid].each do |model_adapter|
     puts "ADAPTER = #{model_adapter}"
     system "ADAPTER=#{model_adapter} rake"
   end
-end
+end

data/gemfiles/Gemfile.rails-3.2

@@ -1,27 +1,26 @@
-source "https://rubygems.org"
+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
-  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"
-  when "mongoid"
-    gem "mongoid", ">= 3.1"
-    gem "bson_ext", :platform => "ruby"
+  gem 'railties', '~> 3.2', '< 4.0'
+  case ENV['ADAPTER']
+  when nil, 'active_record'
+    gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.rc', :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'
+    gem 'activerecord', '~> 3.2.0', :require => 'active_record'
+  when 'mongoid'
+    gem 'mongoid', '>= 3.1'
+    gem 'bson_ext', :platform => 'ruby'
   else
-    raise "Unknown model adapter: #{ENV["ADAPTER"]}"
+    raise "Unknown model adapter: #{ENV['ADAPTER']}"
   end
-  
+
   gem 'coveralls', :require => false
 end
 

data/gemfiles/Gemfile.rails-4.0

@@ -1,34 +1,33 @@
-source "https://rubygems.org"
+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 "ammeter"
-  gem "rake"
-  gem "rspec"
-  gem "rspec-rails"
-  gem "fuubar"
-  gem "bundler"
+  gem 'railties', '~> 4.0.1', '< 4.1'
+  gem 'ammeter'
+  gem 'rake'
+  gem 'rspec'
+  gem 'its'
+  gem 'rspec-rails'
+  gem 'fuubar'
+  gem 'bundler'
 
   gem 'coveralls', :require => false
-  
-  case ENV["ADAPTER"]
-  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"
-  when "mongoid"
-    gem "mongoid", github: 'mongoid/mongoid'
-    gem "bson_ext", :platform => "ruby"
+
+  case ENV['ADAPTER']
+  when nil, 'active_record'
+    gem 'activerecord', '~> 4.0.1', :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"]}"
+    raise "Unknown model adapter: #{ENV['ADAPTER']}"
   end
 end

data/gemfiles/Gemfile.rails-4.1

@@ -0,0 +1,37 @@
+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 'its'
+  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

data/lib/generators/active_record/rolify_generator.rb

@@ -17,7 +17,7 @@ module ActiveRecord
       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 @@ RUBY
       end
     end
   end
-end
+end

data/lib/rolify.rb

@@ -33,6 +33,11 @@ module Rolify
     load_dynamic_methods if Rolify.dynamic_shortcuts
   end
 
+  def adapter
+    return self.superclass.adapter unless self.instance_variable_defined? '@adapter'
+    @adapter
+  end
+
   def resourcify(association_name = :roles, options = {})
     include Resource
 
@@ -52,6 +57,7 @@ module Rolify
   end
 
   def role_class
+    return self.superclass.role_class unless self.instance_variable_defined? '@role_cname'
     self.role_cname.constantize
   end
 end

data/lib/rolify/adapters/active_record/resource_adapter.rb

@@ -3,23 +3,44 @@ require 'rolify/adapters/base'
 module Rolify
   module Adapter
     class ResourceAdapter < ResourceAdapterBase
+      def find_roles(role_name, relation, user)
+        roles = user && (user != :any) ? user.roles : self.role_class
+        roles = roles.where('resource_type IN (?)', self.relation_types_for(relation))
+        roles = roles.where(:name => role_name.to_s) if role_name && (role_name != :any)
+        roles
+      end
+
       def resources_find(roles_table, relation, role_name)
-        resources = relation.joins("INNER JOIN #{quote(roles_table)} ON #{quote(roles_table)}.resource_type = '#{relation.to_s}' AND
+        klasses   = self.relation_types_for(relation)
+        relations = klasses.inject('') do |str, klass|
+          str = "#{str}'#{klass.to_s}'"
+          str << ', ' unless klass == klasses.last
+          str
+        end
+        resources = relation.joins("INNER JOIN #{quote(roles_table)} ON #{quote(roles_table)}.resource_type IN (#{relations}) AND
                                     (#{quote(roles_table)}.resource_id IS NULL OR #{quote(roles_table)}.resource_id = #{quote(relation.table_name)}.#{relation.primary_key})")
-        resources = resources.where("#{quote(roles_table)}.name IN (?) AND #{quote(roles_table)}.resource_type = ?", Array(role_name), relation.to_s)
+        resources = resources.where("#{quote(roles_table)}.name IN (?) AND #{quote(roles_table)}.resource_type IN (?)", Array(role_name), klasses)
         resources = resources.select("#{quote(relation.table_name)}.*")
         resources
       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
 
+      def applied_roles(relation, children)
+        if children
+          relation.role_class.where('resource_type IN (?) AND resource_id IS NULL', self.relation_types_for(relation))
+        else
+          relation.role_class.where('resource_type = ? AND resource_id IS NULL', relation.to_s)
+        end
+      end
+
       private
 
       def quote(column)
-         ActiveRecord::Base.connection.quote_column_name column
+        ActiveRecord::Base.connection.quote_column_name column
       end
     end
   end

data/lib/rolify/adapters/base.rb

@@ -23,6 +23,10 @@ module Rolify
         load "rolify/adapters/#{Rolify.orm}/scopes.rb"
         Rolify::Adapter.const_get(adapter.camelize.to_sym).new(role_cname, user_cname)
       end
+
+      def relation_types_for(relation)
+        relation.descendants.map(&:to_s).push(relation.to_s)
+      end
     end
 
     class RoleAdapterBase < Adapter::Base

data/lib/rolify/adapters/mongoid/resource_adapter.rb

@@ -3,8 +3,16 @@ require 'rolify/adapters/base'
 module Rolify
   module Adapter
     class ResourceAdapter < ResourceAdapterBase
+
+      def find_roles(role_name, relation, user)
+        roles = user && (user != :any) ? user.roles : self.role_class
+        roles = roles.where(:resource_type.in => self.relation_types_for(relation))
+        roles = roles.where(:name => role_name.to_s) if role_name && (role_name != :any)
+        roles
+      end
+
       def resources_find(roles_table, relation, role_name)
-        roles = roles_table.classify.constantize.where(:name.in => Array(role_name), :resource_type => relation.to_s)
+        roles = roles_table.classify.constantize.where(:name.in => Array(role_name), :resource_type.in => self.relation_types_for(relation))
         resources = []
         roles.each do |role|
           if role.resource_id.nil?
@@ -22,6 +30,15 @@ module Rolify
         resources.delete_if { |resource| (resource.applied_roles & roles).empty? }
         resources
       end
+
+      def applied_roles(relation, children)
+        if children
+          relation.role_class.where(:resource_type.in => self.relation_types_for(relation), :resource_id => nil)
+        else
+          relation.role_class.where(:resource_type => relation.to_s, :resource_id => nil)
+        end
+      end
+
     end
   end
 end

data/lib/rolify/configure.rb

@@ -45,12 +45,16 @@ module Rolify
       role_cnames = [ "Role" ] if role_cnames.empty?
       role_cnames.each do |role_cname|
         role_class = role_cname.constantize
-        if role_class.superclass.to_s == "ActiveRecord::Base" && !role_class.table_exists?
+        if role_class.superclass.to_s == "ActiveRecord::Base" && role_table_missing?(role_class)
           warn "[WARN] table '#{role_cname}' doesn't exist. Did you run the migration ? Ignoring rolify config."
           return false
         end
       end
       true
     end
+    
+    def role_table_missing?(role_class)
+      role_class.connected? && !role_class.table_exists?
+    end
   end
-end
+end

data/lib/rolify/resource.rb

@@ -4,12 +4,9 @@ module Rolify
       base.extend ClassMethods
     end
 
-    module ClassMethods 
+    module ClassMethods
       def find_roles(role_name = nil, user = nil)
-        roles = user && (user != :any) ? user.roles : self.role_class
-        roles = roles.where(:resource_type => self.to_s)
-        roles = roles.where(:name => role_name.to_s) if role_name && (role_name != :any)
-        roles
+        self.adapter.find_roles(role_name, self, user)
       end
 
       def with_role(role_name, user = nil)
@@ -18,14 +15,20 @@ module Rolify
         else
           role_name = role_name.to_s
         end
-        resources = self.adapter.resources_find(self.role_table_name, self, role_name)
+
+        resources = self.adapter.resources_find(self.role_table_name, self, role_name) #.map(&:id)
         user ? self.adapter.in(resources, user, role_name) : resources
       end
       alias :with_roles :with_role
+
+      def applied_roles(children = true)
+        self.adapter.applied_roles(self, children)
+      end
     end
-    
+
     def applied_roles
-      self.roles + self.class.role_class.where(:resource_type => self.class.to_s, :resource_id => nil)
+      #self.roles + self.class.role_class.where(:resource_type => self.class.to_s, :resource_id => nil)
+      self.roles + self.class.applied_roles(true)
     end
   end
-end
+end