action-guard 1.2.0 → 1.2.1

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/action-guard.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "action-guard"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Westgeest"]
@@ -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.2.0"
+  s.summary = "Action guard-1.2.1"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/action-guard/syntax.rb

@@ -12,7 +12,7 @@ module ActionGuard
       elsif options.has_key? :only_by
         @guard.exact_role_rule(path, options[:only_by])
       else
-        @guard.allow_rule path
+        @guard.allow_rule(path, &block)
       end
     end
   end

data/spec/action-guard_spec.rb

@@ -291,6 +291,9 @@ describe ActionGuard do
         allow 'some_controller#some_action', :at_least => :admin
         allow 'some_controller#when_role_matches_exact', :only_by => :worker
         allow 'some_controller#when_matches_exact_by_implication', :at_least => :worker, :at_most => :worker
+        allow 'some_controller#when_block_returns_false' do  |account, request_params| 
+          false
+        end 
         allow '' # wildcard for other controllers
       }
       guard.should authorize(account_with_role(:admin)).to_perform_action('some_controller#some_action')
@@ -301,6 +304,8 @@ describe ActionGuard do
       guard.should_not authorize(account_with_role(:admin)).to_perform_action('some_controller#when_role_matches_exact')
       guard.should authorize(account_with_role(:worker)).to_perform_action('some_controller#when_matches_exact_by_implication')
       guard.should_not authorize(account_with_role(:admin)).to_perform_action('some_controller#when_matches_exact_by_implication')
+      guard.should_not authorize(nil).to_perform_action('some_controller#when_block_returns_false')
+        
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: action-guard
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Rob Westgeest
@@ -173,6 +173,6 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Action guard-1.2.0
+summary: Action guard-1.2.1
 test_files: []