acl9 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8c381fe3a5d5c08f53de89f42e32a3d537c0194
-  data.tar.gz: 6f1ecac6cf51489c7ac811b1cf953b260c7b0e97
+  metadata.gz: d5f65e35d4e9298c14f5954b31b864aa8257d8ab
+  data.tar.gz: 0b603fd3fcf803a503a1a3e8ac16244227e1c932
 SHA512:
-  metadata.gz: 12dc684ca7c51688d5b19706ccde9c257e673212475ff31d897a403529879649a5381d7961aaab17a7e94b14bcbd483039aed942f053ab1aa716452c8560f0ff
-  data.tar.gz: af2e0997183914917e14239eb1268a803bad66bd7f0a35f9703a43431d84bf532671a32e2d22471e13a42af28daf32bac211f2cfe12a0cd861cfd520379e7479
+  metadata.gz: 8bc88b6be0fd0bb9b189a5e004cb79a06b552d527f8f7f76627bb8fbc2a02fb1e44cd67a29d4fb9241f7633ded1445346149bb174ce47a2e850d14bdc5a086b9
+  data.tar.gz: 21dee50ff08be47a3e2b07f101b2f348a73242917c12cbf6e461ba38ac86fc8826d05eddd3f054ce2ba302c8ccf692fdea99f4c390432f55dbbfdb7d4eea8237

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.1.0 - 14 May 2015
+
+Added `:only` (as well as `:to`) for specifying actions in `allow`/`deny`
+blocks.
+
 ## 2.0.0 - 14 May 2015
 
 Thanks to @pjungwir:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acl9 (1.3.0)
+    acl9 (2.1.0)
       rails (~> 4.0)
 
 GEM

data/README.md

@@ -42,13 +42,13 @@ class Admin::SchoolsController < ApplicationController
   access_control do
     allow :support, :of => School
     allow :admins, :managers, :teachers, :of => :school
-    deny :teachers, :to => :destroy
+    deny :teachers, :only => :destroy
 
     action :index do
       allow anonymous, logged_in
     end
 
-    allow logged_in, :to => :show
+    allow logged_in, :only => :show
     deny :students
   end
 

data/gemfiles/rails_4.0.gemfile

@@ -5,6 +5,7 @@ source "http://rubygems.org"
 gem "appraisal"
 gem "tapout"
 gem "minitap"
+gem "byebug"
 gem "rails", "~> 4.0.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -5,6 +5,7 @@ source "http://rubygems.org"
 gem "appraisal"
 gem "tapout"
 gem "minitap"
+gem "byebug"
 gem "rails", "~> 4.1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -5,6 +5,7 @@ source "http://rubygems.org"
 gem "appraisal"
 gem "tapout"
 gem "minitap"
+gem "byebug"
 gem "rails", "~> 4.2.0"
 
 gemspec :path => "../"

data/lib/acl9/controller_extensions/dsl_base.rb

@@ -69,8 +69,8 @@ module Acl9
             raise ArgumentError, "You cannot use default inside an actions block"
           end
 
-          def _set_action_clause(to, except)
-            raise ArgumentError, "You cannot use :to/:except inside actions block" if to || except
+          def _set_action_clause(only, except)
+            raise ArgumentError, "You cannot use :only (:to) or :except inside actions block" if only || except
           end
         end
 
@@ -93,14 +93,20 @@ module Acl9
       alias anyone all
 
       def _permitted_allow_deny_option!(key)
-        raise ArgumentError, "#{key} is not a valid option" unless [:to, :except, :if, :unless, *VALID_PREPOSITIONS].include?(key.to_sym)
+        raise ArgumentError, "#{key} is not a valid option" unless [:to, :only, :except, :if, :unless, *VALID_PREPOSITIONS].include?(key.to_sym)
+      end
+
+      def _retrieve_only options
+        only = [ options.delete(:only) ].flatten.compact
+        only |= [ options.delete(:to) ].flatten.compact
+        only if only.present?
       end
 
       def _parse_and_add_rule(*args)
         options = args.extract_options!
         options.keys.each { |key| _permitted_allow_deny_option!(key) }
 
-        _set_action_clause(options.delete(:to), options.delete(:except))
+        _set_action_clause( _retrieve_only(options), options.delete(:except))
 
         object = _role_object(options)
 
@@ -147,15 +153,15 @@ module Acl9
         (@current_rule == :allow ? @allows : @denys) << anded.join(' && ')
       end
 
-      def _set_action_clause(to, except)
-        raise ArgumentError, "both :to and :except cannot be specified in the rule" if to && except
+      def _set_action_clause(only, except)
+        raise ArgumentError, "both :only (:to) and :except cannot be specified in the rule" if only && except
 
         @action_clause  = nil
-        action_list     = to || except
+        action_list     = only || except
         return unless action_list
 
         expr = _action_check_expression(action_list)
-        @action_clause = to ? "#{expr}" : "!#{expr}"
+        @action_clause = only ? "#{expr}" : "!#{expr}"
       end
 
       def _action_check_expression(action_list)

data/lib/acl9/version.rb

@@ -1,3 +1,3 @@
 module Acl9
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/test/controller_extensions/actions_test.rb

@@ -35,7 +35,7 @@ module ControllerExtensions
       end
     end
 
-    [:to, :except].each do |opt|
+    [:to, :only, :except].each do |opt|
       test "should raise an ArgumentError when allow is called with #{opt} option" do
         assert_raise ArgumentError do
           @tester.acl_block! do

data/test/controller_extensions/method_test.rb

@@ -12,27 +12,47 @@ module ControllerExtensions
       %w(index show edit update delete destroy).each { |act| assert_permitted @trusted, act }
     end
 
-    test "should raise an ArgumentError when both :to and :except are specified" do
-      assert_raise ArgumentError do
-        @tester.acl_block! { allow all, :to => :index, :except => ['show', 'edit'] }
+    test "should raise an ArgumentError when either :to or :only and :except are specified" do
+      %i[to only].each do |only|
+        assert_raise ArgumentError do
+          @tester.acl_block! { allow all, only => :index, :except => ['show', 'edit'] }
+        end
       end
     end
 
-    test ":to should limit rule scope to specified actions" do
+    test ":to and :only should combine in union" do
       assert ( @manager = User.create ).has_role! :manager
       assert ( @trusted = User.create ).has_role! :trusted
 
       @tester.acl_block! do
-        allow all,       :to => [:index, :show]
+        allow all,      :only => :index, :to => :show
 
-        allow 'manager', :to => :edit
-        allow 'manager', :to => 'update'
-        allow 'trusted', :to => %w(edit update delete destroy)
+        allow 'manager', :only => :edit, :to => 'edit'
+        allow 'manager', :to => 'update', :only => :update
+        allow 'trusted', :only => %w(edit update destroy), :to => %w(edit delete)
       end
 
       run_tests
     end
 
+
+    test ":to and :only should limit rule scope to specified actions" do
+      assert ( @manager = User.create ).has_role! :manager
+      assert ( @trusted = User.create ).has_role! :trusted
+
+      %i[to only].each do |only|
+        @tester.acl_block! do
+          allow all,       only => [:index, :show]
+
+          allow 'manager', only => :edit
+          allow 'manager', only => 'update'
+          allow 'trusted', only => %w(edit update delete destroy)
+        end
+
+        run_tests
+      end
+    end
+
     test ":except should limit rule scope to all actions except specified" do
       assert ( @manager = User.create ).has_role! :manager
       assert ( @trusted = User.create ).has_role! :trusted

data/test/dummy/config/environments/test.rb

@@ -36,4 +36,5 @@ Dummy::Application.configure do
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+  config.log_level = :unknown
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acl9
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - oleg dashevskii