mongoid-geospatial 3.9.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93a8802d5a645b356af69d76585004ed4e080a16
-  data.tar.gz: 0ec2e2b4b87d28bf04af6d2ed0ef7d1ff49aa412
+  metadata.gz: 863dde3c031d08ba8c4a11aaf0708da5ab9e5a86
+  data.tar.gz: a0355bef1d9eaa010f880dd7556208ab4bc0aacb
 SHA512:
-  metadata.gz: 5142eaf9e0aed0a78e2eb581b7d23b14c50b7050baf030f2e23d66aa9b50806a60ebd87b692f1cb9ba2790a5b8b6aa128480980e2efa3c43fce0d38709493032
-  data.tar.gz: 1e678afee79c30fd9965c7773d7cb2673f2c0a44d3a23a66cac69082b12cb86e914048a54f438f02322d32d22c3f7273f0893fa4a0d414bad59e4a8f4977d58b
+  metadata.gz: a058a1e3350787f81ccedd4179b46708fa5c3edb59a7b83ed4a3d9a8d67c86810d75c0b5ce062d87ab0c33e8dbb6ae290af913d82b15e5067a9321e2a415d799
+  data.tar.gz: 52ae29a334d47ec9f011ee0afc30adf2e31bac9d78dcf126a509be035eb0eebf8a7078c4805584a51335102ee567a53b486debff427cbd69f6c2a176dc0dfce2

data/.travis.yml

@@ -3,17 +3,23 @@ bundler_args: --without development
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - 2.2.0
   - ruby-head
-  - rbx-19mode
   - jruby
   - jruby-head
+  - rbx-2
+
 jdk:
   - oraclejdk7
   - openjdk7
+
 env: JRUBY_OPTS="--server -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -J-Xms512m -J-Xmx1024m"
+
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+
 services:
   - mongodb

data/Gemfile

@@ -1,30 +1,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'
 
-group :development do
-  gem 'pry'
-  gem 'yard'
-end
+gem 'nokogiri'
+gem 'dbf'
+gem 'rgeo'
+gem 'georuby'
 
-group :test do
-  gem 'dbf'
+if ENV['CI']
+  gem 'coveralls', require: false
+else
   gem 'rspec'
-  gem 'nokogiri'
-  gem 'rgeo'
-  gem 'georuby'
-
-  if ENV['CI']
-    gem 'coveralls', require: false
-    gem 'yard'
-  else
-    gem 'rubocop'
-    gem 'fuubar'
-    gem 'guard'
-    gem 'guard-rubocop'
-    gem 'guard-rspec'
-    # gem 'rb-fsevent'
-  end
+  gem 'rubocop'
+  gem 'fuubar'
+  gem 'guard'
+  gem 'guard-rubocop'
+  gem 'guard-rspec'
 end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2013 Mongoid Geospatial Authors
+Copyright (c) 2009-2015 Mongoid Geospatial Authors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -11,6 +11,13 @@ Removing some trash, improving and adding support for RGeo and GeoRuby.
 Version 3+ is going to be beta testing, when it's ready I'll release v4,
 So the major version stays the same as mongoid.
 
+** Gem name: 'mongoid-geospatial' (notice the hyphen) **
+
+The name of this gem has changed.
+Please change the underscore to a hyphen.
+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)
@@ -514,6 +521,3 @@ Contributing
 * 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.
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/nofxx/mongoid-geospatial/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/bench/bench

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+#
+# Just for fun
+#
+$: << File.expand_path("../../lib", __FILE__)
+
+require 'mongoid/geospatial'
+
+Mongoid.configure do |config|
+  config.connect_to("mongoid_geospatial_bench")
+end
+
+Mongoid::Geospatial.with_georuby!
+Mongoid::Geospatial.with_rgeo!
+
+class NoGeo
+  include Mongoid::Document
+  field :name
+end
+
+class Rider
+  include Mongoid::Document
+  include Mongoid::Geospatial
+  field :name
+end
+
+class Cafe
+  include Mongoid::Document
+  include Mongoid::Geospatial
+  field :name
+  field :spot, type: Point
+end
+
+Mongoid.purge!
+# [NoGeo, Rider, Cafe].each(&:delete_all)
+
+Benchmark.bmbm do |b|
+  [100, 1000, 3000].each do |t|
+    nogeo, cafes = [], []
+    b.report("#{t} W NoGeo") do
+      t.times { nogeo << NoGeo.create(name: 'Boring').id }
+    end
+    b.report("#{t} W Rider") { t.times { Rider.create(name: 'Munro') } }
+
+    b.report("#{t} W Cafe ") do
+      t.times { cafes << Cafe.create(name: 'Bacco', spot: [3,3]).id }
+    end
+    # puts "---"
+    b.report("#{t} R NoGeo") { nogeo.each { |id| NoGeo.find(id) }}
+    # b.report("#{t} R Rider") { t.times { Rider.create(name: 'Munro') } }
+    b.report("#{t} R Cafe ") { cafes.each { |id| Cafe.find(id) }}
+    b.report("#{t} R Cafe Georuby") { cafes.each { |id| Cafe.find(id).spot.to_geo }}
+    b.report("#{t} R Cafe RGeo") { cafes.each { |id| Cafe.find(id).spot.to_rgeo }}
+  end
+  b.report("R Cafe GeoRuby") do
+    cafe = Cafe.first
+    1_000_000.times { cafe.spot.to_geo }
+  end
+  b.report("R Cafe RGeo") do
+    cafe = Cafe.first
+    1_000_000.times { cafe.spot.to_rgeo }
+  end
+end

data/lib/mongoid/geospatial.rb

@@ -1,13 +1,13 @@
 require 'mongoid'
-require 'active_support/core_ext/string/inflections'
-require 'active_support/concern'
+# require 'active_support/core_ext/string/inflections'
+# require 'active_support/concern'
 require 'mongoid/geospatial/helpers/spatial'
 require 'mongoid/geospatial/helpers/sphere'
 require 'mongoid/geospatial/helpers/delegate'
 
 require 'mongoid/geospatial/fields/geometry_field'
 
-%w(point circle box line polygon).each do |type|
+%w(point circle line box polygon).each do |type|
   require "mongoid/geospatial/fields/#{type}"
 end
 
@@ -20,16 +20,17 @@ module Mongoid
   module Geospatial
     extend ActiveSupport::Concern
 
-    LNG_SYMBOLS = [:x, :lon, :long, :lng, :longitude, 'x', 'lon', 'long', 'longitude']
+    LNG_SYMBOLS = [:x, :lon, :long, :lng, :longitude,
+                   'x', 'lon', 'long', 'lng', 'longitude']
     LAT_SYMBOLS = [:y, :lat, :latitude, 'y', 'lat', 'latitude']
 
     EARTH_RADIUS_KM = 6371 # taken directly from mongodb
     RAD_PER_DEG = Math::PI / 180
 
     EARTH_RADIUS = {
+      m:  EARTH_RADIUS_KM * 1000,
       km: EARTH_RADIUS_KM,
-      m: EARTH_RADIUS_KM * 1000,
-      mi: EARTH_RADIUS_KM * 0.621371192, # taken directly from mongodb
+      mi: EARTH_RADIUS_KM * 0.621371192,
       ft: EARTH_RADIUS_KM * 5280 * 0.621371192,
       sm: EARTH_RADIUS_KM * 0.53995680345572 # sea mile
     }
@@ -60,7 +61,8 @@ module Mongoid
 
     module ClassMethods #:nodoc:
       def geo_field(name, options = {})
-        field name, { type: Mongoid::Geospatial::Point, spatial: true }.merge(options)
+        field name, { type: Mongoid::Geospatial::Point,
+                      spatial: true }.merge(options)
       end
 
       # create spatial index for given field
@@ -88,19 +90,3 @@ module Mongoid
     end
   end
 end
-
-# model.instance_eval do # wont work
-# #   define_method "near_#{field.name}" do |*args|
-# #     self.where(field.name => args)
-# #   end
-# end
-
-# define_method "near_#{field.name}" do |*args|
-#   queryable.where(field.near_sphere => args)
-# end
-
-# model.class_eval do
-#   define_method "close_to" do |*args|
-#     queriable.where(field.name.near_sphere => *args)
-#   end
-# end

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

@@ -6,8 +6,7 @@ module Mongoid
       include Enumerable
       attr_reader :x, :y
 
-      def initialize(x = nil, y = nil)
-        return unless x && y
+      def initialize(x, y)
         @x, @y = x, y
       end
 

data/lib/mongoid/geospatial/helpers/delegate.rb

@@ -9,7 +9,6 @@ Mongoid::Fields.option :delegate do |model, field, options|
   y_meth = options[:y] || :y
 
   model.instance_eval do
-
     define_method x_meth do
       self[field.name][0]
     end
@@ -25,6 +24,5 @@ Mongoid::Fields.option :delegate do |model, field, options|
     define_method "#{y_meth}=" do |arg|
       self[field.name][1] = arg
     end
-
   end
 end

data/lib/mongoid/geospatial/helpers/spatial.rb

@@ -7,13 +7,10 @@ Mongoid::Fields.option :spatial do |model, field, _options|
   # options = {} unless options.kind_of?(Hash)
 
   model.class_eval do
-
     spatial_fields << field.name.to_sym
     spatial_fields_indexed << field.name.to_sym
 
     # Create 2D index
     spatial_index field.name
-
   end
-
 end

data/lib/mongoid/geospatial/helpers/sphere.rb

@@ -7,12 +7,10 @@ Mongoid::Fields.option :sphere do |model, field, _options|
   # options = {} unless options.kind_of?(Hash)
 
   model.class_eval do
-
     spatial_fields << field.name.to_sym
     spatial_fields_indexed << field.name.to_sym
 
     # Create 2Dsphere index
     sphere_index field.name
-
   end
 end

data/lib/mongoid/geospatial/version.rb

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

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

@@ -4,7 +4,7 @@ module Mongoid
   module Geospatial
     # Wrapper to GeoRuby's Point
     class Point
-      delegate :distance, to: :to_geo
+      # delegate :distance, to: :to_geo
 
       def to_geo
         return unless valid?

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

@@ -1,5 +1,5 @@
 require 'rgeo'
-require 'mongoid_geospatial/ext/rgeo_spherical_point_impl'
+require 'mongoid/geospatial/ext/rgeo_spherical_point_impl'
 
 module Mongoid
   module Geospatial

data/spec/models/event.rb

@@ -9,7 +9,8 @@ class Event
   field :location, type: Point, delegate: true, default: [7, 7]
 
   def self.each_day(start_date, end_date)
-    groups = only(:date).asc(:date).where(:date.gte => start_date, :date.lte => end_date).group
+    groups = only(:date).asc(:date)
+             .where(:date.gte => start_date, :date.lte => end_date).group
     groups.each do |hash|
       yield(hash['date'], hash['group'])
     end

data/spec/models/river.rb

@@ -3,14 +3,14 @@ class River
   include Mongoid::Document
   include Mongoid::Geospatial
 
-  field :name,              type: String
-  field :length,            type: Integer
-  field :discharge,         type: Integer
-  field :course,            type: Line,      spatial: true
+  field :name,        type: String
+  field :length,      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
-  field :mouth,             type: Point,    spatial: { lat: 'latitude', lng: 'longitude' }
-  field :mouth_array,       type: Array,    spatial: { return_array: true }
+  field :source,      type: Point,     spatial: true
+  field :mouth,       type: Point,    spatial: { lat: 'latitude', lng: 'longitude' }
+  field :mouth_array, type: Array,    spatial: { return_array: true }
 
   # simplified spatial indexing
   # you can only index one field in mongodb < 1.9

data/spec/mongoid/geospatial/fields/box_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 describe Mongoid::Geospatial::Box do
-
   it 'should work' do
     alarm = Alarm.new(area: [[1, 2], [3, 4]])
     expect(alarm.area).to be_a Mongoid::Geospatial::Box
   end
-
 end

data/spec/mongoid/geospatial/fields/circle_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 describe Mongoid::Geospatial::Circle do
-
   it 'should work' do
     alarm = Alarm.new(radius: [[1, 2], 3])
     expect(alarm.radius).to be_a Mongoid::Geospatial::Circle
   end
-
 end

data/spec/mongoid/geospatial/fields/line_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Mongoid::Geospatial::Line 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
@@ -34,7 +32,5 @@ describe Mongoid::Geospatial::Line do
       geom = Mongoid::Geospatial::Line.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
-
 end

data/spec/mongoid/geospatial/fields/point_spec.rb

@@ -1,40 +1,37 @@
 require 'spec_helper'
 
 describe Mongoid::Geospatial::Point do
+  describe "Moe's Bar" do
+    let(:bar) { Bar.create!(name: "Moe's") }
 
-  it 'should not interfer with mongoid' do
-    Bar.create!(name: "Moe's")
-    expect(Bar.count).to eql(1)
-  end
+    it 'should not interfer with mongoid' do
+      expect(bar.class.count).to eql(1)
+    end
 
-  it 'should not fail if point is nil' do
-    bar = Bar.create!(name: "Moe's")
-    expect(bar.location).to be_nil
-  end
+    it 'should not fail if point is nil' do
+      expect(bar.location).to 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)
-    expect(bar.save).to be_truthy
-    expect(Bar.first.location.x).to eq(8)
-  end
+    it 'should set point methodically' do
+      bar.location = Mongoid::Geospatial::Point.new(8, 8)
+      expect(bar.save).to be_truthy
+      expect(Bar.first.location.x).to 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 = '2.99,3.99'
-    expect(bar.location.mongoize).to eq([2.99, 3.99])
-  end
+    it 'should set point with comma separated text' do
+      bar.location = '2.99,3.99'
+      expect(bar.location.mongoize).to 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 = '2.99 3.99'
-    expect(bar.location.mongoize).to eq([2.99, 3.99])
-  end
+    it 'should set point with space separated text' do
+      bar.location = '2.99 3.99'
+      expect(bar.location.mongoize).to 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 = '2.99 ,  3.99'
-    expect(bar.location.mongoize).to eq([2.99, 3.99])
+    it 'should set point with space comma separated text' do
+      bar.location = '2.99 ,  3.99'
+      expect(bar.location.mongoize).to eq([2.99, 3.99])
+    end
   end
 
   it 'should set point to nil' do
@@ -62,7 +59,6 @@ describe Mongoid::Geospatial::Point do
   end
 
   describe 'methods' do
-
     let(:bar) { Bar.create!(location: [3, 2]) }
 
     it 'should have a .to_a' do
@@ -92,17 +88,14 @@ describe Mongoid::Geospatial::Point do
     it 'should have a radius sphere helper in miles' do
       expect(bar.location.radius_sphere(1, :mi)[1]).to be_within(0.0001).of(0.00025)
     end
-
   end
 
   describe 'queryable' do
-
     before do
       Bar.create_indexes
     end
 
     describe ':near :near_sphere' do
-
       let!(:berlin) do
         Bar.create(name: :berlin, location: [52.30, 13.25])
       end
@@ -131,13 +124,13 @@ describe Mongoid::Geospatial::Point do
 
       it 'returns the documents sorted closest to furthest sphere' do
         person = Person.new(location: [41.23, 2.9])
-        expect(Bar.near_sphere(location: jim.location))
+        expect(Bar.near_sphere(location: person.location))
           .to eq([paris, prague, berlin])
       end
 
       it 'returns the documents sorted closest to furthest sphere' do
         person = Person.new(location: [41.23, 2.9])
-        expect(Bar.where(:location.near_sphere => jim.location))
+        expect(Bar.where(:location.near_sphere => person.location))
           .to eq([paris, prague, berlin])
       end
 
@@ -145,7 +138,6 @@ describe Mongoid::Geospatial::Point do
         expect(Bar.near(location: jim.location).max_distance(location: 10).to_a)
           .to eq([paris]) # , prague, berlin ]
       end
-
     end
 
     describe ':within_circle :within_spherical_circle' do
@@ -169,41 +161,49 @@ describe Mongoid::Geospatial::Point do
         Person.new(location: [-73.98, 40.75])
       end
 
-      it 'returns the documents within a center_circle' do
+      it 'returns the documents within a circle' do
+        pending 'Moped'
         expect(Bar.where(:location.within_circle =>
                          [elvis.location, 250.0 /
                            Mongoid::Geospatial::EARTH_RADIUS_KM]).to_a)
           .to eq([mile1])
       end
 
-      it 'returns the documents within a center_circle' do
+      it 'returns the documents within a circle' do
+        pending 'Moped'
         expect(Bar.where(:location.within_circle => [elvis.location,
-                           500.0 / Mongoid::Geospatial::EARTH_RADIUS_KM])
+                                                     500.0 / Mongoid::Geospatial::EARTH_RADIUS_KM])
                  .to_a).to include(mile3)
       end
 
-      it 'returns the documents within a center_sphere' do
+      it 'returns the documents within a spherical circle' do
+        pending 'Moped'
         expect(Bar.where(:location.within_spherical_circle =>
                          [elvis.location, 0.0005]).to_a).to eq([mile1])
       end
 
-      it 'returns the documents within a center_sphere' do
+      it 'returns the documents within a spherical circle 2' do
+        pending 'Moped'
         expect(Bar.where(:location.within_spherical_circle =>
                          [elvis.location, 0.5]).to_a).to include(mile9)
       end
 
+      it 'returns the documents within a center circle' do
+        pending 'Moped'
+        expect(Bar.where(:location.within_center_circle =>
+                         [elvis.location, 0.0005]).to_a).to eq([mile1])
+      end
+
       it 'returns the documents within a box' do
+        pending 'Moped'
         expect(Bar.within_box(location: [elvis.location,
-                                elvis.location.map(&:ceil)]).to_a)
+                                         elvis.location.map(&:ceil)]).to_a)
           .to eq([mile3])
       end
-
     end
-
   end
 
   describe '(de)mongoize' do
-
     it 'should mongoize array' do
       bar = Bar.new(location: [10, -9])
       expect(bar.location.class).to eql(Mongoid::Geospatial::Point)
@@ -236,19 +236,13 @@ describe Mongoid::Geospatial::Point do
     # geom.to_geo
 
     describe 'with rgeo' do
-
       describe 'instantiated' do
-
         let(:bar) { Bar.create!(name: 'Vitinho', location: [10, 10]) }
 
         it 'should demongoize to rgeo' do
           expect(bar.location.class).to eql(Mongoid::Geospatial::Point)
         end
-
       end
-
     end
-
   end
-
 end

data/spec/mongoid/geospatial/fields/polygon_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Mongoid::Geospatial::Polygon do
-
   describe '(de)mongoize' do
-
     it 'should support a field mapped as polygon' do
       farm = Farm.new(area: [[5, 5], [6, 5], [6, 6], [5, 6]])
       expect(farm.area).to be_a Mongoid::Geospatial::Polygon
@@ -38,13 +36,10 @@ describe Mongoid::Geospatial::Polygon do
     describe 'with rgeo' do
       # farm.area.should be_a RGeo::Geographic::SphericalPolygonImpl
     end
-
   end
 
   describe 'query' do
-
     context ':box, :polygon' do
-
       before do
         Farm.create_indexes
       end
@@ -58,27 +53,28 @@ describe Mongoid::Geospatial::Polygon do
       end
 
       it 'returns the documents within a box' do
