cancancan 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 597f9c67d00dc9af7805456aca9464c41b795f42
-  data.tar.gz: e52df51e0f69a1f98509e7d8ae7ab8e14affb418
+  metadata.gz: f603bcd9b02f8b042e5de713df94cb01abec7486
+  data.tar.gz: 358a5080dcef4525f7993d9c1383daffc147d169
 SHA512:
-  metadata.gz: df305f2d2c391e2ce49bf98f0cdbe6b0cc0d96140467bb3efa66032ce61fe0ada2984ab94bfc956fbd5a8e3d1251ae7f64e3fe5773a815d172abb62f5f71db18
-  data.tar.gz: 33dcb0f4db08c07cf7e62103588177c628ddf7f8e219495b2e74bec94c9e2608c9b38daf2009626ef51aa77e97f6cdfc4c12d08a946f2c41d2b99e7385a8e7ea
+  metadata.gz: c56c8b9e82e5ab6868a5dafcf811d2363b023c4f1eb05149de64996919e6da6e60dff583e7d1b9f1c1eeb277a52a5327e03b52bf753b3ed79ce2cc22fad0b431
+  data.tar.gz: a1be98535ecbcde3db1b8accc41446bbb139b413b544a2541af00f699e5e5a548d3fdfdb41b09ed951504d4c8a6a31fc24a50aea690ad70ed2fb224a1676d954

data/.travis.yml

@@ -5,12 +5,14 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.2.0
+  - 2.2.2
   - jruby-9.0.5.0
 gemfile:
   - 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
 services:
@@ -18,8 +20,14 @@ services:
 matrix:
   fast_finish: true
   exclude:
+    - rvm: 2.0.0
+      gemfile: gemfiles/activerecord_5.0.gemfile
+    - rvm: 2.1.0
+      gemfile: gemfiles/activerecord_5.0.gemfile
     - rvm: 2.2.0
-      gemfile: gemfiles/activerecord_3.2.gemfile
+      gemfile: gemfiles/activerecord_5.0.gemfile
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/activerecord_5.0.gemfile
 notifications:
   recipients:
     - bryan@bryanrite.com

data/Appraisals

@@ -1,5 +1,6 @@
 appraise "activerecord_3.2" do
   gem "activerecord", "~> 3.2.0", :require => "active_record"
+  gem "actionpack", "~> 3.2.0", :require => "action_pack"
 
   gemfile.platforms :jruby do
     gem "activerecord-jdbcsqlite3-adapter"
@@ -14,6 +15,8 @@ end
 appraise "activerecord_4.0" do
   gem "activerecord", "~> 4.0.5", :require => "active_record"
   gem "activesupport", "~> 4.0.5", :require => "active_support/all"
+  gem "actionpack", "~> 4.0.5", :require => "action_pack"
+
 
   gemfile.platforms :jruby do
     gem "activerecord-jdbcsqlite3-adapter"
@@ -28,6 +31,7 @@ end
 appraise "activerecord_4.1" do
   gem "activerecord", "~> 4.1.1", :require => "active_record"
   gem "activesupport", "~> 4.1.1", :require => "active_support/all"
+  gem "actionpack", "~> 4.1.1", :require => "action_pack"
 
   gemfile.platforms :jruby do
     gem "activerecord-jdbcsqlite3-adapter"
@@ -42,6 +46,23 @@ end
 appraise "activerecord_4.2" do
   gem "activerecord", "~> 4.2.0", :require => "active_record"
   gem 'activesupport', '~> 4.2.0', :require => 'active_support/all'
+  gem "actionpack", "~> 4.2.0", :require => "action_pack"
+
+  gemfile.platforms :jruby do
+    gem "activerecord-jdbcsqlite3-adapter"
+    gem "jdbc-sqlite3"
+  end
+
+  gemfile.platforms :ruby, :mswin, :mingw do
+    gem "sqlite3"
+    gem "pg"
+  end
+end
+
+appraise "activerecord_5.0" do
+  gem "activerecord", "~> 5.0.0.rc1", :require => "active_record"
+  gem 'activesupport', '~> 5.0.0.rc1', :require => 'active_support/all'
+  gem "actionpack", "~> 5.0.0.rc1", :require => "action_pack"
 
   gemfile.platforms :jruby do
     gem "activerecord-jdbcsqlite3-adapter"
@@ -56,6 +77,7 @@ end
 
 appraise "mongoid_2.x" do
   gem "activesupport", "~> 3.0", :require => "active_support/all"
+  gem "actionpack", "~> 3.0", :require => "action_pack"
   gem "mongoid", "~> 2.0.0"
 
   gemfile.platforms :ruby, :mswin, :mingw do
@@ -68,8 +90,9 @@ appraise "mongoid_2.x" do
 end
 
 appraise "sequel_3.x" do
-  gem "sequel", "~> 3.47.0"
+  gem "sequel", "~> 3.48.0"
   gem "activesupport", "~> 3.0", :require => "active_support/all"
+  gem "actionpack", "~> 3.0", :require => "action_pack"
 
   gemfile.platforms :jruby do
     gem "jdbc-sqlite3"

data/CHANGELOG.rdoc

@@ -2,6 +2,13 @@ Develop
 
 Unreleased
 
+1.15.0 (June 13th, 2016)
+
+* Add support for Rails 5 (craig1410)
+
+1.14.0 (May 14th, 2016)
+
+* Use cover for ranges
 * Add support for rails 4 enum's (markpmitchell)
 
 1.13.1 (Oct 8th, 2015)

data/gemfiles/activerecord_3.2.gemfile

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 3.2.0", :require => "active_record"
+gem "actionpack", "~> 3.2.0", :require => "action_pack"
 
 platforms :jruby do
   gem "activerecord-jdbcsqlite3-adapter"

data/gemfiles/activerecord_4.0.gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.0.5", :require => "active_record"
 gem "activesupport", "~> 4.0.5", :require => "active_support/all"
+gem "actionpack", "~> 4.0.5", :require => "action_pack"
 
 platforms :jruby do
   gem "activerecord-jdbcsqlite3-adapter"

data/gemfiles/activerecord_4.1.gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.1.1", :require => "active_record"
 gem "activesupport", "~> 4.1.1", :require => "active_support/all"
+gem "actionpack", "~> 4.1.1", :require => "action_pack"
 
 platforms :jruby do
   gem "activerecord-jdbcsqlite3-adapter"

data/gemfiles/activerecord_4.2.gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.2.0", :require => "active_record"
 gem "activesupport", "~> 4.2.0", :require => "active_support/all"
+gem "actionpack", "~> 4.2.0", :require => "action_pack"
 
 platforms :jruby do
   gem "activerecord-jdbcsqlite3-adapter"

data/gemfiles/activerecord_5.0.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0.0.rc1", :require => "active_record"
+gem "activesupport", "~> 5.0.0.rc1", :require => "active_support/all"
+gem "actionpack", "~> 5.0.0.rc1", :require => "action_pack"
+
+platforms :jruby do
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "jdbc-sqlite3"
+end
+
+platforms :ruby, :mswin, :mingw do
+  gem "sqlite3"
+  gem "pg"
+end
+
+gemspec :path => "../"

data/gemfiles/mongoid_2.x.gemfile

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "activesupport", "~> 3.0", :require => "active_support/all"
+gem "actionpack", "~> 3.0", :require => "action_pack"
 gem "mongoid", "~> 2.0.0"
 
 platforms :ruby, :mswin, :mingw do

data/gemfiles/sequel_3.x.gemfile

@@ -2,8 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "sequel", "~> 3.47.0"
+gem "sequel", "~> 3.48.0"
 gem "activesupport", "~> 3.0", :require => "active_support/all"
+gem "actionpack", "~> 3.0", :require => "action_pack"
 
 platforms :jruby do
   gem "jdbc-sqlite3"

data/lib/cancan/controller_additions.rb

@@ -12,7 +12,7 @@ module CanCan
       #   end
       #
       def load_and_authorize_resource(*args)
-        cancan_resource_class.add_before_filter(self, :load_and_authorize_resource, *args)
+        cancan_resource_class.add_before_action(self, :load_and_authorize_resource, *args)
       end
 
       # Sets up a before filter which loads the model resource into an instance variable.
@@ -32,10 +32,10 @@ module CanCan
       #   end
       #
       # A resource is not loaded if the instance variable is already set. This makes it easy to override
-      # the behavior through a before_filter on certain actions.
+      # the behavior through a before_action on certain actions.
       #
       #   class BooksController < ApplicationController
-      #     before_filter :find_book_by_permalink, :only => :show
+      #     before_action :find_book_by_permalink, :only => :show
       #     load_resource
       #
       #     private
@@ -115,10 +115,10 @@ module CanCan
       #     load_resource :new => :build
       #
       # [:+prepend+]
-      #   Passing +true+ will use prepend_before_filter instead of a normal before_filter.
+      #   Passing +true+ will use prepend_before_action instead of a normal before_action.
       #
       def load_resource(*args)
-        cancan_resource_class.add_before_filter(self, :load_resource, *args)
+        cancan_resource_class.add_before_action(self, :load_resource, *args)
       end
 
       # Sets up a before filter which authorizes the resource using the instance variable.
@@ -174,10 +174,10 @@ module CanCan
       #   Authorize conditions on this parent resource when instance isn't available.
       #
       # [:+prepend+]
-      #   Passing +true+ will use prepend_before_filter instead of a normal before_filter.
+      #   Passing +true+ will use prepend_before_action instead of a normal before_action.
       #
       def authorize_resource(*args)
-        cancan_resource_class.add_before_filter(self, :authorize_resource, *args)
+        cancan_resource_class.add_before_action(self, :authorize_resource, *args)
       end
 
       # Skip both the loading and authorization behavior of CanCan for this given controller. This is primarily
@@ -254,12 +254,16 @@ module CanCan
       #     check_authorization :unless => :devise_controller?
       #
       def check_authorization(options = {})
-        self.after_filter(options.slice(:only, :except)) do |controller|
+        method_name = ActiveSupport.respond_to?(:version) && ActiveSupport.version >= Gem::Version.new("4") ? :after_action : :after_filter
+
+        block = Proc.new do |controller|
           next if controller.instance_variable_defined?(:@_authorized)
           next if options[:if] && !controller.send(options[:if])
           next if options[:unless] && controller.send(options[:unless])
           raise AuthorizationNotPerformed, "This action failed the check_authorization because it does not authorize_resource. Add skip_authorization_check to bypass this check."
         end
+
+        self.send(method_name, options.slice(:only, :except), &block)
       end
 
       # Call this in the class of a controller to skip the check_authorization behavior on the actions.
@@ -268,11 +272,11 @@ module CanCan
       #     skip_authorization_check :only => :index
       #   end
       #
-      # Any arguments are passed to the +before_filter+ it triggers.
+      # Any arguments are passed to the +before_action+ it triggers.
       def skip_authorization_check(*args)
-        self.before_filter(*args) do |controller|
-          controller.instance_variable_set(:@_authorized, true)
-        end
+        method_name = ActiveSupport.respond_to?(:version) && ActiveSupport.version >= Gem::Version.new("4") ? :before_action : :before_filter
+        block = Proc.new{ |controller| controller.instance_variable_set(:@_authorized, true) }
+        self.send(method_name, *args, &block)
       end
 
       def skip_authorization(*args)

data/lib/cancan/controller_resource.rb

@@ -2,15 +2,23 @@ module CanCan
   # Handle the load and authorization controller logic so we don't clutter up all controllers with non-interface methods.
   # This class is used internally, so you do not need to call methods directly on it.
   class ControllerResource # :nodoc:
-    def self.add_before_filter(controller_class, method, *args)
+    def self.add_before_action(controller_class, method, *args)
       options = args.extract_options!
       resource_name = args.first
-      before_filter_method = options.delete(:prepend) ? :prepend_before_filter : :before_filter
-      controller_class.send(before_filter_method, options.slice(:only, :except, :if, :unless)) do |controller|
+      before_action_method = before_callback_name(options)
+      controller_class.send(before_action_method, options.slice(:only, :except, :if, :unless)) do |controller|
         controller.class.cancan_resource_class.new(controller, resource_name, options.except(:only, :except, :if, :unless)).send(method)
       end
     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
+    end
+
     def initialize(controller, *args)
       @controller = controller
       @params = controller.params

data/lib/cancan/model_adapters/active_record_4_adapter.rb

@@ -20,7 +20,7 @@ module CanCan
 
       def self.override_condition_matching?(subject, name, value)
         # ActiveRecord introduced enums in version 4.1.
-        ActiveRecord::VERSION::MINOR >= 1 &&
+        (ActiveRecord::VERSION::MAJOR > 4 || ActiveRecord::VERSION::MINOR >= 1) &&
           subject.class.defined_enums.include?(name.to_s)
       end
 
@@ -37,7 +37,20 @@ module CanCan
 
       # Rails 4.2 deprecates `sanitize_sql_hash_for_conditions`
       def sanitize_sql(conditions)
-        if ActiveRecord::VERSION::MINOR >= 2 && Hash === conditions
+        if ActiveRecord::VERSION::MAJOR > 4 && Hash === conditions
+          table = @model_class.send(:arel_table)
+          table_metadata = ActiveRecord::TableMetadata.new(@model_class, table)
+          predicate_builder = ActiveRecord::PredicateBuilder.new(table_metadata)
+
+          conditions = predicate_builder.resolve_column_aliases(conditions)
+          conditions = @model_class.send(:expand_hash_conditions_for_aggregates, conditions)
+
+          conditions.stringify_keys!
+
+          predicate_builder.build_from_hash(conditions).map { |b|
+            @model_class.send(:connection).visitor.compile b
+          }.join(' AND ')
+        elsif ActiveRecord::VERSION::MINOR >= 2 && Hash === conditions
           table = Arel::Table.new(@model_class.send(:table_name))
 
           conditions = ActiveRecord::PredicateBuilder.resolve_column_aliases @model_class, conditions

data/lib/cancan/version.rb

@@ -1,3 +1,3 @@
 module CanCan
-  VERSION = "1.14.0"
+  VERSION = "1.15.0"
 end

data/spec/cancan/controller_additions_spec.rb

@@ -33,44 +33,44 @@ describe CanCan::ControllerAdditions do
   it "load_and_authorize_resource setups a before filter which passes call to ControllerResource" do
     expect(cancan_resource_class = double).to receive(:load_and_authorize_resource)
     allow(CanCan::ControllerResource).to receive(:new).with(@controller, nil, :foo => :bar) {cancan_resource_class }
-    expect(@controller_class).to receive(:before_filter).with({}) { |options, &block| block.call(@controller) }
+    expect(@controller_class).to receive(callback_action(:before_action)).with({}) { |options, &block| block.call(@controller) }
     @controller_class.load_and_authorize_resource :foo => :bar
   end
 
   it "load_and_authorize_resource properly passes first argument as the resource name" do
     expect(cancan_resource_class = double).to receive(:load_and_authorize_resource)
     allow(CanCan::ControllerResource).to receive(:new).with(@controller, :project, :foo => :bar) {cancan_resource_class}
-    expect(@controller_class).to receive(:before_filter).with({}) { |options, &block| block.call(@controller) }
+    expect(@controller_class).to receive(callback_action(:before_action)).with({}) { |options, &block| block.call(@controller) }
     @controller_class.load_and_authorize_resource :project, :foo => :bar
   end
 
   it "load_and_authorize_resource with :prepend prepends the before filter" do
-    expect(@controller_class).to receive(:prepend_before_filter).with({})
+    expect(@controller_class).to receive(callback_action(:prepend_before_action)).with({})
     @controller_class.load_and_authorize_resource :foo => :bar, :prepend => true
   end
 
   it "authorize_resource setups a before filter which passes call to ControllerResource" do
     expect(cancan_resource_class = double).to receive(:authorize_resource)
     allow(CanCan::ControllerResource).to receive(:new).with(@controller, nil, :foo => :bar) {cancan_resource_class}
-    expect(@controller_class).to receive(:before_filter).with(:except => :show, :if => true) { |options, &block| block.call(@controller) }
+    expect(@controller_class).to receive(callback_action(:before_action)).with(:except => :show, :if => true) { |options, &block| block.call(@controller) }
     @controller_class.authorize_resource :foo => :bar, :except => :show, :if => true
   end
 
   it "load_resource setups a before filter which passes call to ControllerResource" do
     expect(cancan_resource_class = double).to receive(:load_resource)
     allow(CanCan::ControllerResource).to receive(:new).with(@controller, nil, :foo => :bar) {cancan_resource_class}
-    expect(@controller_class).to receive(:before_filter).with(:only => [:show, :index], :unless => false) { |options, &block| block.call(@controller) }
+    expect(@controller_class).to receive(callback_action(:before_action)).with(:only => [:show, :index], :unless => false) { |options, &block| block.call(@controller) }
     @controller_class.load_resource :foo => :bar, :only => [:show, :index], :unless => false
   end
 
   it "skip_authorization_check setups a before filter which sets @_authorized to true" do
-    expect(@controller_class).to receive(:before_filter).with(:filter_options) { |options, &block| block.call(@controller) }
+    expect(@controller_class).to receive(callback_action(:before_action)).with(:filter_options) { |options, &block| block.call(@controller) }
     @controller_class.skip_authorization_check(:filter_options)
     expect(@controller.instance_variable_get(:@_authorized)).to be(true)
   end
 
   it "check_authorization triggers AuthorizationNotPerformed in after filter" do
-    expect(@controller_class).to receive(:after_filter).with(:only => [:test]) { |options, &block| block.call(@controller) }
+    expect(@controller_class).to receive(callback_action(:after_action)).with(:only => [:test]) { |options, &block| block.call(@controller) }
     expect {
       @controller_class.check_authorization(:only => [:test])
     }.to raise_error(CanCan::AuthorizationNotPerformed)
@@ -78,7 +78,7 @@ describe CanCan::ControllerAdditions do
 
   it "check_authorization does not trigger AuthorizationNotPerformed when :if is false" do
     allow(@controller).to receive(:check_auth?) { false }
-    allow(@controller_class).to receive(:after_filter).with({}) { |options, &block| block.call(@controller) }
+    allow(@controller_class).to receive(callback_action(:after_action)).with({}) { |options, &block| block.call(@controller) }
     expect {
       @controller_class.check_authorization(:if => :check_auth?)
     }.not_to raise_error
@@ -86,7 +86,7 @@ describe CanCan::ControllerAdditions do
 
   it "check_authorization does not trigger AuthorizationNotPerformed when :unless is true" do
     allow(@controller).to receive(:engine_controller?) { true }
-    expect(@controller_class).to receive(:after_filter).with({}) { |options, &block| block.call(@controller) }
+    expect(@controller_class).to receive(callback_action(:after_action)).with({}) { |options, &block| block.call(@controller) }
     expect {
       @controller_class.check_authorization(:unless => :engine_controller?)
     }.not_to raise_error
@@ -94,7 +94,7 @@ describe CanCan::ControllerAdditions do
 
   it "check_authorization does not raise error when @_authorized is set" do
     @controller.instance_variable_set(:@_authorized, true)
-    expect(@controller_class).to receive(:after_filter).with(:only => [:test]) { |options, &block| block.call(@controller) }
+    expect(@controller_class).to receive(callback_action(:after_action)).with(:only => [:test]) { |options, &block| block.call(@controller) }
     expect {
       @controller_class.check_authorization(:only => [:test])
     }.not_to raise_error
@@ -138,4 +138,14 @@ describe CanCan::ControllerAdditions do
     expect(@controller_class.cancan_skipper[:load][:project]).to eq({:only => [:index, :show]})
     expect(@controller_class.cancan_skipper[:authorize][:project]).to eq({:only => [:index, :show]})
   end
+
+  private
+
+  def callback_action(action)
+    if ActiveSupport.respond_to?(:version) && ActiveSupport.version >= Gem::Version.new("4")
+      action
+    else
+      action.to_s.sub(/_action/, '_filter')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cancancan
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Bryan Rite
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,7 @@ files:
 - 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
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple authorization solution for Rails.