rgeo-activerecord 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b83476535f3d17674c94804b519733b8323132e
-  data.tar.gz: a6be4923114b7a126efca93c7a9777f05abfe427
+  metadata.gz: eefa5be0ab751442125af4725e0c68a027de604a
+  data.tar.gz: febd0ffb4107382342a35c47d85c4e42f79407f5
 SHA512:
-  metadata.gz: 289df566bcc7790e1a19af1b8ad937529f0b161db4ae95c02dc3b9878cee98e4a31b400dc6e0b96127559ae3c18687ad7276509bbb47c017349eda1b873dec2b
-  data.tar.gz: db7bbcafe746974fa60a8d2aff1ec298e30bb87203685b9cb16172e7f7e8f35b4d64ff905278827b714e77c85724ed3f5b57699241e5ad976f78fffcb2a0786b
+  metadata.gz: 4d80baf3359fd91e9ea9425fc9ae152f7e3ed4ef91e91156ce40b64eb49c7dfe198b2b10355b238ae5d5c5a5e51b808beccdd0ed94ceef5fec71756fa2fdfd6a
+  data.tar.gz: d7e315bd3bba85db027ff861083ab3d0ede51e2d627d4f24172427ad9869456060c94c590ed80ab05a76da9cc2944acf50f4969d43edced4b3ac1c171a2b9d26

data/lib/rgeo/active_record/arel_spatial_queries.rb

@@ -27,7 +27,13 @@ module RGeo
         node.expressions.each_with_index do |expr, index|
           exprs << (node.spatial_argument?(index) ? visit_in_spatial_context(expr, collector) : visit(expr, collector))
         end
-        collector << "#{name}(#{node.distinct ? 'DISTINCT ' : ''}#{exprs.join(', ')})#{node.alias ? " AS #{visit(node.alias, *args)}" : ''}"
+        collector << name
+        collector << "("
+        collector << "DISTINCT " if node.distinct
+        collector << exprs.join(', ')
+        collector << ")"
+        collector << " AS #{ visit(node.alias, collector) }" if node.alias
+        collector
       end
 
       # Generates SQL for a spatial node.
@@ -38,9 +44,9 @@ module RGeo
         when ::String
           collector << "#{st_func('ST_WKTToSQL')}(#{quote(node)})"
         when ::RGeo::Feature::Instance
-          collector << visit_RGeo_Feature_Instance(node, *args)
+          collector << visit_RGeo_Feature_Instance(node, collector)
         when ::RGeo::Cartesian::BoundingBox
-          collector << visit_RGeo_Cartesian_BoundingBox(node, *args)
+          collector << visit_RGeo_Cartesian_BoundingBox(node, collector)
         else
           visit(node, collector)
         end

data/lib/rgeo/active_record/version.rb

@@ -1,5 +1,5 @@
 module RGeo
   module ActiveRecord
-    VERSION = '2.1.0'.freeze
+    VERSION = "2.1.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: An RGeo module providing spatial extensions to ActiveRecord.
@@ -132,4 +132,3 @@ test_files:
 - test/common_adapter_elements_test.rb
 - test/support/fake_record.rb
 - test/test_helper.rb
-has_rdoc: