rgeo-activerecord 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f94beffe14f68a9d360669c0bca51418c0664927
-  data.tar.gz: c01b8a49ffef9f9b827821d84f5f892f01846d52
+  metadata.gz: c7eb9363bf2ff9df529e4df824e216d4020383a4
+  data.tar.gz: fc42ba79ef9e014b201ed9e0ada19aa097f2b95e
 SHA512:
-  metadata.gz: f03466ff65bda17394763232137d63d88ba3a13e5fedd218ef34d2c86fe4a42b4dab3cd12ae997f5e98af8521f67d50ce05ae26465d3643b2d3efaffe8bda4e2
-  data.tar.gz: e6d12a4be7fa31702edbf53795b5f082d1755fd8a8efa4db33979f031a3664b55087687c11557fbb59166aa31e9790d83d79eec9d5a64f758fe209f763a77303
+  metadata.gz: e04b5cac8c5de138c78de8ac43c6c7b2ab7b9479340db4fd62acdb498b5d799fda7be8ea73e378d3e37c225e8d23c53d012574d44a39dd8247d36fb57a9845e5
+  data.tar.gz: 14d81921b88784b5c251f589c5cfc912c063f753a059138d52156cfe40eaed029462413840d1e0c672448708eedeecfe0df9602f62dc3225fa2378e36531ba1a

data/History.md

@@ -1,3 +1,21 @@
+### 1.2.0 / 2014-08-21
+
+* Support ActiveRecord 4.2
+
+### 1.1.0 / 2014-06-17
+
+* Relax rgeo gem dependency
+
+### 1.0.0 / 2014-05-06
+
+* Require ruby 1.9.3+
+* Require ActiveRecord 4+
+* General refactoring and cleanup
+
+### 0.6.0 / 2014-05-06
+
+* Support Rails 4, Arel 4
+
 ### 0.5.0 / 2013-02-27
 
 *   No changes. Rereleased as 0.5.0 final.

data/lib/rgeo/active_record/arel_spatial_queries.rb

@@ -36,7 +36,7 @@ module RGeo
       def visit_in_spatial_context(node_, *args)
         case node_
         when ::String
-          "#{st_func('ST_WKTToSQL')}(#{visit_String(node_, *args)})"
+          "#{st_func('ST_WKTToSQL')}(#{quote(node_)})"
         when ::RGeo::Feature::Instance
           visit_RGeo_Feature_Instance(node_, *args)
         when ::RGeo::Cartesian::BoundingBox

data/lib/rgeo/active_record/common_adapter_elements.rb

@@ -126,9 +126,13 @@ module RGeo
     ::ActiveRecord::SchemaDumper.send :include, GeoSchemaDumper
 
 
-    # Tell ActiveRecord to cache spatial attribute values so they don't get re-parsed on every access.
+    # attribute_types_cached_by_default was removed in ActiveRecord 4.2
+    # :cache_attributes does not work since the connection may not yet be established
 
-    ::ActiveRecord::Base.attribute_types_cached_by_default << :spatial
+    if ::ActiveRecord.version < Gem::Version.new("4.2.0.a")
+      # cache spatial attribute values so they don't get re-parsed on every access.
+      ::ActiveRecord::Base.attribute_types_cached_by_default << :spatial
+    end
 
     # :startdoc:
   end

data/lib/rgeo/active_record/version.rb

@@ -1,5 +1,5 @@
 module RGeo
   module ActiveRecord
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

data/test/tc_basic.rb

@@ -57,7 +57,15 @@ module RGeo
 
         def test_arel_visit_SpatialConstantNode
           visitor = arel_visitor
-          sql = visitor.accept(Arel.spatial('POINT (1.0 2.0)'))
+
+          # :accept API changed in Arel 6.0:
+          # https://github.com/rails/arel/commit/fcd11dcb99d69d
+          sql = if Arel::VERSION > "6.0.0"
+              visitor.accept(Arel.spatial('POINT (1.0 2.0)'), Arel::Collectors::PlainString.new)
+            else
+              visitor.accept(Arel.spatial('POINT (1.0 2.0)'))
+            end
+
           assert_equal("ST_WKTToSQL('POINT (1.0 2.0)')", sql)
         end
       end

data/test/test_helper.rb

@@ -9,7 +9,7 @@ MINITEST_CLASS = if defined?(::Minitest::Test)
                  end
 
 Arel::Visitors::PostgreSQL.send(:include, ::RGeo::ActiveRecord::SpatialToSql)
-Arel::Table.engine = Arel::Sql::Engine.new(FakeRecord::Base.new)
+Arel::Table.engine = FakeRecord::Base.new
 
 def arel_visitor
   Arel::Visitors::PostgreSQL.new(Arel::Table.engine.connection)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: An RGeo module providing spatial extensions to ActiveRecord.