+        pending 'Moped'
         expect(Farm.where(:geom.within_polygon =>
                           ranch.area).to_a).to eq([ranch])
       end
 
       it 'returns the documents within a polygon' do
+        pending 'Moped'
         expect(Farm.where(:geom.within_polygon =>
                           farm.area).to_a).to eq([farm])
       end
 
       it 'returns the documents within a center' do
+        pending 'Moped'
         expect(Farm.where(:geom.within_circle =>
                           [ranch.geom, 0.4]).first).to eq(ranch)
       end
 
       it 'returns the documents within a center_sphere' do
+        pending 'Moped'
         expect(Farm.where(:geom.within_spherical_circle =>
                           [ranch.geom, 0.1]).first).to eq(ranch)
       end
-
     end
-
   end
-
 end

data/spec/mongoid/geospatial/geospatial_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Mongoid::Geospatial do
-
   context 'Class Stuff' do
-
     it 'should have an lng_symbols accessor' do
       expect(Mongoid::Geospatial.lng_symbols).to be_instance_of Array
       expect(Mongoid::Geospatial.lng_symbols).to include :x
@@ -13,11 +11,9 @@ describe Mongoid::Geospatial do
       expect(Mongoid::Geospatial.lat_symbols).to be_instance_of Array
       expect(Mongoid::Geospatial.lat_symbols).to include :y
     end
-
   end
 
   context 'Creating indexes' do
-
     it 'should create a 2d index' do
       Bar.create_indexes
       expect(Bar.collection.indexes[location: '2d']).not_to be_nil
@@ -27,11 +23,9 @@ describe Mongoid::Geospatial do
       Alarm.create_indexes
       expect(Alarm.collection.indexes[spot: '2dsphere']).not_to be_nil
     end
-
   end
 
   context '#nearby 2d' do
-
     before do
       Bar.create_indexes
     end
@@ -44,14 +38,12 @@ describe Mongoid::Geospatial do
       Bar.create(name: 'lax', location: [-118.40, 33.94])
     end
 
-    it 'should work with specifying specific center and different location attribute on collction' do
+    it 'should work specifing center and different location' do
       expect(Bar.nearby(lax.location)).to eq([lax, jfk])
     end
-
   end
 
   context '#nearby 2dsphere' do
-
     before do
       Alarm.create_indexes
     end
@@ -139,5 +131,4 @@ describe Mongoid::Geospatial do
     #     Bar.geo_near([1,1], :page => 1, :per_page => 5).size.should == 5
     #   end
   end
-
 end

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

@@ -1,15 +1,12 @@
 require 'spec_helper'
 
 describe Mongoid::Fields do
-
   context 'delegate' do
-
     before do
       Bus.create_indexes
     end
 
     context 'x, y helpers' do
-
       let(:bus) { Bus.create!(name: 'Far', location: [7, 8]) }
 
       it 'should set instance method x' do
@@ -29,18 +26,19 @@ describe Mongoid::Fields do
         bus.y = 9
         expect(bus.y).to eq(9)
       end
-
     end
 
     it 'should set instance methods x= and y=' do
       bus = Bus.create!(name: 'B', location: [7, 7])
-      bus.x = 9; bus.y = 9
+      bus.x = 9
+      bus.y = 9
       expect(bus.location.to_a).to eq([9, 9])
     end
 
     it 'should work fine with default values' do
       event = Event.create!(name: 'Bvent')
-      event.x = 9; event.y = 9
+      event.x = 9
+      event.y = 9
       expect(event.location.to_a).to eq([9, 9])
     end
 
@@ -48,7 +46,5 @@ describe Mongoid::Fields do
       bus = Bus.create!(name: 'B', location: nil)
       expect { bus.x = 9; bus.y = 9 }.to raise_error(NoMethodError)
     end
-
   end
-
 end

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

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Mongoid::Fields do
-
   context 'spatial' do
-
     before do
       Bar.create_indexes
     end
@@ -27,10 +25,8 @@ describe Mongoid::Fields do
     #   near = Bar.create!(name: "Near", location: [2,2])
     #   Bar.near_location([1,1]).should eq([near, far])
     # end
-
   end
 
   context 'geom' do
   end
-
 end

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

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe Mongoid::Fields do
-
   context 'spatial' do
-
     before do
       Alarm.create_indexes
     end
@@ -20,7 +18,5 @@ describe Mongoid::Fields do
       far  = Alarm.create!(name: 'Far', spot: [7, 7])
       expect(far.spot).to be_instance_of(Mongoid::Geospatial::Point)
     end
-
   end
-
 end

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

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Mongoid::Geospatial::Point do
-
   it 'should not interfer with mongoid' do
     Place.create!(name: "Moe's")
     expect(Place.count).to eql(1)
@@ -13,14 +12,12 @@ describe Mongoid::Geospatial::Point do
   end
 
   describe 'queryable' do
-
     before do
       Mongoid::Geospatial.with_georuby!
       Place.create_indexes
     end
 
     describe '(de)mongoize' do
-
       it 'should mongoize array' do
         geom = Place.new(location: [10, -9]).location
         expect(geom.class).to eql(Mongoid::Geospatial::Point)
@@ -49,17 +46,17 @@ describe Mongoid::Geospatial::Point do
       end
 
       describe 'simple features' do
-
         it 'should mongoize lines' do
           river = River.new(course: [[1, 2], [3, 4], [5, 6]])
-          expect(river.course.to_geo).to be_instance_of(GeoRuby::SimpleFeatures::LineString)
+          expect(river.course.to_geo)
+            .to be_instance_of(GeoRuby::SimpleFeatures::LineString)
         end
 
         it 'should mongoize polygon' do
           farm = Farm.new(area: [[1, 2], [3, 4], [5, 6]])
-          expect(farm.area.to_geo).to be_instance_of(GeoRuby::SimpleFeatures::Polygon)
+          expect(farm.area.to_geo)
+            .to be_instance_of(GeoRuby::SimpleFeatures::Polygon)
         end
-
       end
     end
   end

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

@@ -1,26 +1,6 @@
 require 'spec_helper'
 
 describe 'RGeo Wrapper' do
-
-  before(:all) do
-    # Mongoid::Geospatial.send(:remove_const, 'Point')
-    # Mongoid::Geospatial.send(:remove_const, 'Polygon')
-    # Mongoid::Geospatial.send(:remove_const, 'Line')
-
-    # load "#{File.dirname(__FILE__)}/../../../lib/mongoid/geospatial/fields/point.rb"
-    # load "#{File.dirname(__FILE__)}/../../../lib/mongoid/geospatial/fields/polygon.rb"
-    # load "#{File.dirname(__FILE__)}/../../../lib/mongoid/geospatial/fields/line.rb"
-
-    # Object.send(:remove_const, 'Bar')
-    # load "#{File.dirname(__FILE__)}/../../models/bar.rb"
-
-    # Object.send(:remove_const, 'Farm')
-    # load "#{File.dirname(__FILE__)}/../../models/farm.rb"
-
-    # Object.send(:remove_const, 'River')
-    # load "#{File.dirname(__FILE__)}/../../models/river.rb"
-  end
-
   describe Mongoid::Geospatial::Point do
     it 'should not interfer with mongoid' do
       Bar.create!(name: "Moe's")
@@ -39,9 +19,9 @@ describe 'RGeo Wrapper' do
       expect(Farm.count).to eql(1)
     end
 
-    it 'should not respond to to_geo before loading external' do
+    it 'should respond to to_geo' do
       farm = Farm.create!(area: [[5, 5], [6, 5], [6, 6], [5, 6]])
-      expect(farm.area).not_to respond_to(:to_geo)
+      expect(farm.area).to respond_to(:to_geo)
     end
   end
 
@@ -51,14 +31,13 @@ describe 'RGeo Wrapper' do
       expect(River.count).to eql(1)
     end
 
-    it 'should not respond to to_geo before loading external' do
+    it 'should respond to to_geo before loading external' do
       river = River.create!(course: [[5, 5], [6, 5], [6, 6], [5, 6]])
-      expect(river.course).not_to respond_to(:to_geo)
+      expect(river.course).to respond_to(:to_geo)
     end
   end
 
   describe 'queryable' do
-
     before do
       Mongoid::Geospatial.with_rgeo!
       Bar.create_indexes
@@ -67,20 +46,32 @@ describe 'RGeo Wrapper' do
     end
 
     describe '(de)mongoize' do
-
       describe Mongoid::Geospatial::Point do
         it 'should mongoize array' do
           geom = Bar.new(location: [10, -9]).location
           expect(geom.class).to eql(Mongoid::Geospatial::Point)
-          expect(geom.to_rgeo.class).to eql(RGeo::Geographic::SphericalPointImpl)
           expect(geom.x).to be_within(0.1).of(10)
+        end
+
+        it 'should wrap to georuby' do
+          geom = Bar.new(location: [10, -9]).location
+          expect(geom.to_geo.class)
+            .to eql(GeoRuby::SimpleFeatures::Point)
+          expect(geom.to_geo.y).to be_within(0.1).of(-9)
+        end
+
+        it 'should wrap to rgeo' do
+          geom = Bar.new(location: [10, -9]).location
+          expect(geom.to_rgeo.class)
+            .to eql(RGeo::Geographic::SphericalPointImpl)
           expect(geom.to_rgeo.y).to be_within(0.1).of(-9)
         end
 
         it 'should mongoize hash' do
           geom = Bar.new(location: { x: 10, y: -9 }).location
           expect(geom.class).to eql(Mongoid::Geospatial::Point)
-          expect(geom.to_rgeo.class).to eql(RGeo::Geographic::SphericalPointImpl)
+          expect(geom.to_rgeo.class)
+            .to eql(RGeo::Geographic::SphericalPointImpl)
         end
 
         it 'should accept an RGeo object' do
@@ -92,8 +83,9 @@ 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)
-          expect(bar.location.rgeo_distance(bar2.location).to_i).to be_within(1).of(3_978_262)
+          bar2 = Bar.create! location: [-118.40, 33.94] # ,:unit=>:mi
+          expect(bar.location.rgeo_distance(bar2.location).to_i)
+            .to be_within(1).of(3_978_262)
         end
       end
 

data/spec/spec_helper.rb

@@ -22,21 +22,8 @@ require 'mongoid'
 require 'rspec'
 require 'mongoid/geospatial'
 
-# These environment variables can be set if wanting to test against a database
-# that is not on the local machine.
-ENV['MONGOID_SPEC_HOST'] ||= 'localhost'
-ENV['MONGOID_SPEC_PORT'] ||= '27018'
-
-# These are used when creating any connection in the test suite.
-HOST = ENV['MONGOID_SPEC_HOST']
-PORT = ENV['MONGOID_SPEC_PORT'].to_i
-
 LOGGER = Logger.new($stdout)
 
-if RUBY_VERSION >= '1.9.2'
-  YAML::ENGINE.yamler = 'syck'
-end
-
 puts "Running with Mongoid v#{Mongoid::VERSION}"
 
 Mongoid.configure do |config|
@@ -51,10 +38,6 @@ end
 
 Dir[File.join(SUPPORT, '*.rb')].each { |file| require File.basename(file) }
 
-def bson_object_id_class
-  Moped::BSON::ObjectId
-end
-
 RSpec.configure do |config|
   # config.mock_with(:mocha)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-geospatial
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Ryan Ong
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -69,6 +69,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- bench/bench
 - lib/mongoid/geospatial.rb
 - lib/mongoid/geospatial/ext/rgeo_spherical_point_impl.rb
 - lib/mongoid/geospatial/fields/box.rb
@@ -130,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Mongoid Extension that simplifies MongoDB Geospatial Operations.