where_chain 0.2.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00b02560557c167de9ce11d97c1d0c9184579c753ca0e8b735d9b1734cc77317
-  data.tar.gz: 38dd58fcefd3dc9975b984b3742c558f74a59e813fb0f72a6dea6548ddeed0c2
+  metadata.gz: bc7e391acb640aba967c22926907bc95c610bba037ff38f1890274d751797d50
+  data.tar.gz: ff165ee3f9bda32f0625fc8214f7cfba1f335b273260b008d2e33a26be5505ac
 SHA512:
-  metadata.gz: 2e19f7b633157d5a84a43c28b084cf2e2fc29e19d1a61fae14cf6951bf7619f751287099656ebd2b8504e79072a9a405735e1bece3d221d5622ef944a701f80f
-  data.tar.gz: 5e5b9cb231931d9949126eed5f365d69f6c1c9eccae6b87cc8e05d0a544d24373dd95d4630be5aef9a6a9ea3ef12d24f56dc3be5a7d05d30e1557486bd58a733
+  metadata.gz: 77ab8fd3e5f1f8f9aebaa880a420c72200a789cef67c5e5c1da603fa34b8d37b6f76e6a5e8be21381e6de4cc8a036c6a482baf9fe412e09339238de3610e7601
+  data.tar.gz: 7fd1435df353db94e480285f02451f75168486f7d24a3bd04c357cbe4a7de75cd79d226d1b9c8136344e9c246d43fc8e67620cddb4a4866d4aa2f7906e45b399

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/where_chain.svg)](https://badge.fury.io/rb/where_chain) [![CircleCI](https://circleci.com/gh/marcinruszkiewicz/where_chain.svg?style=shield)](https://circleci.com/gh/marcinruszkiewicz/where_chain)
+[![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)
 
 # 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 comment 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 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.
 
 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 and 5.2.
+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.
 
 ## Usage
 
@@ -84,6 +84,12 @@ $ gem install where_chain
 
 ## Testing the code
 
+Before running any test, you should finish installing the appraised gems:
+
+```bash
+$ bundle exec appraisal install
+```
+
 Running all the tests for all Rails version targets:
 
 ```bash

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError

data/lib/active_record/where_chain_extensions_rails4.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module QueryMethods
     class WhereChain
@@ -34,7 +36,7 @@ module ActiveRecord
           end
         end
 
-        @scope.references!(PredicateBuilder.references(opts)) if Hash === opts
+        @scope.references!(PredicateBuilder.references(opts)) if opts.is_a?(Hash)
         @scope.where_values += where_value
         @scope
       end

data/lib/active_record/where_chain_extensions_rails5.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   # Ruby complains about missing the class if we try to patch it without it
   class Relation
@@ -6,6 +8,7 @@ module ActiveRecord
 
   module QueryMethods
     class WhereChain
+      include ActiveModel::ForbiddenAttributesProtection
       include WhereChainSharedMethods
 
       # Returns a new relation expressing WHERE + NOT condition
@@ -21,16 +24,16 @@ module ActiveRecord
       #
       # Note: This is the Active Record 5 version.
       def not(opts = :chain, *rest)
-        if :chain == opts
+        if opts == :chain
           @invert = true
           return self
         end
 
         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 Hash === opts
+        @scope.references!(PredicateBuilder.references(opts.stringify_keys)) if opts.is_a?(Hash)
         @scope.where_clause += where_clause.invert
         @scope
       end
@@ -44,16 +47,16 @@ 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)
             new_where_clause = build_where_clause(new_predicate, equal_where_clause)
-            if @invert
-              s.where_clause += new_where_clause.invert
-            else
-              s.where_clause += new_where_clause
-            end
+            s.where_clause += if @invert
+                                new_where_clause.invert
+                              else
+                                new_where_clause
+                              end
           end
         end
       end
@@ -67,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/active_record/where_chain_shared_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module WhereChainSharedMethods
     extend ActiveSupport::Concern
@@ -5,7 +7,7 @@ module ActiveRecord
     included do
       # Initialize the chain with a scope and a toggle to invert the generated
       # where statement
-      def initialize(scope, invert=false)
+      def initialize(scope, invert = false)
         @scope = scope
         @invert = invert
       end
@@ -30,7 +32,7 @@ module ActiveRecord
       def unlike(opts, *rest)
         prepare_where(Arel::Nodes::DoesNotMatch, nil, opts, rest)
       end
-      alias not_like unlike
+      alias_method :not_like, :unlike
 
       # Returns a new relation expressing a greater than condition in WHERE
       # according to the conditions in an argument hash
@@ -79,7 +81,7 @@ module ActiveRecord
       def ensure_proper_attributes(opts)
         raise ArgumentError, 'This method requires a Hash as an argument.' unless opts.is_a?(Hash)
 
-        opts.each_pair do |key, value|
+        opts.each_pair do |_key, value|
           if value.is_a?(Hash) || value.is_a?(Array)
             raise ArgumentError, 'The value passed to this method should be a valid type.'
           end

data/lib/where_chain.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 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
+elsif ActiveRecord::VERSION::MAJOR == 5 || ActiveRecord::VERSION::MAJOR == 6
   require 'active_record/where_chain_extensions_rails5'
 end

data/lib/where_chain/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_chain
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Marcin Ruszkiewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-rails
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: pry-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,9 +122,24 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         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 Post.where(''comments > 5'') with Post.where.gt(comments: 5)'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.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
+  Post.where('comments > 5') with Post.where.gt(comments: 5)
 email:
 - marcin.ruszkiewicz@polcode.net
 executables: []
@@ -158,8 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 'WhereChain extensions - Model.where.lt(created_at: Date.today)'