restrict 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09e06d807f7718b921ec0d017f48ff530dcd9543
-  data.tar.gz: 75009eec3d441e82bd472ab8b263080fcc45a8f6
+  metadata.gz: 288411815db7101a293671bce57958441289d44d
+  data.tar.gz: 0999aca9b587696b861e0db17c1dfc8736562808
 SHA512:
-  metadata.gz: 436c9d5a3c3c85463ea8685660c99f5263be59d55d064282d6dcd8a200f0533d9e1a4913142ebb2191eab8478e1a6d61b08e72a747f6979f88464958961cd907
-  data.tar.gz: 3a79026f12d31af31fcde2904ef3d860c519649be71c54e7ec059933c3b09e59fc4a22a4c51f05f5a39ba8f6e38fd519223b2a2b31618869c229c7499e1b8d50
+  metadata.gz: ddd2451c5d3ef62411ad1577568af474447007a96d3c97bb524d9425c7f81dba85c98650ca8a6e3ffeeea3eb6fbb8c7c0f690a432dd363aea96cfb6b7d5cfdd0
+  data.tar.gz: d750c25ef6283f7d160e7046b4edd11873b827bd9249fb7e2cf941255a0a7a839a89d0c7133a244adff61c5c65dc0a6bd207e41aab77339346a5803806af3baf

data/README.md

@@ -37,9 +37,9 @@ end
 
 What that does:
   1. Any anonymous access to one of both methods will raise `Restrict::LoginRequired`
-  2. If a `current_user` exists the access to take is allowed
-  3. If a `current_user` exists but `goodie_manager?` returns false, then `Restrict::AccessDenied` will be raised
-  4. If a `current_user` exists and `goodie_manager?` is true, the access is allowed
+  2. If `user_signed_in?` the access to take is allowed
+  3. If `user_signed_in?` but `goodie_manager?` returns false, then `Restrict::AccessDenied` will be raised
+  4. If `user_signed_in?` and `goodie_manager?` is true, the access is allowed
 
 ### Restrict all actions
 
@@ -53,7 +53,7 @@ This one will apply to all actions on this controller. It takes the `allow_if` o
 
 ```ruby
 # Default is :user_signed_in?
-Restrict.config.authentication_validation_method = :current_user
+Restrict.config.authentication_validation_method = :admin_session_exists?
 ```
 
 You may set the method that is used to figure out whether a user is signed in or not to whatever you like, however it's default is `:user_signed_in?` which is the most common (devise) method in use.

data/lib/restrict/gatekeeper.rb

@@ -8,8 +8,13 @@ module Restrict
 
     private
 
+    def validate_signed_in(controller)
+      method = Restrict.config.authentication_validation_method
+      controller.__send__(method) or raise Restrict::LoginRequired
+    end
+
     def handle_restriction(restriction, controller)
-      controller.current_user or raise Restrict::LoginRequired
+      validate_signed_in(controller)
 
       if restriction.allow_if
         unless controller.__send__(restriction.allow_if)

data/lib/restrict/rails/controller.rb

@@ -5,14 +5,20 @@ module Restrict
 
       included do
         class_attribute :restrictions
-        before_filter :invoke_gatekeeper
       end
 
       module ClassMethods
         def restrict(*args)
+          install_gatekeeper
           self.restrictions ||= []
           restrictions << Restrict::Restriction.new(*args)
         end
+
+        def install_gatekeeper
+          return if @gatekeeper_installed
+          before_filter :invoke_gatekeeper
+          @gatekeeper_installed = true
+        end
       end
 
       private

data/lib/restrict/version.rb

@@ -1,3 +1,3 @@
 module Restrict
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/lib/restrict/gatekeeper_spec.rb

@@ -4,7 +4,6 @@ describe Restrict::Gatekeeper do
 
   let(:gatekeeper) { Restrict::Gatekeeper.new }
   let(:controller) { ExampleController.new }
-  let(:user)       { FakeUser.new }
 
   before { controller.action_name = 'edit' }
 
@@ -15,7 +14,7 @@ describe Restrict::Gatekeeper do
       end
 
       it 'grants user access' do
-        controller.current_user = user
+        controller.user_signed_in = true
         expect { gatekeeper.eye(controller) }.not_to raise_error
       end
     end
@@ -28,7 +27,7 @@ describe Restrict::Gatekeeper do
       end
 
       it 'grants user access' do
-        controller.current_user = user
+        controller.user_signed_in = true
         expect { gatekeeper.eye(controller) }.not_to raise_error
       end
     end
@@ -41,7 +40,7 @@ describe Restrict::Gatekeeper do
       end
 
       it 'raises on missing method' do
-        controller.current_user = user
+        controller.user_signed_in = true
         controller.action_name = 'action1'
         expect { gatekeeper.eye(controller) }.to raise_error(NoMethodError)
       end
@@ -52,13 +51,13 @@ describe Restrict::Gatekeeper do
       end
 
       it 'denies access on falsy return value' do
-        controller.current_user = user
+        controller.user_signed_in = true
         controller.action_name = 'action2'
         expect { gatekeeper.eye(controller) }.to raise_error(Restrict::AccessDenied)
       end
 
       it 'grants access on truthy return value' do
-        controller.current_user = user
+        controller.user_signed_in = true
         controller.action_name = 'action3'
         expect { gatekeeper.eye(controller) }.not_to raise_error
       end
@@ -71,7 +70,7 @@ describe Restrict::Gatekeeper do
       end
 
       it 'denies access if any restriction fails' do
-        controller.current_user = user
+        controller.user_signed_in = true
         expect { gatekeeper.eye(controller) }.to raise_error(Restrict::AccessDenied)
       end
     end

data/spec/spec_helper.rb

@@ -22,17 +22,19 @@ end
 
 # Mimics the behavior of ActionController::Base
 class FakeController
-  attr_accessor :action_name, :current_user
+  attr_accessor :action_name, :user_signed_in
   cattr_accessor :before_filters
 
+  def user_signed_in?
+    !!@user_signed_in
+  end
+
   def self.before_filter(filter)
     self.before_filters ||= []
     before_filters << filter
   end
 end
 
-FakeUser = Struct.new(:foo)
-
 class ExampleController < FakeController
   include Restrict::Rails::Controller
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restrict
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Johannes Opper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-23 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails