authority 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d278f4f1f1672058635b280ec7a87a157c524a8
-  data.tar.gz: 8a71e78e7f76f8ae5a3d54c8dc16f1017c2bc6a6
+  metadata.gz: bd85fafb11f04643dc126e4bec4f2e13c6dad4d5
+  data.tar.gz: f02268b8bc74aef6221fe857ecfe73c75f71cd66
 SHA512:
-  metadata.gz: 9df1e4d9c065a21bb73555fa4839830b3407cd62603e0af3fd3c2532623c0d9744dba517e38578b62ad26e8b80fd310ba353e5e2c29bb639d08e0d5717282e5e
-  data.tar.gz: aa3af216a21af0d250831dcf643c8f171fa64b31a5cd374270693701dc5d98eb71527675f832bfd0f440a8a8f5c6a71ef5733cde22cd3e92bd0d1c5bd3c23a5a
+  metadata.gz: 2538f4aa799c2d0152f638c3687df5c4d4177a29910b96d1063cb68ebac341fc9fb466c8280b86a747cf1925137d23f14438cd6634fb874f5d4eeaffb4e178dd
+  data.tar.gz: 6970dfab4e035115d122c97b83d13cacbb7a87e464bd399aa24dfbfd5eb82ea6feadf6d66c02b2a44fac3a07924dfe1ca42b452eac5ac9490ea2d2eed6b77887

data/.travis.yml

@@ -1,19 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-2
+  - 2.3.1
 
 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
+  - gemfiles/5.0.gemfile

data/CHANGELOG.markdown

@@ -6,6 +6,11 @@ Authority does its best to use [semantic versioning](http://semver.org).
 
 Nothing
 
+## 3.2.0
+
+- [Fix Rails 5 deprecation warning](https://github.com/nathanl/authority/pull/110), thanks to [Douglas Teoh](https://github.com/dteoh)
+- CI now only testing latest MRI (2.3.1) and latest Rails (5.0.0). Nothing has been changed to deliberately drop support for older versions; I just don't have time to figure out [the various issues with installing gems and running tests for other versions](https://travis-ci.org/nathanl/authority/builds/142925459). If someone wants to add back some versions [I dropped](https://github.com/nathanl/authority/commit/a91971bc4b30ddbfdc455805fa2566b537f28b6f), PRs are welcome.
+
 ## 3.1.0
 
 - Allow changing the logger by updating the configuration (see commit 0214d24), based on [a question](https://github.com/nathanl/authority/issues/101) from [Nate Bird](https://github.com/natebird)

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,9 @@
+# Contributor Code of Conduct
+
+Authority is a community effort. Everyone should feel welcome to contribute to it, ask questions, or make suggestions.
+
+All contributors and maintainers must behave in a respectful and kind manner when working on this project. Harassment, sexual language or images, insults, and otherwise offensive behavior will not be tolerated.
+
+Any contributions that violate this standard may be edited or deleted, and the offending contributor may have their right to participate revoked.
+
+If you see behavior that violates this standard, please either open an issue or email one of the project maintainers.

data/README.markdown

@@ -405,7 +405,7 @@ class LlamasController < ApplicationController
 end
 ```
 
-If you want to authorize all actions the same way, use the special `all_actions` hash key. For instance, if you have nested resources, you might say "you're allowed to do anything you like with an employee if you're allowed to update their organization".
+If you want to authorize all actions the same way, use the special `all_actions` hash key. For instance, if you have nested resources, you might say "you're allowed to do anything you like with an employee if you're allowed to update their employer".
 
 ```ruby
 class EmployeesController < ApplicationController
@@ -493,7 +493,7 @@ Your method will be handed the `SecurityViolation`, which has a `message` method
 
 - [adamhunter](https://github.com/adamhunter) for pairing with me on this gem. The only thing faster than his typing is his brain.
 - [kevmoo](https://github.com/kevmoo), [MP211](https://github.com/MP211), and [scottmartin](https://github.com/scottmartin) for pitching in.
-- [nkallen](https://github.com/nkallen) for writing [a lovely blog post on access control](http://pivotallabs.com/users/nick/blog/articles/272-access-control-permissions-in-rails) when he worked at Pivotal Labs. I cried sweet tears of joy when I read that a couple of years ago. I was like, "Zee access code, she is so BEEUTY-FUL!"
+- [nkallen](https://github.com/nkallen) for writing [a lovely blog post on access control](http://blog.pivotal.io/labs/labs/access-control-permissions-in-rails-access-control-permissions-in-rails) when he worked at Pivotal Labs. I cried sweet tears of joy when I read that a couple of years ago. I was like, "Zee access code, she is so BEEUTY-FUL!"
 - [jnunemaker](https://github.com/jnunemaker) for later creating [Canable](http://github.com/jnunemaker/canable), another inspiration for Authority.
 - [TMA](http://www.tma1.com) for employing me and letting me open source some of our code.
 

data/authority.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/nathanl/authority"
 
   gem.add_dependency "activesupport", ">= 3.0.0"
-  gem.add_dependency "rake",          ">= 0.8.7"
 
+  gem.add_development_dependency "rake",  ">= 0.8.7"
   gem.add_development_dependency "rspec", "~> 3.3.0"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/gemfiles/{3.2.gemfile → 5.0.gemfile}

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

data/lib/authority/abilities.rb

@@ -18,7 +18,7 @@ module Authority
       # - If there is none, use 'ApplicationAuthorizer'
       self.authorizer_name = begin
         "#{base.name}Authorizer".constantize.name
-      rescue NameError => e
+      rescue NameError
         "ApplicationAuthorizer"
       end
     end
@@ -58,4 +58,6 @@ module Authority
     end
 
   end
-end
+
+  NoAuthorizerError = Class.new(RuntimeError)
+end

data/lib/authority/authorizer.rb

@@ -43,6 +43,4 @@ module Authority
     end
     private_class_method :user_and_maybe_options
   end
-
-  class NoAuthorizerError < StandardError ; end
 end

data/lib/authority/controller.rb

@@ -45,7 +45,11 @@ module Authority
         self.authority_resource = resource_or_finder
         add_actions(options.fetch(:actions, {}))
         force_action(options[:all_actions]) if options[:all_actions]
-        before_filter :run_authorization_check, options
+        if respond_to? :before_action
+          before_action :run_authorization_check, options
+        else
+          before_filter :run_authorization_check, options
+        end
       end
 
       # Allows defining and overriding a controller's map of its actions to the model's authorizer methods

data/lib/authority/version.rb

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

data/spec/authority/controller_spec.rb

@@ -89,6 +89,12 @@ describe Authority::Controller do
 
         let(:child_controller) { Class.new(controller_class) }
 
+        let(:rails5_controller) do
+          Class.new(controller_class) do
+            def self.before_action(*args) ; end
+          end
+        end
+
         it "allows specifying the class of the model to protect" do
           controller_class.authorize_actions_for(resource_class)
           expect(controller_class.authority_resource).to eq(resource_class)
@@ -105,6 +111,12 @@ describe Authority::Controller do
           controller_class.authorize_actions_for(resource_class, filter_options)
         end
 
+        it "prefers to set up a before_action over before_filter, passing the options it was given" do
+          filter_options = {:only => [:show, :edit, :update]}
+          expect(rails5_controller).to receive(:before_action).with(:run_authorization_check, filter_options)
+          rails5_controller.authorize_actions_for(resource_class, filter_options)
+        end
+
         it "if :all_actions option is given, it overrides the action hash to use the action given" do
           overridden_action_map = controller_class.authority_action_map
           overridden_action_map.update(overridden_action_map) {|k,v| v = :annihilate}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authority
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Nathan Long
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,7 +32,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,6 +67,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.markdown
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.markdown
 - Gemfile
 - LICENSE
@@ -74,10 +75,7 @@ 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
 - lib/authority/authorizer.rb
@@ -121,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Authority helps you authorize actions in your Rails app using plain Ruby

data/gemfiles/4.0.gemfile

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

data/gemfiles/4.1.gemfile

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

data/gemfiles/4.2.gemfile

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