mongoid_spacial 0.0.1 → 0.1.0

data/README.md

@@ -37,7 +37,9 @@ end
 ```
 
 Before we manipulate the data mongoid_spacial handles is what we call points.
+
 Points can be:
+
 * an unordered hash with the lat long string keys defined when setting the field (only applies for setting the field)
 * longitude latitude array in that order - [long,lat]
 * an unordered hash with latitude key(:lat, :latitude) and a longitude key(:lon, :long, :lng, :longitude)
@@ -67,20 +69,21 @@ hudson.mouth  #=> [-74.026667, 40.703056] # notice how this returned as a lng,la
 # notice how the order of lng and lat were switched. it will always come out like this when using spacial.
 ```
 Mongoid Geo has extended all built in spacial symbol extentions
+
 * near
-    River.where(:source.near => [-73.98, 40.77])
-    River.where(:source.near => [[-73.98, 40.77],5]) # sets max distance of 5
-    River.where(:source.near => {:point => [-73.98, 40.77], :max => 5}) # sets max distance of 5
-    River.where(:source.near(:sphere) => [[-73.98, 40.77],5]) # sets max distance of 5 radians
-    River.where(:source.near(:sphere) => {:point => [-73.98, 40.77], :max => 5, :unit => :km}) # sets max distance of 5 km    
-    River.where(:source.near(:sphere) => [-73.98, 40.77])
+  * River.where(:source.near => [-73.98, 40.77])
+  * River.where(:source.near => [[-73.98, 40.77],5]) # sets max distance of 5
+  * River.where(:source.near => {:point => [-73.98, 40.77], :max => 5}) # sets max distance of 5
+  * River.where(:source.near(:sphere) => [[-73.98, 40.77],5]) # sets max distance of 5 radians
+  * River.where(:source.near(:sphere) => {:point => [-73.98, 40.77], :max => 5, :unit => :km}) # sets max distance of 5 km    
+  * River.where(:source.near(:sphere) => [-73.98, 40.77])
 * within
-    River.where(:source.within(:box) => [[-73.99756,40.73083], [-73.988135,40.741404]])
-    River.where(:source.within(:box) => [ {:lat => 40.73083, :lng => -73.99756}, [-73.988135,40.741404]])
-    River.where(:source.within(:polygon) => [ [ 10, 20 ], [ 10, 40 ], [ 30, 40 ], [ 30, 20 ] ]
-    River.where(:source.within(:polygon) => { a : { x : 10, y : 20 }, b : { x : 15, y : 25 }, c : { x : 20, y : 20 } })
-    River.where(:source.within(:center) => [[-73.98, 40.77],5])         # same format as near
-    River.where(:source.within(:center_sphere) => [[-73.98, 40.77],5])  # same format as near(:sphere)
+  * River.where(:source.within(:box) => [[-73.99756,40.73083], [-73.988135,40.741404]])
+  * River.where(:source.within(:box) => [ {:lat => 40.73083, :lng => -73.99756}, [-73.988135,40.741404]])
+  * River.where(:source.within(:polygon) => [ [ 10, 20 ], [ 10, 40 ], [ 30, 40 ], [ 30, 20 ] ]
+  * River.where(:source.within(:polygon) => { a : { x : 10, y : 20 }, b : { x : 15, y : 25 }, c : { x : 20, y : 20 } })
+  * River.where(:source.within(:center) => [[-73.98, 40.77],5])         # same format as near
+  * River.where(:source.within(:center_sphere) => [[-73.98, 40.77],5])  # same format as near(:sphere)
 
 One of the most handy features we have added is geo_near finder
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/lib/mongoid_spacial/contexts/mongo.rb

@@ -2,21 +2,21 @@
 module Mongoid #:nodoc:
   module Contexts #: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_lng_lat ] center The center of where to calculate distance from
@@ -31,57 +31,29 @@ module Mongoid #:nodoc:
       #
       # @return [ Array ] Sorted Rows
       def geo_near(center, opts = {})
+        opts = self.options.merge(opts)
+        # convert point
         center = center.to_lng_lat if center.respond_to?(:to_lng_lat)
 
+        # set default opts
         if distance_multiplier = Mongoid::Spacial.earth_radius[opts.delete(:unit)]
           opts[:distance_multiplier] = distance_multiplier
         end
 
-        query = create_geo_near_query(center,opts)
-        results = klass.db.command(query)
-        if results['results'].kind_of?(Array) && results['results'].size > 0
-          rows = results['results'].collect do |result|
-            res = Mongoid::Factory.from_db(klass, result.delete('obj'))
-            res.geo = {}
-            # camel case is awkward in ruby when using variables...
-            if result['dis']
-              res.geo[:distance] = result.delete('dis').to_f
-            end
-            result.each do |key,value|
-              res.geo[key.snakecase.to_sym] = value
+        if opts.has_key?(:page)
+          opts[:page] ||= 1
+          opts[:paginator] ||= Mongoid::Spacial.paginator
+            if opts[:paginator] == :will_paginate
+              opts[:per_page] ||= klass.per_page
+            elsif opts[:paginator] == :kaminari
+              opts[:per_page] ||= Kaminari.config.default_per_page
+            else
+              opts[:per_page] ||= 25
             end
-            # dist_options[:formula] = opts[:formula] if opts[:formula]
-            opts[:calculate] = klass.spacial_fields_indexed if klass.spacial_fields_indexed.kind_of?(Array) && opts[:calculate] == true
-            if opts[:calculate]
-              opts[:calculate] = [opts[:calculate]] unless opts[:calculate].kind_of? Array
-              opts[:calculate] = opts[:calculate].map(&:to_sym) & geo_fields
-              if klass.spacial_fields_indexed.kind_of?(Array) && klass.spacial_fields_indexed.size == 1
-                primary = klass.spacial_fields_indexed.first
-              end
-              opts[:calculate].each do |key|
-                key = (key.to_s+'_distance').to_s
-                res.geo[key] = res.distance_from(key,center, opts[:distance_multiplier])
-                res.geo[:distance] = res.geo[key] if primary && key == primary
-              end
-            end
-            res
-          end
-        else
-          rows = []
-        end
-        # if opts.has_key?(:page) || opts[:paginator]
-        #   opts[:paginator] ||= Mongoid::Spacial::Config.paginator
-        #   if opts[:paginator] == :kaminari
-
-        #   elsif opts[:paginator] == :will_paginate
-        #   end
-        # end
-
-        if self.options[:skip] && rows.size > self.options[:skip]
-          rows[self.options[:skip]..rows.size-1]
-        else
-          rows
         end
+        query = create_geo_near_query(center,opts)
+        results = klass.db.command(query)
+        Mongoid::Spacial::GeoNear.new(klass,results,opts)
       end
 
       private
@@ -90,14 +62,16 @@ module Mongoid #:nodoc:
         # minimum query
         query = {
           :geoNear  => klass.to_s.tableize,
-          :near     => center, 
+          :near     => center,
         }
 
         # create limit and use skip
-        if opts[:num] 
-          query['num']         = (self.options[:skip] || 0) + opts[:num].to_i          
-        elsif self.options[:limit]
-          query['num']         = (self.options[:skip] || 0) + self.options[:limit]
+        if opts[:num]
+          query['num']         = (opts[:skip] || 0) + opts[:num].to_i
+        elsif opts[:limit]
+          query['num']         = (opts[:skip] || 0) + opts[:limit]
+        elsif opts[:page]
+          query['num'] = (opts[:page] * opts[:per_page])
         end
 
         # allow the use of complex werieis
@@ -112,7 +86,7 @@ module Mongoid #:nodoc:
           query['maxDistance'] = query['maxDistance']/opts[:distance_multiplier] if opts[:distance_multiplier]
         end
 
-        if klass.db.connection.server_version >= '1.7'          
+        if klass.db.connection.server_version >= '1.7'
           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

data/lib/mongoid_spacial/field_option.rb

@@ -16,7 +16,7 @@ field.option :spacial do |model,field,options|
 
     define_method field.name do
       output = self[field.name] || [nil,nil]
-      output = (options[:return_array]) ? lng_lat_a : {lng_meth => output[0], lat_meth => output[0]}
+      output = (options[:return_array]) ? lng_lat_a : {lng_meth => output[0], lat_meth => output[1]}
       return options[:class].new(output) if options[:class]
       output
     end
@@ -29,7 +29,7 @@ field.option :spacial do |model,field,options|
       end
       self[field.name]=arg
       return arg[0..1] if options[:return_array]
-      return h = {lng_meth => arg[0], lat_meth => arg[0]} if options[:class].blank?
+      return h = {lng_meth => arg[0], lat_meth => arg[1]} if options[:class].blank?
       options[:class].new(h)
     end
   end

data/lib/mongoid_spacial/spacial/core_ext.rb

@@ -14,14 +14,14 @@ class Hash
     v = (Mongoid::Spacial.lat_symbols & self.keys).first
     return self[v] if !v.nil? && self[v]
     raise "Hash must contain #{Mongoid::Spacial.lat_symbols.inspect} if ruby version is less than 1.9" if RUBY_VERSION.to_f < 1.9
-    raise "Hash cannot contain #{Mongoid::Spacial.lng_symbols.inspect} as the second item if there is no #{Mongoid::Spacial.lat_symbols.inspect}" if Mongoid::Geo.lng_symbols.index(self.keys[1])    
+    raise "Hash cannot contain #{Mongoid::Spacial.lng_symbols.inspect} as the second item if there is no #{Mongoid::Spacial.lat_symbols.inspect}" if Mongoid::Spacial.lng_symbols.index(self.keys[1])    
     self.values[1]
   end
 
   def to_lng
     v = (Mongoid::Spacial.lng_symbols & self.keys).first
     return self[v] if !v.nil? && self[v]
-    raise "Hash cannot contain #{Mongoid::Spacial.lat_symbols.inspect} as the first item if there is no #{Mongoid::Spacial.lng_symbols.inspect}" if Mongoid::Geo.lat_symbols.index(self.keys[0])
+    raise "Hash cannot contain #{Mongoid::Spacial.lat_symbols.inspect} as the first item if there is no #{Mongoid::Spacial.lng_symbols.inspect}" if Mongoid::Spacial.lat_symbols.index(self.keys[0])
     self.values[0]
   end
 end 

data/lib/mongoid_spacial/spacial/formulas.rb

@@ -1,9 +1,12 @@
 module Mongoid
   module Spacial
     module Formulas
-      RAD_PER_DEG = 0.017453293
+      RAD_PER_DEG = Math::PI/180
+
+      def self.n_vector(point1,point2)
+        p1 = point1.map{|deg| deg * RAD_PER_DEG}
+        p2 = point2.map{|deg| deg * RAD_PER_DEG}
 
-      def n_vector(p1,p2)
         sin_x1 = Math.sin(p1[0])
         cos_x1 = Math.cos(p1[0])
 
@@ -19,26 +22,20 @@ module Mongoid
         cross_prod =  (cos_y1*cos_x1 * cos_y2*cos_x2) +
           (cos_y1*sin_x1 * cos_y2*sin_x2) +
           (sin_y1        * sin_y2)
-        Math.acos(cross_prod)
-      end
 
-      def haversine(p1,p2)
-        lon1,lat1=p1
-        lon2,lat2=p2
+        return cross_prod > 0 ? 0 : Math::PI if (cross_prod >= 1 || cross_prod <= -1) 
 
-        dlon = lon2 - lon1
-        dlat = lat2 - lat1
-
-        dlon_rad = dlon * RAD_PER_DEG
-        dlat_rad = dlat * RAD_PER_DEG
+        Math.acos(cross_prod)
+      end
 
-        lat1_rad = lat1 * RAD_PER_DEG
-        lon1_rad = lon1 * RAD_PER_DEG
+      def self.haversine(point1,point2)
+        p1 = point1.map{|deg| deg * RAD_PER_DEG}
+        p2 = point2.map{|deg| deg * RAD_PER_DEG}
 
-        lat2_rad = lat2 * RAD_PER_DEG
-        lon2_rad = lon2 * RAD_PER_DEG
+        dlon = p2[0] - p1[0]
+        dlat = p2[1] - p1[1]
 
-        a = (Math.sin(dlat_rad/2))**2 + Math.cos(lat1_rad) * Math.cos(lat2_rad) * (Math.sin(dlon_rad/2))**2
+        a = (Math.sin(dlat/2))**2 + Math.cos(p1[1]) * Math.cos(p2[1]) * (Math.sin(dlon/2))**2
 
         2 * Math.atan2( Math.sqrt(a), Math.sqrt(1-a))
       end

data/lib/mongoid_spacial/spacial/geo_near.rb

@@ -0,0 +1,84 @@
+module Mongoid
+  module Spacial
+    class GeoNear < Array
+      attr_reader :stats
+
+      def initialize(klass,results,opts = {})
+        raise "class must include Mongoid::Spacial::Document" unless klass.respond_to?(:spacial_fields_indexed)
+        @klass, @stats,@opts = klass,results['stats'],opts
+
+        @_original_array = results['results'].collect do |result|
+          res = Mongoid::Factory.from_db(klass, result.delete('obj'))
+          res.geo = {}
+          # camel case is awkward in ruby when using variables...
+          if result['dis']
+            res.geo[:distance] = result.delete('dis').to_f
+          end
+          result.each do |key,value|
+            res.geo[key.snakecase.to_sym] = value
+          end
+          # dist_options[:formula] = opts[:formula] if opts[:formula]
+          opts[:calculate] = klass.spacial_fields_indexed if klass.spacial_fields_indexed.kind_of?(Array) && opts[:calculate] == true
+          if opts[:calculate]
+            opts[:calculate] = [opts[:calculate]] unless opts[:calculate].kind_of? Array
+            opts[:calculate] = opts[:calculate].map(&:to_sym) & geo_fields
+            if klass.spacial_fields_indexed.kind_of?(Array) && klass.spacial_fields_indexed.size == 1
+              primary = klass.spacial_fields_indexed.first
+            end
+            opts[:calculate].each do |key|
+              key = (key.to_s+'_distance').to_sym
+              res.geo[key] = res.distance_from(key,center, opts[:distance_multiplier])
+              res.geo[:distance] = res.geo[key] if primary && key == primary
+            end
+          end
+          res
+        end
+
+        if opts[:page]
+          start = (opts[:page]-1)*opts[:per_page] # assuming current_page is 1 based.
+          super(@_original_array[start, opts[:per_page]])
+        elsif opts[:skip] && @_original_array.size > opts[:skip]
+          super(@_original_array[opts[:skip]..-1])
+        else
+          super(@_original_array)
+        end
+      end
+
+      def current_page
+        @opts[:page]
+      end
+
+      def num_pages
+        @stats['nscanned']/@opts[:per_page]
+      end
+      alias_method :total_pages, :num_pages
+
+      def out_of_bounds?
+        current_page > total_pages
+      end
+
+      def limit_value
+        @opts[:per_page]
+      end
+      alias_method :per_page, :limit_value
+
+      def offset
+        (current_page - 1) * per_page
+      end
+
+      # current_page - 1 or nil if there is no previous page
+      def previous_page
+        current_page > 1 ? (current_page - 1) : nil
+      end
+
+      # current_page + 1 or nil if there is no next page
+      def next_page
+        current_page < total_pages ? (current_page + 1) : nil
+      end
+
+      def total_entries
+        @stats['nscanned']
+      end
+    end
+  end
+end

data/lib/mongoid_spacial/spacial.rb

@@ -1,9 +1,10 @@
 require 'mongoid_spacial/spacial/core_ext'
+require 'mongoid_spacial/spacial/formulas'
 module Mongoid
   module Spacial
-    autoload :Formulas,          'mongoid_spacial/spacial/formulas'
     autoload :Document,          'mongoid_spacial/spacial/document'
-    
+    autoload :GeoNear,           'mongoid_spacial/spacial/geo_near'
+
     EARTH_RADIUS_KM = 6371 # taken directly from mongodb
 
     EARTH_RADIUS = {
@@ -12,7 +13,7 @@ module Mongoid
       :mi => EARTH_RADIUS_KM*0.621371192, # taken directly from mongodb
       :ft => EARTH_RADIUS_KM*5280*0.621371192,
     }
-    
+
     LNG_SYMBOLS = [:x, :lon, :long, :lng, :longitude]
     LAT_SYMBOLS = [:y, :lat, :latitude]
 
@@ -33,5 +34,8 @@ module Mongoid
 
     mattr_accessor :distance_formula
     @@distance_formula = :n_vector
+
+    mattr_accessor :paginator
+    @@paginator = :kaminari
   end
 end

data/mongoid_spacial.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_spacial}
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Ryan Ong}]
-  s.date = %q{2011-06-22}
+  s.date = %q{2011-06-23}
   s.description = %q{A Mongoid Extention that simplifies and adds support for MongoDB Geo Spacial Calculations.}
   s.email = %q{ryanong@gmail.com}
   s.extra_rdoc_files = [
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
     "lib/mongoid_spacial/spacial/core_ext.rb",
     "lib/mongoid_spacial/spacial/document.rb",
     "lib/mongoid_spacial/spacial/formulas.rb",
+    "lib/mongoid_spacial/spacial/geo_near.rb",
     "mongoid_spacial.gemspec",
     "spec/config/mongod.conf",
     "spec/config/mongoid.yml",
@@ -116,10 +117,11 @@ Gem::Specification.new do |s|
     "spec/models/wiki_page.rb",
     "spec/spec_helper.rb",
     "spec/support/authentication.rb",
-    "spec/unit/mongoid_spacial/criterion/complex_spec.rb",
-    "spec/unit/mongoid_spacial/criterion/inclusion_spec.rb",
-    "spec/unit/mongoid_spacial/criterion/near_spacial_spec.rb",
-    "spec/unit/mongoid_spacial/criterion/within_spacial_spec.rb"
+    "spec/unit/mongoid/criterion/complex_spec.rb",
+    "spec/unit/mongoid/criterion/inclusion_spec.rb",
+    "spec/unit/mongoid/criterion/near_spacial_spec.rb",
+    "spec/unit/mongoid/criterion/within_spacial_spec.rb",
+    "spec/unit/mongoid/spacial/formulas_spec.rb"
   ]
   s.homepage = %q{http://github.com/ryanong/mongoid_spacial}
   s.licenses = [%q{MIT}]

data/spec/functional/mongoid/contexts/mongo_spec.rb

@@ -1,97 +1,78 @@
 require "spec_helper"
 
 describe Mongoid::Contexts::Mongo do
+  describe "#geo_near" do
 
-  before do
-    Bar.delete_all
-    Bar.create_indexes
-  end
-  
-  let!(:munich) do
-    Bar.create(:location => [45, 11], :name => 'Munich')
-  end
+    before do
+      Bar.delete_all
+      Bar.create_indexes
+    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
 
-  let!(:berlin) do
-    Bar.create(:location => [46, 12], :name => 'Berlin')
-  end
-  describe "geo_near" do
     it "should work with specifying specific center and different location attribute on collction" do
-      location = [-47,23.5]
-      near = Bar.geo_near(location)
-      near.should == [munich,berlin]
-      near.first.geo[:distance].should > 0
+      Bar.geo_near(lax.location, :spherical => true).should == [lax, jfk]
+      Bar.geo_near(jfk.location, :spherical => true).should == [jfk, lax]
     end
 
     describe 'option :num' do
       it "should limit number of results to 1" do
-        location = [-47,23.5]
-        Bar.geo_near(location, :num => 1).size.should == 1
+        Bar.geo_near(jfk.location, :num => 1).size.should == 1
       end
     end
-    
+
     describe 'option :maxDistance' do
-      it "should limit on maximum distance" do
-        location = [45.1, 11.1]
-        # db.runCommand({ geo_near : "points", near :[45.1, 11.1]}).results;
-        # dis: is 0.14141869255648362  and  1.2727947855285668 
-        Bar.geo_near(location, :max_distance => 0.2).should == [munich]
+      it "should get 1 item" do
+        Bar.geo_near(lax.location, :spherical => true, :max_distance => 2465/Mongoid::Spacial.earth_radius[:mi]).size.should == 1
       end
+      it "should get 2 items" do
+        Bar.geo_near(lax.location, :spherical => true, :max_distance => 2480/Mongoid::Spacial.earth_radius[:mi]).size.should == 2
+      end
+
     end
-    
-    describe 'option :distanceMultiplier' do
+
+    describe 'option :distance_multiplier' do
       it "should multiply returned distance with multiplier" do
-        location = [45.1, 11.1]
-        Bar.geo_near(location, :distance_multiplier => 4).first.geo[:distance].should > 0
+          Bar.geo_near(lax.location, :spherical => true, :distance_multiplier=> Mongoid::Spacial.earth_radius[:mi]).second.geo[:distance].to_i.should be_within(1).of(2469)
       end
     end
-    
+
     describe 'option :unit' do
       it "should multiply returned distance with multiplier" do
-        location = [45.1, 11.1]
-        distance = Bar.geo_near(location, :unit => :mi).first.geo[:distance]
-        distance.should > 559
-        distance.should < 560
+          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
-        location = [45.1, 11.1]
-        near = Bar.geo_near(location, :max_distance => 570, :unit => :mi)
-        near.size.should == 1
-        near.first.should == munich
-      end
-
-      it "should convert max_distance to radians with unit" do
-        location = [45.1, 11.1]
-        Bar.geo_near(location, :max_distance => 570, :distance_multiplier => 4, :unit => :mi).first.should == munich
+          Bar.geo_near(lax.location, :spherical => true, :max_distance => 2465, :unit => :mi).size.should == 1
       end
 
     end
 
     describe 'option :query' do
       it "should filter using extra query option" do
-        location = [45.1, 11.1]
         # two record in the collection, only one's name is Munich
-        Bar.geo_near(location, :query => {:name => 'Munich'}).size.should == 1
+        Bar.geo_near(jfk.location, :query => {:name => jfk.name}).should == [jfk]
       end
     end
 
     describe 'criteria chaining' do
       it "should filter by where" do
-        location = [45.1, 11.1]
-        # two record in the collection, only one's name is Munich
-        a = Bar.where(:name => 'Munich')
-        # p a.selector
-        # a.geo_near(location).size.should == 1
+        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
-        location = [-47,23.5]
-        Bar.skip(1).geo_near(location).size.should == 1
+        Bar.skip(1).geo_near(jfk.location).size.should == 1
       end
 
       it 'should limit 1' do
-        location = [-47,23.5]
-        Bar.limit(1).geo_near(location).size.should == 1
+        Bar.limit(1).geo_near(jfk.location).size.should == 1
       end
 
     end

data/spec/unit/mongoid/spacial/formulas_spec.rb

@@ -0,0 +1,37 @@
+require "spec_helper"
+
+describe Mongoid::Spacial::Formulas do
+    context "#n_vector" do
+      it {
+        bna = [-86.67, 36.12]
+        lax = [-118.40, 33.94]
+        dist1 = Mongoid::Spacial::Formulas.n_vector(bna, lax)
+        dist2 = Mongoid::Spacial::Formulas.n_vector(lax, bna)
+
+        # target is 0.45306
+        dist1.should be_within(0.00001).of(0.45306)
+        dist2.should be_within(0.00001).of(0.45306)
+      }
+      it {
+        # actual distance 2471.788
+        jfk = [-73.77694444, 40.63861111 ]
+        lax = [-118.40, 33.94]
+
+        dist = Mongoid::Spacial::Formulas.n_vector(jfk, lax) * Mongoid::Spacial.earth_radius[:mi]
+        dist.should be_within(1).of(2469)
+      }
+    end
+
+    context "#haversine" do
+      it {
+        # actual distance 2471.788
+        jfk = [-73.77694444, 40.63861111 ]
+        lax = [-118.40, 33.94]
+
+        dist = Mongoid::Spacial::Formulas.haversine(jfk, lax) * Mongoid::Spacial.earth_radius[:mi]
+        dist.should be_within(1).of(2469)
+      }
+    end
+
+end
+

metadata

@@ -2,7 +2,7 @@
 name: mongoid_spacial
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ryan Ong
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-22 00:00:00 Z
+date: 2011-06-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongoid
@@ -166,6 +166,7 @@ files:
 - lib/mongoid_spacial/spacial/core_ext.rb
 - lib/mongoid_spacial/spacial/document.rb
 - lib/mongoid_spacial/spacial/formulas.rb
+- lib/mongoid_spacial/spacial/geo_near.rb
 - mongoid_spacial.gemspec
 - spec/config/mongod.conf
 - spec/config/mongoid.yml
@@ -242,10 +243,11 @@ files:
 - spec/models/wiki_page.rb
 - spec/spec_helper.rb
 - spec/support/authentication.rb
-- spec/unit/mongoid_spacial/criterion/complex_spec.rb
-- spec/unit/mongoid_spacial/criterion/inclusion_spec.rb
-- spec/unit/mongoid_spacial/criterion/near_spacial_spec.rb
-- spec/unit/mongoid_spacial/criterion/within_spacial_spec.rb
+- spec/unit/mongoid/criterion/complex_spec.rb
+- spec/unit/mongoid/criterion/inclusion_spec.rb
+- spec/unit/mongoid/criterion/near_spacial_spec.rb
+- spec/unit/mongoid/criterion/within_spacial_spec.rb
+- spec/unit/mongoid/spacial/formulas_spec.rb
 homepage: http://github.com/ryanong/mongoid_spacial
 licenses: 
 - MIT
@@ -259,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4261020674425124733
+      hash: -2362332534301507743
       segments: 
       - 0
       version: "0"