mongoid-geospatial 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 863dde3c031d08ba8c4a11aaf0708da5ab9e5a86
-  data.tar.gz: a0355bef1d9eaa010f880dd7556208ab4bc0aacb
+  metadata.gz: 3610388899a7280b932823c0541ac28e1590bc4a
+  data.tar.gz: 884000ab8ac5263b1fde24db7d966e823f9fa554
 SHA512:
-  metadata.gz: a058a1e3350787f81ccedd4179b46708fa5c3edb59a7b83ed4a3d9a8d67c86810d75c0b5ce062d87ab0c33e8dbb6ae290af913d82b15e5067a9321e2a415d799
-  data.tar.gz: 52ae29a334d47ec9f011ee0afc30adf2e31bac9d78dcf126a509be035eb0eebf8a7078c4805584a51335102ee567a53b486debff427cbd69f6c2a176dc0dfce2
+  metadata.gz: cab14e04b4353673b88bafa569743546809c8f7d179f0272ccec68390dd03f6a98923a062ff749043d8ef66a810ad5db20d21d8acc07f10570d0b1b6b92abb5f
+  data.tar.gz: 519caf325d7896a2db2ef706c60e166f67b793a827c0fb2b56965527c6c388b6ffd1ae6364d9602c12fbebe984e74444fcfc60c19bcff0870796a66b65f8a837

data/.hound.yml

@@ -0,0 +1,2 @@
+ruby:
+  enabled: true

data/.rspec

@@ -0,0 +1,3 @@
+--tty
+--color
+--format documentation

data/.travis.yml

@@ -14,7 +14,7 @@ jdk:
   - oraclejdk7
   - openjdk7
 
-env: JRUBY_OPTS="--server -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -J-Xms512m -J-Xmx1024m"
+env: CI="travis" JRUBY_OPTS="--server -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -J-Xms512m -J-Xmx1024m"
 
 matrix:
   allow_failures:

data/Gemfile

@@ -2,23 +2,24 @@ source 'http://rubygems.org'
 
 gemspec # Specify  gem's dependencies in mongoid_geospatial.gemspec
 
-gem 'pry'
 gem 'rake'
-gem 'yard'
-gem 'mongoid' #, github: 'mongoid/mongoid'
 
-gem 'nokogiri'
-gem 'dbf'
-gem 'rgeo'
-gem 'georuby'
+group :test do
+  gem 'pry'
+  gem 'yard'
+  gem 'nokogiri'
+
+  gem 'dbf'
+  gem 'rgeo'
+  gem 'georuby'
 
-if ENV['CI']
-  gem 'coveralls', require: false
-else
   gem 'rspec'
+
   gem 'rubocop'
   gem 'fuubar'
   gem 'guard'
   gem 'guard-rubocop'
   gem 'guard-rspec'
+
+  gem 'coveralls', require: false if ENV['CI']
 end

data/README.md

@@ -1,7 +1,6 @@
 Mongoid Geospatial
 ==================
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/nofxx/mongoid-geospatial?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 A Mongoid Extension that simplifies the use of MongoDB spatial features.
 
@@ -21,6 +20,7 @@ If you need to: require 'mongoid/geospatial'
 [![Gem Version](https://badge.fury.io/rb/mongoid-geospatial.png)](http://badge.fury.io/rb/mongoid-geospatial)
 [![Code Climate](https://codeclimate.com/github/nofxx/mongoid-geospatial.png)](https://codeclimate.com/github/nofxx/mongoid-geospatial)
 [![Coverage Status](https://coveralls.io/repos/nofxx/mongoid-geospatial/badge.png)](https://coveralls.io/r/nofxx/mongoid-geospatial)
+[![Dependency Status](https://gemnasium.com/nofxx/mongoid-geospatial.svg)](https://gemnasium.com/nofxx/mongoid-geospatial)
 [![Build Status](https://travis-ci.org/nofxx/mongoid-geospatial.png?branch=master)](https://travis-ci.org/nofxx/mongoid-geospatial)
 
 
@@ -60,26 +60,26 @@ A place to illustrate Point, Line and Polygon
 
 For geo points, an extra macro `geo_field` is available
 
-
       geo_field :location
-      # Will generate:
+
+Will generate:
+
       field :location, type: Point, spatial: true
 
 
 
-Generate indexes on MongoDB:
+Generate indexes on MongoDB via rake:
 
 
     rake db:mongoid:create_indexes
 
 
-Index programatically via https://github.com/kristianmandrup/mongoid_indexing gem
+Or programatically:
 
 
-    Mongoid::Indexing.create_indexes
+    Place.create_indexes
 
 
-This is fx useful when running specs or when working with spatials on a gem or engine.
 
 
 Points
@@ -125,13 +125,12 @@ Conventions:
 
 This lib uses #x and #y everywhere.
 It's shorter than lat or lng or another variation that also confuses.
-A point is a 2D mathematical notation, longitude/latitude is when you use that notation to map an sphere.
-
-In other words, all longitudes are 'xs' where not all 'xs' are longitudes.
-In the eyes of a moralist it's not even a valid position point, it does not have #z or #m.
+A point is a 2D mathematical notation, longitude/latitude is when you
+use that notation to map an sphere. In other words:
+All longitudes are 'xs' where not all 'xs' are longitudes.
 
 Distance and other geometrical calculations are delegated to the external
-library you choosed. More info about using RGeo or GeoRuby below.
+library of your choice. More info about using RGeo or GeoRuby below.
 Some built in helpers for mongoid queries:
 
     # Returns middle point + radius
@@ -153,7 +152,7 @@ And for polygons and lines:
 Query
 -----
 
-Before you read about mongoid_spatial have sure you read this:
+Before you read about this gem have sure you read this:
 
 http://mongoid.org/en/origin/docs/selection.html#standard
 
@@ -172,6 +171,10 @@ You can use Geometry instance directly on any query:
   * Bar.where(:location.near_sphere => person.house)
 
 
+### Not supported (until Mongoid 5.0.0)
+Those have been dropped from moped, should return on mongoid 5.
+Sad story.
+
 * within_box
   * Bar.within_box(location: hood.area)
 
@@ -188,6 +191,7 @@ You can use Geometry instance directly on any query:
   * Bar.within_polygon(location: city.area)
 
 
+
 External Libraries
 ------------------
 
@@ -200,16 +204,12 @@ It'll require more stuff installed to compile/work.
 
 
 Use GeoRuby?
-https://github.com/nofxx/geo_ruby
+https://github.com/nofxx/georuby
 
 GeoRuby is a pure Ruby Geometry Library.
 It's perfect if you want simple calculations and/or keep your stack in pure ruby.
 Albeit not full featured in maths it has a handful of methods and good import/export helpers.
 
-Use Nothing?
-
-This lib won't stand in your way.
-Write your own wrapper if you want.
 
 
 Geometry Helpers
@@ -503,21 +503,10 @@ Indexes need to be created. Execute command:
 
     rake db:mongoid:create_indexes
 
-Using mongoid-geospatial (or mongoid for that matter) without rails?
-
-    https://github.com/kristianmandrup/mongoid_indexing
-
-You need a way to create indexes easily, check out the gem above.
-
-
 
 Contributing
 ------------
 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+* Have mongod running
+* Install dev gems with `bundle install`
+* Run `rake spec`, `spec spec` or `guard`

data/lib/mongoid/geospatial.rb

@@ -5,28 +5,39 @@ require 'mongoid/geospatial/helpers/spatial'
 require 'mongoid/geospatial/helpers/sphere'
 require 'mongoid/geospatial/helpers/delegate'
 
-require 'mongoid/geospatial/fields/geometry_field'
-
-%w(point circle line box polygon).each do |type|
-  require "mongoid/geospatial/fields/#{type}"
-end
-
 module Mongoid
+
   #
   # Main Geospatial module
   #
   # include Mongoid::Geospatial
   #
   module Geospatial
+    autoload :GeometryField,      'mongoid/geospatial/geometry_field'
+
+    autoload :Point,      'mongoid/geospatial/fields/point'
+    autoload :LineString, 'mongoid/geospatial/fields/line_string'
+    autoload :Polygon,    'mongoid/geospatial/fields/polygon'
+
+    autoload :Box,        'mongoid/geospatial/fields/box'
+    autoload :Circle,     'mongoid/geospatial/fields/circle'
+
+    autoload :VERSION,    'mongoid/geospatial/version'
+
     extend ActiveSupport::Concern
 
+    # Symbols accepted as 'longitude', 'x'...
     LNG_SYMBOLS = [:x, :lon, :long, :lng, :longitude,
                    'x', 'lon', 'long', 'lng', 'longitude']
+
+    # Symbols accepted as 'latitude', 'y'...
     LAT_SYMBOLS = [:y, :lat, :latitude, 'y', 'lat', 'latitude']
 
+    # For distance spherical calculations
     EARTH_RADIUS_KM = 6371 # taken directly from mongodb
     RAD_PER_DEG = Math::PI / 180
 
+    # Earth radius in multiple units
     EARTH_RADIUS = {
       m:  EARTH_RADIUS_KM * 1000,
       km: EARTH_RADIUS_KM,
@@ -59,26 +70,42 @@ module Mongoid
       require 'mongoid/geospatial/wrappers/georuby'
     end
 
-    module ClassMethods #:nodoc:
-      def geo_field(name, options = {})
-        field name, { type: Mongoid::Geospatial::Point,
-                      spatial: true }.merge(options)
-      end
-
-      # create spatial index for given field
+    module ClassMethods
+      #
+      # Create Spatial index for given field
+      #
+      #
       # @param [String,Symbol] name
       # @param [Hash] options options for spatial_index
+      #
       # http://www.mongodb.org/display/DOCS/Geospatial+Indexing#GeospatialIndexing-geoNearCommand
+      #
       def spatial_index(name, options = {})
         spatial_fields_indexed << name
         index({ name => '2d' }, options)
       end
 
+      #
+      # Creates Sphere index for given field
+      #
+      #
+      # @param [String,Symbol] name
+      # @param [Hash] options options for spatial_index
+      #
+      # http://www.mongodb.org/display/DOCS/Geospatial+Indexing#GeospatialIndexing-geoNearCommand
       def sphere_index(name, options = {})
         spatial_fields_indexed << name
         index({ name => '2dsphere' }, options)
       end
 
+      #
+      # Creates Sphere index for given field
+      #
+      #
+      # @param [String,Symbol] name
+      # @param [Hash] options options for spatial_index
+      #
+      # http://www.mongodb.org/display/DOCS/Geospatial+Indexing#GeospatialIndexing-geoNearCommand
       def spatial_scope(field, _opts = {})
         singleton_class.class_eval do
           # define_method(:close) do |args|
@@ -87,6 +114,12 @@ module Mongoid
           end
         end
       end
+
+      private
+      def geo_field(name, options = {})
+        field name, { type: Mongoid::Geospatial::Point,
+                      spatial: true }.merge(options)
+      end
     end
   end
 end

data/lib/mongoid/geospatial/fields/{line.rb → line_string.rb}

@@ -1,6 +1,6 @@
 module Mongoid
   module Geospatial
-    class Line < GeometryField
+    class LineString < GeometryField
     end
   end
 end

data/lib/mongoid/geospatial/fields/point.rb

@@ -6,12 +6,14 @@ module Mongoid
       include Enumerable
       attr_reader :x, :y
 
-      def initialize(x, y)
-        @x, @y = x, y
+      def initialize(x, y, z = nil)
+        @x, @y, @z = x, y, z
       end
 
       # Object -> Database
       # Let's store NilClass if we are invalid.
+      #
+      # @return (Array)
       def mongoize
         return nil unless x && y
         [x, y]
@@ -27,28 +29,44 @@ module Mongoid
         yield x
         yield y
       end
-
-      def to_s
-        "#{x}, #{y}"
-      end
-
+      #
+      # Point representation as a Hash
+      #
+      # @return (Hash)
       def to_hsh(xl = :x, yl = :y)
         { xl => x, yl => y }
       end
       alias_method :to_hash, :to_hsh
 
+      # Helper for [self, radius]
       def radius(r = 1)
         [mongoize, r]
       end
 
+      # Helper for [self, radius / earth radius]
       def radius_sphere(r = 1, unit = :km)
         radius r.to_f / Mongoid::Geospatial.earth_radius[unit]
       end
 
+      #
+      # Am I valid?
+      #
+      # Validates that x & y are `Numeric`
+      #
       def valid?
         x && y && x.is_a?(Numeric) && y.is_a?(Numeric)
       end
 
+      #
+      # Point definition as string
+      #
+      # "x, y"
+      #
+      # @return [String] Point as comma separated String
+      def to_s
+        "#{x}, #{y}"
+      end
+
       #
       # Distance calculation methods. Thinking about not using it
       # One needs to choose and external lib. GeoRuby or RGeo
@@ -78,21 +96,80 @@ module Mongoid
       # end
 
       class << self
+        #
+        # Database -> Object
+        # Get it back
+        def demongoize(obj)
+          obj && Point.new(*obj)
+        end
+
+        #
+        # Object -> Database
+        # Send it to MongoDB
+        def mongoize(obj)
+          case obj
+          when Point  then obj.mongoize
+          when String then from_string(obj)
+          when Array  then from_array(obj)
+          when Hash   then from_hash(obj)
+          when NilClass then nil
+          else
+            return obj.to_xy if obj.respond_to?(:to_xy)
+            fail 'Invalid Point'
+          end
+        end
+
+        # Converts the object that was supplied to a criteria
+        # into a database friendly form.
+        def evolve(obj)
+          obj.respond_to?(:x) ? obj.mongoize : obj
+        end
+
+        private
+
+        #
+        # Sanitize a `Point` from a `String`
+        #
         # Makes life easier:
-        # "" -> nil
+        # ""         ->    []
+        # "1, 2"     ->    [1.0, 2.0]
+        # "1.1 2.2"  ->    [1.1, 2.2]
+        #
+        # @return (Array)
+        #
         def from_string(str)
           return nil if str.empty?
           str.split(/,|\s/).reject(&:empty?).map(&:to_f)
         end
 
+        #
+        # Sanitize a `Point` from an `Array`
+        #
         # Also makes life easier:
-        # [] -> nil
+        # []          ->   []
+        # [1,2]       ->   [1.0, 2.0]
+        #
+        # @return (Array)
+        #
         def from_array(ary)
           return nil if ary.empty?
-          ary[0..1].map(&:to_f)
+          ary.flatten[0..1].map(&:to_f)
         end
 
-        # Throw error on wrong hash, just for a change.
+        #
+        # Sanitize a `Point` from a `Hash`
+        #
+        # Uses Mongoid::Geospatial.lat_symbols & lng_symbols
+        #
+        # Also makes life easier:
+        # {x: 1.0, y: 2.0}       ->  [1.0, 2.0]
+        # {lat: 1.0, lon: 2.0}   ->  [1.0, 2.0]
+        # {lat: 1.0, long: 2.0}  ->  [1.0, 2.0]
+        #
+        # Throws error if hash has less than 2 items.
+        #
+        # @return (Array)
+        #
         def from_hash(hsh)
           fail 'Hash must have at least 2 items' if hsh.size < 2
           [from_hash_x(hsh), from_hash_y(hsh)]
@@ -101,40 +178,13 @@ module Mongoid
         def 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
+          fail "Hash must contain #{Mongoid::Geospatial.lat_symbols.inspect}"
         end
 
         def 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(hsh.keys[0])
-          hsh.values[0].to_f
-        end
-
-        # Database -> Object
-        def demongoize(object)
-          Point.new(*object) if object
-        end
-
-        def mongoize(object)
-          case object
-          when Point  then object.mongoize
-          when String then from_string(object)
-          when Array  then from_array(object)
-          when Hash   then from_hash(object)
-          when NilClass then nil
-          else
-            return object.to_xy if object.respond_to?(:to_xy)
-            fail 'Invalid Point'
-          end
-        end
-
-        # Converts the object that was supplied to a criteria
-        # into a database friendly form.
-        def evolve(object)
-          object.respond_to?(:x) ? object.mongoize : object
+          fail "Hash must contain #{Mongoid::Geospatial.lng_symbols.inspect}"
         end
       end # << self
     end # Point

data/lib/mongoid/geospatial/{fields/geometry_field.rb → geometry_field.rb}

@@ -1,8 +1,16 @@
 module Mongoid
   module Geospatial
+    #
     # Main Geometry Array
-    # Holds Lines/Polygons....
+    #
+    # All multi point classes inherit from this one:
+    # LineString, Polygon, MultiPoint, MultiLineString, MultiPolygon
+    #
     class GeometryField < Array
+      #
+      # Determines the multi point geometry bounding box.
+      # Useful to find map boundaries, and fit to screen.
+      #
       def bounding_box
         max_x, min_x = -Float::MAX, Float::MAX
         max_y, min_y = -Float::MAX, Float::MAX
@@ -16,24 +24,43 @@ module Mongoid
       end
       alias_method :bbox, :bounding_box
 
+      #
+      # Determines the center point of a multi point geometry.
+      # Geometry may be closed or not.
+      #
       def center_point
         min, max = *bbox
         [(min[0] + max[0]) / 2.0, (min[1] + max[1]) / 2.0]
       end
       alias_method :center, :center_point
 
+      #
+      # Generates a radius from the point
+      #
+      # @param [Numeric] r radius
+      # @return [Array]  [point, r] point and radius in mongoid format
       def radius(r = 1)
         [center, r]
       end
 
+      #
+      # Generates a spherical radius from the point
+      #
+      # point.radius(x) ->  [point, x / earth radius]
+      #
+      # @see Point#radius
+      # @return (Float)
+      #
       def radius_sphere(r = 1, unit = :km)
         radius r.to_f / Mongoid::Geospatial.earth_radius[unit]
       end
 
       class << self
+        #
         # Database -> Object
-        def demongoize(o)
-          new(o)
+        #
+        def demongoize(obj)
+          obj && new(obj)
         end
       end
     end

data/lib/mongoid/geospatial/version.rb

@@ -1,6 +1,6 @@
 module Mongoid
-  # Gem version
+  # Mongoid Geospatial version
   module Geospatial
-    VERSION = '4.0.0'
+    VERSION = '4.0.1'
   end
 end

data/lib/mongoid/geospatial/wrappers/georuby.rb

@@ -3,28 +3,36 @@ require 'geo_ruby'
 module Mongoid
   module Geospatial
     # Wrapper to GeoRuby's Point
-    class Point
+    Point.class_eval do
       # delegate :distance, to: :to_geo
 
+      #
+      # With GeoRuby support
+      #
+      # @return (GeoRuby::SimpleFeatures::Point)
       def to_geo
         return unless valid?
         GeoRuby::SimpleFeatures::Point.xy(x, y)
       end
 
+      #
+      # With GeoRuby support
+      #
+      # @return (Float)
       def geo_distance(other)
         to_geo.spherical_distance(other.to_geo)
       end
     end
 
-    # Wrapper to GeoRuby's Line
-    class Line < GeometryField
+    # Wrapper to GeoRuby's LineString
+    LineString.class_eval do
       def to_geo
         GeoRuby::SimpleFeatures::LineString.from_coordinates(self)
       end
     end
 
     # Wrapper to GeoRuby's Polygon
-    class Polygon < GeometryField
+    Polygon.class_eval do
       def to_geo
         GeoRuby::SimpleFeatures::Polygon.from_coordinates(self)
       end

data/lib/mongoid/geospatial/wrappers/rgeo.rb

@@ -4,19 +4,26 @@ require 'mongoid/geospatial/ext/rgeo_spherical_point_impl'
 module Mongoid
   module Geospatial
     # Wrapper to Rgeo's Point
-    class Point
+    Point.class_eval do
+      #
+      # With RGeo support
+      #
+      # @return (RGeo::SphericalFactory::Point)
       def to_rgeo
         RGeo::Geographic.spherical_factory.point x, y
       end
 
+      #
+      # Distance with RGeo
+      #
+      # @return (Float)
       def rgeo_distance(other)
         to_rgeo.distance other.to_rgeo
       end
     end
 
     # Rgeo's GeometryField concept
-    class GeometryField
-      private
+    GeometryField.class_eval do
 
       def points
         map do |pair|
@@ -25,18 +32,18 @@ module Mongoid
       end
     end
 
-    # Wrapper to Rgeo's Line
-    class Line < GeometryField
+    # Wrapper to Rgeo's LineString
+    LineString.class_eval do
       def to_rgeo
-        RGeo::Geographic.spherical_factory.line_string points
+        RGeo::Geographic.spherical_factory.line_string(points)
       end
     end
 
     # Wrapper to Rgeo's Polygon
-    class Polygon < GeometryField
+    Polygon.class_eval do
       def to_rgeo
-        ring = RGeo::Geographic.spherical_factory.linear_ring points
-        RGeo::Geographic.spherical_factory.polygon ring
+        ring = RGeo::Geographic.spherical_factory.linear_ring(points)
+        RGeo::Geographic.spherical_factory.polygon(ring)
       end
     end
   end

data/mongoid-geospatial.gemspec

@@ -8,7 +8,6 @@ Gem::Specification.new do |gem|
   gem.summary       = 'Mongoid Extension that simplifies MongoDB Geospatial Operations.'
   gem.homepage      = 'https://github.com/nofxx/mongoid-geospatial'
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = 'mongoid-geospatial'
@@ -16,7 +15,5 @@ Gem::Specification.new do |gem|
   gem.version       = Mongoid::Geospatial::VERSION
   gem.license       = 'MIT'
 
-  gem.add_dependency('mongoid', ['>= 3.0.0'])
-  gem.add_dependency('activemodel', ['>= 3.2'])
-  gem.add_dependency('activesupport', ['>= 3.2'])
+  gem.add_dependency('mongoid', ['>= 4.0.0'])
 end

data/spec/models/river.rb

@@ -6,7 +6,7 @@ class River
   field :name,        type: String
   field :length,      type: Integer
   field :discharge,   type: Integer
-  field :course,      type: Line,      spatial: true
+  field :course,      type: LineString,      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' }

data/spec/mongoid/geospatial/fields/{line_spec.rb → line_string_spec.rb}

@@ -1,35 +1,42 @@
 require 'spec_helper'
 
-describe Mongoid::Geospatial::Line do
+describe Mongoid::Geospatial::LineString do
   describe '(de)mongoize' do
     it 'should support a field mapped as linestring' do
       river = River.new(course: [[5, 5], [6, 5], [6, 6], [5, 6]])
-      expect(river.course).to be_a Mongoid::Geospatial::Line
+      expect(river.course).to be_a Mongoid::Geospatial::LineString
       expect(river.course).to eq([[5, 5], [6, 5], [6, 6], [5, 6]])
     end
 
+    it 'should update line string too' do
+      river = River.create!(name: 'Amazonas')
+      river.course = [[1, 1], [1, 1], [9, 9], [9, 9]]
+      river.save
+      expect(River.first.course).to eq(river.course)
+    end
+
     it 'should support a field mapped as linestring' do
       River.create!(course: [[5, 5], [6, 5], [6, 6], [5, 6]])
       expect(River.first.course).to eq([[5, 5], [6, 5], [6, 6], [5, 6]])
     end
 
     it 'should have a bounding box' do
-      geom = Mongoid::Geospatial::Line.new [[1, 5], [6, 5], [6, 6], [5, 6]]
+      geom = Mongoid::Geospatial::LineString.new [[1, 5], [6, 5], [6, 6], [5, 6]]
       expect(geom.bbox).to eq([[1, 5], [6, 6]])
     end
 
     it 'should have a center point' do
-      geom = Mongoid::Geospatial::Line.new [[1, 1], [1, 1], [9, 9], [9, 9]]
+      geom = Mongoid::Geospatial::LineString.new [[1, 1], [1, 1], [9, 9], [9, 9]]
       expect(geom.center).to eq([5.0, 5.0])
     end
 
     it 'should have a radius helper' do
-      geom = Mongoid::Geospatial::Line.new [[1, 1], [1, 1], [9, 9], [9, 9]]
+      geom = Mongoid::Geospatial::LineString.new [[1, 1], [1, 1], [9, 9], [9, 9]]
       expect(geom.radius(10)).to eq([[5.0, 5.0], 10])
     end
 
     it 'should have a radius sphere' do
-      geom = Mongoid::Geospatial::Line.new [[1, 1], [1, 1], [9, 9], [9, 9]]
+      geom = Mongoid::Geospatial::LineString.new [[1, 1], [1, 1], [9, 9], [9, 9]]
       expect(geom.radius_sphere(10)[1]).to be_within(0.001).of(0.001569)
     end
   end

data/spec/mongoid/geospatial/helpers/delegate_spec.rb

@@ -30,16 +30,16 @@ describe Mongoid::Fields do
 
     it 'should set instance methods x= and y=' do
       bus = Bus.create!(name: 'B', location: [7, 7])
-      bus.x = 9
+      bus.x = 8
       bus.y = 9
-      expect(bus.location.to_a).to eq([9, 9])
+      expect(bus.location.to_a).to eq([8, 9])
     end
 
     it 'should work fine with default values' do
       event = Event.create!(name: 'Bvent')
-      event.x = 9
+      event.x = 8
       event.y = 9
-      expect(event.location.to_a).to eq([9, 9])
+      expect(event.location.to_a).to eq([8, 9])
     end
 
     it 'should not work fine with nils' do

data/spec/mongoid/geospatial/wrappers/rgeo_spec.rb

@@ -25,7 +25,7 @@ describe 'RGeo Wrapper' do
     end
   end
 
-  describe Mongoid::Geospatial::Line do
+  describe Mongoid::Geospatial::LineString do
     it 'should not interfer with mongoid' do
       River.create!(name: 'Mississippi')
       expect(River.count).to eql(1)
@@ -99,10 +99,10 @@ describe 'RGeo Wrapper' do
         end
       end
 
-      describe Mongoid::Geospatial::Line do
+      describe Mongoid::Geospatial::LineString do
         it 'should mongoize array' do
           geom = River.create!(course: [[5, 5], [6, 5], [6, 6], [5, 6]]).course
-          expect(geom.class).to eql(Mongoid::Geospatial::Line)
+          expect(geom.class).to eql(Mongoid::Geospatial::LineString)
           expect(geom.to_rgeo.class).to eql(RGeo::Geographic::SphericalLineStringImpl)
           expect(geom.to_rgeo.to_s)
             .to eq 'LINESTRING (5.0 5.0, 6.0 5.0, 6.0 6.0, 5.0 6.0)'

data/spec/spec_helper.rb

@@ -17,9 +17,10 @@ if ENV['CI']
   # end
 end
 
+require 'rspec'
+
 require 'mongoid'
 # require "mocha"
-require 'rspec'
 require 'mongoid/geospatial'
 
 LOGGER = Logger.new($stdout)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-geospatial
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Ryan Ong
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -17,42 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.0.0
 description: Mongoid Extension that simplifies MongoDB casting and operations on spatial
   Ruby objects.
 email:
@@ -63,6 +35,8 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
+- ".hound.yml"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - Guardfile
@@ -74,10 +48,10 @@ files:
 - lib/mongoid/geospatial/ext/rgeo_spherical_point_impl.rb
 - lib/mongoid/geospatial/fields/box.rb
 - lib/mongoid/geospatial/fields/circle.rb
-- lib/mongoid/geospatial/fields/geometry_field.rb
-- lib/mongoid/geospatial/fields/line.rb
+- lib/mongoid/geospatial/fields/line_string.rb
 - lib/mongoid/geospatial/fields/point.rb
 - lib/mongoid/geospatial/fields/polygon.rb
+- lib/mongoid/geospatial/geometry_field.rb
 - lib/mongoid/geospatial/helpers/delegate.rb
 - lib/mongoid/geospatial/helpers/spatial.rb
 - lib/mongoid/geospatial/helpers/sphere.rb
@@ -97,7 +71,7 @@ files:
 - spec/models/river.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/line_string_spec.rb
 - spec/mongoid/geospatial/fields/point_spec.rb
 - spec/mongoid/geospatial/fields/polygon_spec.rb
 - spec/mongoid/geospatial/geospatial_spec.rb
@@ -148,7 +122,7 @@ test_files:
 - spec/models/river.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/line_string_spec.rb
 - spec/mongoid/geospatial/fields/point_spec.rb
 - spec/mongoid/geospatial/fields/polygon_spec.rb
 - spec/mongoid/geospatial/geospatial_spec.rb