restrict 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 288411815db7101a293671bce57958441289d44d
-  data.tar.gz: 0999aca9b587696b861e0db17c1dfc8736562808
+  metadata.gz: 0e119fe0a7f5a3b29548df9ff5d6f6bf77b490ab
+  data.tar.gz: 34a0da6663e3113ec9fcd1dce4b1bdde1afc7ae2
 SHA512:
-  metadata.gz: ddd2451c5d3ef62411ad1577568af474447007a96d3c97bb524d9425c7f81dba85c98650ca8a6e3ffeeea3eb6fbb8c7c0f690a432dd363aea96cfb6b7d5cfdd0
-  data.tar.gz: d750c25ef6283f7d160e7046b4edd11873b827bd9249fb7e2cf941255a0a7a839a89d0c7133a244adff61c5c65dc0a6bd207e41aab77339346a5803806af3baf
+  metadata.gz: b7d7b6b0e2da3fea9b62fffadd031b464956659a7123d6dbab3c7d66e9fb7a060aa8deef33327af5326ec922985560852a0b38827110fc607c2caee9a89c4c35
+  data.tar.gz: 4dce49238f2706ac0930f2d7a59f859cff47cb61d2709422bb9072fe4b916676fb854d33ba25bbe6536afba23596186ab1542487b5227012d5bb5ab6d4b145b4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+[0.0.6] - 2014-08-25
+  * Breaking change: use :unless instead of :allow_if
+
 [0.0.4] - 2014-08-23
   * Bugfixes
   * Multiple restrictions for the same action are possible

data/README.md

@@ -17,7 +17,7 @@ Works with rails 3 and 4 and all versions every ruby 2.
 ```ruby
 class GoodiesController < ApplicationController
   restrict :take
-  restrict :delete, allow_if: :goodie_manager?
+  restrict :delete, unless: :goodie_manager?
 
   def take
     # Grab a goodie
@@ -47,7 +47,7 @@ What that does:
 restrict :all_actions
 ```
 
-This one will apply to all actions on this controller. It takes the `allow_if` option as well.
+This one will apply to all actions on this controller. It takes the `unless` option as well.
 
 ### Configuration
 
@@ -60,7 +60,7 @@ You may set the method that is used to figure out whether a user is signed in or
 
 ## Todo Ideas
 
-* restrict :all_actions, except: [:new], allow_if: 'dsfsdf'
+* restrict :all_actions, except: [:new], unless: 'dsfsdf'
 
 ## Contributing
 

data/lib/restrict/gatekeeper.rb

@@ -16,8 +16,8 @@ module Restrict
     def handle_restriction(restriction, controller)
       validate_signed_in(controller)
 
-      if restriction.allow_if
-        unless controller.__send__(restriction.allow_if)
+      if restriction.unless
+        unless controller.__send__(restriction.unless)
           raise Restrict::AccessDenied, reason: restriction
         end
       end
@@ -26,7 +26,7 @@ module Restrict
     def concerning_restrictions(controller)
       controller.restrictions or return
       controller.restrictions.select do |restriction|
-        restriction.concerning?(controller.action_name)
+        restriction.applies_to?(controller.action_name)
       end
     end
   end

data/lib/restrict/rails/controller.rb

@@ -14,6 +14,9 @@ module Restrict
           restrictions << Restrict::Restriction.new(*args)
         end
 
+        # This could happen in included block as well, but often you need
+        # other before filters to happen before you actually check the
+        # restrictions, so lets set it where it is used in the code as well.
         def install_gatekeeper
           return if @gatekeeper_installed
           before_filter :invoke_gatekeeper

data/lib/restrict/restriction.rb

@@ -1,25 +1,25 @@
 module Restrict
   class Restriction
-    attr_accessor :actions, :allow_if
+    attr_accessor :actions, :unless
 
     def initialize(*args)
       options   = args.extract_options!
-      @allow_if = options[:allow_if]
+      @unless = options[:unless]
       @actions  = args
       actions.empty? and raise ArgumentError, "expected actions to restrict, but got #{actions.inspect}"
     end
 
-    def concerning?(action)
-      concerns_action?(action) || concerns_all?
+    def applies_to?(action)
+      applies_to_action?(action) || applies_to_all_actions?
     end
 
     private
 
