arel-extensions 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0f5c8d435e6378cdaf63398e946ea88c0404589c
-  data.tar.gz: c2db5c4c9cdc751ab836f241aa1f20232da98aef
+SHA256:
+  metadata.gz: 52a47012efafaa4b4d73f2b13b017a3e35c75587525de84c16dd4a585a29909e
+  data.tar.gz: 2a8a38a06be27912f2877bebd701a4f1f1dcce1e0d69211611f660de612f902c
 SHA512:
-  metadata.gz: 93ef06c1a1fd9f451cb3b4914c88e82a982ce923e2ba70e539d6ef2882ea9e3d042f8c9994fbbca9d225856ad0bd7933ea446ec69224515550c0fbde602fbc0f
-  data.tar.gz: 9fd582e8334735fdd142ffbf3745010eb1c4b0f1661f1a77e0ca11acb6516fe1d8fa894f7c82886475b4dca284c09d91024ef78413df4782a11dec1f3f584f4f
+  metadata.gz: 1b533cb96f4274645663d55e5b2ff5784784490f72baa34925791914c95b76724b06a9f7b64873e8c5f5f85f64622b26256bff7f5cd7caa1f29c3f9906dc4d88
+  data.tar.gz: e9ce3d9dbb5d1efbc757e032df5809cc5aad64bdd4ee5eaaf7097ff4f437b0a16536367867e72475a4e019bf759ac81dcc7aaeedbe1e313b5d1760debc3e4856

data/.travis.yml

@@ -0,0 +1,42 @@
+language: ruby
+sudo: false
+
+cache:
+  bundler: true
+
+rvm:
+  - 2.3.4
+  - 2.4.1
+
+env:
+  matrix:
+    - RAILS_VERSION=v5.1.0 GEM=ar:mysql2
+    - RAILS_VERSION=v5.1.0 GEM=ar:sqlite3
+    - RAILS_VERSION=v5.1.0 GEM=ar:postgresql
+    - RAILS_VERSION=v5.1.1 GEM=ar:mysql2
+    - RAILS_VERSION=v5.1.1 GEM=ar:sqlite3
+    - RAILS_VERSION=v5.1.1 GEM=ar:postgresql
+
+addons:
+  postgresql: "9.4"
+
+before_install:
+  - unset BUNDLE_GEMFILE
+  - gem update --system
+  - gem update bundler
+
+install:
+  - git clone https://github.com/rails/rails.git ~/build/rails
+  - pushd ~/build/rails
+  - git checkout $RAILS_VERSION
+  - sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/build/rails/activerecord/Rakefile
+  - sed -i "s/t.warning = true/t.warning = false/g" ~/build/rails/activerecord/Rakefile
+  - sed -i "/require 'support\/connection'/a \$LOAD_PATH.unshift\(File.expand_path\('~\/build\/malomalo\/arel-extensions\/lib'\)\)\nrequire 'arel/extensions'" ~/build/rails/activerecord/test/cases/helper.rb
+  - "sed -i \"/group :db do/a gem 'arel-extensions', require: 'arel/extensions', path: File.expand_path\\('~\\/build\\/malomalo\\/arel-extensions'\\)\" ~/build/rails/Gemfile"
+  - sed -i "/rb-inotify/d" ~/build/rails/Gemfile
+  - cat ~/build/rails/Gemfile
+  - bundle install --jobs=3 --retry=3
+  - popd
+
+script:
+  - cd ~/build/rails && ci/travis.rb

data/arel-extensions.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'arel-extensions'
-  gem.version = '1.5.2'
+  gem.version = '1.6.0'
   
   gem.authors       = ["Jon Bracy"]
   gem.email         = ["jonbracy@gmail.com"]
@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'arel', '>= 7.0.0'
+  gem.add_dependency 'arel', '>= 9.0.0'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'minitest'

data/lib/active_record/query_methods.rb

@@ -24,8 +24,8 @@ module ActiveRecord::QueryMethods
   end
   alias uniq_on! distinct_on!
 
-  def build_arel_with_distinct_on
-    arel = build_arel_without_distinct_on
+  def build_arel_with_distinct_on(aliases)
+    arel = build_arel_without_distinct_on(aliases)
     arel.distinct_on(self.distinct_on_values) if !self.distinct_on_values.empty?
     arel
   end

data/lib/arel/extensions.rb

@@ -1,5 +1,8 @@
+require File.expand_path('../nodes/hex_encoded_binary', __FILE__)
+
 require File.expand_path('../nodes/overlaps', __FILE__)
 require File.expand_path('../nodes/contains', __FILE__)
+require File.expand_path('../nodes/within', __FILE__)
 require File.expand_path('../nodes/excludes', __FILE__)
 require File.expand_path('../nodes/contained_by', __FILE__)
 require File.expand_path('../array_predications', __FILE__)

data/lib/arel/gis_predications.rb

@@ -1,29 +1,9 @@
 module Arel
   module GISPredications
     
-    def within(n=nil, e=nil, s=nil, w=nil)
-      if n.class.to_s == 'String' && e.nil?
-        within(*n.split(','))
-      elsif n.is_a?(Array)
-        within(*n)
-      elsif n.is_a?(Hash)
-        if (n.keys - [:n, :e, :s, :w]).empty?
-          within(n[:n], n[:e], n[:s], n[:w])
-        elsif (n.keys - [:north, :east, :south, :west]).empty?
-          within(n[:north], n[:east], n[:south], n[:west])
-        else
-          radius = n[:radius] * 1609.34
-          point_args = [point[:longitude], point[:latitude], radius].map { |x| Arel::Nodes.build_quoted(x) }
-          point = Arel::Nodes::NamedFunction.new('ST_MakePoint', point_args).cast_as('geography')
-          Arel::Nodes::NamedFunction.new('ST_DWithin', [self, point, radius])
-        end
-      else
-        make_envelope_args = [w, s, e, n, 4326].map { |x| Arel::Nodes.build_quoted(x) }
-        envelope = Arel::Nodes::NamedFunction.new('ST_MakeEnvelope', make_envelope_args)
-        # Arel::Nodes::NamedFunction.new('ST_Contains', [envelope, self])
-        Arel::Nodes::NamedFunction.new('ST_Within', [self, envelope])
-      end
+    def within(bounds)
+      Arel::Nodes::Within.new(self, bounds)
     end
 
   end
-end
+end

data/lib/arel/json_predications.rb

@@ -16,7 +16,7 @@ module Arel
     end
     
     def has_any_key(*keys)
-      Arel::Nodes::HasAnyKeys.new(self, keys)
+      Arel::Nodes::HasAnyKey.new(self, keys)
     end
     
     def cast_as(type)

data/lib/arel/nodes/has_any_key.rb

@@ -1,6 +1,6 @@
 module Arel
   module Nodes
-    class HasAnyKeys < Binary
+    class HasAnyKey < Binary
       # ?|
     end
   end

data/lib/arel/nodes/hex_encoded_binary.rb

@@ -0,0 +1,7 @@
+module Arel
+  module Nodes
+    class HexEncodedBinary < Unary
+      
+    end
+  end
+end

data/lib/arel/nodes/within.rb

@@ -0,0 +1,6 @@
+module Arel
+  module Nodes
+    class Within < Binary
+    end
+  end
+end

data/lib/arel/visitors/postgresql_extensions.rb

@@ -64,6 +64,24 @@ module Arel
         collector << " ? " << quote(right.to_s)
         collector
       end
+
+      def visit_Arel_Nodes_HasKeys(o, collector)
+        right = o.right
+        
+        collector = visit o.left, collector
+        
+        collector << " ?& array[" << Array(right).map { |v| quote(v.to_s) }.join(',') << "]"
+        collector
+      end
+      
+      def visit_Arel_Nodes_HasAnyKey(o, collector)
+        right = o.right
+        
+        collector = visit o.left, collector
+        
+        collector << " ?| array[" << Array(right).map { |v| quote(v.to_s) }.join(',') << "]"
+        collector
+      end
       
       def visit_Arel_Attributes_Cast(o, collector)
         collector << "("
@@ -100,6 +118,28 @@ module Arel
         collector << ')'
         collector
       end
