indulgence 0.0.4 → 0.0.5

data/README.rdoc

@@ -188,10 +188,6 @@ This will create an Ability object with the following methods:
 [compare_single] Used by :indulge?
 [filter_many]    Used by :indulgence 
 
-Alternatively, you can achieve the same result by defining lambdas for the
-ability methods :compare_single and :filter_many. If you use lambdas, you must
-also define a name.
-
 Alternatively you can define the ability like this:
 
   def things_they_wrote
@@ -199,7 +195,7 @@ Alternatively you can define the ability like this:
   end
 
 This will use :author to define attributes of an ability object. :author could
-be an association or an attribute that return either the entity or the entity.id.
+be an association or an attribute that returns either the entity or the entity.id.
 
 So this also works:
 

data/lib/indulgence/ability.rb

@@ -30,8 +30,12 @@ module Indulgence
     def compare_single(thing, entity)
       return @compare_single.call thing, entity if @compare_single
       
-      identifier = thing.send(relationship)    
-      identifier == entity.id || identifier == entity     
+      identifier = thing.send(relationship)
+      if identifier.kind_of?(Array)
+        identifier.include? entity
+      else 
+        identifier == entity.id || identifier == entity   
+      end
     end
     
     def filter_many(things, entity)

data/lib/indulgence/version.rb

@@ -1,10 +1,12 @@
 module Indulgence
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end
 
 # History
 # =======
 # 
+# 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 

data/test/lib/role.rb

@@ -1,6 +1,10 @@
+require 'indulgence'
+
 class Role < ActiveRecord::Base
   has_many :users
   
+  acts_as_indulgent
+  
   def title
     self.name
   end

data/test/lib/role_permission.rb

@@ -0,0 +1,16 @@
+require 'indulgence'
+
+class RolePermission < Indulgence::Permission
+  def default
+    {
+      create: from_has_many,
+      read: from_has_many,
+      update: all,
+      delete: none
+    }
+  end
+  
+  def from_has_many
+    define_ability(:users)
+  end
+end

data/test/units/role_permission_test.rb

@@ -0,0 +1,28 @@
+require_relative '../test_helper'
+require 'user'
+require 'role'
+require 'role_permission'
+
+class RolePermissionTest < Test::Unit::TestCase
+  def setup
+    @role = Role.create(:name => 'mortal')
+    @user = User.create(:name => 'Trevor', :role_id => @role.id)
+  end
+  
+  def test_indulge_with_has_many
+    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
+      Role.indulgence(@user, :delete)
+    end
+  end
+  
+  def teardown
+    User.delete_all
+    Role.delete_all
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indulgence
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -82,12 +82,14 @@ files:
 - 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/thing_permission_test.rb
 - test/units/thing_test.rb
 - test/lib/role.rb
 - test/lib/user.rb
 - test/lib/thing.rb
 - test/lib/thing_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
@@ -126,12 +128,14 @@ test_files:
 - 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/thing_permission_test.rb
 - test/units/thing_test.rb
 - test/lib/role.rb
 - test/lib/user.rb
 - test/lib/thing.rb
 - test/lib/thing_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