authority 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd85fafb11f04643dc126e4bec4f2e13c6dad4d5
-  data.tar.gz: f02268b8bc74aef6221fe857ecfe73c75f71cd66
+  metadata.gz: 6807a134d4eaf6379becb0f913924baa5f03e396
+  data.tar.gz: 2cf81ed57c186516dd26a6bfc63394e1b0784400
 SHA512:
-  metadata.gz: 2538f4aa799c2d0152f638c3687df5c4d4177a29910b96d1063cb68ebac341fc9fb466c8280b86a747cf1925137d23f14438cd6634fb874f5d4eeaffb4e178dd
-  data.tar.gz: 6970dfab4e035115d122c97b83d13cacbb7a87e464bd399aa24dfbfd5eb82ea6feadf6d66c02b2a44fac3a07924dfe1ca42b452eac5ac9490ea2d2eed6b77887
+  metadata.gz: 7f09a2d8e2bbf1107fcbb641fc3449073312ddf869f2d0ab4eed34c0a2d407a932e9160db59bacf7dd25a7cc66742227595a974d2aaab1b5f1db4443e37c4786
+  data.tar.gz: d51cf95c7d1c6353faa3843194a1824ace890c38125f2b9c08b0ee7bf9cb3e4a127478c507669b9df2b25c41892dcd183f4644da833cc7fc233a4c3e434bd4ca

data/.travis.yml

@@ -1,6 +1,27 @@
 language: ruby
 rvm:
-  - 2.3.1
+  - 1.9.3
+  - 2.0
+  - 2.1
+  - 2.2
+  - jruby-19mode # JRuby in 1.9 mode
+  # - rbx-2
+
+before_install:
+  - gem update bundler && bundle --version
 
 gemfile:
-  - gemfiles/5.0.gemfile
+  - gemfiles/3.2.gemfile
+  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
+  - gemfiles/4.2.gemfile
+
+matrix:
+  exclude:
+    - rvm: rbx
+      gemfile: gemfiles/4.0.gemfile
+  include:
+    - rvm: 2.2.2
+      gemfile: gemfiles/5.0.gemfile
+    - rvm: 2.3.1
+      gemfile: gemfiles/5.0.gemfile

data/CHANGELOG.markdown

@@ -2,9 +2,10 @@
 
 Authority does its best to use [semantic versioning](http://semver.org).
 
-## Unreleased
+## 3.2.1
 
-Nothing
+- Allow supplying extra arguments to authorizers in `authorize_actions_for` via the `:args` parameter.
+- Resume CI testing against multiple versions of Ruby and Rails, thanks to [Douglas Teoh's work](https://github.com/nathanl/authority/pull/112).
 
 ## 3.2.0
 

data/README.markdown

@@ -370,7 +370,12 @@ class LlamasController < ApplicationController
 end
 ```
 
-As with other authorization checks, you can also pass options here, and they'll be sent along to your authorization method: `authorize_action_for(@llama, :sporting => @hat_style)`. Generally, though, your authorization will depend on some attribute or association of the model instance, so the authorizer can check `@llama.neck_strength` and `@llama.owner.nationality`, etc, without needing any additional information.
+You can pass extra arguments to your authorization checks in these controller helpers:
+
+- `authorize_actions_for(Llama, args: [{:mamma => true}]`
+- `authorize_action_for(@llama, :sporting => @hat_style)`
+
+Generally, though, your authorization will depend on some attribute or association of the model instance, so the authorizer can check `@llama.neck_strength` and `@llama.owner.nationality`, etc, without needing any additional information.
 
 Note that you can also call `authority_actions` as many times as you like, so you can specify one mapping at a time if you prefer:
 

data/gemfiles/3.2.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 3.2.3'
+gem 'rspec', '~> 2.14.0'
+
+gemspec path: '../'

data/gemfiles/4.0.gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 4.0.0'
+gem 'rspec', '~> 2.14.0'
+
+platforms :jruby, :ruby_19 do
+  gem 'mime-types', '~> 2.99.2'
+end
+
+gemspec path: '../'

data/gemfiles/4.1.gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 4.1.0'
+gem 'rspec', '~> 2.14.0'
+
+platforms :jruby, :ruby_19 do
+  gem 'mime-types', '~> 2.99.2'
+end
+
+gemspec path: '../'

data/gemfiles/4.2.gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 4.2.0'
+gem 'rspec', '~> 2.14.0'
+
+platforms :jruby, :ruby_19 do
+  gem 'mime-types', '~> 2.99.2'
+end
+
+gemspec path: '../'

data/lib/authority/controller.rb

@@ -15,7 +15,8 @@ module Authority
 
     included do
       rescue_from(Authority::SecurityViolation, :with => Authority::Controller.security_violation_callback)
-      class_attribute :authority_resource, :instance_reader => false
+      class_attribute :authority_resource,  :instance_reader => false
+      class_attribute :authority_arguments, :instance_writer => false
     end
 
     attr_writer :authorization_performed
@@ -40,11 +41,16 @@ module Authority
       # determine that class when the request is made
       # @param [Hash] options - can contain :actions to
       # be merged with existing
-      # ones and any other options applicable to a before_filter
+      # ones and any other options applicable to a before_filter,
+      # and can contain an array of :opts to pass to the authorizer
       def authorize_actions_for(resource_or_finder, options = {})
         self.authority_resource = resource_or_finder
         add_actions(options.fetch(:actions, {}))
         force_action(options[:all_actions]) if options[:all_actions]
+        
+        # Capture custom authorization options
+        self.authority_arguments = options.delete(:args)
+        
         if respond_to? :before_action
           before_action :run_authorization_check, options
         else
@@ -139,11 +145,11 @@ module Authority
     def run_authorization_check
       if instance_authority_resource.is_a?(Array)
         # Array includes options; pass as separate args
-        authorize_action_for(*instance_authority_resource)
+        authorize_action_for(*instance_authority_resource, *authority_arguments)
       else
         # *resource would be interpreted as resource.to_a, which is wrong and
         # actually triggers a query if it's a Sequel model
-        authorize_action_for(instance_authority_resource)
+        authorize_action_for(instance_authority_resource, *authority_arguments)
       end
     end
 

data/lib/authority/version.rb

@@ -1,3 +1,3 @@
 module Authority
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

data/spec/authority/controller_spec.rb

@@ -138,6 +138,16 @@ describe Authority::Controller do
           expect(child_controller.authority_action_map).to eq(updated_map)
         end
 
+        it "if :opts option is given, it extracts extra options for the authorization check" do
+          controller_class.authorize_actions_for(resource_class, :args => [:foo, :bar])
+          expect(controller_class.authority_arguments).to eq([:foo, :bar])
+        end
+
+        it "if :opts option wasn't given, no extra options are set" do
+          controller_class.authorize_actions_for(resource_class)
+          expect(controller_class.authority_arguments?).not_to be true
+        end
+
       end
 
       describe "authority_resource" do
@@ -282,6 +292,27 @@ describe Authority::Controller do
 
         end
 
+        context "if extra opts were specified" do
+
+          let(:resource_class) { Hash }
+          let(:controller_class) do
+            Class.new(ExampleController).tap do |c|
+              c.send(:include, Authority::Controller)
+              c.authorize_actions_for(:method_to_find_class, args: [:extra, :args])
+            end
+          end
+          
+          before :each do
+            allow(controller_instance).to receive(:method_to_find_class).and_return(resource_class)
+          end
+
+          it "uses extra args in authorization check" do
+            expect(controller_instance).to receive(:authorize_action_for).with(resource_class, :extra, :args)
+            controller_instance.send(:run_authorization_check)
+          end
+          
+        end
+
         context "if a method for determining the class was specified" do
 
           let(:resource_class) { Hash }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authority
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Nathan Long
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,6 +75,10 @@ files:
 - Rakefile
 - TODO.markdown
 - authority.gemspec
+- gemfiles/3.2.gemfile
+- gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
+- gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
 - lib/authority.rb
 - lib/authority/abilities.rb