indulgence 0.1.2 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmJiMTU1MDg5ZDRhOWRmZjgwYTNhOTU1ZWRiMTcxNDMzMjU4YWU0Mg==
-  data.tar.gz: !binary |-
-    MTA3MjYwOTkwMGQyNjk2NzZmNWE3NzdmM2I4NDYyNTMxNjFlM2Q2MQ==
+SHA1:
+  metadata.gz: f8f234d4658451ecf9f338b09b0c483f4fc269d6
+  data.tar.gz: aa0a25dc4d605700df60ac1aff1edcc08dc61447
 SHA512:
-  metadata.gz: !binary |-
-    YTYyOWE1ZWMwODMxZjkzNjUzNmQ1NjY4OTVlM2IxZWYxODJlNGQ5YzE2YTJk
-    MzI4NmNiOGFmNjI0YTc0N2MxMGVhNzFlZjc4YzdmYTMxY2ZhNTJkY2VkYzQw
-    N2FmYjM1NTA1YTFhNGZlNjFkYzM5MzU3MTA4YjFmY2I2YjA1M2I=
-  data.tar.gz: !binary |-
-    ZDY4Y2ZhYTZmZDE0MjBmZDZmNTQ1ZWIzNjA2OGRmYjE5ZmYwM2ZhNjczMGQ1
-    N2IzYmE2NjVlZGIwZGFhMmNiMTExYThlODgzMmI3ZjkzY2E0N2NlYmY3YTBl
-    ODFiNTJlZmE5N2U0ZmVmNDNjZmM0OTIzOTU1Y2VmYTM5ZTU3MzA=
+  metadata.gz: 3a9d519a3b1a14393a0c9ccc0c8e4300c4370ac96bfdfa10d5599eb10156b45be7af5f6a69b96089e046b58d04c3c2c99ada60fa1e7730fb4eec480c7af83963
+  data.tar.gz: b907d7477881668bcec5aea9525a44824b2774dc019abeecfa0f15c1ce33919110447749706cb5d19b4bc9d2322b236f343f688f7f650f93072a74fea8d280b2

data/README.rdoc

@@ -118,7 +118,7 @@ Let's give Emperors the right to see and do anything by first creating an empero
     emperor = Role.create(:name => 'emperor')
     caesar = User.create(
       :first_name => 'Julius', 
-      :last_name => 'Ceasar',
+      :last_name => 'Caesar',
       :role => emperor
     )
 

data/Rakefile

@@ -4,17 +4,21 @@ require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
 
-Rake::TestTask.new do |t|
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
   t.test_files = FileList['test/**/*_test.rb']
 end
 
+task :default => :test
+
 require 'standalone_migrations'
 StandaloneMigrations::Tasks.load_tasks
 
 task :console do
   require 'irb'
   require 'irb/completion'
-  require 'indulgence' 
+  require 'indulgence'
   ARGV.clear
   IRB.start
-end
+end

data/lib/indulgence.rb

@@ -6,7 +6,7 @@ require_relative 'active_record/acts/indulgent'
 
 module Indulgence
   def self.strict?
-    @strict.nil? || @strict
+    !instance_variable_defined?(:@strict) || @strict
   end
 
   def self.strict=(boolean)

data/lib/indulgence/ability.rb

@@ -2,7 +2,7 @@
 module Indulgence
   class Ability
     attr_reader :name, :relationship, :args
-    
+
     def initialize(args = {})
       @name = args[:name]
       @compare_single = args[:compare_single]
@@ -11,14 +11,14 @@ module Indulgence
       @args = args
       valid?
     end
-    
+
     def ==(another_ability)
       [:name, :args].each do |method|
         return false if send(method) != another_ability.send(method)
       end
       return true
     end
-    
+
     def valid?
       must_be_name
       unless relationship
@@ -26,41 +26,41 @@ module Indulgence
         must_respond_to_call @filter_many
       end
     end
-    
+
     def compare_single(thing, entity)
       return @compare_single.call thing, entity if @compare_single
-      
+
       identifier = thing.send(relationship)
-      if identifier.kind_of?(Array)
+      if identifier.kind_of?(Array) || identifier.kind_of?(ActiveRecord::Relation)
         identifier.include? entity
-      else 
-        identifier == entity.id || identifier == entity   
+      else
+        identifier == entity.id || identifier == entity
       end
     end
-    
+
     def filter_many(things, entity)
       return @filter_many.call things, entity if @filter_many
-      
+
       if things.reflect_on_association(relationship)
         things.joins(relationship).where(entity.class.table_name => {:id => entity.id})
       else
         things.where(relationship => entity.id)
       end
     end
-    
+
     private
     def must_be_name
       unless name
         raise AbilityConfigurationError, "A name is required for each ability"
       end
     end
-    
+
     def must_respond_to_call(item)
       unless item.respond_to? :call
         raise AbilityConfigurationError, "item must respond to call: #{item.inspect}"
       end
     end
-    
-    
+
+
   end
 end

data/lib/indulgence/version.rb

@@ -1,14 +1,16 @@
 module Indulgence
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end
 
 # History
 # =======
 #
+# 0.2.0   Updated to work with ActiveRecord 5.
+#
 # 0.1.2   Adds strict mode - to allow more flexible use (if a none user object
 #         is passed to indulge?, in strict mode a no method error is raised. When
 #         indulgence.strict = false, indulge? will use the default abilities)
-# 
+#
 # 0.1.1   Makes it easier to use the state of an object to determine permissions
 #         rather than a user's role.
 #
@@ -20,38 +22,38 @@ end
 #
 # 0.0.6   Specifies the default behaviour as assigning the none ability to
 #         all CRUD actions.
-# 
+#
 # 0.0.5   Allows simplified ability definition to be used with has_many
-# 
+#
 # 0.0.4   Simplifies defining abilities
-# 
-#         Allows and ability to be defined by passing in the name of the 
+#
+#         Allows and ability to be defined by passing in the name of the
 #         association that it refers to.
-# 
+#
 # 0.0.3   Updated to use latest version of standalone_migrations
-# 
+#
 #         Branch this app has been using has been merged into standalone_migrations
 #         main. So config in .standalone_migrations now works without
 #         using a specific clone branch.
-# 
+#
 # 0.0.2   Rebuild with lessons learnt from first usage in host app
-# 
-#         Adds automatic caching of abilites. Required a reworking of ability 
+#
+#         Adds automatic caching of abilites. Required a reworking of ability
 #         lambdas, so that a particular entity id wasn't cached
-#         
-#         Renamed ability methods truth as compare_single, and where_clause as 
+#
+#         Renamed ability methods truth as compare_single, and where_clause as
 #         filter_many as more descriptive.
-#         
-#         Forced Ability methods #compare_single and #filter_many to use lambdas 
+#
+#         Forced Ability methods #compare_single and #filter_many to use lambdas
 #         (or other object that responds to call). The reasons:
-#         
+#
 #           1. To remove the special way that the none ability was handled.
 #           2. Previously, if Ability#filter_many was nil everything would be returned,
 #              which I think is counter-intuitive.
 #           3. Also if Ability#filter_many was undefined, then everything would
 #              be returned, which is just poor design for a permission tool. Now
-#              an error is raised. 
-# 
+#              an error is raised.
+#
 # 0.0.1   Initial build
 #         First alpa version
-#
+#

data/test/test_helper.rb

@@ -3,7 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__),'units')
 $:.unshift File.join(File.dirname(__FILE__),'lib')
 $:.unshift File.join(File.dirname(__FILE__),'..','lib','indulgence')
 
-require 'test/unit'
+require "minitest/autorun"
 
 require 'active_record'
 ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database =>  "test/db/test.sqlite3.db"

data/test/units/indulgence/ability_tests/method_only.rb

@@ -1,7 +1,7 @@
 
 module Indulgence
   module AbilityTests
-    class MethodOnly < Test::Unit::TestCase
+    class MethodOnly < Minitest::Test
 
       def setup
         @attributes = {
@@ -28,7 +28,7 @@ module Indulgence
       end
       
       def assert_initiation_raises_error
-        assert_raise AbilityConfigurationError do
+        assert_raises AbilityConfigurationError do
           Ability.new(@attributes)
         end
       end

data/test/units/indulgence/ability_tests/with_lambdas.rb

@@ -2,7 +2,7 @@
 
 module Indulgence
   module AbilityTests
-    class WithLambdas < Test::Unit::TestCase
+    class WithLambdas < Minitest::Test
 
       def setup
         @attributes = {
@@ -35,7 +35,7 @@ module Indulgence
       end
 
       def assert_initiation_raises_error
-        assert_raise AbilityConfigurationError do
+        assert_raises AbilityConfigurationError do
           Ability.new(@attributes)
         end
       end

data/test/units/indulgence/permission_test.rb

@@ -5,7 +5,7 @@ require 'permission'
 require 'ability'
 
 module Indulgence
-  class PermissionTest < Test::Unit::TestCase
+  class PermissionTest < Minitest::Test
     
     def test_creation
       permission = Permission.new(User.create(:name => 'Whisp'), :read)

data/test/units/role_permission_test.rb

@@ -3,35 +3,36 @@ require 'user'
 require 'role'
 require 'role_permission'
 
-class RolePermissionTest < Test::Unit::TestCase
+class RolePermissionTest < Minitest::Test
   def setup
     @role = Role.create(:name => 'mortal')
     @user = User.create(:name => 'Trevor', :role_id => @role.id)
   end
-  
+
   def test_indulge_with_has_many
+    @role.reload
     assert_equal(true, @role.indulge?(@user, :read))
     assert_equal(false, @role.indulge?(@user, :delete))
   end
-  
+
   def test_indulgence_with_has_many
     assert_equal([@role], Role.indulgence(@user, :read))
-    assert_raise ActiveRecord::RecordNotFound do
+    assert_raises ActiveRecord::RecordNotFound do
       Role.indulgence(@user, :delete)
     end
   end
 
   def test_null_entity_indulge
     assert_equal(false, @role.indulge?(nil, :update))
-    assert_not_equal(@role.indulge?(@user, :update), @role.indulge?(nil, :update))
+    refute_equal(@role.indulge?(@user, :update), @role.indulge?(nil, :update))
   end
 
   def test_null_entity_indulgence
-    assert_raise ActiveRecord::RecordNotFound do
+    assert_raises ActiveRecord::RecordNotFound do
       assert_equal(0, Role.indulgence(nil, :update).count)
     end
   end
-  
+
   def teardown
     User.delete_all
     Role.delete_all

data/test/units/role_test.rb

@@ -2,7 +2,7 @@ require_relative '../test_helper'
 require 'user'
 require 'role'
 
-class RoleTest < Test::Unit::TestCase
+class RoleTest < Minitest::Test
   def teardown
     User.delete_all
     Role.delete_all

data/test/units/thing_permission_test.rb

@@ -3,7 +3,7 @@ require 'user'
 require 'role'
 require 'thing_permission'
 
-class ThingPermissionTest < Test::Unit::TestCase
+class ThingPermissionTest < Minitest::Test
   
   Permission = Indulgence::Permission
   
@@ -47,7 +47,7 @@ class ThingPermissionTest < Test::Unit::TestCase
   
   def test_setting_unknown_role_method_causes_error
     Permission.role_method = :something_else
-    assert_raise NoMethodError do
+    assert_raises NoMethodError do
       ThingPermission.new(@super_user, :read).role_name
     end
   end
@@ -59,7 +59,7 @@ class ThingPermissionTest < Test::Unit::TestCase
   
   def test_setting_unknown_role_name_method_causes_error
     Permission.role_name_method = :something_else
-    assert_raise NoMethodError do
+    assert_raises NoMethodError do
       ThingPermission.new(@super_user, :read).role_name
     end
   end
@@ -70,7 +70,7 @@ class ThingPermissionTest < Test::Unit::TestCase
   end
   
   def test_with_unspecified_ability
-    assert_raise Indulgence::AbilityNotFound do
+    assert_raises Indulgence::AbilityNotFound do
       ThingPermission.new(@user, :unspecified)
     end
   end

data/test/units/thing_test.rb

@@ -2,8 +2,8 @@ require_relative '../test_helper'
 require 'user'
 require 'thing'
 
-class ThingTest < Test::Unit::TestCase
-  
+class ThingTest < Minitest::Test
+
   def setup
     @god = Role.create(:name => 'god')
     @demigod = Role.create(:name => 'demigod')
@@ -13,38 +13,38 @@ class ThingTest < Test::Unit::TestCase
     @thing = Thing.create(:name => 'Stuff', :owner => @owner)
   end
 
-  
+
   def test_user
     assert_equal(@owner, @thing.owner)
-    assert_equal([@thing], @owner.things) 
+    assert_equal([@thing], @owner.things)
   end
-  
+
   def test_indulge
     make_second_thing
     assert_equal(false, @thing.indulge?(@owner, :read))
     assert_equal(false, @thing.indulge?(@owner, :delete))
     assert_equal(false, @other_thing.indulge?(@owner, :delete))
   end
-  
+
   def test_indulge_by_god
     make_second_thing
     @owner.update_attribute(:role, @god)
     assert_equal(true, @thing.indulge?(@owner, :read))
     assert_equal(true, @thing.indulge?(@owner, :delete))
-    assert_equal(true, @other_thing.indulge?(@owner, :delete))    
+    assert_equal(true, @other_thing.indulge?(@owner, :delete))
   end
-  
+
   def test_indulgence_by_god
     make_second_thing
     @owner.update_attribute(:role, @god)
-    assert_equal(Thing.all, Thing.indulgence(@owner, :delete))  
+    assert_equal(Thing.all, Thing.indulgence(@owner, :delete))
   end
-  
+
   def test_indulge_by_demigod
     make_second_thing
     @owner.update_attribute(:role, @demigod)
     assert_equal(true, @thing.indulge?(@owner, :read))
-    assert_equal(true, @thing.indulge?(@owner, :delete)) 
+    assert_equal(true, @thing.indulge?(@owner, :delete))
     assert_equal(false, @other_thing.indulge?(@owner, :delete))
   end
 
@@ -52,15 +52,15 @@ class ThingTest < Test::Unit::TestCase
     make_second_thing
     @owner.update_attribute(:role, @thief)
     assert_equal(true, @thing.indulge?(@owner, :read))
-    assert_equal(true, @thing.indulge?(@owner, :update)) 
+    assert_equal(true, @thing.indulge?(@owner, :update))
     assert_equal(false, @thing.indulge?(@owner, :delete))
   end
-  
+
   def test_indulge_via_entity_association
     make_second_thing
     @owner.update_attribute(:role, @friend)
     assert_equal(true, @thing.indulge?(@owner, :read))
-    assert_equal(true, @thing.indulge?(@owner, :update)) 
+    assert_equal(true, @thing.indulge?(@owner, :update))
     assert_equal(false, @thing.indulge?(@owner, :delete))
   end
 
@@ -90,53 +90,53 @@ class ThingTest < Test::Unit::TestCase
     @owner.update_attribute(:role, @demigod)
     assert_equal(false, Thing.indulge?(@owner, :update))
   end
-    
+
   def test_indulge_other_thing
     other_thing = OtherThing.create(:name => 'Other Stuff', :owner => @owner)
     assert_equal(false, other_thing.indulge?(@owner, :read))
     assert_equal(false, other_thing.indulge?(@owner, :delete))
   end
-  
+
   def test_indulgence
     make_second_thing
     @owner.update_attribute(:role, @demigod)
     assert_equal(Thing.order('id'), Thing.indulgence(@owner, :read).order('id'))
-    assert_raise ActiveRecord::RecordNotFound do
+    assert_raises ActiveRecord::RecordNotFound do
       Thing.indulgence(@user, :read).order('id')
     end
     assert_equal([@thing], Thing.indulgence(@owner, :delete))
-    assert_raise ActiveRecord::RecordNotFound do
+    assert_raises ActiveRecord::RecordNotFound do
       Thing.indulgence(@user, :delete)
     end
   end
-  
+
   def test_indulgence_via_entity_id_method
     make_second_thing
     @owner.update_attribute(:role, @thief)
     assert_equal(Thing.where(:owner_id => @owner.id), Thing.indulgence(@owner, :update))
   end
-  
+
   def test_indulgence_via_entity_association
     make_second_thing
     @owner.update_attribute(:role, @friend)
-    assert_equal(Thing.where(:owner_id => @owner.id).all, Thing.indulgence(@owner, :update).all)
+    assert_equal(Thing.where(:owner_id => @owner.id).to_a, Thing.indulgence(@owner, :update).to_a)
   end
-  
+
   def test_indulgence_with_unspecified_ability
-    assert_raise ActiveRecord::RecordNotFound do
+    assert_raises ActiveRecord::RecordNotFound do
       Thing.indulgence(@owner, :unspecified)
-    end    
+    end
   end
-  
+
   def test_find
     make_second_thing
     @owner.update_attribute(:role, @demigod)
     assert_equal(@thing, Thing.indulgence(@owner, :delete).find(@thing.id))
-    assert_raise ActiveRecord::RecordNotFound do
+    assert_raises ActiveRecord::RecordNotFound do
       assert_equal(@thing, Thing.indulgence(@user, :delete).find(@thing.id))
     end
   end
-  
+
   def test_aliased_compare_single_method
     make_second_thing
     assert_equal(false, @thing.permit?(@owner, :read))
@@ -149,29 +149,29 @@ class ThingTest < Test::Unit::TestCase
     @owner.update_attribute(:role, @god)
     assert_equal(true, Thing.permit?(@owner, :read))
   end
-  
+
   def test_aliased_filter_many_method
     make_second_thing
     @owner.update_attribute(:role, @demigod)
     assert_equal(Thing.order('id'), Thing.permitted(@owner, :read).order('id'))
-    assert_raise ActiveRecord::RecordNotFound do
+    assert_raises ActiveRecord::RecordNotFound do
       Thing.permitted(@user, :read).order('id')
     end
     assert_equal([@thing], Thing.permitted(@owner, :delete))
-    assert_raise ActiveRecord::RecordNotFound do
+    assert_raises ActiveRecord::RecordNotFound do
       Thing.permitted(@user, :delete)
     end
   end
-  
+
   def make_second_thing
     @user = User.create(:name => 'Clive')
     @other_thing = Thing.create(:name => 'Debris', :owner => @user)
   end
-  
+
   def teardown
     Role.delete_all
     User.delete_all
     Thing.delete_all
   end
-  
+
 end

data/test/units/user_test.rb

@@ -2,7 +2,7 @@ require_relative '../test_helper'
 require 'user'
 require 'role'
 
-class UserTest < Test::Unit::TestCase
+class UserTest < Minitest::Test
   def teardown
     User.delete_all
     Role.delete_all

data/test/units/work_process_test.rb

@@ -3,7 +3,7 @@ require 'user'
 require 'work_process'
 require 'work_process_permission'
 
-class WorkProcessTest < Test::Unit::TestCase
+class WorkProcessTest < Minitest::Test
   
   def teardown
     User.delete_all
@@ -49,7 +49,7 @@ class WorkProcessTest < Test::Unit::TestCase
   end
   
   def test_indulgence_when_not_permitted
-    assert_raise ActiveRecord::RecordNotFound do
+    assert_raises ActiveRecord::RecordNotFound do
       WorkProcess.indulgence(user, :update, :beginning)
     end
   end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: indulgence
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Rob Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: standalone_migrations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.1
 description: Packages permission functionality into a set of permission objects.
@@ -104,43 +104,43 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Yet another permissions gem
 test_files:
-- test/units/role_test.rb
+- test/db/migrate/20141008101147_create_work_processes.rb
+- test/db/migrate/20130408085511_create_users.rb
+- test/db/migrate/20130408103015_create_roles.rb
+- test/db/migrate/20130408132217_create_things.rb
+- test/db/test.sqlite3.db
+- test/db/schema.rb
+- test/db/config.yml
+- test/units/user_test.rb
+- test/units/work_process_test.rb
+- test/units/thing_test.rb
+- test/units/indulgence/ability_tests/with_lambdas.rb
+- test/units/indulgence/ability_tests/method_only.rb
 - test/units/indulgence/permission_test.rb
 - test/units/indulgence/ability_test.rb
-- test/units/indulgence/ability_tests/method_only.rb
-- test/units/indulgence/ability_tests/with_lambdas.rb
-- test/units/user_test.rb
 - test/units/role_permission_test.rb
-- test/units/work_process_test.rb
 - test/units/thing_permission_test.rb
-- test/units/thing_test.rb
-- test/lib/role.rb
-- test/lib/work_process.rb
-- test/lib/user.rb
+- test/units/role_test.rb
 - test/lib/thing.rb
-- test/lib/thing_permission.rb
-- test/lib/work_process_permission.rb
 - test/lib/role_permission.rb
-- test/db/migrate/20130408103015_create_roles.rb
-- test/db/migrate/20130408085511_create_users.rb
-- test/db/migrate/20130408132217_create_things.rb
-- test/db/migrate/20141008101147_create_work_processes.rb
-- test/db/config.yml
-- test/db/test.sqlite3.db
-- test/db/schema.rb
+- test/lib/work_process_permission.rb
+- test/lib/user.rb
+- test/lib/role.rb
+- test/lib/thing_permission.rb
+- test/lib/work_process.rb
 - test/test_helper.rb