action-guard 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/action-guard.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "action-guard"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Westgeest"]
-  s.date = "2012-06-06"
+  s.date = "2012-10-01"
   s.description = "authorisation module of actions based on url-paths for usage in Rails and possibly other ruby based web frameworks"
   s.email = "rob.westgeest@qwan.it"
   s.extra_rdoc_files = [
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
-  s.summary = "Action guard-1.1.0"
+  s.summary = "Action guard-1.2.0"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/action-guard/base.rb

@@ -33,8 +33,8 @@ module ActionGuard
       rules[path_matcher] = LevelRule.new(from_role_value, to_role_value, self, &block)
     end
 
-    def allow_rule(path_matcher)
-      rules[path_matcher] = AllowRule.new
+    def allow_rule(path_matcher, &block)
+      rules[path_matcher] = AllowRule.new(&block)
     end
 
     def refuse_rule(path_matcher)

data/lib/action-guard/rules.rb

@@ -27,7 +27,11 @@ module ActionGuard
   end
 
   class AllowRule
+    def initialize(&block)
+      @additional_rule = block
+    end
     def allows?(person, request_params)
+      return @additional_rule.call(person, request_params) unless @additional_rule.nil?
       true
     end
   end

data/spec/action-guard_spec.rb

@@ -129,6 +129,39 @@ describe ActionGuard do
       end
     end
 
+    describe "on an allowance rule with a block" do 
+      let!(:mock_block_body) { mock }
+
+      before do
+        guard.allow_rule('some_controller#some_action') do |*args|
+          mock_block_body.block_called(*args)
+        end
+      end
+
+      it "calls block" do
+        account = account_with_role(:worker)
+        mock_block_body.should_receive(:block_called).with(account, request_params_for('some_controller#some_action'))
+        guard.authorized?(account, a_request_for( 'some_controller#some_action'))
+      end
+
+      it "disallows when block returns false" do
+        account = account_with_role(:worker)
+
+        mock_block_body.stub(:block_called).and_return false
+
+        guard.authorized?(account, a_request_for('some_controller#some_action')).should be_false
+      end
+
+      it "allows when block returns true" do
+        account = account_with_role(:worker)
+
+        mock_block_body.stub(:block_called).and_return true
+
+        guard.authorized?(account, a_request_for('some_controller#some_action')).should be_true
+      end
+    end
+
+
     describe "on an exact rule" do
       before do
         guard.exact_role_rule 'home', :admin

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: action-guard
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Rob Westgeest
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-06 00:00:00 Z
+date: 2012-10-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -173,6 +173,6 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Action guard-1.1.0
+summary: Action guard-1.2.0
 test_files: []