cancancan 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0ea8834742608ecbf144220b0c94d7a81ccfb31
-  data.tar.gz: 5c796d392b463218b3f65801b7c41459ec2120d0
+  metadata.gz: 9115e4337e5f3acf25ada77c66a9e2eef4627cd8
+  data.tar.gz: 530b77ec0c2f974624e814a65d798864b30324b8
 SHA512:
-  metadata.gz: 1a37095cca2bb56e5243eeef0f809926ddc20ed8792e8cee90c54ddef818a55f17bd3a92c0aaeba1b9e451d0009cbd7a535a543a3540ee072ad1cc900b117766
-  data.tar.gz: 50bdff681b887c27b8650d510ab86f296eefbf68019fdf085519d925f2c70e417728061cbba75028c7f7eca7d114b0ea951da842fdcb33d4690653953dac57dd
+  metadata.gz: 8e4091db3eb5acc0567e7d9c80df489974013021a5ee54010a4f9406727680d753c48d955b31e4285fb6903aedfda66089f9a12c2afc07e9e55b90545f31de69
+  data.tar.gz: 438619dd7cde250eb3598ed34cdc28f514a7d9ce2fa18221cdc3c945312a855ab5cb3c378e5c7737367551353f39f2fdf4e37fd16371e4af3d18b88eb9985da3

data/cancancan.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.0.0'
 
   s.add_development_dependency 'bundler', '~> 1.3'
-  s.add_development_dependency 'rubocop', '~> 0.46'
+  s.add_development_dependency 'rubocop', '~> 0.48.1'
   s.add_development_dependency 'rake', '~> 10.1', '>= 10.1.1'
   s.add_development_dependency 'rspec', '~> 3.2', '>= 3.2.0'
   s.add_development_dependency 'appraisal', '~> 2.0', '>= 2.0.0'

data/lib/cancan/ability.rb

@@ -223,7 +223,7 @@ module CanCan
       keys = unauthorized_message_keys(action, subject)
       variables = { action: action.to_s }
       variables[:subject] = (subject.class == Class ? subject : subject.class).to_s.underscore.humanize.downcase
-      message = I18n.translate(nil, variables.merge(scope: :unauthorized, default: keys + ['']))
+      message = I18n.translate(keys.shift, variables.merge(scope: :unauthorized, default: keys + ['']))
       message.blank? ? nil : message
     end
 
@@ -291,11 +291,10 @@ module CanCan
 
     def unauthorized_message_keys(action, subject)
       subject = (subject.class == Class ? subject : subject.class).name.underscore unless subject.is_a? Symbol
-      [subject, :all].map do |try_subject|
-        [aliases_for_action(action), :manage].flatten.map do |try_action|
-          :"#{try_action}.#{try_subject}"
-        end
-      end.flatten
+      aliases = aliases_for_action(action)
+      [subject, :all].product([*aliases, :manage]).map do |try_subject, try_action|
+        :"#{try_action}.#{try_subject}"
+      end
     end
 
     # Accepts an array of actions and returns an array of actions which match.

data/lib/cancan/controller_additions.rb

@@ -40,7 +40,7 @@ module CanCan
       #     private
       #
       #     def find_book_by_permalink
-      #       @book = Book.find_by_permalink!(params[:id)
+      #       @book = Book.find_by_permalink!(params[:id])
       #     end
       #   end
       #
@@ -285,13 +285,14 @@ module CanCan
       end
 
       def cancan_skipper
-        @_cancan_skipper ||= { authorize: {}, load: {} }
+        self._cancan_skipper ||= { authorize: {}, load: {} }
       end
     end
 
     def self.included(base)
       base.extend ClassMethods
       base.helper_method :can?, :cannot?, :current_ability if base.respond_to? :helper_method
+      base.class_attribute :_cancan_skipper
     end
 
     # Raises a CanCan::AccessDenied exception if the current_ability cannot
@@ -383,8 +384,9 @@ module CanCan
   end
 end
 
-if defined? ActionController::Base
-  ActionController::Base.class_eval do
-    include CanCan::ControllerAdditions
+if defined? ActionController
+  %w[Base API].each do |klass|
+    next unless ActionController.const_defined?(klass)
+    ActionController.const_get(klass).class_eval { include CanCan::ControllerAdditions }
   end
 end

data/lib/cancan/controller_resource.rb

@@ -170,7 +170,8 @@ module CanCan
     end
 
     def resource_instance
-      @controller.instance_variable_get("@#{instance_name}") if load_instance?
+      return unless load_instance? && @controller.instance_variable_defined?("@#{instance_name}")
+      @controller.instance_variable_get("@#{instance_name}")
     end
 
     def collection_instance=(instance)
@@ -178,6 +179,7 @@ module CanCan
     end
 
     def collection_instance
+      return unless @controller.instance_variable_defined?("@#{instance_name.to_s.pluralize}")
       @controller.instance_variable_get("@#{instance_name.to_s.pluralize}")
     end
 
@@ -258,7 +260,8 @@ module CanCan
       elsif @options[:class] && @params.key?(extract_key(@options[:class]))
         @params[extract_key(@options[:class])]
       else
-        @params[extract_key(namespaced_name)]
+        params = @params[extract_key(namespaced_name)]
+        params.is_a?(Hash) ? params : nil
       end
     end
 

data/lib/cancan/version.rb

@@ -1,3 +1,3 @@
 module CanCan
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cancancan
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Alessandro Rodi (Renuo AG)
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: 0.48.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: 0.48.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Simple authorization solution for Rails.