mongoid_geospatial 2.8.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff35a5a79d20c1dd655b49bb626bdce8b8c2e6b4
-  data.tar.gz: 0d4041b8ec06429c6db10a9ecd9da1d28a5afa7d
+  metadata.gz: f481eb153c311039d3c9ab431dd181481b51a97b
+  data.tar.gz: 3d1fa8021e6b79c79e85463a468ea865e53cdd99
 SHA512:
-  metadata.gz: 2cb1cd1a60cd4641a184a94c5a3336d306e61dd0202fb9b7b270a49d13e7367a5dde932545b2b449c78b7ed9b3b40528cbdf2c002903c62a86f911d9052715be
-  data.tar.gz: dd5fb4f2a67516d97e444d679b3c454e8cc55a09a5edaba462cdd34ff32dc94eda20f2db6f810cbfbc75e7352f2ed955c74ea1f2464a2a95d2149abc69a240ca
+  metadata.gz: bc40ac5a0f57a48a1d83c4c940b86ca381252aafa17b2eb90a1943fc27303007230e66a3ff1b98420735dadfc5b58f0d1e2478c58c1e58c7d73b66e3f5a8e433
+  data.tar.gz: d5264c6beec42461c03d803892b2b46270e17e9bdbdd6f9f160cdcabc9cd2230d162bfbf39f59889b4b809e6d52da67247ad7346a1ee12e3ceac874d62cd6dab

data/Gemfile

@@ -2,6 +2,8 @@ source 'http://rubygems.org'
 gemspec # Specify  gem's dependencies in mongoid_geospatial.gemspec
 
 gem 'rake'
+gem 'mongoid', github: 'mongoid/mongoid'
+
 
 group :development do
   gem 'pry'

data/Guardfile

@@ -1,9 +1,21 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
-require 'guard'
+ignore /\/.#.+/
 
-guard 'rspec' do
+guard :rspec do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { "spec" } # { |m| "spec spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end
+
+
+# guard 'spork', :cucumber_env => { 'RAILS_ENV' => 'test' }, :rspec_env => { 'RAILS_ENV' => 'test' } do
+#   watch('config/application.rb')
+#   watch('config/environment.rb')
+#   watch('config/environments/test.rb')
+#   watch(%r{^config/initializers/.+\.rb$})
+#   watch('Gemfile.lock')
+#   watch('spec/spec_helper.rb') { :rspec }
+#   watch('test/test_helper.rb') { :test_unit }
+#   watch(%r{features/support/}) { :cucumber }
+# end

data/README.md

@@ -19,7 +19,7 @@ Quick Start
 -----------
 
 This gem focus on (making helpers for) spatial features MongoDB has.
-You can also use an external Geometric/Spatial alongside.
+You may also use an external Geometric/Spatial gem alongside.
 
     # Gemfile
     gem 'mongoid_geospatial'
@@ -47,13 +47,10 @@ You can also use an external Geometric/Spatial alongside.
 For geo points, an extra macro `geo_field` is available
 
 
-    class Place
-      include Mongoid::Document
-      include Mongoid::Geospatial
-
-      # field :location, type: Point, spatial: true
       geo_field :location
-    end
+      # Will generate:
+      field :location, type: Point, spatial: true
+
 
 
 Generate indexes on MongoDB:
@@ -104,11 +101,14 @@ Now to access this spatial information we can do this
 
 If you need a hash
 
-    hudson.mouth.to_hsh  # => { x: -74.026667, y: 40.703056 }
+    hudson.mouth.to_hsh   # => { x: -74.026667, y: 40.703056 }
 
 If you are using GeoRuby or RGeo
 
-    hudson.mouth.to_geo  # => NiceGeolib::Point
+    hudson.mouth.to_geo   # => GeoRuby::Point
+
+    hudson.mouth.to_rgeo  # => RGeo::Point
+
 
 Conventions:
 
@@ -205,8 +205,10 @@ Geometry Helpers
 ----------------
 
 We currently support GeoRuby and RGeo.
-If you require one of those, a #to_geo method will be available to all
-spatial fields, returning the external library corresponding object.
+If you require one of those, a #to_geo and #to_rgeo, respectivelly,
+method(s) will be available to all spatial fields, returning the
+external library corresponding object.
+
 To illustrate:
 
     class Person
@@ -224,7 +226,7 @@ To illustrate:
 
     # Example with RGeo
     point.class # Mongoid::Geospatial::Point
-    point.to_geo.class # RGeo::Geographic::SphericalPointImpl
+    point.to_rgeo.class # RGeo::Geographic::SphericalPointImpl
 
 
 Configure
@@ -234,14 +236,14 @@ Assemble it as you need (use a initializer file):
 
 With RGeo
 
-    Mongoid::Geospatial.use_rgeo
+    Mongoid::Geospatial.with_rgeo!
     # Optional
     # Mongoid::Geospatial.factory = RGeo::Geographic.spherical_factory
 
 
 With GeoRuby
 
-    Mongoid::Geospatial.use_georuby
+    Mongoid::Geospatial.with_georuby!
 
 
 Defaults (change if you know what you're doing)

data/lib/mongoid_geospatial/extensions/georuby_point.rb

@@ -0,0 +1,12 @@
+module GeoRuby
+  module SimpleFeatures
+    # GeoRuby Point
+    class Point
+
+      def mongoize
+        [x, y]
+      end
+
+    end
+  end
+end

data/lib/mongoid_geospatial/extensions/rgeo_spherical_point_impl.rb

@@ -1,13 +1,20 @@
 module RGeo
   module Geographic
+    # RGeo Point
     class SphericalPointImpl
+
+      def mongoize
+        [x, y]
+      end
+
       def to_a
         [x, y, z]
       end
 
-      def [] index
+      def [](index)
         to_a[index]
       end
+
     end
   end
 end

data/lib/mongoid_geospatial/fields/point.rb

@@ -2,10 +2,12 @@ module Mongoid
   module Geospatial
     class Point
       include Enumerable
-      attr_accessor :x, :y
+      attr_reader :x, :y
 
-      def initialize(x=nil, y=nil)
-        @x, @y = x, y
+      def initialize(x = nil, y = nil)
+        return unless x
+        ll = y ? [x, y] : x.split(/,|\s/).reject(&:empty?)
+        @x, @y = ll.map(&:to_f)
       end
 
       # Object -> Database
@@ -24,6 +26,10 @@ module Mongoid
         yield y
       end
 
+      def to_s
+        "#{x}, #{y}"
+      end
+
       def to_hsh xl = :x, yl = :y
         {xl => x, yl => y}
       end
@@ -64,16 +70,15 @@ module Mongoid
 
         # Database -> Object
         def demongoize(object)
-          return unless object
-          Point.new(*object)
+          Point.new(*object) if object
         end
 
         def mongoize(object)
           case object
           when Point then object.mongoize
-          when Array then object.to_xy
-          when Hash then object.to_xy
-          else object
+          when Array then Geospatial.from_array(object)
+          when Hash then Geospatial.from_hash(object)
+          else object.mongoize
           end
         end
 

data/lib/mongoid_geospatial/geospatial.rb

@@ -32,11 +32,11 @@ module Mongoid
       self.spatial_fields_indexed = []
     end
 
-    def self.use_rgeo
+    def self.with_rgeo!
       require 'mongoid_geospatial/wrappers/rgeo'
     end
 
-    def self.use_georuby
+    def self.with_georuby!
       require 'mongoid_geospatial/wrappers/georuby'
     end
 

data/lib/mongoid_geospatial/helpers/core.rb

@@ -0,0 +1,28 @@
+module Mongoid
+  module Geospatial
+
+    def self.from_array(ary)
+      ary[0..1].map(&:to_f)
+    end
+
+    def self.from_hash(hsh)
+      raise "Hash must have at least 2 items" if hsh.size < 2
+      [from_hash_x(hsh), from_hash_y(hsh)]
+    end
+
+    def self.from_hash_y(hsh)
+      v = (Mongoid::Geospatial.lat_symbols & hsh.keys).first
+      return hsh[v].to_f if !v.nil? && hsh[v]
+      fail "Hash must contain #{Mongoid::Geospatial.lat_symbols.inspect} if ruby version is less than 1.9" if RUBY_VERSION.to_f < 1.9
+      fail "Hash cannot contain #{Mongoid::Geospatial.lng_symbols.inspect} as the second item if there is no #{Mongoid::Geospatial.lat_symbols.inspect}" if Mongoid::Geospatial.lng_symbols.index(hsh.keys[1])
+      hsh.values[1].to_f
+    end
+
+    def self.from_hash_x(hsh)
+      v = (Mongoid::Geospatial.lng_symbols & hsh.keys).first
+      return hsh[v].to_f if !v.nil? && hsh[v]
+      fail "Hash cannot contain #{Mongoid::Geospatial.lat_symbols.inspect} as the first item if there is no #{Mongoid::Geospatial.lng_symbols.inspect}" if Mongoid::Geospatial.lat_symbols.index(keys[0])
+      values[0].to_f
+    end
+  end
+end

data/lib/mongoid_geospatial/helpers/spatial.rb

@@ -15,4 +15,5 @@ Mongoid::Fields.option :spatial do |model, field, options|
     spatial_index field.name
 
   end
+
 end

data/lib/mongoid_geospatial/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Geospatial
-    VERSION = "2.8.3"
+    VERSION = "3.0.0"
   end
 end

data/lib/mongoid_geospatial/wrappers/georuby.rb

@@ -1,5 +1,5 @@
 require 'geo_ruby'
-# require 'mongoid_geospatial/extensions/georuby'
+require 'mongoid_geospatial/extensions/georuby_point'
 
 module Mongoid
   module Geospatial
@@ -11,26 +11,16 @@ module Mongoid
         GeoRuby::SimpleFeatures::Point.xy(x, y)
       end
 
-      def distance other
+      def geo_distance other
         to_geo.spherical_distance(other.to_geo)
       end
 
-      def self.mongoize(obj)
-        case obj
-        when GeoRuby::SimpleFeatures::Point then [obj.x, obj.y]
-        when Point then obj.mongoize
-        when Array then obj.to_xy
-        when Hash  then obj.to_xy
-        else obj
-        end
-      end
     end
 
-
     class Line < GeometryField
 
       def to_geo
-        GeoRuby::SimpleFeatures::LineString.from_coordinates([self])
+        GeoRuby::SimpleFeatures::LineString.from_coordinates(self)
       end
 
     end
@@ -38,7 +28,7 @@ module Mongoid
     class Polygon < GeometryField
 
       def to_geo
-        GeoRuby::SimpleFeatures::Polygon.from_coordinates([self])
+        GeoRuby::SimpleFeatures::Polygon.from_coordinates(self)
       end
 
     end

data/lib/mongoid_geospatial/wrappers/rgeo.rb

@@ -5,23 +5,14 @@ module Mongoid
   module Geospatial
 
     class Point
-      def to_geo
+      def to_rgeo
         RGeo::Geographic.spherical_factory.point x, y
       end
 
-      def distance other
-        to_geo.distance other.to_geo
+      def rgeo_distance other
+        to_rgeo.distance other.to_rgeo
       end
 
-      def self.mongoize(obj)
-        case obj
-        when RGeo::Geographic::SphericalPointImpl then [obj.x, obj.y]
-        when Point then obj.mongoize
-        when Array then obj.to_xy
-        when Hash  then obj.to_xy
-        else obj
-        end
-      end
     end
 
     class GeometryField
@@ -34,17 +25,19 @@ module Mongoid
     end
 
     class Line < GeometryField
-      def to_geo
+      def to_rgeo
         RGeo::Geographic.spherical_factory.line_string points
       end
 
     end
 
     class Polygon < GeometryField
-      def to_geo
+      def to_rgeo
         ring = RGeo::Geographic.spherical_factory.linear_ring points
         RGeo::Geographic.spherical_factory.polygon ring
       end
     end
+
   end
+
 end

data/lib/mongoid_geospatial.rb

@@ -2,8 +2,8 @@ require 'mongoid'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/concern'
 require 'mongoid_geospatial/geospatial'
-require 'mongoid_geospatial/extensions/core_ext'
 require 'mongoid_geospatial/extensions/rgeo_spherical_point_impl'
+require 'mongoid_geospatial/helpers/core'
 require 'mongoid_geospatial/helpers/spatial'
 require 'mongoid_geospatial/helpers/sphere'
 require 'mongoid_geospatial/helpers/delegate'

data/mongoid_geospatial.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/mongoid_geospatial/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Ryan Ong", "Marcos Piccinini"]
   gem.email         = ["use@git.hub.com"]
-  gem.description   = "Mongoid Extension that simplifies MongoDB operations and autocast for spatial Ruby objects."
+  gem.description   = "Mongoid Extension that simplifies MongoDB casting and operations on spatial Ruby objects."
   gem.summary       = "Mongoid Extension that simplifies MongoDB Geospatial Operations."
   gem.homepage      = "https://github.com/nofxx/mongoid_geospatial"
 

data/spec/models/alarm.rb

@@ -2,6 +2,7 @@ class Alarm
   include Mongoid::Document
   include Mongoid::Geospatial
 
+  field :name
   field :radius,  type: Circle
   field :area,    type: Box
   field :spot,    type: Point, sphere: true

data/spec/models/bus.rb

@@ -2,6 +2,7 @@ class Bus
   include Mongoid::Document
   include Mongoid::Geospatial
 
+  field :name
   field :plates,   :type => String
   field :location, :type => Point, :delegate => true
 

data/spec/models/person.rb

@@ -1,8 +1,7 @@
 class Person
   include Mongoid::Document
-  include Mongoid::MultiParameterAttributes
   include Mongoid::Timestamps
-  include Mongoid::Versioning
+  # include Mongoid::Versioning
   include Mongoid::Geospatial
 
   attr_accessor :mode
@@ -22,7 +21,7 @@ class Person
   field :score,      type: Integer
   field :owner_id,   type: Integer
   field :reading,    type: Object
-  field :bson_id,    type: bson_object_id_class
+  # field :bson_id,    type: bson_object_id_class
   field :employer_id
   field :security_code
   field :blood_alcohol_content, type: Float, :default => lambda{ 0.0 }
@@ -42,7 +41,7 @@ class Person
 
   attr_reader :rescored
 
-  attr_protected :security_code, :owner_id
+  # attr_protected :security_code, :owner_id
 
   embeds_many :addresses, :as => :addressable do
     def extension

data/spec/models/river.rb

@@ -4,7 +4,7 @@ class River
 
   field :name,              type: String
   field :length,            type: Integer
-  field :average_discharge, type: Integer
+  field :discharge,         type: Integer
   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

data/spec/mongoid_geospatial/fields/point_spec.rb

@@ -12,11 +12,37 @@ describe Mongoid::Geospatial::Point do
     bar.location.should be_nil
   end
 
+  it "should set point methodically" do
+    bar = Bar.create!(name: "Moe's", location: Mongoid::Geospatial::Point.new)
+    bar.location = Mongoid::Geospatial::Point.new(8,8)
+    bar.save.should be_true
+    Bar.first.location.x.should eq(8)
+  end
+
+  it "should set point with comma separated text" do
+    bar = Bar.create!(name: "Moe's", location: Mongoid::Geospatial::Point.new)
+    bar.location = Mongoid::Geospatial::Point.new("2.99,3.99")
+    bar.location.mongoize.should eq([2.99, 3.99])
+  end
+
+  it "should set point with space separated text" do
+    bar = Bar.create!(name: "Moe's", location: Mongoid::Geospatial::Point.new)
+    bar.location = Mongoid::Geospatial::Point.new("2.99 3.99")
+    bar.location.mongoize.should eq([2.99, 3.99])
+  end
+
+  it "should set point with space comma separated text" do
+    bar = Bar.create!(name: "Moe's", location: Mongoid::Geospatial::Point.new)
+    bar.location = Mongoid::Geospatial::Point.new("2.99 ,  3.99")
+    bar.location.mongoize.should eq([2.99, 3.99])
+  end
+
   it "should set point to nil" do
     bar = Bar.create!(name: "Moe's", location: [1, 1])
     bar.location = nil
     bar.location.should be_nil
     bar.save.should be_true
+    Bar.first.location.should be_nil
   end
 
   describe "methods" do

data/spec/mongoid_geospatial/geospatial_spec.rb

@@ -20,12 +20,12 @@ describe Mongoid::Geospatial do
 
     it "should create a 2d index" do
       Bar.create_indexes
-      Bar.index_options.keys.should include({:location => '2d'})
+      Bar.collection.indexes[:location => '2d'].should_not be_nil
     end
 
     it "should create a 2dsphere index" do
       Alarm.create_indexes
-      Alarm.index_options.keys.should include({:spot => '2dsphere'})
+      Alarm.collection.indexes[:spot => '2dsphere'].should_not be_nil
     end
 
   end

data/spec/mongoid_geospatial/helpers/core_spec.rb

@@ -0,0 +1,28 @@
+module Mongoid
+  module Geospatial
+
+    def self.from_array(ary)
+      ary[0..1].map(&:to_f)
+    end
+
+    def self.from_hash(hsh)
+      raise "Hash must have at least 2 items" if hsh.size < 2
+      [from_hash_x(hsh), from_hash_y(hsh)]
+    end
+
+    def self.from_hash_y(hsh)
+      v = (Mongoid::Geospatial.lat_symbols & hsh.keys).first
+      return hsh[v].to_f if !v.nil? && hsh[v]
+      fail "Hash must contain #{Mongoid::Geospatial.lat_symbols.inspect} if ruby version is less than 1.9" if RUBY_VERSION.to_f < 1.9
+      fail "Hash cannot contain #{Mongoid::Geospatial.lng_symbols.inspect} as the second item if there is no #{Mongoid::Geospatial.lat_symbols.inspect}" if Mongoid::Geospatial.lng_symbols.index(hsh.keys[1])
+      hsh.values[1].to_f
+    end
+
+    def self.from_hash_x(hsh)
+      v = (Mongoid::Geospatial.lng_symbols & hsh.keys).first
+      return hsh[v].to_f if !v.nil? && hsh[v]
+      fail "Hash cannot contain #{Mongoid::Geospatial.lat_symbols.inspect} as the first item if there is no #{Mongoid::Geospatial.lng_symbols.inspect}" if Mongoid::Geospatial.lat_symbols.index(keys[0])
+      values[0].to_f
+    end
+  end
+end

data/spec/mongoid_geospatial/helpers/spatial_spec.rb

@@ -9,7 +9,7 @@ describe Mongoid::Fields do
     end
 
     it "should created indexes" do
-      Bar.index_options.keys.should include({:location => '2d'})
+      Bar.collection.indexes[:location => '2d'].should_not be_nil
     end
 
     it "should set spatial fields" do

data/spec/mongoid_geospatial/helpers/sphere_spec.rb

@@ -9,7 +9,7 @@ describe Mongoid::Fields do
     end
 
     it "should created indexes" do
-      Alarm.index_options.keys.should include({:spot => '2dsphere'})
+      Alarm.collection.indexes[:spot => '2dsphere'].should_not be_nil
     end
 
     it "should set spatial fields" do

data/spec/mongoid_geospatial/wrappers/georuby_spec.rb

@@ -24,7 +24,7 @@ describe Mongoid::Geospatial::Point do
   describe "queryable" do
 
     before do
-      Mongoid::Geospatial.use_georuby
+      Mongoid::Geospatial.with_georuby!
       Place.create_indexes
     end
 
@@ -54,7 +54,7 @@ describe Mongoid::Geospatial::Point do
       it "should calculate 3d distances by default" do
         bar = Place.create! location: [-73.77694444, 40.63861111 ]
         bar2 = Place.create! location: [-118.40, 33.94] #,:unit=>:mi, :spherical => true)
-        bar.location.distance(bar2.location).to_i.should be_within(1).of(3973808)
+        bar.location.geo_distance(bar2.location).to_i.should be_within(1).of(3973808)
       end
 
       describe "simple features" do

data/spec/mongoid_geospatial/wrappers/rgeo_spec.rb

@@ -60,7 +60,7 @@ describe "RGeo Wrapper" do
   describe "queryable" do
 
     before do
-      Mongoid::Geospatial.use_rgeo
+      Mongoid::Geospatial.with_rgeo!
       Bar.create_indexes
       Farm.create_indexes
       River.create_indexes
@@ -72,15 +72,15 @@ describe "RGeo Wrapper" do
         it "should mongoize array" do
           geom = Bar.new(location: [10, -9]).location
           geom.class.should eql(Mongoid::Geospatial::Point)
-          geom.to_geo.class.should eql(RGeo::Geographic::SphericalPointImpl)
+          geom.to_rgeo.class.should eql(RGeo::Geographic::SphericalPointImpl)
           geom.x.should be_within(0.1).of(10)
-          geom.to_geo.y.should be_within(0.1).of(-9)
+          geom.to_rgeo.y.should be_within(0.1).of(-9)
         end
 
         it "should mongoize hash" do
           geom = Bar.new(location: {x: 10, y: -9}).location
           geom.class.should eql(Mongoid::Geospatial::Point)
-          geom.to_geo.class.should eql(RGeo::Geographic::SphericalPointImpl)
+          geom.to_rgeo.class.should eql(RGeo::Geographic::SphericalPointImpl)
         end
 
         it "should accept an RGeo object" do
@@ -93,7 +93,7 @@ describe "RGeo Wrapper" do
         it "should calculate 3d distances by default" do
           bar = Bar.create! location: [-73.77694444, 40.63861111 ]
           bar2 = Bar.create! location: [-118.40, 33.94] #,:unit=>:mi, :spherical => true)
-          bar.location.distance(bar2.location).to_i.should be_within(1).of(3978262)
+          bar.location.rgeo_distance(bar2.location).to_i.should be_within(1).of(3978262)
         end
       end
 
@@ -101,8 +101,8 @@ describe "RGeo Wrapper" do
         it "should mongoize array" do
           geom = Farm.create!(area: [[5,5],[6,5],[6,6],[5,6]]).area
           geom.class.should eql(Mongoid::Geospatial::Polygon)
-          geom.to_geo.class.should eql(RGeo::Geographic::SphericalPolygonImpl)
-          geom.to_geo.to_s.should eq "POLYGON ((5.0 5.0, 6.0 5.0, 6.0 6.0, 5.0 6.0, 5.0 5.0))"
+          geom.to_rgeo.class.should eql(RGeo::Geographic::SphericalPolygonImpl)
+          geom.to_rgeo.to_s.should eq "POLYGON ((5.0 5.0, 6.0 5.0, 6.0 6.0, 5.0 6.0, 5.0 5.0))"
         end
       end
 
@@ -110,8 +110,8 @@ describe "RGeo Wrapper" do
         it "should mongoize array" do
           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)"
+          geom.to_rgeo.class.should eql(RGeo::Geographic::SphericalLineStringImpl)
+          geom.to_rgeo.to_s.should eq "LINESTRING (5.0 5.0, 6.0 5.0, 6.0 6.0, 5.0 6.0)"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geospatial
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Ryan Ong
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -53,8 +53,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-description: Mongoid Extension that simplifies MongoDB operations and autocast for
-  spatial Ruby objects.
+description: Mongoid Extension that simplifies MongoDB casting and operations on spatial
+  Ruby objects.
 email:
 - use@git.hub.com
 executables: []
@@ -70,7 +70,7 @@ files:
 - README.md
 - Rakefile
 - lib/mongoid_geospatial.rb
-- lib/mongoid_geospatial/extensions/core_ext.rb
+- lib/mongoid_geospatial/extensions/georuby_point.rb
 - lib/mongoid_geospatial/extensions/rgeo_spherical_point_impl.rb
 - lib/mongoid_geospatial/fields/box.rb
 - lib/mongoid_geospatial/fields/circle.rb
@@ -79,6 +79,7 @@ files:
 - lib/mongoid_geospatial/fields/point.rb
 - lib/mongoid_geospatial/fields/polygon.rb
 - lib/mongoid_geospatial/geospatial.rb
