permissioner 0.1.0.beta → 0.1.1.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ba85c8029c5e0f9a4f4f9e57c546ff2dc87e74e
-  data.tar.gz: e9502b6cb5c9a1dc7a269ce74af1e93b23e4606e
+  metadata.gz: 283f7e1c48c2fa3ef067f72a57ef99c64b0bee45
+  data.tar.gz: 7d2445b825b484f698f46887dbae818adca3af02
 SHA512:
-  metadata.gz: e4802cc89cfb79b4a6d500f72ca4d0e4d31650bf6c183bebd8c7caac7d34342d074fead3c94e9ece2d6e3eb79f4d3b04566a497c52806d2cf8e12be65c993295
-  data.tar.gz: 9d1710c507e6d7a74ed131d8f8899bd3ef6abcd7623ff676c69c3341be585a0d150f7c7536c073152ae4ad8674286157c017cbaf83f983a24485448b90d995c0
+  metadata.gz: 2e4f293f79ca9bae4d30bf4c8e262f57cba4f7f2920c355b08b894ebaef1058e4bf7c4e0704a448f8c30f343bff1bae332b2075db0364cf53776e99c41429782
+  data.tar.gz: 8699d0ae874e3b08ef9efa448bf8fdb70fdefc32510c2beb5376da705451b63f643228e0d906def191daaa5efcf4491c2e6f95227f0b3ce41569e5785665ffed

data/lib/permissioner/service_additions.rb

@@ -5,16 +5,16 @@ module Permissioner
 
     def initialize current_user=nil
       @current_user = current_user
+      @filters = {}
       configure_permissions
     end
 
     def allow_action?(controller, action, subjects={})
-      allowed =
-          @allow_all ||
-          (@allowed_actions &&
-              (@allowed_actions[[controller.to_s, action.to_s]] || @allowed_actions[[controller.to_s, 'all']]))
-      allowed = allowed && (allowed == true || allowed.call(subjects[:resource]))
-      allowed && passed_filters?(controller, action, subjects)
+      allowed = @allow_all
+      if !allowed && @allowed_actions
+        allowed = @allowed_actions[[controller.to_s, action.to_s]] || @allowed_actions[[controller.to_s, 'all']]
+      end
+      allowed && (@allow_all || passed_filters?(controller, action, subjects))
     end
 
     def allow_attribute?(resource, attribute)
@@ -61,7 +61,8 @@ module Permissioner
       @allowed_actions ||= {}
       Array(controllers).each do |controller|
         Array(actions).each do |action|
-          @allowed_actions[[controller.to_s, action.to_s]] = block || true
+          @allowed_actions[[controller.to_s, action.to_s]] = true
+          add_block_to_filters(controller, action, &block) if block_given?
         end
       end
     end
@@ -80,11 +81,9 @@ module Permissioner
 
     def add_filter(controllers, actions, &block)
       raise 'no block given' unless block_given?
-      @filters ||= {}
       Array(controllers).each do |controller|
         Array(actions).each do |action|
-          @filters[[controller.to_s, action.to_s]] ||= []
-          @filters[[controller.to_s, action.to_s]] << block
+          add_block_to_filters(controller, action, &block)
         end
       end
     end
@@ -113,5 +112,13 @@ module Permissioner
     #
     def configure_permissions
     end
+
+    private
+
+    def add_block_to_filters(controller, action, &block)
+      raise 'cannot add filter to :all' if action.to_s == 'all'
+      @filters[[controller.to_s, action.to_s]] ||= []
+      @filters[[controller.to_s, action.to_s]] << block
+    end
   end
 end

data/lib/permissioner/version.rb

@@ -1,3 +1,3 @@
 module Permissioner
-  VERSION = "0.1.0.beta"
+  VERSION = "0.1.1.beta"
 end

data/spec/permissioner/controller_additions_spec.rb

@@ -2,56 +2,55 @@ require 'spec_helper'
 
 describe Permissioner::ControllerAdditions do
 
-  before :each do
-    @controller_class = Class.new
-    @controller_class.stub(:helper_method)
-    @controller_class.send(:include, Permissioner::ControllerAdditions)
-    @controller = @controller_class.new
-    @controller.stub(:current_user)
+  let(:controller) do
+    controller_class = Class.new
+    controller_class.stub(:helper_method)
+    controller_class.send(:include, Permissioner::ControllerAdditions)
+    controller = controller_class.new
+    controller.stub(:current_user)
+    controller
   end
 
   describe '::included' do
 
-    before :each do
-      @clazz = Class.new
-    end
+    let(:clazz) { Class.new }
 
     it 'should set view helpers' do
-      @clazz.should_receive(:helper_method).with(:allow_action?, :allow_attribute?, :permission_service)
-      @clazz.send(:include, Permissioner::ControllerAdditions)
+      clazz.should_receive(:helper_method).with(:allow_action?, :allow_attribute?, :permission_service)
+      clazz.send(:include, Permissioner::ControllerAdditions)
     end
 
     it 'should delegate helper methods to permission servie' do
-      @clazz.stub(:helper_method)
-      @clazz.should_receive(:delegate).with(:allow_action?, :allow_attribute?, to: :permission_service)
-      @clazz.send(:include, Permissioner::ControllerAdditions)
+      clazz.stub(:helper_method)
+      clazz.should_receive(:delegate).with(:allow_action?, :allow_attribute?, to: :permission_service)
+      clazz.send(:include, Permissioner::ControllerAdditions)
     end
   end
 
-
   describe 'authorize' do
 
+    let(:params) { {controller: 'comments', action: 'index'} }
+
     before :each do
-      @params = {controller: 'comments', action: 'index'}
-      @controller.stub(:current_resource).and_return('resource')
-      @controller.stub(:params).and_return(@params)
+      controller.stub(:current_resource).and_return('resource')
+      controller.stub(:params).and_return(params)
     end
 
     it 'should call permit_params! if action allwed and filters passed' do
-      @controller.permission_service.should_receive(:allow_action?).and_return(true)
-      @controller.permission_service.should_receive(:permit_params!).with(@params)
-      @controller.authorize
+      controller.permission_service.should_receive(:allow_action?).and_return(true)
+      controller.permission_service.should_receive(:permit_params!).with(params)
+      controller.authorize
     end
 
     it 'should call allow_action? with correct parameters' do
-      @controller.permission_service.should_receive(:allow_action?).with('comments', 'index', resource: 'resource', params: @params).and_return(true)
-      @controller.authorize
+      controller.permission_service.should_receive(:allow_action?).with('comments', 'index', resource: 'resource', params: params).and_return(true)
+      controller.authorize
     end
 
     it 'should raise Permissioner::NotAuthorized when action not allowed' do
-      @controller.permission_service.should_receive(:allow_action?).with('comments', 'index', resource: 'resource', params: @params).and_return(false)
+      controller.permission_service.should_receive(:allow_action?).with('comments', 'index', resource: 'resource', params: params).and_return(false)
       expect {
-        @controller.authorize
+        controller.authorize
       }.to raise_error Permissioner::NotAuthorized
     end
   end
@@ -59,31 +58,29 @@ describe Permissioner::ControllerAdditions do
   describe '#permission_service' do
 
     it 'should return instance of PermissionService' do
-      @controller.permission_service.class.should eq PermissionService
+      controller.permission_service.class.should eq PermissionService
     end
 
     it 'should cache PermissionService instance' do
-      permission_service_1 = @controller.permission_service
-      permission_service_2 = @controller.permission_service
-      permission_service_1.should eq permission_service_2
+      controller.permission_service.should be controller.permission_service
     end
 
     it 'should create PermissionService by calling PermissionService::new' do
       PermissionService.should_receive(:new)
-      @controller.permission_service
+      controller.permission_service
     end
 
     it 'should pass current_user to PermissionService::initialize' do
-      @controller.should_receive(:current_user).and_return('current_user')
+      controller.should_receive(:current_user).and_return('current_user')
       PermissionService.should_receive(:new).with('current_user')
-      @controller.permission_service
+      controller.permission_service
     end
   end
 
   describe '#current_resource' do
 
     it 'should return nil as default' do
-      @controller.current_resource.should be_nil
+      controller.current_resource.should be_nil
     end
   end
 end

data/spec/permissioner/service_additions_spec.rb

@@ -25,79 +25,64 @@ describe Permissioner::ServiceAdditions do
 
   describe '#allow_action?' do
 
-    it 'should return true if @allow_all is true' do
-      permission_service.allow_all
-      permission_service.allow_action?(:comments, :index).should be_true
-    end
-
-    context 'block not given' do
+    context 'filters not given' do
 
-      it 'should return true if given action allowed' do
+      it 'should return true if action is allowed' do
         permission_service.allow_actions :comments, :index
         permission_service.allow_action?(:comments, :index).should be_true
       end
 
-      it 'should return true for every action when all actions are allowed' do
+      it 'should return true for every action if  all actions of controller are allowed' do
         permission_service.allow_actions :comments, :all
         permission_service.allow_action?(:comments, :index).should be_true
       end
 
-      it 'should return true if action is allowed and given filter returns true' do
-        permission_service.add_filter :comments, :index, &Proc.new { true }
-        permission_service.allow_actions :comments, :index
+      it 'should return true if allow_all is true' do
+        permission_service.allow_all
         permission_service.allow_action?(:comments, :index).should be_true
       end
 
-      it 'should return false if given action not allowed' do
-        permission_service.allow_action?(:comments, :index).should be_false
-        permission_service.allow_actions :comments, :create
-        permission_service.allow_action?(:comments, :index).should be_false
-      end
-
-      it 'should return false if action is allowed and given filter returns false' do
-        permission_service.add_filter :comments, :index, &Proc.new { false }
-        permission_service.allow_actions :comments, :index
+      it 'should return false if actions is not allowed' do
         permission_service.allow_action?(:comments, :index).should be_false
       end
     end
 
-    context 'block given' do
+    context 'filters given' do
 
-      it 'should call block for given action when ressource is given' do
-        block = Proc.new {}
-        block.should_receive(:call)
-        permission_service.allow_actions :comments, :index, &block
-        permission_service.allow_action?(:comments, :index, resource: 'resource')
+      it 'should return true if action is allowed and all filters return true' do
+        permission_service.allow_actions :comments, :index, &Proc.new { true }
+        permission_service.add_filter :comments, :index, &Proc.new { true }
+        permission_service.allow_action?(:comments, :index).should be_true
       end
 
-      it 'should return true when block returns true' do
-        block = Proc.new { true }
-        permission_service.allow_actions :comments, :index, &block
+      it 'should return true for every action if all actions of controller are allowed and filters return true' do
+        permission_service.allow_actions :comments, :all
+        permission_service.add_filter :comments, :index, &Proc.new { true }
         permission_service.allow_action?(:comments, :index).should be_true
       end
 
-      it 'should return true if block and given filter returns true' do
-        permission_service.add_filter :comments, :index, &Proc.new { true }
-        permission_service.allow_actions :comments, :index, &Proc.new { true }
+      it 'should return true if allow_all is true but filters return false' do
+        permission_service.allow_all
+        permission_service.allow_actions :comments, :index, &Proc.new { false }
+        permission_service.add_filter :comments, :index, &Proc.new { false }
         permission_service.allow_action?(:comments, :index).should be_true
       end
 
-      it 'should return false when block returns false' do
-        block = Proc.new { false }
-        permission_service.allow_actions :comments, :index, &block
-        permission_service.allow_action?(:comments, :index, resource: 'resource').should be_false
+      it 'should return false if given action allowed but filters return false' do
+        permission_service.allow_actions :comments, :index, &Proc.new { false }
+        permission_service.allow_action?(:comments, :index).should be_false
       end
 
-      it 'should return false if block returns true and given filter returns false' do
-        permission_service.add_filter :comments, :index, &Proc.new { false }
+      it 'should return false if given action allowed but at least one filter returns false' do
         permission_service.allow_actions :comments, :index, &Proc.new { true }
-        permission_service.allow_action?(:comments, :index, resource: 'resource').should be_false
+        permission_service.add_filter :comments, :index, &Proc.new { false }
+        permission_service.allow_action?(:comments, :index).should be_false
       end
 
-      it 'should return false if block returns false and given filter returns true' do
-        permission_service.add_filter :comments, :index, &Proc.new { true }
-        permission_service.allow_actions :comments, :index, &Proc.new { false }
-        permission_service.allow_action?(:comments, :index, resource: 'resource').should be_false
+      it 'should return false for every action if all actions of controller are allowed but filters return false' do
+        permission_service.allow_actions :comments, :all
+        permission_service.add_filter :comments, :index, &Proc.new { false }
+        permission_service.allow_action?(:comments, :index).should be_false
       end
     end
 
@@ -215,28 +200,79 @@ describe Permissioner::ServiceAdditions do
 
   describe '#allow_actions' do
 