-    def concerns_all?
+    def applies_to_all_actions?
       actions.include?(:all_actions)
     end
 
-    def concerns_action?(name)
+    def applies_to_action?(name)
       actions.include?(name.to_sym)
     end
   end

data/lib/restrict/rspec/matcher.rb

@@ -4,12 +4,12 @@ RSpec::Matchers.define :have_restriction_on do |given_action_name|
     @given_controller = given_controller
 
     @restriction = given_controller.restrictions.find do |restriction|
-      restriction.concerning?(given_action_name)
+      restriction.applies_to?(given_action_name)
     end
 
     if @restriction
-      if @given_allow_if
-        @restriction.allow_if == @given_allow_if
+      if @given_unless
+        @restriction.unless == @given_unless
       else
         true
       end
@@ -18,21 +18,21 @@ RSpec::Matchers.define :have_restriction_on do |given_action_name|
     end
   end
 
-  chain :with_allow_if do |given_allow_if|
-    @given_allow_if = given_allow_if
+  chain :unless do |given_unless|
+    @given_unless = given_unless
   end
 
   failure_message do |actual|
-    if @restriction && @given_allow_if
-      "Expected restriction to call #{@given_allow_if.inspect}, but calls #{@restriction.allow_if.inspect}"
+    if @restriction && @given_unless
+      "Expected restriction to call #{@given_unless.inspect}, but calls #{@restriction.unless.inspect}"
     else
       "Expected to have restriction on #{@given_action_name}, but was not found in #{@given_controller.restrictions.inspect}"
     end
   end
 
   failure_message_when_negated do |actual|
-    if @given_allow_if
-      "Expected restriction not to call #{@given_allow_if.inspect}, but calls #{@restriction.allow_if.inspect}"
+    if @given_unless
+      "Expected restriction not to call #{@given_unless.inspect}, but calls #{@restriction.unless.inspect}"
     else
       "Expected not to have restriction on #{@given_action_name}, but was found in #{@given_controller.restrictions.inspect}"
     end

data/lib/restrict/rspec/matcher_rspec2.rb

@@ -4,12 +4,12 @@ RSpec::Matchers.define :have_restriction_on do |given_action_name|
     @given_controller = given_controller
 
     @restriction = given_controller.restrictions.find do |restriction|
-      restriction.concerning?(given_action_name)
+      restriction.applies_to?(given_action_name)
     end
 
     if @restriction
-      if @given_allow_if
-        @restriction.allow_if == @given_allow_if
+      if @given_unless
+        @restriction.unless == @given_unless
       else
         true
       end
@@ -18,21 +18,21 @@ RSpec::Matchers.define :have_restriction_on do |given_action_name|
     end
   end
 
-  chain :with_allow_if do |given_allow_if|
-    @given_allow_if = given_allow_if
+  chain :unless do |given_unless|
+    @given_unless = given_unless
   end
 
   failure_message_for_should do |actual|
-    if @restriction && @given_allow_if
-      "Expected restriction to call #{@given_allow_if.inspect}, but calls #{@restriction.allow_if.inspect}"
+    if @restriction && @given_unless
+      "Expected restriction to call #{@given_unless.inspect}, but calls #{@restriction.unless.inspect}"
     else
       "Expected to have restriction on #{@given_action_name}, but was not found in #{@given_controller.restrictions.inspect}"
     end
   end
 
   failure_message_for_should_not do |actual|
-    if @given_allow_if
-      "Expected restriction not to call #{@given_allow_if.inspect}, but calls #{@restriction.allow_if.inspect}"
+    if @given_unless
+      "Expected restriction not to call #{@given_unless.inspect}, but calls #{@restriction.unless.inspect}"
     else
       "Expected not to have restriction on #{@given_action_name}, but was found in #{@given_controller.restrictions.inspect}"
     end

data/lib/restrict/version.rb

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

data/spec/lib/restrict/gatekeeper_spec.rb

@@ -34,9 +34,9 @@ describe Restrict::Gatekeeper do
 
     context 'with conditional restriction' do
       before do
-        controller.class.restrict :action1, allow_if: :missing
-        controller.class.restrict :action2, allow_if: :falsy
-        controller.class.restrict :action3, allow_if: :truthy
+        controller.class.restrict :action1, unless: :missing
+        controller.class.restrict :action2, unless: :falsy
+        controller.class.restrict :action3, unless: :truthy
       end
 
       it 'raises on missing method' do
@@ -66,7 +66,7 @@ describe Restrict::Gatekeeper do
     context 'with multiple restrictions' do
       before do
         controller.class.restrict :all_actions
-        controller.class.restrict :edit, allow_if: :falsy
+        controller.class.restrict :edit, unless: :falsy
       end
 
       it 'denies access if any restriction fails' do

data/spec/lib/restrict/rails/controller_spec.rb

@@ -6,7 +6,7 @@ describe Restrict::Rails::Controller do
 
   before do
     controller.class.restrict :index
-    controller.class.restrict :show, allow_if: :access_allowed?
+    controller.class.restrict :show, unless: :access_allowed?
   end
 
   describe '#restrict' do
@@ -15,7 +15,7 @@ describe Restrict::Rails::Controller do
     end
 
     it 'builds and adds a conditional restriction' do
-      expect(controller).to have_restriction_on(:show).with_allow_if(:access_allowed?)
+      expect(controller).to have_restriction_on(:show).unless(:access_allowed?)
     end
   end
 

data/spec/lib/restrict/restriction_spec.rb

@@ -13,23 +13,23 @@ describe Restrict::Restriction do
     end
   end
 
-  describe '#concerning?' do
+  describe '#applies_to?' do
     it 'returns true if the given action is contained' do
-      expect(restriction).to be_concerning(:show)
+      expect(restriction).to be_applies_to(:show)
     end
 
     it 'returns true if the given name is a string' do
-      expect(restriction).to be_concerning('show')
+      expect(restriction).to be_applies_to('show')
     end
 
     it 'returns false if the given action name is not contained' do
-      expect(restriction).not_to be_concerning(:index)
+      expect(restriction).not_to be_applies_to(:index)
     end
 
     it 'returns true if it concerns :all_actions' do
       restriction = Restrict::Restriction.new(:all_actions)
-      expect(restriction).to be_concerning(:foo)
-      expect(restriction).to be_concerning(:bar)
+      expect(restriction).to be_applies_to(:foo)
+      expect(restriction).to be_applies_to(:bar)
     end
   end
 end

data/spec/lib/restrict/rspec/matcher_spec.rb

@@ -3,12 +3,6 @@ require 'spec_helper'
 describe 'have_restriction_on' do
   let(:controller) { ExampleController.new }
 
-  # before do
-  #   controller.class.restrict :index
-  #   controller.class.restrict :show, allow_if: :access_allowed?
-  # end
-
-
   context 'without restrictions' do
     it 'matcher fails' do
       expect {
@@ -42,17 +36,17 @@ describe 'have_restriction_on' do
 
     it 'matcher conditional chain fails' do
       expect {
-        expect(controller).to have_restriction_on(:show).with_allow_if(:something)
+        expect(controller).to have_restriction_on(:show).unless(:something)
       }.to raise_error RSpec::Expectations::ExpectationNotMetError
     end
 
     it 'negated matcher with conditional chain passes' do
-      expect(controller).not_to have_restriction_on(:show).with_allow_if(:something)
+      expect(controller).not_to have_restriction_on(:show).unless(:something)
     end
   end
 
   context 'with conditional restriction' do
-    before { controller.class.restrict :show, allow_if: :something }
+    before { controller.class.restrict :show, unless: :something }
 
     it 'matcher passes' do
       expect(controller).to have_restriction_on(:show)
@@ -71,12 +65,12 @@ describe 'have_restriction_on' do
     end
 
     it 'matcher conditional chain passes' do
-      expect(controller).to have_restriction_on(:show).with_allow_if(:something)
+      expect(controller).to have_restriction_on(:show).unless(:something)
     end
 
     it 'negated matcher with conditional chain passes' do
       expect {
-        expect(controller).not_to have_restriction_on(:show).with_allow_if(:something)
+        expect(controller).not_to have_restriction_on(:show).unless(:something)
       }.to raise_error RSpec::Expectations::ExpectationNotMetError
     end
   end

metadata

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