mongoid_geospatial 2.0.0 → 2.2.0

data/spec/mongoid_geospatial/geospatial_spec.rb

@@ -16,12 +16,97 @@ describe Mongoid::Geospatial do
 
   end
 
+  #
+  # TODO: Model helpers
+  # describe "#geo_near" do
 
-  context "Included" do
+  #   before do
+  #     Bar.create_indexes
+  #   end
 
-    # HO
-  end
+  #   let!(:jfk) do
+  #     Bar.create(:name => 'jfk', :location => [-73.77694444, 40.63861111 ])
+  #   end
+
+  #   let!(:lax) 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
+  #     pending
+  #     Bar.geo_near(lax.location, :spherical => true).should == [lax, jfk]
+  #   end
+
+  #   context ':maxDistance' do
+  #     it "should get 1 item" do
+  #       Bar.geo_near(lax.location, :spherical => true, :max_distance => 2465/Mongoid::Geospatial.earth_radius[:mi]).size.should == 1
+  #     end
+
+  #   end
+
+  #     context ':distance_multiplier' do
+  #       it "should multiply returned distance with multiplier" do
+  #         Bar.geo_near(lax.location, :spherical => true, :distance_multiplier=> Mongoid::Geospatial.earth_radius[:mi]).second.geo[:distance].to_i.should be_within(1).of(2469)
+  #       end
+  #     end
+
+  #     context ':unit' do
+  #       it "should multiply returned distance with multiplier" do
+  #         Bar.geo_near(lax.location, :spherical => true, :unit => :mi).second.geo[:distance].to_i.should be_within(1).of(2469)
+  #       end
+
+  #       it "should convert max_distance to radians with unit" do
+  #         Bar.geo_near(lax.location, :spherical => true, :max_distance => 2465, :unit => :mi).size.should == 1
+  #       end
+
+  #     end
+
+  #     context ':query' do
+  #       it "should filter using extra query option" do
+  #         # two record in the collection, only one's name is Munich
+  #         Bar.geo_near(jfk.location, :query => {:name => jfk.name}).should == [jfk]
+  #       end
+  #     end
+
+  #   end
+
+  #   context 'criteria chaining' do
+  #     it "should filter by where" do
+  #       Bar.where(:name => jfk.name).geo_near(jfk.location).should == [jfk]
+  #       Bar.any_of({:name => jfk.name},{:name => lax.name}).geo_near(jfk.location).should == [jfk,lax]
+  #     end
+
+  #     it 'should skip 1' do
+  #       Bar.skip(1).geo_near(jfk.location).size.should == 1
+  #     end
+
+  #     it 'should limit 1' do
+  #       Bar.limit(1).geo_near(jfk.location).size.should == 1
+  #     end
+  #   end
+  # end
+
+  # context ':paginate' do
+  #   before do
+  #     Bar.create_indexes
+  #     50.times do
+  #       Bar.create({:location => [rand(360)-180,rand(360)-180]})
+  #     end
+  #   end
+
+  #   [nil,1,2].each do |page|
+  #     it "page=#{page} should have 25" do
+  #       Bar.geo_near([1,1], :page => page).size.should == 25
+  #     end
+  #   end
 
+  #   it "page=3 should have 0" do
+  #     Bar.geo_near([1,1], :page => 20).size.should == 0
+  #   end
 
+  #   it "per_page=5" do
+  #     Bar.geo_near([1,1], :page => 1, :per_page => 5).size.should == 5
+  #   end
+  # end
 
 end

data/spec/mongoid_geospatial/wrappers/rgeo_spec.rb

@@ -0,0 +1,43 @@
+require "spec_helper"
+
+describe Mongoid::Geospatial::Point do
+
+  it "should not inferfer with mongoid" do
+    Bar.create!(name: "Moe's")
+    Bar.count.should eql(1)
+  end
+
+  describe "queryable" do
+
+    before do
+      Bar.create_indexes
+      Mongoid::Geospatial.use_rgeo
+    end
+
+    describe "(de)mongoize" 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.x.should be_within(0.1).of(10)
+        geom.to_geo.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)
+      end
+
+      it "should accept an RGeo object" do
+        pending
+        point = RGeo::Geographic.spherical_factory.point 1, 2
+        bar = Bar.create!(location: point)
+        bar.location.x.should be_within(0.1).of(1)
+        bar.location.y.should be_within(0.1).of(2)
+      end
+
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ $LOAD_PATH.unshift(MODELS)
 $LOAD_PATH.unshift(SUPPORT)
 
 require "mongoid"
-require "mocha"
+# require "mocha"
 require "rspec"
 require "mongoid_geospatial"
 
@@ -27,12 +27,10 @@ if RUBY_VERSION >= '1.9.2'
   YAML::ENGINE.yamler = 'syck'
 end
 
-puts "version: #{Mongoid::VERSION}"
-
-require 'mongoid_setup'
+puts "Running with Mongoid v#{Mongoid::VERSION}"
 
 Mongoid.configure do |config|
-  Mongoid::VersionSetup.configure config
+  config.connect_to('mongoid_geo_test')
 end
 
 # Autoload every model for the test suite that sits in spec/app/models.
@@ -44,27 +42,13 @@ end
 Dir[ File.join(SUPPORT, "*.rb") ].each { |file| require File.basename(file) }
 
 def bson_object_id_class
-  Mongoid::VERSION > '3' ? Moped::BSON:: ObjectId : BSON::ObjectId
+  Moped::BSON::ObjectId
 end
 
 RSpec.configure do |config|
-  config.mock_with(:mocha)
+  # config.mock_with(:mocha)
 
   config.before(:each) do
     Mongoid.purge!
-    # Mongoid.database.collections.each do |collection|
-    #   unless collection.name =~ /^system\./
-    #     collection.remove
-    #   end
-    # end
   end
-
-  # We filter out the specs that require authentication if the database has not
-  # had the mongoid user set up properly.
-  # user_configured = Support::Authentication.configured?
-  # warn(Support::Authentication.message) unless user_configured
-
-  # config.filter_run_excluding(:config => lambda { |value|
-  #   return true if value == :user && !user_configured
-  # })
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geospatial
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
@@ -157,23 +157,17 @@ files:
 - README.md
 - Rakefile
 - lib/mongoid_geospatial.rb
-- lib/mongoid_geospatial/contextual/mongo.rb
-- lib/mongoid_geospatial/criteria.rb
-- lib/mongoid_geospatial/criterion/complex.rb
-- lib/mongoid_geospatial/criterion/inclusion.rb
-- lib/mongoid_geospatial/criterion/near_spatial.rb
-- lib/mongoid_geospatial/criterion/within_spatial.rb
+- lib/mongoid_geospatial/extensions/core_ext.rb
 - lib/mongoid_geospatial/extensions/rgeo_spherical_point_impl.rb
-- lib/mongoid_geospatial/extensions/symbol.rb
 - lib/mongoid_geospatial/field_option.rb
+- lib/mongoid_geospatial/fields/geometry_field.rb
 - lib/mongoid_geospatial/fields/line_string.rb
 - lib/mongoid_geospatial/fields/point.rb
 - lib/mongoid_geospatial/fields/polygon.rb
-- lib/mongoid_geospatial/finders.rb
 - lib/mongoid_geospatial/geospatial.rb
-- lib/mongoid_geospatial/geospatial/core_ext.rb
-- lib/mongoid_geospatial/geospatial/geo_near_results.rb
 - lib/mongoid_geospatial/version.rb
+- lib/mongoid_geospatial/wrappers/georuby.rb
+- lib/mongoid_geospatial/wrappers/rgeo.rb
 - mongoid_geospatial.gemspec
 - spec/models/address.rb
 - spec/models/bar.rb
@@ -182,16 +176,13 @@ files:
 - spec/models/person.rb
 - spec/models/phone.rb
 - spec/models/river.rb
-- spec/mongoid_geospatial/contextual/mongo_spec.rb
-- spec/mongoid_geospatial/criterion/complex_spec.rb
-- spec/mongoid_geospatial/criterion/inclusion_spec.rb
-- spec/mongoid_geospatial/criterion/near_spatial_spec.rb
-- spec/mongoid_geospatial/criterion/within_spatial_spec.rb
+- spec/mongoid_geospatial/extensions/core_ext_spec.rb
+- spec/mongoid_geospatial/field_option_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/geo_near_results_spec.rb
 - spec/mongoid_geospatial/geospatial_spec.rb
-- spec/mongoid_geospatial/mongoid_geospatial_spec.rb
+- spec/mongoid_geospatial/wrappers/rgeo_spec.rb
 - spec/spec_helper.rb
 - spec/support/authentication.rb
 - spec/support/mongod.conf
@@ -229,16 +220,13 @@ test_files:
 - spec/models/person.rb
 - spec/models/phone.rb
 - spec/models/river.rb
-- spec/mongoid_geospatial/contextual/mongo_spec.rb
-- spec/mongoid_geospatial/criterion/complex_spec.rb
-- spec/mongoid_geospatial/criterion/inclusion_spec.rb
-- spec/mongoid_geospatial/criterion/near_spatial_spec.rb
-- spec/mongoid_geospatial/criterion/within_spatial_spec.rb
+- spec/mongoid_geospatial/extensions/core_ext_spec.rb
+- spec/mongoid_geospatial/field_option_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/geo_near_results_spec.rb
 - spec/mongoid_geospatial/geospatial_spec.rb
-- spec/mongoid_geospatial/mongoid_geospatial_spec.rb
+- spec/mongoid_geospatial/wrappers/rgeo_spec.rb
 - spec/spec_helper.rb
 - spec/support/authentication.rb
 - spec/support/mongod.conf

data/lib/mongoid_geospatial/contextual/mongo.rb

@@ -1,118 +0,0 @@
-# encoding: utf-8
-module Mongoid #:nodoc:
-  module Contextual #:nodoc:
-    class Mongo #:nodoc:
-
-      # Fetches rows from the data base sorted by distance.
-      # In MongoDB versions 1.7 and above it returns a distance.
-      # Uses all criteria chains except without, only, asc, desc, order_by
-      #
-      # @example Minimal Query
-      #
-      #   Address.geo_near([70,40])
-      #
-      # @example Chained Query
-      #
-      #   Address.where(:state => 'ny').geo_near([70,40])
-      #
-      # @example Calc Distances Query
-      #
-      #   Address.geo_near([70,40], :max_distance => 5, :unit => 5)
-      #
-      # @param [ Array, Hash, #to_xy ] center The center of where to calculate distance from
-      # @param [ Hash ] opts the options to query with
-      # @options opts [Integer] :num The number of rows to fetch
-      # @options opts [Hash] :query The query to filter the rows by, accepts
-      # @options opts [Numeric] :distance_multiplier this is multiplied against the calculated distance
-      # @options opts [Numeric] :max_distance The max distance of a row that should be returned in :unit(s)
-      # @options opts [Numeric, :km, :k, :mi, :ft] :unit automatically sets :distance_multiplier and converts :max_distance
-      # @options opts [true,false] :spherical Will determine the distance either by spherical calculation or flat calculation
-      # @options opts [TrueClass,Array<Symbol>] :calculate Which extra fields to calculate distance for in ruby, if set to TrueClass it will calculate all spatial fields
-      #
-      # @return [ Array ] Sorted Rows
-      def geo_near(center, opts = {})
-        opts = self.criteria.options.merge(opts)
-        # convert point
-        center = center.to_xy if center.respond_to?(:to_xy)
-        center = [center.x, center.y] if center.respond_to?(:x)
-
-        # set default opts
-        opts[:skip] ||= 0
-
-        if unit = Mongoid::Geospatial.earth_radius[opts[:unit]]
-          opts[:unit] = (opts[:spherical]) ? unit : unit * Mongoid::Geospatial::RAD_PER_DEG
-        end
-
-        if unit = Mongoid::Geospatial.earth_radius[opts[:distance_multiplier]]
-          opts[:distance_multiplier] = (opts[:spherical]) ? unit : unit * Mongoid::Geospatial::RAD_PER_DEG
-        end
-
-        opts[:distance_multiplier] = opts[:unit] if opts[:unit].kind_of?(Numeric)
-
-        # setup paging.
-        if opts.has_key?(:page)
-          opts[:page] ||= 1
-          opts[:paginator] ||= Mongoid::Geospatial.paginator()
-
-           if opts[:per_page].blank?
-             opts[:per_page] = case opts[:paginator]
-                              when :will_paginate
-                                @document.per_page
-                              when :kaminari
-                                Kaminari.config.default_per_page
-                              else
-                                Mongoid::Geospatial.default_per_page
-                              end
-             opts[:per_page] = opts[:per_page].to_i
-           end
-
-        end
-        opts[:query] = create_geo_near_query(center,opts)
-        results = klass.mongo_session.command(opts[:query])
-
-        Mongoid::Geospatial::GeoNearResults.new(klass,results,opts)
-      end
-
-      private
-
-      def create_geo_near_query(center,opts)
-        # minimum query
-        query = {}
-        query[:geoNear] = klass.collection_name
-        query[:near] = center
-
-        # create limit and use skip
-        if opts[:num]
-          query['num']         = opts[:skip].to_i + opts[:num].to_i
-        elsif opts[:limit]
-          query['num']         = opts[:skip].to_i + opts[:limit].to_i
-        elsif opts[:page]
-          query['num'] = opts[:skip].to_i + (opts[:page].to_i * opts[:per_page].to_i)
-        end
-
-        # allow the use of complex werieis
-        if opts[:query]
-          query['query']         = self.criteria.where(opts[:query]).selector
-        elsif self.criteria.selector != {}
-          query['query']         = self.criteria.selector
-        end
-
-        if opts[:max_distance]
-          query['maxDistance'] = opts[:max_distance].to_f
-          query['maxDistance'] = query['maxDistance']/opts[:unit].to_f if opts[:unit]
-        end
-
-        if opts[:unique_docs]
-            query['uniqueDocs'] = true
-        end
-
-        query['spherical']  = true if opts[:spherical]
-
-        # mongodb < 1.7 returns degrees but with earth flat. in Mongodb 1.7 you can set sphere and let mongodb calculate the distance in Miles or KM
-        # for mongodb < 1.7 we need to run Haversine first before calculating degrees to Km or Miles. See below.
-        query['distanceMultiplier'] = opts[:distance_multiplier].to_f if opts[:distance_multiplier]
-        query
-      end
-    end
-  end
-end

data/lib/mongoid_geospatial/criteria.rb

@@ -1,10 +0,0 @@
-require 'mongoid_geospatial/criterion/complex'
-require 'mongoid_geospatial/criterion/near_spatial'
-require 'mongoid_geospatial/criterion/within_spatial'
-
-
-module Mongoid #:nodoc:
-  class Criteria
-    delegate :geo_near, :to => :context
-  end
-end

data/lib/mongoid_geospatial/criterion/complex.rb

@@ -1,26 +0,0 @@
-# encoding: utf-8
-module Mongoid #:nodoc:
-  module Criterion #:nodoc:
-    # Complex criterion are used when performing operations on symbols to get
-    # get a shorthand syntax for where clauses.
-    #
-    # Example:
-    #
-    # <tt>{ :field => { "$lt" => "value" } }</tt>
-    # becomes:
-    # <tt> { :field.lt => "value }</tt>
-    class Complex
-      
-      attr_accessor :key, :operator
-      
-      def initialize(opts = {})
-        @key, @operator = opts[:key], opts[:operator]
-      end
-      
-
-      def to_mongo_query v
-        {"$#{operator}" => v}
-      end
-    end
-  end
-end

data/lib/mongoid_geospatial/criterion/inclusion.rb

@@ -1,14 +0,0 @@
-# encoding: utf-8
-# module Mongoid #:nodoc:
-#   module Criterion #:nodoc:
-#     module Inclusion
-#       def near(attributes = {})
-#         update_selector(attributes, "$near")
-#       end
-
-#       def near_sphere(attributes = {})
-#         update_selector(attributes, "$near")
-#       end
-#     end
-#   end
-# end