active_record_extended 0.4.0 → 0.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3676a5b5f744f28f9e545a951e006f03457660046d5908d5f5fdc4200591c6c6
-  data.tar.gz: '0434468d2a6f1988df93a4150b7276e1d0d0538252519cf715e76cd12ba5e8de'
+  metadata.gz: 56c4be1e6e48ce5c2c7430545666c5a972d8355539d9f4eacd606bfb8919eb2c
+  data.tar.gz: d4ceaaaa423fc093cec3fb463ec2e2a54f9eba2f7f8b13ca0f2c55b45b4b38d1
 SHA512:
-  metadata.gz: 0bafb6e58693b523541fe90556bf863a271d93310e76de4929214f4b6e06117da92aa625dad7c932f1a5f58b8647b8b3f521de48b8428d011402b1c329af0fb4
-  data.tar.gz: 234e63478d2f25f2eccdc5fe5c6a96a7a500ae0f5207a8232fdef30638cfb7e773cec4a413cc8073419525c26729796a7766288c955500f402a88e4720728523
+  metadata.gz: 1d5132209987cef0e73351c8343121998a107fad83d29d0e4b9f44fff72254b8c3f97f8b3ac237eb54f6aeb2b53254f5d93c4b63a0bc3597084e848795be9ce2
+  data.tar.gz: a9f707ddb4b0734e9fa8e62403e8787859e464e2b0d288dc6b51ab15abf235e1420398cbe7292de7987b42463572c96028f28dcd84cde16658df67a809ef65f5

data/.travis.yml

@@ -12,6 +12,7 @@ branches:
   only:
     - master
 gemfile:
+  - gemfiles/activerecord-50.gemfile
   - gemfiles/activerecord-51.gemfile
   - gemfiles/activerecord-52.gemfile
   - gemfiles/activerecord-52+.gemfile

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.5.0.beta1 - May 26th 2018
+
+Added support for Rails 5.0.x
+
+### Warning for Rails 5.0.x Projects
+The proposed changes to this could cause unintended behavior in existing Rails 5.0.x applications. 
+This is due to the overwrite needed to be done on its internal Predicate builder. 
+Rails projects above 5.0.x should not experience any unforeseen issues since they contain the necessary structure required.
+
+**Use with caution.** And always make sure you have good tests to verify everything in your application.
+
 # 0.4.0 - May 9th 2018
 
 - Use Arel's `or` for grouping queries when using `#any_of` or `#none_of`

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    active_record_extended (0.4.0)
-      activerecord (>= 5.1, < 6.0)
+    active_record_extended (0.5.0.beta1)
+      activerecord (>= 5.0, < 6.0)
       ar_outer_joins (~> 0.2)
       pg (~> 0.18)
 
@@ -60,7 +60,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.55.0)
+    rubocop (0.56.0)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)

data/active_record_extended.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 5.1", "< 6.0"
+  spec.add_dependency "activerecord", ">= 5.0", "< 6.0"
   spec.add_dependency "ar_outer_joins", "~> 0.2"
   spec.add_dependency "pg", "~> 0.18"
 

data/gemfiles/activerecord-50.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "activerecord", "~> 5.0.0"
+gem "pg", "~> 0.18"

data/lib/active_record_extended/active_record.rb

@@ -7,7 +7,10 @@ require "active_record/relation/query_methods"
 require "active_record_extended/predicate_builder/array_handler_decorator"
 Dir["#{File.dirname(__FILE__)}/query_methods/**/*.rb"].each { |f| require File.expand_path(f) }
 
-if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR == 1
+if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR <= 1
+  if ActiveRecord::VERSION::MINOR.zero?
+    require "active_record_extended/patch/5_0/predicate_builder_decorator"
+  end
   require "active_record_extended/patch/5_1/where_clause"
 elsif ActiveRecord::VERSION::MAJOR >= 5
   require "active_record_extended/patch/5_2/where_clause"

data/lib/active_record_extended/patch/5_0/predicate_builder_decorator.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+# Stripped from Rails 5.1.x
+# This patch is used so that when querying with hash elements that do not belong to an association,
+# but instead a data attribute. It returns the corrected attribute binds back to the query builder.
+#
+# Without joins
+# Before:
+#   Person.where.contains(data: { nickname: "george" })
+#     #=> "SELECT \"people\".* FROM \"people\" WHERE (\"data\".\"nickname\" @> 'george')"
+#
+# After:
+#  Person.where.contains(data: { nickname: "george" })
+#   #=> "SELECT \"people\".* FROM \"people\" WHERE (\"people\".\"data\" @> '\"nickname\"=>\"george\"')"
+#
+# With Joins
+# Before:
+#   Tag.joins(:person).where.contains(people: { data: { nickname: "george" } })
+#   #=> NoMethodError: undefined method `type' for nil:NilClass
+#
+# After:
+#  Tag.joins(:person).where.contains(people: { data: { nickname: "george" } })
+#  #=> "SELECT \"tags\".* FROM \"tags\" INNER JOIN \"people\" ON \"people\".\"id\" = \"tags\".\"person_id\"
+#         WHERE (\"people\".\"data\" @> '\"nickname\"=>\"george\"')"
+#
+module ActiveRecord
+  class TableMetadata
+    def has_column?(column_name) # rubocop:disable Naming/PredicateName
+      klass&.columns_hash&.key?(column_name.to_s)
+    end
+  end
+
+  class PredicateBuilder
+    def create_binds_for_hash(attributes) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize
+      result = attributes.dup
+      binds = []
+
+      attributes.each do |column_name, value| # rubocop:disable Metrics/BlockLength
+        if value.is_a?(Hash) && !table.has_column?(column_name)
+          attrs, bvs = associated_predicate_builder(column_name).create_binds_for_hash(value)
+          result[column_name] = attrs
+          binds += bvs
+          next
+        elsif value.is_a?(Relation)
+          binds += value.bound_attributes
+        elsif value.is_a?(Range) && !table.type(column_name).respond_to?(:subtype)
+          first = value.begin
+          last = value.end
+          unless first.respond_to?(:infinite?) && first.infinite?
+            binds << build_bind_param(column_name, first)
+            first = Arel::Nodes::BindParam.new
+          end
+          unless last.respond_to?(:infinite?) && last.infinite?
+            binds << build_bind_param(column_name, last)
+            last = Arel::Nodes::BindParam.new
+          end
+
+          result[column_name] = RangeHandler::RangeWithBinds.new(first, last, value.exclude_end?)
+        elsif can_be_bound?(column_name, value)
+          result[column_name] = Arel::Nodes::BindParam.new
+          binds << build_bind_param(column_name, value)
+        end
+
+        # Find the foreign key when using queries such as:
+        # Post.where(author: author)
+        #
+        # For polymorphic relationships, find the foreign key and type:
+        # PriceEstimate.where(estimate_of: treasure)
+        if table.associated_with?(column_name)
+          result[column_name] = AssociationQueryHandler.value_for(table, column_name, value)
+        end
+      end
+
+      [result, binds]
+    end
+
+    def can_be_bound?(column_name, value)
+      return if table.associated_with?(column_name)
+      case value
+      when Array, Range
+        table.type(column_name).respond_to?(:subtype)
+      else
+        !value.nil? && handler_for(value).is_a?(BasicObjectHandler)
+      end
+    end
+  end
+end

data/lib/active_record_extended/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordExtended
-  VERSION = "0.4.0"
+  VERSION = "0.5.0.beta1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_extended
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0.beta1
 platform: ruby
 authors:
 - George Protacio-Karaszi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -144,6 +144,7 @@ files:
 - active_record_extended.gemspec
 - bin/console
 - bin/setup
+- gemfiles/activerecord-50.gemfile
 - gemfiles/activerecord-51.gemfile
 - gemfiles/activerecord-52+.gemfile
 - gemfiles/activerecord-52.gemfile
@@ -153,6 +154,7 @@ files:
 - lib/active_record_extended/arel/nodes.rb
 - lib/active_record_extended/arel/predications.rb
 - lib/active_record_extended/arel/visitors/postgresql_decorator.rb
+- lib/active_record_extended/patch/5_0/predicate_builder_decorator.rb
 - lib/active_record_extended/patch/5_1/where_clause.rb
 - lib/active_record_extended/patch/5_2/where_clause.rb
 - lib/active_record_extended/predicate_builder/array_handler_decorator.rb
@@ -187,9 +189,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6