activerecord-filter 5.2.0.1 → 5.2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26d709e898a2b1e634b35d8cfdf03c2ff6dcfd4a5b2cef998e773264b467e02d
-  data.tar.gz: ebb8836cdfdc121038783d277b008dc83bef40e7afe8e9ef056398ccc36e781d
+  metadata.gz: f3f2f8ce86b8790223e58f6a7d00753d3fbaee45d88cd474615e12acecee5c1f
+  data.tar.gz: b0908b5b381e21460c280fa5cb09ef423922e9a4ab89cb03622100ee100b10cc
 SHA512:
-  metadata.gz: 409f335d2379eefeb0ded8b991e22f099c08b975e6e89febed33cc84a8f3713cd4a65191f305fe863c36c52e6d23dda2b10f1fc85b11600acc1363c2ddb33e26
-  data.tar.gz: e9867eb6b51f5af8c43dd187c68f93f117f005099b3f3c1f590e5bdacba2d37f9659c24594861f6547e238ebc2948f426eb93ad36310eaf2916a5828111327db
+  metadata.gz: e65e7f030a7f00101cfa16e7d572c4fd3c177e0ccc0970449f3cbb07546527325ec97d48411666a2a6d2048e2cfdc0538f68d1bc0b976b32e9f0aa9e7477873a
+  data.tar.gz: e6d868e3c2037571e15ce8d287a9025fc7bbfc07431b345ff4a9be2e391bfd3800f0c540a3bb57215a338cced11cf43f9316a343f16541a943f97d07270d5fc6

data/lib/active_record/filter.rb

@@ -195,9 +195,9 @@ module ActiveRecord
         # end
     
         # TODO us above if to determin if SRID sent
-        geometry_value = if subvalue.is_a?(Hash)
+        geometry_value = if value.is_a?(Hash)
           Arel::Nodes::NamedFunction.new('ST_SetSRID', [Arel::Nodes::NamedFunction.new('ST_GeomFromGeoJSON', [Arel::Nodes.build_quoted(JSON.generate(subvalue))]), 4326])
-        elsif subvalue[0,1] == "\x00" || subvalue[0,1] == "\x01" || subvalue[0,4] =~ /[0-9a-fA-F]{4}/
+        elsif value[0,1] == "\x00" || value[0,1] == "\x01" || value[0,4] =~ /[0-9a-fA-F]{4}/
           Arel::Nodes::NamedFunction.new('ST_SetSRID', [Arel::Nodes::NamedFunction.new('ST_GeomFromEWKB', [Arel::Nodes.build_quoted(subvalue)]), 4326])
         else
           Arel::Nodes::NamedFunction.new('ST_SetSRID', [Arel::Nodes::NamedFunction.new('ST_GeomFromText', [Arel::Nodes.build_quoted(subvalue)]), 4326])
@@ -376,7 +376,7 @@ class ActiveRecord::Relation
       buckets.default = []
 
       association_joins         = buckets[:association_join]
-      stashed_association_joins = buckets[:stashed_join]
+      stashed_joins             = buckets[:stashed_join]
       join_nodes                = buckets[:join_node].uniq
       string_joins              = buckets[:string_join].map(&:strip).uniq
 
@@ -384,10 +384,10 @@ class ActiveRecord::Relation
       alias_tracker = alias_tracker(join_list, aliases)
 
       join_dependency = ActiveRecord::Associations::JoinDependency.new(
-        klass, table, association_joins, alias_tracker
+        klass, table, association_joins
       )
       
-      joins = join_dependency.join_constraints(stashed_association_joins, join_type)
+      joins = join_dependency.join_constraints(stashed_joins, join_type, alias_tracker)
       joins.each { |join| manager.from(join) }
       # join_infos = join_dependency.join_constraints stashed_association_joins, join_type
 
@@ -427,4 +427,4 @@ module ActiveRecord::SpawnMethods
 end
 
 ActiveRecord::Relation.prepend(ActiveRecord::Relation::Filter)
-ActiveRecord::Base.extend(ActiveRecord::Filter)
+ActiveRecord::Base.extend(ActiveRecord::Filter)

data/lib/active_record/filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Filter
-    VERSION = '5.2.0.1'
+    VERSION = '5.2.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-filter
 version: !ruby/object:Gem::Version
-  version: 5.2.0.1
+  version: 5.2.1.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: arel-extensions
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +148,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement