rgeo-activerecord 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11ad920c01d1f944cd3d7f4f658b4138a1954284
-  data.tar.gz: 184abfc52e1c1708726c344bc66842133381949d
+  metadata.gz: 83c247d03120c2d00d9fc30cd2af5c9e57c5da68
+  data.tar.gz: 9fbfb89f6fa017dac3bbba473665eba29868c629
 SHA512:
-  metadata.gz: 6bffb41f789ef87f8557cbdbc786a3c2070c7d193e9fe819467397b556a613ac8a9b9e363def43a0f09afcfdfae8fdddeaf4b1584f5166901dbd59be2c6af1f8
-  data.tar.gz: 7254fcac74eb52b88152d27f8f452045f376202462365822432e0cda43c35ffa6f0df65516ad85f63e9f6b9a2af5eabc8d60e25da28bc7f5136b1b28c59745b2
+  metadata.gz: e69081bdf3b855cc6c0c51ab63ae46441c39737bc3d221e3c8e25116f5f7d1837f93ada751f03e03216c9a403893a0d48966e05fca9a2a43c9a32505cea2100c
+  data.tar.gz: c5ba3ba814a4ffa59a130916cd0fdba7f8a1f77a3de8a6d5524ada43345e7ff2392be3b77f1d90450fc50fe76289142cff4030836e4f45c7bd058c9639d71e83

data/History.md

@@ -1,8 +1,3 @@
-### 1.3.0 / 2017-07-02
-
-* Fix indexes in schema dump #25
-* Dump schema using new hash syntax #18
-
 ### 1.2.0 / 2014-08-21
 
 * Support ActiveRecord 4.2

data/lib/rgeo/active_record/arel_spatial_queries.rb

@@ -21,28 +21,28 @@ module RGeo
       # mapping for the database, and it also uses the type information
       # in the node to determine when to cast string arguments to WKT,
 
-      def visit_RGeo_ActiveRecord_SpatialNamedFunction(node, *args)
-        name_ = st_func(node.name)
+      def visit_RGeo_ActiveRecord_SpatialNamedFunction(node, collector)
+        name = st_func(node.name)
         exprs = []
         node.expressions.each_with_index do |expr, index|
-          exprs << (node.spatial_argument?(index) ? visit_in_spatial_context(expr, *args) : visit(expr, *args))
+          exprs << (node.spatial_argument?(index) ? visit_in_spatial_context(expr, collector) : visit(expr, collector))
         end
-        "#{name_}(#{node.distinct ? 'DISTINCT ' : ''}#{exprs.join(', ')})#{node.alias ? " AS #{visit(node.alias, *args)}" : ''}"
+        collector << "#{name}(#{node.distinct ? 'DISTINCT ' : ''}#{exprs.join(', ')})#{node.alias ? " AS #{visit(node.alias, *args)}" : ''}"
       end
 
       # Generates SQL for a spatial node.
       # The node must be a string (in which case it is treated as WKT),
       # an RGeo feature, or a spatial attribute.
-      def visit_in_spatial_context(node, *args)
+      def visit_in_spatial_context(node, collector)
         case node
         when ::String
-          "#{st_func('ST_WKTToSQL')}(#{quote(node)})"
+          collector << "#{st_func('ST_WKTToSQL')}(#{quote(node)})"
         when ::RGeo::Feature::Instance
-          visit_RGeo_Feature_Instance(node, *args)
+          collector << visit_RGeo_Feature_Instance(node, *args)
         when ::RGeo::Cartesian::BoundingBox
-          visit_RGeo_Cartesian_BoundingBox(node, *args)
+          collector << visit_RGeo_Cartesian_BoundingBox(node, *args)
         else
-          visit(node, *args)
+          visit(node, collector)
         end
       end
     end
@@ -65,11 +65,11 @@ module RGeo
     # Make sure the standard Arel visitors can handle RGeo feature objects by default.
 
     ::Arel::Visitors::Visitor.class_eval do
-      def visit_RGeo_ActiveRecord_SpatialConstantNode(node, *args)
+      def visit_RGeo_ActiveRecord_SpatialConstantNode(node, collector)
         if respond_to?(:visit_in_spatial_context)
-          visit_in_spatial_context(node.delegate, *args)
+          visit_in_spatial_context(node.delegate, collector)
         else
-          visit(node.delegate, *args)
+          visit(node.delegate, collector)
         end
       end
     end

data/lib/rgeo/active_record/common_adapter_elements.rb

@@ -6,7 +6,7 @@ module RGeo
     # Some default column constructors specifications for most spatial
     # databases. Individual adapters may add to or override this list.
     DEFAULT_SPATIAL_COLUMN_CONSTRUCTORS = {
-      spatial:             { type: 'geometry' }.freeze,
+      spatial:             { :type => 'geometry' }.freeze,
       geometry:            {}.freeze,
       point:               {}.freeze,
       line_string:         {}.freeze,
@@ -19,7 +19,7 @@ module RGeo
 
     # Index definition struct with a spatial flag field.
 
-    class SpatialIndexDefinition < Struct.new(:table, :name, :unique, :columns, :lengths, :orders, :where, :using, :type, :spatial)
+    class SpatialIndexDefinition < Struct.new(:table, :name, :unique, :columns, :lengths, :orders, :where, :spatial)
     end
 
     # Returns a feature type module given a string type.
@@ -108,21 +108,14 @@ module RGeo
         if indexes.any?
           add_index_statements = indexes.map do |index|
             statement = [
-                ("add_index #{index.table.inspect}"),
+                "add_index #{index.table.inspect}",
                 index.columns.inspect,
-                ("name: #{index.name.inspect}"),
+                "name: #{index.name.inspect}",
               ]
             statement << 'unique: true' if index.unique
             statement << 'spatial: true' if index.respond_to?(:spatial) && index.spatial
             index_lengths = (index.lengths || []).compact
             statement << ("length: #{::Hash[*index.columns.zip(index.lengths).flatten].inspect}") if index_lengths.any?
-
-            index_orders = index.orders || {}
-            statement << "order: #{index.orders.inspect}" if index_orders.any?
-            statement << "where: #{index.where.inspect}" if index.where
-            statement << "using: #{index.using.inspect}" if index.using
-            statement << "type: #{index.type.inspect}" if index.type
-
             "  #{statement.join(', ')}"
           end
           stream.puts add_index_statements.sort.join("\n")
@@ -133,15 +126,6 @@ module RGeo
 
     ::ActiveRecord::SchemaDumper.send :include, GeoSchemaDumper
 
-
-    # attribute_types_cached_by_default was removed in ActiveRecord 4.2
-    # :cache_attributes does not work since the connection may not yet be established
-
-    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
 end

data/lib/rgeo/active_record/spatial_expressions.rb

@@ -1,9 +1,7 @@
 module RGeo
   module ActiveRecord
     # Returns true if spatial expressions (i.e. the methods in the
-    # SpatialExpressions module) are supported. Generally, this is true
-    # if Arel is at version 2.1 or later.
-
+    # SpatialExpressions module) are supported.
     def self.spatial_expressions_supported?
       defined?(::Arel::Nodes::NamedFunction)
     end
@@ -11,8 +9,6 @@ module RGeo
     # A set of spatial expression builders.
     # These methods can be chained off other spatial expressions to form
     # complex expressions.
-    #
-    # These functions require Arel 2.1 or later.
     module SpatialExpressions
       #--
       # Generic functions
@@ -260,9 +256,6 @@ module Arel
   # This node wraps a spatial value (such as an RGeo feature or a text
   # string in WKT format). It supports chaining with the functions
   # defined by RGeo::ActiveRecord::SpatialExpressions.
-  #
-  # Requires Arel 2.1 or later.
-
   def self.spatial(arg)
     ::RGeo::ActiveRecord::SpatialConstantNode.new(arg)
   end

data/lib/rgeo/active_record/version.rb

@@ -1,5 +1,5 @@
 module RGeo
   module ActiveRecord
-    VERSION = '1.3.0'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end

data/test/basic_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class BasicTest < MINITEST_CLASS  # :nodoc:
+class BasicTest < Minitest::Test # :nodoc:
   class MyTable < ::ActiveRecord::Base
   end
 
@@ -54,16 +54,8 @@ class BasicTest < MINITEST_CLASS  # :nodoc:
 
   def test_arel_visit_spatial_constant_node
     visitor = arel_visitor
-
-    # :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)
+    sql = visitor.accept(Arel.spatial('POINT (1.0 2.0)'), Arel::Collectors::PlainString.new)
+    assert_equal("ST_WKTToSQL('POINT (1.0 2.0)')", sql.value)
   end
 
   private

data/test/common_adapter_elements_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CommonAdapterElementsTest < Minitest::Test # :nodoc:
+  def test_geo_schema_dumper
+
+  end
+end

data/test/test_helper.rb

@@ -2,11 +2,11 @@ require 'minitest/autorun'
 require 'rgeo/active_record'
 require 'support/fake_record'
 
-MINITEST_CLASS = if defined?(::Minitest::Test)
-                   ::Minitest::Test
-                 else
-                   ::Minitest::Unit::TestCase
-                 end
-
 Arel::Visitors::PostgreSQL.send(:include, ::RGeo::ActiveRecord::SpatialToSql)
 Arel::Table.engine = FakeRecord::Base.new
+
+begin
+  require 'byebug'
+rescue LoadError
+  # ignore
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
-- Daniel Azuma
+- Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
@@ -30,46 +30,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: '1.1'
 description: RGeo is a geospatial data library for Ruby. RGeo::ActiveRecord is an
   optional RGeo module providing some spatial extensions to ActiveRecord, as well
   as common tools used by RGeo-based spatial adapters.
-email: dazuma@gmail.com
+email: dazuma@gmail.com, parhameter@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -87,6 +101,7 @@ files:
 - lib/rgeo/active_record/spatial_expressions.rb
 - lib/rgeo/active_record/version.rb
 - test/basic_test.rb
+- test/common_adapter_elements_test.rb
 - test/support/fake_record.rb
 - test/test_helper.rb
 homepage: http://github.com/rgeo/rgeo-activerecord
@@ -108,12 +123,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: An RGeo module providing spatial extensions to ActiveRecord.
 test_files:
 - test/basic_test.rb
+- test/common_adapter_elements_test.rb
 - test/support/fake_record.rb
 - test/test_helper.rb
 has_rdoc: