aegis 2.0.2 → 2.0.3

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/aegis.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aegis}
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch", "Tobias Kraze"]
@@ -62,6 +62,7 @@ Gem::Specification.new do |s|
      "spec/loader_spec.rb",
      "spec/permissions_spec.rb",
      "spec/rcov.opts",
+     "spec/sieve_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
@@ -94,7 +95,8 @@ Gem::Specification.new do |s|
      "spec/has_role_spec.rb",
      "spec/permissions_spec.rb",
      "spec/spec_helper.rb",
-     "spec/loader_spec.rb"
+     "spec/loader_spec.rb",
+     "spec/sieve_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/aegis/sieve.rb

@@ -9,7 +9,7 @@ module Aegis
     end
 
     def may?(context, *args)
-      matches_role = @role_name == 'everyone' || @role_name == context.user.role_name
+      matches_role = @role_name == 'everyone' || @role_name == context.user.role.name
       if matches_role
         if @block
           block_result = context.instance_exec(*args, &@block)

data/spec/loader_spec.rb

@@ -16,9 +16,22 @@ describe Aegis::Loader do
 
   end
 
+  describe 'load_paths' do
+
+    it "should require all paths" do
+
+      Aegis::Loader.stub(:paths => ['one', 'two'])
+      Aegis::Loader.should_receive(:require).with('one')
+      Aegis::Loader.should_receive(:require).with('two')
+      Aegis::Loader.load_paths
+
+    end
+
+  end
+
   describe 'loaded?' do
 
-    it "should be loaded" do
+    it "should be loaded by the time this test runs" do
       Aegis::Loader.should be_loaded
     end
 

data/spec/permissions_spec.rb

@@ -196,8 +196,8 @@ describe Aegis::Permissions do
       frank = @user_class.new(:name => 'Frank', :role_name => 'user')
       waldo = @user_class.new(:name => 'Waldo', :role_name => 'user')
 
-      frank.may_update_post?('the post').should be_false
-      waldo.may_update_post?('the post').should be_true
+      @permissions.may?(frank, 'update_post', 'the post').should be_false
+      @permissions.may?(waldo, 'update_post', 'the post').should be_true
 
     end
 
@@ -317,8 +317,8 @@ describe Aegis::Permissions do
       end
 
       @user.stub(:password => "secret")
-      @user.may_sign_in?("wrong_password").should be_false
-      @user.may_sign_in?("secret").should be_true
+      @permissions.may?(@user, "sign_in", "wrong_password").should be_false
+      @permissions.may?(@user, "sign_in", "secret").should be_true
 
     end
 
@@ -335,7 +335,7 @@ describe Aegis::Permissions do
       end
 
       spy.should_receive(:observe).with("the property", "the comment", "additional argument")
-      @moderator.may_update_property_comment?("the property", "the comment", "additional argument")
+      @permissions.may?(@moderator, "update_property_comment", "the property", "the comment", "additional argument")
     end
 
     it "should evaluate additional resource actions" do
@@ -487,32 +487,32 @@ describe Aegis::Permissions do
       @permissions.class_eval do
         missing_action_means :default_permission
       end
-      @user.may_missing_action?.should be_false
-      @admin.may_missing_action?.should be_true
+      @permissions.may?(@user, 'missing_action').should be_false
+      @permissions.may?(@admin, 'missing_action').should be_true
     end
 
     it "should grant everyone access if the strategy is :allow" do
       @permissions.class_eval do
         missing_action_means :allow
       end
-      @user.may_missing_action?.should be_true
-      @admin.may_missing_action?.should be_true
+      @permissions.may?(@user, 'missing_action').should be_true
+      @permissions.may?(@admin, 'missing_action').should be_true
     end
 
     it "should deny everyone access if the strategy is :deny" do
       @permissions.class_eval do
         missing_action_means :deny
       end
-      @user.may_missing_action?.should be_false
-      @admin.may_missing_action?.should be_false
+      @permissions.may?(@user, 'missing_action').should be_false
+      @permissions.may?(@admin, 'missing_action').should be_false
     end
 
     it "should raise an error if the strategy is :error" do
       @permissions.class_eval do
         missing_action_means :error
       end
-      lambda { @user.may_missing_action? }.should raise_error
-      lambda { @admin.may_missing_action? }.should raise_error
+      lambda { @permissions.may?(@user, 'missing_action') }.should raise_error
+      lambda { @permissions.may?(@admin, 'missing_action') }.should raise_error
     end
 
   end
@@ -546,5 +546,26 @@ describe Aegis::Permissions do
 
   end
 
+  describe 'find_action_by_path' do
+
+    before(:each) do
+      @permissions.class_eval do
+        action :action_name do
+          allow :user
+        end
+      end
+    end
+
+    it "should find an action by a string" do
+      @permissions.find_action_by_path('action_name').should_not be_abstract
+    end
+
+    it "should find an action by a symbol" do
+      @permissions.find_action_by_path(:action_name).should_not be_abstract
+    end
+
+  end
+
+
 end
 

data/spec/sieve_spec.rb

@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe Aegis::Sieve do
+
+  before(:each) do
+    @role = stub('role', :name => 'user')
+    @user = stub('user', :role => @role)
+    @context = OpenStruct.new(:user => @user)
+  end
+
+  describe 'may? 'do
+
+    it "should use the role's name to find out if the sieve matches" do
+      @role.should_receive(:name)
+      Aegis::Sieve.new('moderator', true).may?(@context)
+    end
+
+    it "should return nil if the sieve doesn't match the role" do
+      Aegis::Sieve.new('moderator', true).may?(@context).should be_nil
+    end
+
+    it "should return the effect if the sieve matches the role" do
+      Aegis::Sieve.new('user', true).may?(@context).should be_true
+      Aegis::Sieve.new('user', false).may?(@context).should be_false
+    end
+
+    it "should match any role if its role name is set to 'everyone'" do
+      Aegis::Sieve.new('everyone', true).may?(@context).should be_true
+      Aegis::Sieve.new('everyone', false).may?(@context).should be_false
+    end
+
+    context "with a block" do
+
+      it "should return the effect if the block evaluates to true" do
+        Aegis::Sieve.new('user', true, lambda { true }).may?(@context).should be_true
+        Aegis::Sieve.new('user', false, lambda { true }).may?(@context).should be_false
+      end
+
+      it "should invert the effect if the block evaluates to false" do
+        Aegis::Sieve.new('user', true, lambda { false }).may?(@context).should be_false
+        Aegis::Sieve.new('user', false, lambda { false }).may?(@context).should be_true
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - Henning Koch
@@ -74,6 +74,7 @@ files:
 - spec/loader_spec.rb
 - spec/permissions_spec.rb
 - spec/rcov.opts
+- spec/sieve_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -131,3 +132,4 @@ test_files:
 - spec/permissions_spec.rb
 - spec/spec_helper.rb
 - spec/loader_spec.rb
+- spec/sieve_spec.rb