where_chain 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f908efafd89e45ee67d4051326d7998aee4dea9d008e6e95a2dc23064754f12f
-  data.tar.gz: 368905be74dfd90a3eb62cf190b06a800e1764c235870364cf2c79eb243fde92
+  metadata.gz: d8cbeba2f22837e6e7df392c402c59a81c2dc7e516d231f5f8fd3695c51cbc0d
+  data.tar.gz: b017adeb34d58508c222987c5198fee4653881a5fce32f56d41de4e86b94abd8
 SHA512:
-  metadata.gz: 2c71031c54d4e19143165b9ea03f12b548dd1bf3850649a8937a3c376f36168559d359f93a1a250fc61a7ba0a8e22b85a69e8af34d69eaf3d29f01fb4aa991e2
-  data.tar.gz: 65f15b0f747953b251b4f48c87f84d4eda3064e739d575ea4fa02de81093d05f1efa4b884340a466e020965c8fe8031fe0269a429dce46b7cff163318852729f
+  metadata.gz: b68533130e8d4561aa95dd3d117f52565924e07d74c8dd2d7bcc85276ede3aa6e866c1e86f5a10672754bbb838fc7932709cb837efec95baa420e7782c982479
+  data.tar.gz: 5e58d5ab2d1810933c5f326d6462b80e2712c0da947393bd2c0265db99ea23ad1f246c36fa94db7ad8397a1dc22e4927caaacd8b7943a5c5a3254a8e35310f09

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/where_chain.svg)](https://badge.fury.io/rb/where_chain) [![TravisCI](https://travis-ci.com/marcinruszkiewicz/where_chain.svg?branch=master)](https://travis-ci.com/marcinruszkiewicz/where_chain)
+[![Gem Version](https://badge.fury.io/rb/where_chain.svg)](https://badge.fury.io/rb/where_chain) ![TravisCI](https://github.com/marcinruszkiewicz/where_chain/actions/workflows/rspec.yml/badge.svg)
 
 # WhereChain
 
@@ -6,11 +6,11 @@ In Rails, we usually use Active Record, which allows us to escape from writing S
 
 In the older versions, you also had to write `Post.where('name IS NOT null')` to do a negation. Rails 4.0 added a class called `WhereChain` that added some [new possibilities](https://github.com/rails/rails/commit/de75af7acc5c05c708443de40e78965925165217), one of which was a `not` method. The proper way to write  became `Post.where.not(name: nil)` instead.
 
-Within the same commit there were also two new methods that [didn't survive to the release of Rails 4.0](https://github.com/rails/rails/commit/8d02afeaee8993bd0fde69687fdd9bf30921e805) - `.like` and `.not_like`. As you can read in this commit discussion, there has been work made to bring them back, like the [activerecord-like](https://github.com/ReneB/activerecord-like) gem or [Squeel](https://github.com/activerecord-hackery/squeel), but these has their own problems - activerecord-like only adds `.like` and `.not_like` back and the latest version is locked to Active Record 5; and Squeel provides a whole new query DSL, which not everyone will like. There was actually a pull request adding `.gt` and other [inequality methods](https://github.com/rails/rails/pull/8453), which was closed even faster than the first one.
+Within the same commit there were also two new methods that [didn't survive to the release of Rails 4.0](https://github.com/rails/rails/commit/8d02afeaee8993bd0fde69687fdd9bf30921e805) - `.like` and `.not_like`. As you can read in this commit discussion, there has been work made to bring them back, like the [activerecord-like](https://github.com/ReneB/activerecord-like) gem or [Squeel](https://github.com/activerecord-hackery/squeel), but these have their own problems - activerecord-like only adds `.like` and `.not_like` back and the latest version is locked to Active Record 5; and Squeel provides a whole new query DSL, which not everyone will like. There was actually a pull request adding `.gt` and other [inequality methods](https://github.com/rails/rails/pull/8453), which was closed even faster than the first one.
 
 This gem brings these two methods back and extends WhereChain with additional methods: `.gt`, `.gte`, `.lt` and `.lte`, so that by using it you can replace the SQL strings like `Post.where('comments > 5')` with `Post.where.gt(comments: 5)`.
 
-WhereChain depends on the Active Record gem in a version higher than 4.2, due to problems with Ruby versions lesser than 2.4. Rails 4.2 is already the version that's being maintained, so you probably should not use an earlier one anyway. The gem is tested on the latest Ruby and all current Rails versions - 4.2, 5.0, 5.1, 5.2 and 6.0.
+WhereChain depends on the Active Record gem in a version higher than 4.2. The gem is tested on the latest Ruby and all current Rails versions - 5.2, 6.0, 6.1, and 7.0. If you have an older version, it will probably still work, because Active Record doesn't really change all that often, but Rails versions older than 5.2 depend on old and unsupported Ruby versions, so I'm not making any promises there.
 
 ## Usage
 

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.5.0'
 end

data/lib/where_chain.rb

@@ -5,6 +5,6 @@ require 'active_record/where_chain_shared_methods'
 # Active Record changed a lot in Rails 5 and 4 is still supported
 if ActiveRecord::VERSION::MAJOR == 4
   require 'active_record/where_chain_extensions_rails4'
-elsif ActiveRecord::VERSION::MAJOR == 5 || ActiveRecord::VERSION::MAJOR == 6
+elsif ActiveRecord::VERSION::MAJOR >= 5
   require 'active_record/where_chain_extensions_rails5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_chain
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Marcin Ruszkiewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2023-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -126,16 +126,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
 description: |
   This is a Rails plugin that extends Active Record with additional methods: .like, .unlike,
   .gt, .gte, .lt and .lte, so that you can replace the SQL strings like
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: 'WhereChain extensions - Model.where.lt(created_at: Date.today)'