fortress 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8807ceb07a787af9e28880231b85215cd11e10c4
-  data.tar.gz: 916d0af542ab25823cac2db1df20d7810502f8ca
+  metadata.gz: 4b5730842ffb0c266be737f1beb08214fa812a2e
+  data.tar.gz: f89c8718b2bd3f83e387d20c0ddb407922fe32d9
 SHA512:
-  metadata.gz: 11fb3fce13b31dd8f0db8236051b7386df0c9d9007812aba764a4d2d1a724ef747e726a81ef939d2164a1f39ad46c7b2ddd8fc5c8d2d30200e629998a5add6a3
-  data.tar.gz: 38b701f41f66e26b1a7869fb7f08cfc54a2ce277c5bf3c328df2b0e189adceae8811364cdc9eb3607536a6e54b63d3c2f4eeced5014d33175be46973e1a54339
+  metadata.gz: 7021c45f9a31239645766b7ba2cf7962f2a15bdcf942d68177f6ebe4a7d72307ef660fd1e8b2d8d8b35f800660d449c430c0cc8b1c9c0f713f4e2b293c58b15d
+  data.tar.gz: 61adb02f34db781748d294976416157a2ea9840acf45d0ac1d18e2314e82c9bd41d2a4f75bb8ce0fb5f4e90e134265368ed279a6ca8b61c0eee56be6dd9f4694

data/.rubocop.yml

@@ -0,0 +1,3 @@
+AllCops:
+  Exclude:
+    - 'bin/*'

data/lib/fortress/controller_interface.rb

@@ -32,7 +32,7 @@ module Fortress
       return false if action_forbidden?(name.to_sym)
 
       if conditionnal_method_with_action?(name.to_sym)
-        return params[:if][:method] == true
+        return call_allow_method == true
       end
 
       return true if action_allowed_from_only?(name.to_sym)
@@ -55,7 +55,7 @@ module Fortress
 
     def conditionally_allowed?(action_name)
       return unless allow_method?
-      return unless needs_to_check_action?(action_name)
+      return unless needs_to_check_action?(action_name.to_sym)
       call_allow_method
     end
 

data/lib/fortress/version.rb

@@ -4,5 +4,5 @@
 # @author zedtux
 #
 module Fortress
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/fixtures/controllers.rb

@@ -26,6 +26,16 @@ class GuitarsController < TestController
   def update; end
 
   def destroy; end
+
+  private
+
+  def true
+    true
+  end
+
+  def false
+    false
+  end
 end
 
 #

data/spec/fortress/authorisations_appending_spec.rb

@@ -2,22 +2,23 @@ require 'spec_helper'
 
 describe 'Authorisations appending (YourCursus/fortress#7)' do
   describe GuitarsController, type: :controller do
-    let(:controller) { 'GuitarsController' }
+    let(:controller_name) { 'GuitarsController' }
     before { Fortress::Mechanism.initialize_authorisations }
     context 'when calling the first time `fortress_allow` method' do
       before { GuitarsController.fortress_allow [:index, :show] }
       it 'should create a new authorisation for the controller' do
-        expect(Fortress::Mechanism.authorisations).to have_key(controller)
-        expect(Fortress::Mechanism.authorisations[controller])
+        expect(Fortress::Mechanism.authorisations).to have_key(controller_name)
+        expect(Fortress::Mechanism.authorisations[controller_name])
           .to eql(only: [:index, :show])
       end
       context 'when calling a second time `fortress_allow` method' do
-        before { GuitarsController.fortress_allow :create, if: true }
+        before { GuitarsController.fortress_allow :create, if: :true }
         it 'should append keys to the existing controller authorisation' do
-          expect(Fortress::Mechanism.authorisations).to have_key(controller)
-          expect(Fortress::Mechanism.authorisations[controller])
+          expect(Fortress::Mechanism.authorisations)
+            .to have_key(controller_name)
+          expect(Fortress::Mechanism.authorisations[controller_name])
             .to eql(only: [:index, :show],
-                    if: { method: true, actions: [:create] })
+                    if: { method: :true, actions: [:create] })
         end
       end
     end
@@ -25,17 +26,43 @@ describe 'Authorisations appending (YourCursus/fortress#7)' do
     context 'when calling the first time `fortress_allow` method' do
       before { GuitarsController.fortress_allow :all, except: :destroy }
       it 'should create a new authorisation for the controller' do
-        expect(Fortress::Mechanism.authorisations).to have_key(controller)
-        expect(Fortress::Mechanism.authorisations[controller])
+        expect(Fortress::Mechanism.authorisations).to have_key(controller_name)
+        expect(Fortress::Mechanism.authorisations[controller_name])
           .to eql(all: true, except: [:destroy])
       end
       context 'when calling a second time `fortress_allow` method' do
-        before { GuitarsController.fortress_allow :destroy, if: true }
-        it 'should append keys to the existing controller authorisation' do
-          expect(Fortress::Mechanism.authorisations).to have_key(controller)
-          expect(Fortress::Mechanism.authorisations[controller])
-            .to eql(all: true, except: [:destroy],
-                    if: { method: true, actions: [:destroy] })
+        context 'using the `:if` option with a method returning true' do
+          before { GuitarsController.fortress_allow :destroy, if: :true }
+          it 'should append keys to the existing controller authorisation' do
+            expect(Fortress::Mechanism.authorisations)
+              .to have_key(controller_name)
+            expect(Fortress::Mechanism.authorisations[controller_name])
+              .to eql(all: true, except: [:destroy],
+                      if: { method: :true, actions: [:destroy] })
+          end
+          it 'should allow the controller action' do
+            post :destroy, id: 1
+
+            expect(response).to_not redirect_to(root_url)
+            expect(flash[:error]).to be_nil
+            expect(response).to have_http_status(:ok)
+          end
+        end
+        context 'using the `:if` option with a method returning false' do
+          before { GuitarsController.fortress_allow :destroy, if: :false }
+          it 'should append keys to the existing controller authorisation' do
+            expect(Fortress::Mechanism.authorisations)
+              .to have_key(controller_name)
+            expect(Fortress::Mechanism.authorisations[controller_name])
+              .to eql(all: true, except: [:destroy],
+                      if: { method: :false, actions: [:destroy] })
+          end
+          it 'should prevent the controller action' do
+            post :destroy, id: 1
+
+            expect(response).to redirect_to(root_url)
+            expect(flash[:error]).to be_present
+          end
         end
       end
     end

data/spec/fortress/controller_interface_spec.rb

@@ -95,7 +95,7 @@ describe Fortress::ControllerInterface do
           context 'the `:method` return false' do
             before do
               Fortress::Mechanism.authorisations['GuitarsController'] = {
-                if: { actions: [:index], method: false }
+                if: { actions: [:index], method: :false }
               }
             end
             subject { Fortress::ControllerInterface.new(@controller) }
@@ -106,7 +106,7 @@ describe Fortress::ControllerInterface do
           context 'the `:method` return true' do
             before do
               Fortress::Mechanism.authorisations['GuitarsController'] = {
-                if: { actions: [:index], method: true }
+                if: { actions: [:index], method: :true }
               }
             end
             subject { Fortress::ControllerInterface.new(@controller) }

data/spec/fortress/controller_spec.rb

@@ -382,7 +382,7 @@ describe GuitarsController, type: :controller do
   context 'allowing the index action with a condition returning true' do
     before do
       Fortress::Mechanism.initialize_authorisations
-      GuitarsController.fortress_allow :index, if: true
+      GuitarsController.fortress_allow :index, if: :true
     end
     describe 'GET index' do
       it 'should return a 200 HTTP code' do
@@ -454,7 +454,7 @@ describe GuitarsController, type: :controller do
   context 'allowing the index action with a condition returning false' do
     before do
       Fortress::Mechanism.initialize_authorisations
-      GuitarsController.fortress_allow :index, if: false
+      GuitarsController.fortress_allow :index, if: :false
     end
     describe 'GET index' do
       it 'should redirect to the root_url and set a flash error message' do

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require "codeclimate-test-reporter"
+require 'codeclimate-test-reporter'
 CodeClimate::TestReporter.start
 
 require 'action_controller/railtie'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fortress
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Guillaume Hain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -120,6 +120,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"