-    it 'should add controller and action to @allowed_actions' do
-      permission_service.allow_actions :comments, :index
-      allowed_actions = permission_service.instance_variable_get(:@allowed_actions)
-      allowed_actions.count.should eq 1
-      allowed_actions[['comments', 'index']].should be_true
-    end
+    context 'block not given' do
+
+      it 'should add actions to @allowed_actions when one action is given' do
+        permission_service.allow_actions :comments, :index
+        allowed_actions = permission_service.instance_variable_get(:@allowed_actions)
+        allowed_actions.count.should eq 1
+        allowed_actions[['comments', 'index']].should be_true
+      end
+
+      it 'should add actions to @allowed_actions when multiple actions are given' do
+        permission_service.allow_actions([:comments, :users], [:index, :create])
+        allowed_actions = permission_service.instance_variable_get(:@allowed_actions)
+        allowed_actions.count.should eq 4
+        allowed_actions[['comments', 'index']].should be_true
+        allowed_actions[['comments', 'create']].should be_true
+        allowed_actions[['users', 'index']].should be_true
+        allowed_actions[['users', 'create']].should be_true
+      end
 
-    it 'should add controllers and action to @allowed_actions when multiple given' do
-      permission_service.allow_actions([:comments, :users], [:index, :create])
-      allowed_actions = permission_service.instance_variable_get(:@allowed_actions)
-      allowed_actions.count.should eq 4
-      allowed_actions[['comments', 'index']].should be_true
-      allowed_actions[['comments', 'create']].should be_true
-      allowed_actions[['users', 'index']].should be_true
-      allowed_actions[['users', 'create']].should be_true
+      it 'should not add any filters' do
+        permission_service.allow_actions :comments, :index
+        filters = permission_service.instance_variable_get(:@filters)
+        filters.count.should eq 0
+      end
     end
 
-    it 'should add controllers and action to @allowed_actions and store block when given' do
-      block = Proc.new {}
-      permission_service.allow_actions(:comments, :edit, &block)
-      allowed_actions = permission_service.instance_variable_get(:@allowed_actions)
-      allowed_actions[['comments', 'edit']].object_id.should eq block.object_id
+    context 'block given' do
+
+      it 'should add block to @filters one aciton is given' do
+        block = Proc.new {}
+        permission_service.allow_actions :comments, :index, &block
+        filters = permission_service.instance_variable_get(:@filters)
+        filters.count.should eq 1
+        filters[['comments', 'index']].should eq [block]
+      end
+
+      it 'should add block to @filters when multiple actions are given' do
+        block = Proc.new {}
+        permission_service.allow_actions([:comments, :users], [:index, :create], &block)
+        filters = permission_service.instance_variable_get(:@filters)
+        filters.count.should eq 4
+        filters[['comments', 'index']].should eq [block]
+        filters[['comments', 'create']].should eq [block]
+        filters[['users', 'index']].should eq [block]
+        filters[['users', 'create']].should eq [block]
+      end
+
+      it 'should add multiple blocks to @filters fore every actions' do
+        block_1 = Proc.new {}
+        block_2 = Proc.new {}
+        permission_service.allow_actions :comments, :index, &block_1
+        permission_service.allow_actions :comments, :index, &block_2
+        filters = permission_service.instance_variable_get(:@filters)
+        filters.count.should eq 1
+        filters[['comments', 'index']].should eq [block_1, block_2]
+      end
+
+      it 'should add actions to @allowed_actions' do
+        permission_service.allow_actions :comments, :index, &Proc.new {}
+        allowed_actions = permission_service.instance_variable_get(:@allowed_actions)
+        allowed_actions.count.should eq 1
+        allowed_actions[['comments', 'index']].should be_true
+      end
+
+      it 'should raise error if block is given for all actions' do
+        message = 'cannot add filter to :all'
+        expect {
+          permission_service.allow_actions :comments, :all, &Proc.new {}
+        }.to raise_exception message
+        expect {
+          permission_service.allow_actions :comments, 'all', &Proc.new {}
+        }.to raise_exception message
+      end
     end
   end
 
@@ -298,6 +334,16 @@ describe Permissioner::ServiceAdditions do
     it 'should rails exception when no block given' do
       expect { permission_service.add_filter(:comments, :index) }.to raise_error('no block given')
     end
+
+    it 'should raise error if block is given for all actions' do
+      message = 'cannot add filter to :all'
+      expect {
+        permission_service.add_filter :comments, :all, &Proc.new {}
+      }.to raise_exception message
+      expect {
+        permission_service.add_filter :comments, 'all', &Proc.new {}
+      }.to raise_exception message
+    end
   end
 
   describe '#clear_filters' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: permissioner
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta
+  version: 0.1.1.beta
 platform: ruby
 authors:
 - Daniel Grawunder, Christian Mierich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec