surrounded 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c6531f19ef8b5dbc0b493ec8e152e9b437a30cb
-  data.tar.gz: e697f17d7fd567a6267dacd4920818f7fc38479d
+  metadata.gz: 349c77c09cbb18c43dff15df5fcb3ce444f6aee1
+  data.tar.gz: 61b1e9fb3ce7e7865a624425fbb4fc746644d674
 SHA512:
-  metadata.gz: 45331f12b9e8bede773e36f022f1df5950de459b6687b5dad81b960d2cf4d85fbd694b79d4cc94691871dfdae699a0bbe19a54537f544c98e21afd29f20f2e60
-  data.tar.gz: 0adab8408e419a3437a75bf08f342a15aaef6b6b9090bd1bb3352a09e44eeeebe4bbf6abe638cd4601dcce85daf10180a088e336e0b94e3f021f7de2090aab9b
+  metadata.gz: 166ecba24f2037b1a57c80a163f1a2a75506af524d88552af1caa3d6d72ea79cd0693a97df446acbfd7ac903e57b4d8a8c524b21d5f087dbf21fd0ad00c5c4ab
+  data.tar.gz: 04b781c0db8fc068de9af65f4fda3f58b3b8d1e4f859c6dfa67800e89be032cc696a5690b6c7adf7661663dea61dd2eea6dbabb74ad915517e04be0faa9d86a1

data/lib/surrounded/access_control.rb

@@ -9,7 +9,7 @@ module Surrounded
     
     def disallow(*names, &block)
       names.map do |name|
-        define_method("disallow_#{name}?", &block)
+        define_access_method(name, &block)
       end
     end
     
@@ -33,6 +33,20 @@ module Surrounded
       }
     end
     
+    def define_access_method(name, &block)
+      class_eval {
+        meth = AccessMethods.instance_method(:with_roles)
+        define_method "disallow_#{name}?" do
+          begin
+            apply_roles if __apply_role_policy == :trigger
+            instance_exec(&block)
+          ensure
+            remove_roles if __apply_role_policy == :trigger
+          end
+        end
+      }
+    end
+    
     module AccessMethods
       def all_triggers
         self.class.triggers
@@ -44,6 +58,15 @@ module Surrounded
           !self.respond_to?(method_restrictor, true) || !self.send(method_restrictor)
         }.to_set
       end
+      
+      def with_roles(policy = :trigger)
+        begin
+          apply_roles if __apply_role_policy == policy
+          yield
+        ensure
+          remove_roles if __apply_role_policy == policy
+        end
+      end
     end
   end
 end

data/lib/surrounded/version.rb

@@ -1,3 +1,3 @@
 module Surrounded
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/test/context_access_test.rb

@@ -14,6 +14,20 @@ class FilteredContext
   disallow :if_ready do
     user.name != 'Amy'
   end
+  
+  trigger :check_disallow_behavior do
+    # used for disallow check
+  end
+  
+  disallow :check_disallow_behavior do
+    user.special
+  end
+  
+  role :user do
+    def special
+      'special user method'
+    end
+  end
 end
 
 describe Surrounded::Context, 'access control' do
@@ -37,4 +51,8 @@ describe Surrounded::Context, 'access control' do
     }
     assert_match(/access to FilteredContext#if_ready is not allowed/i, error.message)
   end
+  
+  it 'applies roles in disallow blocks' do
+    assert_equal 'special user method', context.disallow_check_disallow_behavior?
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: surrounded
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - '''Jim Gay'''
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: triad