cannie 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b94c55e9c803c675720227999d8ad2dd25fd28d
-  data.tar.gz: 0d8ca482c78937b9f4b8703d1dc0a71a99bb4d39
+  metadata.gz: fb9f9ff798ce6036fb378e643d66ab7a6cc678e8
+  data.tar.gz: 4ae746f74792940b996abfd21842078b8fe794a7
 SHA512:
-  metadata.gz: 7bb904c6afa19b0726dece42bb5a12268fa035bf8cd27a1747eb4c31e5c1e4c72b49255f69ff57b4719ae54a7f1f7ab0a2c988885d3b4d4c32905ec5ecd5f2e7
-  data.tar.gz: 5caa12f62cafe9d7b357528656ca9c427f02c9eadfb01ec19b396271d52064560094e46640de8305912ebd18e31c591edbcf39fbeae917629b012b8fd255c9dd
+  metadata.gz: f7ce6ab4dfdfecca9c648bba8b28d19b8438cc15dc956098567853e54bf9d4cf4a8efece057537f6e30838a2db73d4014e2621fafaf55aa92ee12f975fc68a50
+  data.tar.gz: 65bd5926da7baf5da5f5329ce4a2c466dbf38236d55bfc0b64ba351abd37971604f3603d21a935e2bc3e93a5cbcc7d72e90230087d62bd70c179c4d3d1a8f335

data/lib/cannie/controller_extensions.rb

@@ -19,8 +19,8 @@ module Cannie
       def check_permissions(options={})
         after_action(options.slice(:only, :except)) do |controller|
           next if controller.permitted?
-          next if options[:if] && !controller.instance_eval(options[:if])
-          next if options[:unless] && controller.instance_eval(options[:unless])
+          next if options[:if] && !controller.instance_eval(&options[:if])
+          next if options[:unless] && controller.instance_eval(&options[:unless])
           raise CheckPermissionsNotPerformed, 'Action failed the check_permissions because it does not calls permit! method. Add skip_check_permissions to bypass this check.'
         end
       end

data/lib/cannie/version.rb

@@ -1,3 +1,3 @@
 module Cannie
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/cannie/controller_extensions_spec.rb

@@ -1,20 +1,13 @@
 require 'spec_helper'
 
-class TestController < ActionController::Base
-  def action
-  end
-end
-
 describe Cannie::ControllerExtensions do
-  subject { TestController.new }
-
-  let(:before_filters) do
-    subject.class._process_action_callbacks.select{|f| f.kind == :before}.map(&:raw_filter)
-  end
+  let(:klass) {
+    Class.new(ActionController::Base) do
+      def action; end
+    end
+  }
 
-  let(:after_filters) do
-    subject.class._process_action_callbacks.select{|f| f.kind == :after}.map(&:raw_filter)
-  end
+  subject { klass.new }
 
   let(:permissions) do
     Class.new do
@@ -30,66 +23,51 @@ describe Cannie::ControllerExtensions do
 
   describe '.check_permissions' do
     describe 'without conditions' do
-      before do
-        TestController.class_eval do
-          check_permissions
-        end
-      end
+      before { klass.check_permissions }
 
       it 'raises exception if controller.permitted? evaluates to false' do
-        expect { after_filters.first.call(subject) }.to raise_error(Cannie::CheckPermissionsNotPerformed)
+        expect { subject.run_callbacks(:process_action) }.to raise_error(Cannie::CheckPermissionsNotPerformed)
       end
 
       it 'does not raise exception if controller.permitted? evaluates to true' do
         subject.stub(:permitted?).and_return(true)
-        expect { after_filters.first.call(subject) }.not_to raise_error
+        expect { subject.run_callbacks(:process_action) }.not_to raise_error
       end
     end
 
     describe 'with if condition' do
-      before do
-        TestController.class_eval do
-          check_permissions if: ->{ self.var == true }
-        end
-      end
+      before { klass.check_permissions if: :condition? }
 
       it 'raises exception if :if block executed in controller scope returns true' do
-        TestController.stub(:var).and_return(true)
-        expect { after_filters.first.call(subject) }.to raise_error(Cannie::CheckPermissionsNotPerformed)
+        subject.stub(:condition?).and_return(true)
+        expect { subject.run_callbacks(:process_action) }.to raise_error(Cannie::CheckPermissionsNotPerformed)
       end
 
       it 'does not raise exception if :if block executed in controller scope returns false' do
-        TestController.stub(:var).and_return(false)
-        expect { after_filters.first.call(subject) }.to raise_error(Cannie::CheckPermissionsNotPerformed)
+        subject.stub(:condition?).and_return(false)
+        expect { subject.run_callbacks(:process_action) }.not_to raise_error
       end
     end
 
     describe 'with unless condition' do
-      before do
-        TestController.class_eval do
-          check_permissions unless: ->{ self.var == true }
-        end
-      end
+      before { klass.check_permissions unless: :condition? }
 
       it 'raises exception if :unless block executed in controller scope returns false' do
-        TestController.stub(:var).and_return(true)
-        expect { after_filters.first.call(subject) }.to raise_error(Cannie::CheckPermissionsNotPerformed)
+        subject.stub(:condition?).and_return(false)
+        expect { subject.run_callbacks(:process_action) }.to raise_error(Cannie::CheckPermissionsNotPerformed)
       end
 
       it 'does not raise exception if :unless block executed in controller scope returns false' do
-        TestController.stub(:var).and_return(false)
-        expect { after_filters.first.call(subject) }.to raise_error(Cannie::CheckPermissionsNotPerformed)
+        subject.stub(:condition?).and_return(true)
+        expect { subject.run_callbacks(:process_action) }.not_to raise_error
       end
     end
   end
 
   describe '.skip_check_permissions' do
     it 'sets @_permitted to true to bypass permissions checking' do
-      subject.class.instance_eval do
-        skip_check_permissions
-      end
-
-      before_filters.first.call(subject)
+      klass.skip_check_permissions
+      subject.run_callbacks(:process_action)
       expect(subject.permitted?).to be_true
     end
   end
@@ -126,4 +104,26 @@ describe Cannie::ControllerExtensions do
       expect { subject.permit! :update, on: [3,6,11] }.to raise_error(Cannie::ActionForbidden)
     end
   end
+
+  describe '#current_permissions' do
+    before(:all) do
+      Permissions = Class.new do
+        attr_reader :user
+        def initialize(user)
+          @user = user
+        end
+      end
+    end
+
+    before { subject.stub(:current_user).and_return 'User' }
+
+    it 'creates new Permissions object' do
+      expect(subject.current_permissions).to be_instance_of(Permissions)
+    end
+
+    it 'passes current_user to Permissions::new' do
+      subject.stub(:current_user).and_return 'User'
+      expect(subject.current_permissions.user).to eq('User')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cannie
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - hck