cancancan 1.17.0 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 418d49100740136f143204714c01555ca5787a1e
-  data.tar.gz: 2631fb854865b69ab8720023eb2e50289f680603
+  metadata.gz: cf0604650f3cc8651f5960cedd2e857a023947d6
+  data.tar.gz: 1c4e56a7fa9915ef901f3e042645a2064edcfcc8
 SHA512:
-  metadata.gz: 2ac85e5511555021a0841efbdb82eb0eccf5d3145d8e53de3df189484f5a7eb34796224912556c553ead44d75aa0d496838fe73c8db25a10ede4d889c0ab115f
-  data.tar.gz: 34dc9609930ec647cf36f7ce5fe3caa8663720ba4f8d871df3333ad41e42177aac79f383a932f6189ea05c02b2060f6a44724cd1cd27c5ecd574886742d6b303
+  metadata.gz: a3ec244830eb89b049fc102b85df7978b9162c52c4661b380fda28026e1af3c3edf85518f19b7eae5de528546980b61c95d4054d1c7a6d962dd4385cfe5bcfa7
+  data.tar.gz: 5a17a987ae0a3c8eaee50bff9b958fa66a572c88d1b460f77de7563a2a7a7ae178f587f3f790a39514a6661d9ef9f2845c90e19249197a55b6a3f7dc61c061cc

data/cancancan.gemspec

@@ -15,16 +15,14 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.license     = 'MIT'
 
-  s.files       = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  s.test_files  = `git ls-files -- Appraisals {spec,features,gemfiles}/*`.split($INPUT_RECORD_SEPARATOR)
-  s.executables = `git ls-files -- bin/*`.split($INPUT_RECORD_SEPARATOR).map { |f| File.basename(f) }
+  s.files       = `git ls-files lib init.rb cancancan.gemspec`.split($INPUT_RECORD_SEPARATOR)
   s.require_paths = ['lib']
 
   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 'rake', '~> 10.1.1'
-  s.add_development_dependency 'rspec', '~> 3.2.0'
-  s.add_development_dependency 'appraisal', '>= 2.0.0'
+  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'
 end

data/lib/cancan.rb

@@ -5,20 +5,11 @@ require 'cancan/controller_resource'
 require 'cancan/controller_additions'
 require 'cancan/model_additions'
 require 'cancan/exceptions'
-require 'cancan/inherited_resource'
 
 require 'cancan/model_adapters/abstract_adapter'
 require 'cancan/model_adapters/default_adapter'
 
 if defined? ActiveRecord
-  require 'cancan/model_adapters/active_record_adapter'
-  if ActiveRecord.respond_to?(:version) &&
-     ActiveRecord.version >= Gem::Version.new('4')
-    require 'cancan/model_adapters/active_record_4_adapter'
-  else
-    require 'cancan/model_adapters/active_record_3_adapter'
-  end
+  require 'cancan/model_adapters/active_record_adapter'  
+  require 'cancan/model_adapters/active_record_4_adapter'
 end
-
-require 'cancan/model_adapters/mongoid_adapter' if defined?(Mongoid) && defined?(Mongoid::Document)
-require 'cancan/model_adapters/sequel_adapter' if defined? Sequel

data/lib/cancan/ability.rb

@@ -414,7 +414,7 @@ module CanCan
 
     def default_alias_actions
       {
-        read: [:index, :show],
+        read: %i[index show],
         create: [:new],
         update: [:edit]
       }

data/lib/cancan/controller_additions.rb

@@ -256,8 +256,6 @@ module CanCan
       #     check_authorization :unless => :devise_controller?
       #
       def check_authorization(options = {})
-        method_name = active_support_4? ? :after_action : :after_filter
-
         block = proc do |controller|
           next if controller.instance_variable_defined?(:@_authorized)
           next if options[:if] && !controller.send(options[:if])
@@ -267,7 +265,7 @@ module CanCan
                 'Add skip_authorization_check to bypass this check.'
         end
 
-        send(method_name, options.slice(:only, :except), &block)
+        send(:after_action, options.slice(:only, :except), &block)
       end
 
       # Call this in the class of a controller to skip the check_authorization behavior on the actions.
@@ -278,32 +276,17 @@ module CanCan
       #
       # Any arguments are passed to the +before_action+ it triggers.
       def skip_authorization_check(*args)
-        method_name = active_support_4? ? :before_action : :before_filter
         block = proc { |controller| controller.instance_variable_set(:@_authorized, true) }
-        send(method_name, *args, &block)
-      end
-
-      def skip_authorization(*_args)
-        raise ImplementationRemoved,
-              'The CanCan skip_authorization method has been renamed to skip_authorization_check. '\
-              'Please update your code.'
+        send(:before_action, *args, &block)
       end
 
       def cancan_resource_class
-        if ancestors.map(&:to_s).include? 'InheritedResources::Actions'
-          InheritedResource
-        else
-          ControllerResource
-        end
+        ControllerResource
       end
 
       def cancan_skipper
         @_cancan_skipper ||= { authorize: {}, load: {} }
       end
-
-      def active_support_4?
-        ActiveSupport.respond_to?(:version) && ActiveSupport.version >= Gem::Version.new('4')
-      end
     end
 
     def self.included(base)
@@ -352,10 +335,6 @@ module CanCan
       current_ability.authorize!(*args)
     end
 
-    def unauthorized!(_message = nil)
-      raise ImplementationRemoved, 'The unauthorized! method has been removed from CanCan, use authorize! instead.'
-    end
-
     # Creates and returns the current user's ability and caches it. If you
     # want to override how the Ability is defined then this is the place.
     # Just define the method in the controller to change behavior.

data/lib/cancan/controller_resource.rb

@@ -14,11 +14,7 @@ module CanCan
     end
 
     def self.before_callback_name(options)
-      if ActiveSupport.respond_to?(:version) && ActiveSupport.version >= Gem::Version.new('4')
-        options.delete(:prepend) ? :prepend_before_action : :before_action
-      else
-        options.delete(:prepend) ? :prepend_before_filter : :before_filter
-      end
+      options.delete(:prepend) ? :prepend_before_action : :before_action
     end
 
     def initialize(controller, *args)
@@ -26,12 +22,6 @@ module CanCan
       @params = controller.params
       @options = args.extract_options!
       @name = args.first
-      nested_err = 'The :nested option is no longer supported, instead use :through with separate load/authorize call.'
-      raise CanCan::ImplementationRemoved, nested_err if @options[:nested]
-      name_err = 'The :name option is no longer supported, instead pass the name as the first argument.'
-      raise CanCan::ImplementationRemoved, name_err if @options[:name]
-      resource_err = 'The :resource option has been renamed back to :class, use false if no class.'
-      raise CanCan::ImplementationRemoved, resource_err if @options[:resource]
     end
 
     def load_and_authorize_resource
@@ -138,7 +128,7 @@ module CanCan
     end
 
     def id_param
-      @params[id_param_key].to_s if @params[id_param_key]
+      @params[id_param_key].to_s if @params[id_param_key].present?
     end
 
     def id_param_key
@@ -205,13 +195,11 @@ module CanCan
 
     def resource_base_through
       if parent_resource
-        base = if @options[:singleton]
-                 resource_class
-               else
-                 parent_resource.send(@options[:through_association] || name.to_s.pluralize)
-               end
-        base = base.scoped if base.respond_to?(:scoped) && active_record_3?
-        base
+        if @options[:singleton]
+          resource_class
+        else
+          parent_resource.send(@options[:through_association] || name.to_s.pluralize)
+        end
       elsif @options[:shallow]
         resource_class
       else
@@ -220,10 +208,6 @@ module CanCan
       end
     end
 
-    def active_record_3?
-      defined?(ActiveRecord) && ActiveRecord::VERSION::MAJOR == 3
-    end
-
     def parent_name
       @options[:through] && [@options[:through]].flatten.detect { |i| fetch_parent(i) }
     end
@@ -313,11 +297,11 @@ module CanCan
     end
 
     def new_actions
-      [:new, :create] + Array(@options[:new])
+      %i[new create] + Array(@options[:new])
     end
 
     def save_actions
-      [:create, :update]
+      %i[create update]
     end
 
     private

data/lib/cancan/matchers.rb

@@ -9,7 +9,13 @@ end
 
 Kernel.const_get(rspec_module)::Matchers.define :be_able_to do |*args|
   match do |ability|
-    ability.can?(*args)
+    actions = args.first
+    if actions.is_a? Array
+      break false if actions.empty?
+      actions.all? { |action| ability.can?(action, *args[1..-1]) }
+    else
+      ability.can?(*args)
+    end
   end
 
   # Check that RSpec is < 2.99

data/lib/cancan/model_adapters/active_record_4_adapter.rb

@@ -8,9 +8,7 @@ module CanCan
 
       # TODO: this should be private
       def self.override_condition_matching?(subject, name, _value)
-        # ActiveRecord introduced enums in version 4.1.
-        (ActiveRecord::VERSION::MAJOR > 4 || ActiveRecord::VERSION::MINOR >= 1) &&
-          subject.class.defined_enums.include?(name.to_s)
+        subject.class.defined_enums.include?(name.to_s)
       end
 
       # TODO: this should be private

data/lib/cancan/model_adapters/active_record_adapter.rb

@@ -144,6 +144,6 @@ module CanCan
   end
 end
 
-ActiveRecord::Base.class_eval do
-  include CanCan::ModelAdditions
+ActiveSupport.on_load(:active_record) do
+  send :include, CanCan::ModelAdditions
 end

data/lib/cancan/rule.rb

@@ -16,8 +16,8 @@ module CanCan
       raise Error, both_block_and_hash_error if conditions.is_a?(Hash) && block
       @match_all = action.nil? && subject.nil?
       @base_behavior = base_behavior
-      @actions = [action].flatten
-      @subjects = [subject].flatten
+      @actions = Array(action)
+      @subjects = Array(subject)
       @conditions = conditions || {}
       @block = block
     end

data/lib/cancan/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cancancan
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Alessandro Rodi (Renuo AG)
@@ -46,6 +46,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.1
   type: :development
@@ -53,6 +56,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.1
 - !ruby/object:Gem::Dependency
@@ -60,6 +66,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
@@ -67,12 +76,18 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -80,6 +95,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -90,41 +108,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
-- Appraisals
-- CHANGELOG.rdoc
-- CONTRIBUTING.md
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
 - cancancan.gemspec
-- gemfiles/activerecord_3.2.gemfile
-- gemfiles/activerecord_4.0.gemfile
-- gemfiles/activerecord_4.1.gemfile
-- gemfiles/activerecord_4.2.gemfile
-- gemfiles/activerecord_5.0.gemfile
-- gemfiles/mongoid_2.x.gemfile
-- gemfiles/sequel_3.x.gemfile
 - init.rb
 - lib/cancan.rb
 - lib/cancan/ability.rb
 - lib/cancan/controller_additions.rb
 - lib/cancan/controller_resource.rb
 - lib/cancan/exceptions.rb
-- lib/cancan/inherited_resource.rb
 - lib/cancan/matchers.rb
 - lib/cancan/model_adapters/abstract_adapter.rb
-- lib/cancan/model_adapters/active_record_3_adapter.rb
 - lib/cancan/model_adapters/active_record_4_adapter.rb
 - lib/cancan/model_adapters/active_record_adapter.rb
 - lib/cancan/model_adapters/default_adapter.rb
-- lib/cancan/model_adapters/mongoid_adapter.rb
-- lib/cancan/model_adapters/sequel_adapter.rb
 - lib/cancan/model_additions.rb
 - lib/cancan/rule.rb
 - lib/cancan/version.rb
@@ -132,23 +127,6 @@ files:
 - lib/generators/cancan/ability/USAGE
 - lib/generators/cancan/ability/ability_generator.rb
 - lib/generators/cancan/ability/templates/ability.rb
-- spec/README.rdoc
-- spec/cancan/ability_spec.rb
-- spec/cancan/controller_additions_spec.rb
-- spec/cancan/controller_resource_spec.rb
-- spec/cancan/exceptions_spec.rb
-- spec/cancan/inherited_resource_spec.rb
-- spec/cancan/matchers_spec.rb
-- spec/cancan/model_adapters/active_record_4_adapter_spec.rb
-- spec/cancan/model_adapters/active_record_adapter_spec.rb
-- spec/cancan/model_adapters/default_adapter_spec.rb
-- spec/cancan/model_adapters/mongoid_adapter_spec.rb
-- spec/cancan/model_adapters/sequel_adapter_spec.rb
-- spec/cancan/rule_spec.rb
-- spec/matchers.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/support/ability.rb
 homepage: https://github.com/CanCanCommunity/cancancan
 licenses:
 - MIT
@@ -164,38 +142,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Simple authorization solution for Rails.
-test_files:
-- Appraisals
-- gemfiles/activerecord_3.2.gemfile
-- gemfiles/activerecord_4.0.gemfile
-- gemfiles/activerecord_4.1.gemfile
-- gemfiles/activerecord_4.2.gemfile
-- gemfiles/activerecord_5.0.gemfile
-- gemfiles/mongoid_2.x.gemfile
-- gemfiles/sequel_3.x.gemfile
-- spec/README.rdoc
-- spec/cancan/ability_spec.rb
-- spec/cancan/controller_additions_spec.rb
-- spec/cancan/controller_resource_spec.rb
-- spec/cancan/exceptions_spec.rb
-- spec/cancan/inherited_resource_spec.rb
-- spec/cancan/matchers_spec.rb
-- spec/cancan/model_adapters/active_record_4_adapter_spec.rb
-- spec/cancan/model_adapters/active_record_adapter_spec.rb
-- spec/cancan/model_adapters/default_adapter_spec.rb
-- spec/cancan/model_adapters/mongoid_adapter_spec.rb
-- spec/cancan/model_adapters/sequel_adapter_spec.rb
-- spec/cancan/rule_spec.rb
-- spec/matchers.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/support/ability.rb
+test_files: []

data/.gitignore

@@ -1,15 +0,0 @@
-.DS_Store
-.idea/*
-*.swp
-**/*.swp
-*.gem
-.bundle
-
-gemfiles/*.lock
-Gemfile.lock
-
-.rvmrc
-.rbenv-version
-.ruby-version
-.ruby-gemset
-/tmp