+- lib/mongoid_geospatial/helpers/core.rb
 - lib/mongoid_geospatial/helpers/delegate.rb
 - lib/mongoid_geospatial/helpers/spatial.rb
 - lib/mongoid_geospatial/helpers/sphere.rb
@@ -96,13 +97,13 @@ files:
 - spec/models/phone.rb
 - spec/models/place.rb
 - spec/models/river.rb
-- spec/mongoid_geospatial/extensions/core_ext_spec.rb
 - spec/mongoid_geospatial/fields/box_spec.rb
 - spec/mongoid_geospatial/fields/circle_spec.rb
 - spec/mongoid_geospatial/fields/line_spec.rb
 - spec/mongoid_geospatial/fields/point_spec.rb
 - spec/mongoid_geospatial/fields/polygon_spec.rb
 - spec/mongoid_geospatial/geospatial_spec.rb
+- spec/mongoid_geospatial/helpers/core_spec.rb
 - spec/mongoid_geospatial/helpers/delegate_spec.rb
 - spec/mongoid_geospatial/helpers/spatial_spec.rb
 - spec/mongoid_geospatial/helpers/sphere_spec.rb
@@ -147,13 +148,13 @@ test_files:
 - spec/models/phone.rb
 - spec/models/place.rb
 - spec/models/river.rb
-- spec/mongoid_geospatial/extensions/core_ext_spec.rb
 - spec/mongoid_geospatial/fields/box_spec.rb
 - spec/mongoid_geospatial/fields/circle_spec.rb
 - spec/mongoid_geospatial/fields/line_spec.rb
 - spec/mongoid_geospatial/fields/point_spec.rb
 - spec/mongoid_geospatial/fields/polygon_spec.rb
 - spec/mongoid_geospatial/geospatial_spec.rb
+- spec/mongoid_geospatial/helpers/core_spec.rb
 - spec/mongoid_geospatial/helpers/delegate_spec.rb
 - spec/mongoid_geospatial/helpers/spatial_spec.rb
 - spec/mongoid_geospatial/helpers/sphere_spec.rb

data/lib/mongoid_geospatial/extensions/core_ext.rb

@@ -1,29 +0,0 @@
-class Array
-  def to_xy
-    self[0..1].map(&:to_f)
-  end
-  alias :to_lng_lat :to_xy
-end
-
-class Hash
-  def to_xy
-    raise "Hash must have at least 2 items" if self.size < 2
-    [to_x, to_y]
-  end
-  alias :to_lng_lat :to_xy
-
-  def to_y
-    v = (Mongoid::Geospatial.lat_symbols & self.keys).first
-    return self[v].to_f if !v.nil? && self[v]
-    raise "Hash must contain #{Mongoid::Geospatial.lat_symbols.inspect} if ruby version is less than 1.9" if RUBY_VERSION.to_f < 1.9
-    raise "Hash cannot contain #{Mongoid::Geospatial.lng_symbols.inspect} as the second item if there is no #{Mongoid::Geospatial.lat_symbols.inspect}" if Mongoid::Geospatial.lng_symbols.index(self.keys[1])
-    self.values[1].to_f
-  end
-
-  def to_x
-    v = (Mongoid::Geospatial.lng_symbols & self.keys).first
-    return self[v].to_f if !v.nil? && self[v]
-    raise "Hash cannot contain #{Mongoid::Geospatial.lat_symbols.inspect} as the first item if there is no #{Mongoid::Geospatial.lng_symbols.inspect}" if Mongoid::Geospatial.lat_symbols.index(self.keys[0])
-    self.values[0].to_f
-  end
-end

data/spec/mongoid_geospatial/extensions/core_ext_spec.rb

@@ -1,32 +0,0 @@
-require "spec_helper"
-
-describe "Core Extensions" do
-
-  describe Array do
-
-    it "should have a #to_xy method" do
-      [1,2,3].to_xy.should eql([1.0, 2.0])
-    end
-
-  end
-
-  describe Hash do
-
-    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
-end