arel-extensions 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93c939760cdc803cc6bbedb950ebb9ce9ca39610
-  data.tar.gz: ff6576c5f315d326dbd4e25a7f76d06df2159a67
+  metadata.gz: 608dab3c15e77d6dd8ee5c39d54b442886f67cf4
+  data.tar.gz: d2fb99dc3fc50b3668cb192561883284891fc2e1
 SHA512:
-  metadata.gz: 4808b1ca2d55f753f32952883252797135193882afd328456e410db83960db3ed21342eafd9639bb15e11b7c33913bd931cbe3d60d83d3edbf71d400a2f40149
-  data.tar.gz: f071b4ea0c5f8887d283afed3be26be4a2e9cc361a13ea1b62fec88c051d8575b213ad5e4fc773be7618fc2ced3c510afc882700b4a4c57e9f3287d4c7dd205a
+  metadata.gz: db29b2210f174795a094f396f76d031e373c6391e13030e17ef2a24ec6eb840ae58c870acf863251c01053c9784332a72e8b477fbf744042720e7f36b5141575
+  data.tar.gz: 6b059b8c0c0fa4a6961c969cb6798ea2de47ed904381d0b73d48a8362dc516b4f2cc2c2be55c7b2c4f1907df227cc37b11ccf1dd9e1e33651ea57a41f30af4cd

data/arel-extensions.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'arel-extensions'
-  gem.version = '1.4.0'
+  gem.version = '1.5.0'
   
   gem.authors       = ["Jon Bracy"]
   gem.email         = ["jonbracy@gmail.com"]

data/lib/arel/extensions.rb

@@ -19,6 +19,10 @@ require File.expand_path('../nodes/ts_match', __FILE__)
 require File.expand_path('../ts_predications', __FILE__)
 Arel::Attributes::Attribute.include(Arel::TSPredications)
 
+
+require File.expand_path('../gis_predications', __FILE__)
+Arel::Attributes::Attribute.include(Arel::GISPredications)
+
 require File.expand_path('../../active_record/query_methods', __FILE__)
 
 if defined?(Arel::Visitors::PostgreSQL)

data/lib/arel/gis_predications.rb

@@ -0,0 +1,29 @@
+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
+    end
+
+  end
+end

data/lib/arel/nodes/excludes.rb

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

data/lib/arel/visitors/postgresql_extensions.rb

@@ -22,6 +22,15 @@ module Arel
         collector
       end
 
+      def visit_Arel_Nodes_Excludes o, collector
+        collector << 'NOT ('
+        visit o.left, collector
+        collector << ' @> '
+        collector << quote(o.left.type_cast_for_database(o.right))
+        collector << ')'
+        collector
+      end
+
       def visit_Arel_Nodes_Overlaps o, collector
         visit o.left, collector
         collector << ' && '

data/lib/arel/visitors/sunstone_extensions.rb

@@ -5,17 +5,23 @@ 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)
         else
-          key = key.to_s.split('.')
-          hash = { key.pop => value }
-          while key.size > 0
-            hash = { key.pop => hash }
-          end
-          hash
+          { key => value }
+        end
+      end
+
+      def visit_Arel_Nodes_Excludes o, collector
+        key = visit(o.left, collector)
+        value = { excludes: visit(o.right, collector) }
+        
+        if key.is_a?(Hash)
+          add_to_bottom_of_hash(key, value)
+        else
+          { key => value }
         end
       end
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-extensions
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-01 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -67,9 +67,11 @@ files:
 - lib/arel/attributes/cast.rb
 - lib/arel/attributes/key.rb
 - lib/arel/extensions.rb
+- lib/arel/gis_predications.rb
 - lib/arel/json_predications.rb
 - lib/arel/nodes/contained_by.rb
 - lib/arel/nodes/contains.rb
+- lib/arel/nodes/excludes.rb
 - lib/arel/nodes/has_any_key.rb
 - lib/arel/nodes/has_key.rb
 - lib/arel/nodes/has_keys.rb