+      
+      def visit_Arel_Nodes_HexEncodedBinary(o, collector)
+        collector << "E'\\\\x"
+        collector << o.expr
+        collector << "'"
+        collector
+      end
+
+      def visit_Arel_Nodes_Within o, collector
+        envelope = if o.right.is_a?(Arel::Nodes::HexEncodedBinary)
+          Arel::Nodes::NamedFunction.new('ST_GeomFromEWKB', [o.right])
+        elsif o.right.is_a?(Arel::Nodes::Quoted) && o.right.expr.is_a?(String)
+          Arel::Nodes::NamedFunction.new('ST_GeomFromEWKT', [o.right])
+        elsif o.right.is_a?(Arel::Nodes::Quoted) && o.right.expr.is_a?(Hash)
+          Arel::Nodes::NamedFunction.new('ST_GeomFromGeoJSON', [Arel::Nodes.build_quoted(o.right.expr.to_json)])
+        else
+          raise 'within error'
+        end
+
+        visit(Arel::Nodes::NamedFunction.new('ST_Within', [o.left, envelope]), collector)
+        collector
+      end
 
     end
   end

data/lib/arel/visitors/sunstone_extensions.rb

@@ -5,7 +5,7 @@ module Arel
       
       def visit_Arel_Nodes_Contains o, collector
         key = visit(o.left, collector)
-        value = { contains:  visit(o.right, collector) }
+        value = { contains: visit(o.right, collector) }
         
         if key.is_a?(Hash)
           add_to_bottom_of_hash(key, value)
@@ -14,6 +14,21 @@ module Arel
         end
       end
 
+      def visit_Arel_Nodes_HexEncodedBinary(o, collector)
+        o.expr
+      end
+      
+      def visit_Arel_Nodes_Within o, collector
+        key = visit(o.left, collector)
+        value = { within: visit(o.right, collector) }
+
+        if key.is_a?(Hash)
+          add_to_bottom_of_hash(key, value)
+        else
+          { key => value }
+        end
+      end
+
       def visit_Arel_Nodes_Excludes o, collector
         key = visit(o.left, collector)
         value = { excludes: o.left.type_cast_for_database(o.right) }
@@ -25,6 +40,39 @@ module Arel
         end
       end
       
+      def visit_Arel_Nodes_HasKey o, collector
+        key = visit(o.left, collector)
+        value = {has_key: (o.right.nil? ? nil : o.right.to_s)}
+        
+        if key.is_a?(Hash)
+          add_to_bottom_of_hash(key, value)
+        else
+          { key => value }
+        end
+      end
+      
+      def visit_Arel_Nodes_HasKeys o, collector
+        key = visit(o.left, collector)
+        value = {has_keys: Array(o.right).map(&:to_s)}
+        
+        if key.is_a?(Hash)
+          add_to_bottom_of_hash(key, value)
+        else
+          { key => value }
+        end
+      end
+      
+      def visit_Arel_Nodes_HasAnyKey o, collector
+        key = visit(o.left, collector)
+        value = {has_any_key: Array(o.right).map(&:to_s)}
+        
+        if key.is_a?(Hash)
+          add_to_bottom_of_hash(key, value)
+        else
+          { key => value }
+        end
+      end
+      
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-extensions
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 9.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 9.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".travis.yml"
 - LICENSE
 - README.md
 - arel-extensions.gemspec
@@ -75,10 +76,12 @@ files:
 - lib/arel/nodes/has_any_key.rb
 - lib/arel/nodes/has_key.rb
 - lib/arel/nodes/has_keys.rb
+- lib/arel/nodes/hex_encoded_binary.rb
 - lib/arel/nodes/overlaps.rb
 - lib/arel/nodes/ts_match.rb
 - lib/arel/nodes/ts_query.rb
 - lib/arel/nodes/ts_vector.rb
+- lib/arel/nodes/within.rb
 - lib/arel/ts_predications.rb
 - lib/arel/visitors/postgresql_extensions.rb
 - lib/arel/visitors/sunstone_extensions.rb
@@ -102,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Adds support for missing SQL operators and functions to Arel