action-guard 0.0.2 → 0.1.0

data/.autotest

@@ -0,0 +1,11 @@
+Autotest.add_hook(:initialize) do |at|
+  at.clear_mappings
+  at.add_mapping(%r{^lib/.*\.rb$}) { |f, _|
+    at.files_matching %r%^spec/.*_spec\.rb$%
+  }
+  at.add_mapping(%r{^spec/.*_spec\.rb$}) { |f, _|
+    f
+  }
+end
+
+

data/.gitignore

@@ -14,6 +14,7 @@ doc
 # jeweler generated
 pkg
 
+tags
 # Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
 #
 # * Create a file at ~/.gitignore

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/action-guard.gemspec

@@ -4,18 +4,19 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{action-guard}
-  s.version = "0.0.2"
+  s.name = "action-guard"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Westgeest"]
-  s.date = %q{2011-06-27}
-  s.description = %q{authorisation module of actions based on url-paths for usage in Rails and possibly other ruby based web frameworks}
-  s.email = %q{rob.westgeest@qwan.it}
+  s.date = "2012-03-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 = [
     "README.md"
   ]
   s.files = [
+    ".autotest",
     ".document",
     ".gitignore",
     ".rspec",
@@ -37,15 +38,14 @@ Gem::Specification.new do |s|
     "spec/action-guard_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/rwestgeest/action-guard}
+  s.homepage = "http://github.com/rwestgeest/action-guard"
   s.licenses = ["MIT"]
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Action guard-0.0.2}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Action guard-0.1.0"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/action-guard/base.rb

@@ -27,9 +27,10 @@ module ActionGuard
       @roles.keys.map { |r| r.to_s }
     end
 
-    def leveled_rule(path_matcher, role_value, &block)
-      raise Error.new("undefined role '#{role_value}'") unless valid_role?(role_value)
-      rules[path_matcher] = LevelRule.new(role_value, self, &block)
+    def leveled_rule(path_matcher, from_role_value, to_role_value = nil, &block)
+      raise Error.new("undefined role '#{from_role_value}'") unless valid_role?(from_role_value)
+      raise Error.new("undefined role '#{to_role_value}'") if to_role_value && !valid_role?(to_role_value)
+      rules[path_matcher] = LevelRule.new(from_role_value, to_role_value, self, &block)
     end
 
     def allow_rule(path_matcher)

data/lib/action-guard/role.rb

@@ -10,6 +10,10 @@ module ActionGuard
       level <= other.level
     end
 
+    def < (other)
+      level > other.level
+    end
+
     def to_s
       "Role(:#{@value})"
     end

data/lib/action-guard/rules.rb

@@ -10,15 +10,17 @@ module ActionGuard
   end
 
   class LevelRule
-    def initialize(allowed_level, role_leveler, &proc)
+    def initialize(allowed_level, to_allowed_level, role_leveler, &proc)
       @role_leveler = role_leveler
       @allowed_level = allowed_level
+      @to_allowed_level = to_allowed_level
       @additional_rule = proc
     end
 
     def allows?(person)
       return false unless person
       return false unless @role_leveler.role(person.role) >= @role_leveler.role(@allowed_level)
+      return false if @to_allowed_level && @role_leveler.role(@to_allowed_level) < @role_leveler.role(person.role)
       return true unless @additional_rule
       return @additional_rule.call(person)
     end

data/lib/action-guard/syntax.rb

@@ -8,7 +8,7 @@ module ActionGuard
     end
     def allow(path, options={}, &block)
       if options.has_key? :at_least
-        @guard.leveled_rule(path, options[:at_least], &block)
+        @guard.leveled_rule(path, options[:at_least], options[:at_most], &block)
       elsif options.has_key? :only_by
         @guard.exact_role_rule(path, options[:only_by])
       else

data/spec/action-guard_spec.rb

@@ -37,11 +37,12 @@ describe ActionGuard do
   end
 
   describe "role" do
+    before do 
+      guard.define_role :god, 0
+      guard.define_role :admin, 1
+    end
+
     describe ">=" do
-      before do 
-        guard.define_role :god, 0
-        guard.define_role :admin, 1
-      end
       it "should be true when role level is lower" do
         guard.role(:god).should >= guard.role(:admin)
       end
@@ -52,6 +53,17 @@ describe ActionGuard do
         guard.role(:admin).should_not >= guard.role(:god)
       end
     end
+    describe "<" do
+      it "should be true when role level is higher" do
+        guard.role(:admin).should < guard.role(:god)
+      end
+      it "should be true when role level is equal" do
+        guard.role(:admin).should_not < guard.role(:admin)
+      end
+      it "should be false when role level is lower" do
+        guard.role(:god).should_not < guard.role(:admin)
+      end
+    end
   end
 
   describe "defining a rule" do
@@ -60,6 +72,14 @@ describe ActionGuard do
         guard.leveled_rule '/some_controller/some_action', :biker
       }.should raise_error ActionGuard::Error
     end
+
+    it "fails when role not defined" do
+      guard.define_role(:god, 0)
+      lambda {
+        guard.leveled_rule '/some_controller/some_action', :god, :biker
+      }.should raise_error ActionGuard::Error
+    end
+
     it "passes when role defined" do
       lambda {
         guard.define_role :biker, 0
@@ -78,8 +98,10 @@ describe ActionGuard do
 
   describe "authorization"  do
     before do
-      guard.define_role :admin, 0
-      guard.define_role :worker, 1
+      guard.define_role :god, 0
+      guard.define_role :king, 1
+      guard.define_role :admin, 2
+      guard.define_role :worker, 3
     end
 
     describe "on an allowance rule" do
@@ -116,17 +138,27 @@ describe ActionGuard do
     describe "on a leveled action rule" do
       before do
         guard.leveled_rule '/some_controller/some_action', :admin
+        guard.leveled_rule '/some_controller/some_other_action', :admin, :king
       end
 
       it "disallows action when no account available" do
         guard.should_not authorize(nil).to_perform_action('/some_controller/some_action')
+        guard.should_not authorize(nil).to_perform_action('/some_controller/some_other')
       end
 
       it "allows action for that level and higher" do
+        guard.should authorize(account_with_role(:god)).to_perform_action('/some_controller/some_action')
         guard.should authorize(account_with_role(:admin)).to_perform_action('/some_controller/some_action')
         guard.should_not authorize(account_with_role(:worker)).to_perform_action('/some_controller/some_action')
       end
 
+      it "allows action for that level and higher until second level" do
+        guard.should authorize(account_with_role(:king)).to_perform_action('/some_controller/some_other_action')
+        guard.should authorize(account_with_role(:admin)).to_perform_action('/some_controller/some_other_action')
+        guard.should_not authorize(account_with_role(:god)).to_perform_action('/some_controller/some_other_action')
+        guard.should_not authorize(account_with_role(:worker)).to_perform_action('/some_controller/some_other_action')
+      end
+
       it "does not allow the action for a account with an illegal role value" do
         guard.should_not authorize(account_with_role(:biker)).to_perform_action('/some_controller/some_action')
       end
@@ -200,6 +232,7 @@ describe ActionGuard do
         allow '/some_controller', :at_least => :worker
         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 '/'
       }
       guard.should authorize(account_with_role(:admin)).to_perform_action('/some_controller/some_action')
@@ -208,6 +241,8 @@ describe ActionGuard do
       guard.should authorize(account_with_role(:worker)).to_perform_action('/some_other_controller/some_other_action')
       guard.should authorize(nil).to_perform_action('/some_other_controller/some_other_action')
       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')
     end
   end
 end

metadata

@@ -2,12 +2,12 @@
 name: action-guard
 version: !ruby/object:Gem::Version 
   hash: 27
-  prerelease: false
+  prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Rob Westgeest
@@ -15,14 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 +02:00
-default_executable: 
+date: 2012-03-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: rspec
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,12 +29,12 @@ dependencies:
         - 5
         - 0
         version: 2.5.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :development
+  version_requirements: *id001
+  name: rspec
   prerelease: false
-  name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,12 +45,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  type: :development
+  version_requirements: *id002
+  name: bundler
   prerelease: false
-  name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,12 +61,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  type: :development
+  version_requirements: *id003
+  name: jeweler
   prerelease: false
-  name: rcov
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,12 +75,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  type: :development
+  version_requirements: *id004
+  name: rcov
   prerelease: false
-  name: ZenTest
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,12 +91,12 @@ dependencies:
         - 2
         - 0
         version: 4.2.0
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  type: :development
+  version_requirements: *id005
+  name: ZenTest
   prerelease: false
-  name: rspec
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -111,7 +107,10 @@ dependencies:
         - 5
         - 0
         version: 2.5.0
-  requirement: *id006
+  version_requirements: *id006
+  name: rspec
+  prerelease: false
+  type: :development
 description: authorisation module of actions based on url-paths for usage in Rails and possibly other ruby based web frameworks
 email: rob.westgeest@qwan.it
 executables: []
@@ -121,6 +120,7 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- .autotest
 - .document
 - .gitignore
 - .rspec
@@ -141,7 +141,6 @@ files:
 - script/console
 - spec/action-guard_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/rwestgeest/action-guard
 licenses: 
 - MIT
@@ -171,9 +170,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Action guard-0.0.2
+summary: Action guard-0.1.0
 test_files: []