rgeo-activerecord 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d27b6bb8914ba1efbe13091ef65dd328b0e57202
-  data.tar.gz: f66b13c43432eaebac55630b5d80f315a0754f63
+  metadata.gz: 746ee8f040e9ef026c3d43bc346ca06f868acd30
+  data.tar.gz: e2f02e5a4e134c090d701a0812c6d6b639f12caa
 SHA512:
-  metadata.gz: 3dc2edf13190bee7e2e713ea002bd15b10a92dd425d3f3f7a49951aa486087897de92557ab54fd832675178c95a3ec699924da77c309b157810772e9c49abcf4
-  data.tar.gz: 1694a93bb2e6e857a9efa89bcc1a534f3008632c9f83465ae1c8a63523198cfe8c7340549a668bf31b0526aa047644e560448d0adc48f4e982258551a79fa05c
+  metadata.gz: debe22e1741a1889064d29b00351b12b5a942e9993b82c29c56b9ec6a96579f3028ea843cea70341aa6860d2627ce5f83c335715a8bb178e74d41c6d4775bd3f
+  data.tar.gz: 68c7b5367ce0d0efa4d810810cc5788dbfebda986f5380b1891391fb27486723a2bcc9fd8f8eb5847ef1ea54726db24a79388406416a674db905c0fbb57fdaf6

data/History.md

@@ -1,3 +1,7 @@
+### 4.0.5 / 2015-12-29
+
+* Fix #geometric_type_from_name for :geometrycollection
+
 ### 4.0.4 / 2015-12-29
 
 * Restore rgeo/active_record.rb

data/lib/rgeo/active_record/arel_spatial_queries.rb

@@ -54,7 +54,7 @@ module RGeo
 
     # This node wraps an RGeo feature and gives it spatial expression constructors.
     class SpatialConstantNode
-      include RGeo::ActiveRecord::SpatialExpressions
+      include SpatialExpressions
 
       # The delegate should be the RGeo feature.
       def initialize(delegate)

data/lib/rgeo/active_record/common_adapter_elements.rb

@@ -6,15 +6,15 @@ 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,
+      geometry_collection: {}.freeze,
       geometry:            {}.freeze,
-      point:               {}.freeze,
       line_string:         {}.freeze,
-      polygon:             {}.freeze,
-      geometry_collection: {}.freeze,
       multi_line_string:   {}.freeze,
       multi_point:         {}.freeze,
       multi_polygon:       {}.freeze,
+      point:               {}.freeze,
+      polygon:             {}.freeze,
+      spatial:             { type: "geometry" }.freeze,
     }.freeze
 
     # Index definition struct with a spatial flag field.
@@ -25,14 +25,14 @@ module RGeo
 
     def self.geometric_type_from_name(name)
       case name.to_s
+      when /^geometrycollection/i then Feature::GeometryCollection
       when /^geometry/i then Feature::Geometry
-      when /^point/i then Feature::Point
       when /^linestring/i then Feature::LineString
-      when /^polygon/i then Feature::Polygon
-      when /^geometrycollection/i then Feature::GeometryCollection
-      when /^multipoint/i then Feature::MultiPoint
       when /^multilinestring/i then Feature::MultiLineString
+      when /^multipoint/i then Feature::MultiPoint
       when /^multipolygon/i then Feature::MultiPolygon
+      when /^point/i then Feature::Point
+      when /^polygon/i then Feature::Polygon
       end
     end
   end

data/lib/rgeo/active_record/geometry_mixin.rb

@@ -26,7 +26,7 @@ module RGeo
         if block && !value
           value = block
         elsif value == :geojson
-          require "rgeo-geojson"
+          require "rgeo/geo_json"
           value = proc { |geom| GeoJSON.encode(geom) }
         end
         if value.is_a?(Proc)

data/lib/rgeo/active_record/version.rb

@@ -1,5 +1,5 @@
 module RGeo
   module ActiveRecord
-    VERSION = "4.0.4".freeze
+    VERSION = "4.0.5".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-activerecord
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: rgeo-geojson
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.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.