acl9 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c453f2d63455ec9792617d8436fdf11069dc843d
-  data.tar.gz: 20ae0c3d277ac3b8393b5a63e04a2b4c3e8c2576
+  metadata.gz: a8c381fe3a5d5c08f53de89f42e32a3d537c0194
+  data.tar.gz: 6f1ecac6cf51489c7ac811b1cf953b260c7b0e97
 SHA512:
-  metadata.gz: 3ea8427b7aac68a931a94c5cdefd3c5f82560130efd528bc46f260f55595044a4b425b3ee24bd22adf80a03b6fc57156142aee0d66b80b50703dcfae55245f0a
-  data.tar.gz: 07e1e06046612cad72fcbb37b8070b5c76d554b6f5168aeaa5eeec733696e639cde81cea13fecb19d2f5440245dcf83d69330038c32b01d68839358118424f07
+  metadata.gz: 12dc684ca7c51688d5b19706ccde9c257e673212475ff31d897a403529879649a5381d7961aaab17a7e94b14bcbd483039aed942f053ab1aa716452c8560f0ff
+  data.tar.gz: af2e0997183914917e14239eb1268a803bad66bd7f0a35f9703a43431d84bf532671a32e2d22471e13a42af28daf32bac211f2cfe12a0cd861cfd520379e7479

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 2.0.0 - 14 May 2015
+
+Thanks to @pjungwir:
+
+ * Raise ArgumentError now if bad options passed to allow/deny
+
+## 1.3.0 - 13 May 2015
+
+Quick new feature dump:
+
+ * Prepositions in has(_no)_role[!?] methods
+
+## 1.2.1 - 13 Mar 2015
+
+Bugfix for API love:
+
+ * Rails::API was erroring
+
 ## 1.2.0 - 12 Jan 2015
 
 The generator release (and some other cool new features):

data/Gemfile

@@ -1,8 +1,9 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in csvision.gemspec
+# Specify your gem's dependencies in acl9.gemspec
 gemspec
 
 gem 'appraisal'
 gem 'tapout'
 gem 'minitap'
+gem 'byebug'

data/Gemfile.lock

@@ -42,15 +42,18 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ansi (1.4.3)
+    ansi (1.5.0)
     appraisal (1.0.2)
       bundler
       rake
       thor (>= 0.14.0)
     arel (6.0.0)
     builder (3.2.2)
+    byebug (4.0.5)
+      columnize (= 0.9.0)
     codeclimate-test-reporter (0.4.1)
       simplecov (>= 0.7.1, < 1.0.0)
+    columnize (0.9.0)
     docile (1.1.5)
     erubis (2.7.0)
     globalid (0.3.5)
@@ -128,6 +131,7 @@ PLATFORMS
 DEPENDENCIES
   acl9!
   appraisal
+  byebug
   codeclimate-test-reporter
   minitap
   sqlite3

data/README.md

@@ -16,7 +16,7 @@ Acl9 is [Semantically Versioned](http://semver.org/), so just add this to your
 `Gemfile`:
 
 ```ruby
-gem 'acl9', '~> 1.0'
+gem 'acl9', '~> 2.0'
 ```
 
 You will need Ruby 2.x
@@ -277,6 +277,16 @@ end
 
 **Then check for any duplicates** and resolve those manually.
 
+### Acl9 now raises ArgumentError on bad args to `allow`/`deny`
+
+In 2.x and above we now try to help the developer by raising ArgumentError if
+they mess up with the options they pass to `allow`/`deny`, this prevents people
+doing things that they think are going to work but actually aren't like:
+
+```ruby
+  allow all, actions: [ :index, :show ]    # <---- BROKEN!!
+```
+
 ## Community
 
 **IRC:** Please drop in for a chat on #acl9 on Freenode, [use

data/lib/acl9/controller_extensions/dsl_base.rb

@@ -92,8 +92,13 @@ module Acl9
       alias everybody all
       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)
+      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))
 

data/lib/acl9/prepositions.rb

@@ -1,15 +1,15 @@
 module Acl9
   module Prepositions
-    VALID_PREPOSITIONS = %w(of for in on at by).freeze unless defined? VALID_PREPOSITIONS
+    VALID_PREPOSITIONS = %i(of for in on at by).freeze unless defined? VALID_PREPOSITIONS
 
     def _by_preposition options
       object = nil
 
       VALID_PREPOSITIONS.each do |prep|
-        if options[prep.to_sym]
+        if options[prep]
           raise ArgumentError, "You may only use one preposition to specify object" if object
 
-          object = options[prep.to_sym]
+          object = options[prep]
         end
       end
       object

data/lib/acl9/version.rb

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

data/test/controller_extensions/prepositions_test.rb

@@ -28,6 +28,15 @@ module ControllerExtensions
       end
     end
 
+    test "invalid option raises ArgumentError" do
+      assert @foo = Foo.first_or_create
+      assert ( user = User.create).has_role! :manager, of: @foo
+
+      assert_raise ArgumentError do
+        @tester.acl_block! { allow :manager, of: :foo, something_bad: :foo }
+      end
+    end
+
     test "allow class role allowed" do
       assert ( user = User.create ).has_role! :owner, Foo
 

metadata

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