where_chain 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f908efafd89e45ee67d4051326d7998aee4dea9d008e6e95a2dc23064754f12f
-  data.tar.gz: 368905be74dfd90a3eb62cf190b06a800e1764c235870364cf2c79eb243fde92
+  metadata.gz: bc7e391acb640aba967c22926907bc95c610bba037ff38f1890274d751797d50
+  data.tar.gz: ff165ee3f9bda32f0625fc8214f7cfba1f335b273260b008d2e33a26be5505ac
 SHA512:
-  metadata.gz: 2c71031c54d4e19143165b9ea03f12b548dd1bf3850649a8937a3c376f36168559d359f93a1a250fc61a7ba0a8e22b85a69e8af34d69eaf3d29f01fb4aa991e2
-  data.tar.gz: 65f15b0f747953b251b4f48c87f84d4eda3064e739d575ea4fa02de81093d05f1efa4b884340a466e020965c8fe8031fe0269a429dce46b7cff163318852729f
+  metadata.gz: 77ab8fd3e5f1f8f9aebaa880a420c72200a789cef67c5e5c1da603fa34b8d37b6f76e6a5e8be21381e6de4cc8a036c6a482baf9fe412e09339238de3610e7601
+  data.tar.gz: 7fd1435df353db94e480285f02451f75168486f7d24a3bd04c357cbe4a7de75cd79d226d1b9c8136344e9c246d43fc8e67620cddb4a4866d4aa2f7906e45b399

data/lib/active_record/where_chain_extensions_rails5.rb

@@ -8,6 +8,7 @@ module ActiveRecord
 
   module QueryMethods
     class WhereChain
+      include ActiveModel::ForbiddenAttributesProtection
       include WhereChainSharedMethods
 
       # Returns a new relation expressing WHERE + NOT condition
@@ -30,9 +31,9 @@ module ActiveRecord
 
         opts = sanitize_forbidden_attributes(opts)
 
-        where_clause = @scope.send(:where_clause_factory).build(opts, rest)
+        where_clause = where_clause_factory_build(opts, rest)
 
-        @scope.references!(PredicateBuilder.references(opts)) if opts.is_a?(Hash)
+        @scope.references!(PredicateBuilder.references(opts.stringify_keys)) if opts.is_a?(Hash)
         @scope.where_clause += where_clause.invert
         @scope
       end
@@ -46,7 +47,7 @@ module ActiveRecord
       def prepare_where(node_type, infix, opts, rest)
         @scope.tap do |s|
           opts.each_pair do |key, value|
-            equal_where_clause = s.send(:where_clause_factory).build({ key => value }, rest)
+            equal_where_clause = where_clause_factory_build({ key => value }, rest)
             equal_where_clause_predicate = equal_where_clause.send(:predicates).first
 
             new_predicate = arel_node(node_type, infix, equal_where_clause_predicate)
@@ -69,6 +70,16 @@ module ActiveRecord
           Relation::WhereClause.new([new_predicate])
         end
       end
+
+      # Active Record 6.1 removed the where_clause_factory.build method
+      # method was replaced by build_where_clause
+      def where_clause_factory_build(opts, rest = [])
+        if ActiveRecord.version.release >= Gem::Version.new('6.1.0')
+          @scope.send(:build_where_clause, opts, rest)
+        else
+          @scope.send(:where_clause_factory).build(opts, rest)
+        end
+      end
     end
   end
 end

data/lib/where_chain/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WhereChain
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_chain
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Marcin Ruszkiewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord