cancancan 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e578e1005885c6f192bb9796d1beaa98878b01e
-  data.tar.gz: 8f4f962696dedc14dd038489dc46054c523c55a2
+  metadata.gz: 21431fc240e1b6a6093c6b9020f3804be1dc4b92
+  data.tar.gz: 604de9f26326c369c30746aee8103e9761c8319f
 SHA512:
-  metadata.gz: 5737784c038345e4ff19c5dc519c828cb36268f77bafef9fa9d40ba3ae396fe030b2c3fc60f3e755903c9d398a59b450690cc0564b22aef1a1f46826c753aa35
-  data.tar.gz: b4faa7beedaba71e8303aafb358a4ecd02b8d4be7abb2730c2f7b8bc9e13c46650acfa77e0ab4ecd81da381e166ddd9ab9fb098c79e7a9d3fa95dbaf5e24c0e4
+  metadata.gz: 05de9daae982bbf29448fbbcc5f15ea074ab8d33a4cef3b84555c494c9a2f8fabe759b09241d593de05ffb83c7c579de25445c6b88cc398cf9f4da39008ba57e
+  data.tar.gz: 040dbc4c5450a992bd3ce233435a44faac4aedba9cbec03387242bb8e84933f315135955765d318da58b0f0b40d9f0825c2bccf9bf2a6b2e1a552e613ed88826

data/Appraisals

@@ -86,6 +86,7 @@ appraise "activerecord_4.2" do
 
   gemfile.platforms :ruby, :mswin, :mingw do
     gem "sqlite3"
+    gem "pg"
   end
 end
 

data/CHANGELOG.rdoc

@@ -1,6 +1,11 @@
 Develop
 
 
+1.10.1 (January 13th, 2015)
+
+* Fix cancancan#168 - A bug with ActiveRecord 4.2 support causing ProtocolViolation due to named parameters not being passed in.
+
+
 1.10.0 (January 7th, 2015)
 
 * Fix i18n issue for Ruby < 1.9.3 (bryanrite)

data/README.md

@@ -134,7 +134,7 @@ You can also use a string that will be evaluated in the context of the controlle
 
 Finally, it's possible to associate `param_method` with a Proc object which will be called with the controller as the only argument:
 
-    load_and_authorize_resource param_method: Proc.new [ |c| c.params.require(:article).permit(:name) ]
+    load_and_authorize_resource param_method: Proc.new { |c| c.params.require(:article).permit(:name) }
 
 See [Strong Parameters](https://github.com/CanCanCommunity/cancancan/wiki/Strong-Parameters) for more information.
 

data/gemfiles/activerecord_4.2.gemfile

@@ -12,6 +12,7 @@ end
 
 platforms :ruby, :mswin, :mingw do
   gem "sqlite3"
+  gem "pg"
 end
 
 gemspec :path => "../"

data/lib/cancan/model_adapters/active_record_4_adapter.rb

@@ -21,13 +21,17 @@ module CanCan
       # Rails 4.2 deprecates `sanitize_sql_hash_for_conditions`
       def sanitize_sql(conditions)
         if ActiveRecord::VERSION::MINOR >= 2 && Hash === conditions
-          relation = @model_class.unscoped.where(conditions)
-          predicates = relation.where_values
-          bind_values = relation.bind_values
-          query = Arel::Nodes::And.new(predicates).to_sql
-          conditions = [query, *bind_values.map { |col, val| val }]
+          table = Arel::Table.new(@model_class.send(:table_name))
+
+          conditions = ActiveRecord::PredicateBuilder.resolve_column_aliases @model_class, conditions
+          conditions = @model_class.send(:expand_hash_conditions_for_aggregates, conditions)
+
+          ActiveRecord::PredicateBuilder.build_from_hash(@model_class, conditions, table).map { |b|
+            @model_class.send(:connection).visitor.compile b
+          }.join(' AND ')
+        else
+          @model_class.send(:sanitize_sql, conditions)
         end
-        @model_class.send(:sanitize_sql, conditions)
       end
     end
   end

data/lib/cancan/version.rb

@@ -1,3 +1,3 @@
 module CanCan
-  VERSION = "1.10.0"
+  VERSION = "1.10.1"
 end

data/spec/cancan/model_adapters/active_record_4_adapter_spec.rb

@@ -2,39 +2,84 @@ require "spec_helper"
 
 if defined? CanCan::ModelAdapters::ActiveRecord4Adapter
   describe CanCan::ModelAdapters::ActiveRecord4Adapter do
-    before :each do
-      ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-      ActiveRecord::Migration.verbose = false
-      ActiveRecord::Schema.define do
-        create_table(:parents) do |t|
-          t.timestamps :null => false
+    context 'with sqlite3' do
+      before :each do
+        ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+        ActiveRecord::Migration.verbose = false
+        ActiveRecord::Schema.define do
+          create_table(:parents) do |t|
+            t.timestamps :null => false
+          end
+
+          create_table(:children) do |t|
+            t.timestamps :null => false
+            t.integer :parent_id
+          end
         end
 
-        create_table(:children) do |t|
-          t.timestamps :null => false
-          t.integer :parent_id
+        class Parent < ActiveRecord::Base
+          has_many :children, lambda { order(:id => :desc) }
         end
-      end
 
-      class Parent < ActiveRecord::Base
-        has_many :children, lambda { order(:id => :desc) }
-      end
+        class Child < ActiveRecord::Base
+          belongs_to :parent
+        end
 
-      class Child < ActiveRecord::Base
-        belongs_to :parent
+        (@ability = double).extend(CanCan::Ability)
       end
 
-      (@ability = double).extend(CanCan::Ability)
+      it "respects scope on included associations" do
+        @ability.can :read, [Parent, Child]
+
+        parent = Parent.create!
+        child1 = Child.create!(:parent => parent, :created_at => 1.hours.ago)
+        child2 = Child.create!(:parent => parent, :created_at => 2.hours.ago)
+
+        expect(Parent.accessible_by(@ability).order(:created_at => :asc).includes(:children).first.children).to eq [child2, child1]
+      end
     end
 
-    it "respects scope on included associations" do
-      @ability.can :read, [Parent, Child]
+    if Gem::Specification.find_all_by_name('pg').any?
+      context 'with postgresql' do
+        before :each do
+          ActiveRecord::Base.establish_connection(:adapter => "postgresql", :database => "postgres", :schema_search_path => 'public')
+          ActiveRecord::Base.connection.drop_database('cancan_postgresql_spec')
+          ActiveRecord::Base.connection.create_database 'cancan_postgresql_spec', 'encoding' => 'utf-8', 'adapter' => 'postgresql'
+          ActiveRecord::Base.establish_connection(:adapter => "postgresql", :database => "cancan_postgresql_spec")
+          ActiveRecord::Migration.verbose = false
+          ActiveRecord::Schema.define do
+            create_table(:parents) do |t|
+              t.timestamps :null => false
+            end
+
+            create_table(:children) do |t|
+              t.timestamps :null => false
+              t.integer :parent_id
+            end
+          end
 
-      parent = Parent.create!
-      child1 = Child.create!(:parent => parent, :created_at => 1.hours.ago)
-      child2 = Child.create!(:parent => parent, :created_at => 2.hours.ago)
+          class Parent < ActiveRecord::Base
+            has_many :children, lambda { order(:id => :desc) }
+          end
 
-      expect(Parent.accessible_by(@ability).order(:created_at => :asc).includes(:children).first.children).to eq [child2, child1]
+          class Child < ActiveRecord::Base
+            belongs_to :parent
+          end
+
+          (@ability = double).extend(CanCan::Ability)
+        end
+
+        it "allows overlapping conditions in SQL and merge with hash conditions" do
+          @ability.can :read, Parent, :children => {:parent_id => 1}
+          @ability.can :read, Parent, :children => {:parent_id => 1}
+
+          parent = Parent.create!
+          child1 = Child.create!(:parent => parent, :created_at => 1.hours.ago)
+          child2 = Child.create!(:parent => parent, :created_at => 2.hours.ago)
+
+          expect(Parent.accessible_by(@ability)).to eq([parent])
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cancancan
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Bryan Rite
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler