mongoid_geospatial 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40a6843731a3832611eb19ca69e9008580660fb8
-  data.tar.gz: e3aecc3c1f01dbb4ddda4e7c4401bd45c03c792a
+  metadata.gz: 5ac994cd87075d0e5e38f5bee7c1fa62d2d6bc0f
+  data.tar.gz: 444d017b5c507586baa79cca90878abc86dee177
 SHA512:
-  metadata.gz: 2f33b113b83240f8fbef94eb645c4d380a66c2587b3eb7886fe9db08502df7bf998af9ce99c2c2ede38a64297a6caed57b5d13f706954a3e39dd48b7599f66da
-  data.tar.gz: 2cecc4bb71f7562f73318cc0915264fe2c7368c5fb441f4a13122d67742ec14f77bcf82ab86f0c9ea5f05320af78bd14b2e686f5b717663024da738a2e57976d
+  metadata.gz: 6d654768a8e1099c1fd4675f5a390faead85e32718f395889f9fc973a298efef3a64faf41fa8a2336f27535de63d673e11dd477238decfd90cab5af25ca6109f
+  data.tar.gz: 9a2c7861e3f54530ebece165b7ec6b7ca2d93dc9b4c0db6200753fc6af01dc9c420ed6301791d391772ab5144d3ca3bc84e14749faa28c76a750109e47b2d91e

data/lib/mongoid_geospatial/geospatial.rb

@@ -2,8 +2,8 @@ module Mongoid
   module Geospatial
     extend ActiveSupport::Concern
 
-    LNG_SYMBOLS = [:x, :lon, :long, :lng, :longitude]
-    LAT_SYMBOLS = [:y, :lat, :latitude]
+    LNG_SYMBOLS = [:x, :lon, :long, :lng, :longitude, 'x', 'lon', 'long', 'longitude']
+    LAT_SYMBOLS = [:y, :lat, :latitude, 'y', 'lat', 'latitude']
 
     EARTH_RADIUS_KM = 6371 # taken directly from mongodb
     RAD_PER_DEG = Math::PI / 180

data/lib/mongoid_geospatial/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Geospatial
-    VERSION = "2.8.1"
+    VERSION = "2.8.2"
   end
 end

data/lib/mongoid_geospatial/wrappers/georuby.rb

@@ -28,15 +28,17 @@ module Mongoid
 
 
     class Line < GeometryField
+
       def to_geo
-        GeoRuby::SimpleFeatures::LineString.from_array(self)
+        GeoRuby::SimpleFeatures::LineString.from_coordinates([self])
       end
 
     end
 
     class Polygon < GeometryField
+
       def to_geo
-        GeoRuby::SimpleFeatures::Polygon.from_array(self)
+        GeoRuby::SimpleFeatures::Polygon.from_coordinates([self])
       end
 
     end

data/spec/models/river.rb

@@ -5,8 +5,9 @@ class River
   field :name,              type: String
   field :length,            type: Integer
   field :average_discharge, type: Integer
-  field :source,            type: Line,     spatial: true
+  field :course,            type: Line,      spatial: true
   # set return_array to true if you do not want a hash returned all the time
+  field :source,            type: Point,     spatial: true
   field :mouth,             type: Point,    spatial: {lat: 'latitude', lng: 'longitude'}
   field :mouth_array,       type: Array,    spatial: {return_array: true}
 

data/spec/mongoid_geospatial/extensions/core_ext_spec.rb

@@ -12,8 +12,20 @@ describe "Core Extensions" do
 
   describe Hash do
 
-    it "should have a #to_xy method" do
-      { x: 1.1, y: 2.1 }.to_xy.should eql([1.1, 2.1])
+    it "converts hash with symbol keys x,y to array with x,y" do
+       { x: 1.1, y: 2.1 }.to_xy.should eql([1.1, 2.1])
+    end
+
+    it "converts hash with symbol keys y,x to array with x,y" do
+      { y: 2.1, x: 1.1 }.to_xy.should eql([1.1, 2.1])
+    end
+
+    it "converts hash with string keys x,y to array with x,y" do
+      { 'x' => 1.1, 'y' => 2.1 }.to_xy.should eql([1.1, 2.1])
+    end
+
+    it "converts hash with string keys y,x to array with x,y" do
+      { 'y' => 2.1, 'x' => 1.1 }.to_xy.should eql([1.1, 2.1])
     end
 
   end

data/spec/mongoid_geospatial/fields/line_spec.rb

@@ -5,14 +5,14 @@ describe Mongoid::Geospatial::Line do
   describe "(de)mongoize" do
 
     it "should support a field mapped as linestring" do
-      river = River.new(source: [[5,5],[6,5],[6,6],[5,6]])
-      river.source.should be_a Mongoid::Geospatial::Line
-      river.source.should eq([[5,5],[6,5],[6,6],[5,6]])
+      river = River.new(course: [[5,5],[6,5],[6,6],[5,6]])
+      river.course.should be_a Mongoid::Geospatial::Line
+      river.course.should eq([[5,5],[6,5],[6,6],[5,6]])
     end
 
     it "should support a field mapped as linestring" do
-      River.create!(source: [[5,5],[6,5],[6,6],[5,6]])
-      River.first.source.should eq([[5,5],[6,5],[6,6],[5,6]])
+      River.create!(course: [[5,5],[6,5],[6,6],[5,6]])
+      River.first.course.should eq([[5,5],[6,5],[6,6],[5,6]])
     end
 
     it "should have a bounding box" do

data/spec/mongoid_geospatial/fields/point_spec.rb

@@ -162,7 +162,19 @@ describe Mongoid::Geospatial::Point do
       geom.y.should be_within(0.1).of(-9)
     end
 
+    it "should mongoize hash with symbols in any order" do
+      geom = Bar.new(location: {y: -9, x: 10}).location
+      geom.class.should eql(Mongoid::Geospatial::Point)
+      geom.x.should be_within(0.1).of(10)
+      geom.y.should be_within(0.1).of(-9)
+    end
 
+    it "should mongoize hash with string keys in any order" do
+      geom = Bar.new(location: {'y' => -9, 'x' => 10}).location
+      geom.class.should eql(Mongoid::Geospatial::Point)
+      geom.x.should be_within(0.1).of(10)
+      geom.y.should be_within(0.1).of(-9)
+    end
 
     # should raise
     # geom.to_geo

data/spec/mongoid_geospatial/wrappers/georuby_spec.rb

@@ -57,6 +57,19 @@ describe Mongoid::Geospatial::Point do
         bar.location.distance(bar2.location).to_i.should be_within(1).of(3973808)
       end
 
+      describe "simple features" do
+
+        it "should mongoize lines" do
+          river = River.new(course: [[1,2],[3,4],[5,6]])
+          river.course.to_geo.should be_instance_of(GeoRuby::SimpleFeatures::LineString)
+        end
+
+        it "should mongoize polygon" do
+          farm = Farm.new(area: [[1,2],[3,4],[5,6]])
+          farm.area.to_geo.should be_instance_of(GeoRuby::SimpleFeatures::Polygon)
+        end
+
+      end
     end
   end
 end

data/spec/mongoid_geospatial/wrappers/rgeo_spec.rb

@@ -52,8 +52,8 @@ describe "RGeo Wrapper" do
     end
 
     it "should not respond to to_geo before loading external" do
-      river = River.create!(source: [[5,5],[6,5],[6,6],[5,6]])
-      river.source.should_not respond_to(:to_geo)
+      river = River.create!(course: [[5,5],[6,5],[6,6],[5,6]])
+      river.course.should_not respond_to(:to_geo)
     end
   end
 
@@ -108,7 +108,7 @@ describe "RGeo Wrapper" do
 
       describe Mongoid::Geospatial::Line do
         it "should mongoize array" do
-          geom = River.create!(source: [[5,5],[6,5],[6,6],[5,6]]).source
+          geom = River.create!(course: [[5,5],[6,5],[6,6],[5,6]]).course
           geom.class.should eql(Mongoid::Geospatial::Line)
           geom.to_geo.class.should eql(RGeo::Geographic::SphericalLineStringImpl)
           geom.to_geo.to_s.should eq "LINESTRING (5.0 5.0, 6.0 5.0, 6.0 6.0, 5.0 6.0)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geospatial
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Ryan Ong
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid