mongoid_geo 0.5.4.1 → 0.6.0

data/spec/mongoid/geo/geo_near_to_model_spec.rb

@@ -0,0 +1,74 @@
+require "mongoid/spec_helper"
+
+Address.collection.create_index([['location', Mongo::GEO2D]], :min => -180, :max => 180)
+
+describe Mongoid::Geo::Near do
+
+  let(:address) do
+    Address.new        
+  end  
+  
+  before(:each) do
+    Address.create(:location => [45, 11], :city => 'Munich')
+    Address.create(:location => [46, 12], :city => 'Berlin')
+    Address.create(:location => [46, 11], :city => 'Berlin')
+  end
+
+  describe "geoNear" do
+    describe 'Mongo DB version 1.7+ uses internal distance calculations' do
+      it "should return models with distances not calculated by haversine" do
+        Mongoid::Geo.mongo_db_version = 1.7
+        
+        address.location = "23.5, -47"
+        results = Address.geoNear(address, :location)
+        results.first.lat.should == 45
+        
+        # if Mongo DB < 1.7 installed but Mongoid Geo configured for 1.7 
+        #models.map(&:distance).first.should == nil
+
+        # if Mongo DB 1.7 installed but Mongoid Geo configured for 1.7 
+        results.map(&:distance).first.should be_within(0.0001).of(61.85669195123871) 
+      end
+    end
+    
+    context "mongo_db_version is 1.5" do
+      
+      before(:each) do
+        Mongoid::Geo.mongo_db_version = 1.5
+        address.location = "23.5, -47"
+        @hashies = Address.geoNear(address, :location)
+      end
+      describe '#to_models' do
+        it "should return models" do
+          pending "I'm current useing mongodb > 1.5,so can't make this pass"
+          models = @hashies.to_models
+          models.first.distance.should == @hashies.first.distance
+          models.first.lat.should == 45
+          models.map(&:distance).first.should > 1
+        end
+      end
+
+      describe '#to_model' do
+        it "should return model" do
+          pending "I'm current useing mongodb > 1.5,so can't make this pass"
+          hashie = @hashies.first
+
+          my_model = hashie.to_model       
+
+          my_model.distance.should == hashie.distance
+
+          my_model.lat.should == 45      
+          first_dist = my_model.distance
+          my_model.distance.should > 1
+          lambda {my_model.distance = 500}.should raise_error
+          my_model.distance.should > 1        
+
+          address.location = "27.5, 12"        
+          my_model = Address.geoNear(address, :location, :num => 1).first.to_model
+          my_model.distance.should_not == first_dist        
+        end
+      end
+    end
+   
+  end
+end

data/spec/mongoid/geo/geo_spherical_mode_spec.rb

@@ -0,0 +1,137 @@
+require "mongoid/spec_helper"
+
+describe 'Mongoid Spherical mode' do
+
+  let(:address) do
+    Address.new        
+  end
+  
+  let(:point) do
+    b = (Struct.new :lat, :lng).new
+    b.lat = 72
+    b.lng = -44
+    b
+  end  
+
+  let(:location) do
+    a = (Struct.new :location).new
+    a.location = point
+    a
+  end  
+
+  let(:position) do
+    a = (Struct.new :position).new
+    a.position = point
+    a
+  end  
+
+
+  let(:other_point) do
+    b = (Struct.new :latitude, :longitude).new
+    b.latitude = 72
+    b.longitude = -44
+    b
+  end  
+
+
+  describe "Special geo Array setter" do
+    it "should split a String into parts and convert to floats" do
+      Mongoid::Geo.spherical.should be_false
+      Mongoid::Geo.spherical_mode do
+        Mongoid::Geo.spherical.should be_true
+        Mongoid::Geo.lat_index.should == 1
+        Mongoid::Geo.lng_index.should == 0
+        address.location = "23.5, -47"
+        address.location.should == [23.5, -47].reverse
+      end
+      Mongoid::Geo.spherical.should be_false
+    end    
+    
+    context 'Spherical mode' do
+      before :each do
+        Mongoid::Geo.spherical = true
+      end
+    
+      after :each do
+        Mongoid::Geo.spherical = false
+      end
+      
+      it "should split a String into parts and convert to floats" do
+        address.location = "23.5, -47"
+        address.location.should == [23.5, -47].reverse
+      end
+      
+      it "should work with point Hash, keys :lat, :lng" do
+        address.location = {:lat => 23.5, :lng => -49}
+        address.location.should == [23.5, -49].reverse
+      end
+    
+      it "should work with point Hash, keys :latitude, :longitude" do
+        address.location = {:latitude => 23.5, :longitude => -49}
+        address.location.should == [23.5, -49].reverse
+      end
+    
+    
+      it "should work with point hashes using the first point only" do
+        address.location = [{:lat => 23.5, :lng => -49}, {:lat => 72, :lng => -49}]
+        address.location.should == [23.5, -49].reverse
+      end
+    
+      it "should work with point object has #lat and #lng methods" do
+        address.location = point
+        address.location.should == [72, -44].reverse
+      end 
+      
+      it 'should work with point object that has location attribute' do
+        address.location = location
+        address.location.should == [72, -44].reverse
+      end
+
+      it 'should work with point object that has position attribute add should add #lat and #lng methods' do
+        address.location = position
+        address.location.should == [72, -44].reverse
+        address.lat.should == 72
+        address.lng.should == -44
+      end
+
+      it 'should work with point object that has position attribute and should add #latitude and #longitude methods' do
+        address.pos = position
+        address.pos.should == [72, -44].reverse
+        address.latitude.should == 72
+        address.latitude = 45
+        address.latitude.should == 45
+        address.longitude.should == -44
+      end
+
+      it 'should work with point object that has #latitude and #longitude methods' do
+        address.location = other_point
+        address.location.should == [72, -44].reverse
+      end
+      
+      it "should work with point objects using the first point only" do
+        address.location = [point, {:lat => 72, :lng => -49}]
+        address.location.should == [72, -44].reverse
+      end
+      
+      it "should drop nils" do
+        address.location = [nil, point, {:lat => 72, :lng => -49}]
+        address.location.should == [72, -44].reverse
+      end
+      
+      it "should default to normal behavior" do
+        address.location = 23.5, -49
+        address.location.should == [23.5, -49].reverse
+      
+        address.location = [23.5, -50]
+        address.location.should == [23.5, -50].reverse
+      end
+      
+      it "should handle nil values" do
+        address.location = nil
+        address.location.should be_nil
+        address.lat.should      be_nil
+        address.lng.should      be_nil
+      end               
+    end
+  end
+end

data/spec/mongoid/spec_helper.rb

@@ -0,0 +1,23 @@
+require 'rspec'
+require 'mongoid'
+require 'mongoid_geo'
+                 
+Mongoid.configure.master = Mongo::Connection.new.db('mongoid-geo')
+
+Mongoid.database.collections.each do |coll|
+  coll.remove
+end
+
+# require 'mongoid/geo/fields'
+require 'models/address'
+require 'models/person'
+
+RSpec.configure do |config|
+  config.after :each do
+    Mongoid.database.collections.each do |coll|
+      coll.remove
+    end      
+  end
+end
+
+

data/spec/spec_helper.rb

@@ -0,0 +1,31 @@
+# Configure Rails Envinronment
+ENV["RAILS_ENV"] = "test"
+
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require "rails/test_help"
+require "rspec/rails"
+
+ActionMailer::Base.delivery_method = :test
+ActionMailer::Base.perform_deliveries = true
+ActionMailer::Base.default_url_options[:host] = "test.com"
+
+Rails.backtrace_cleaner.remove_silencers!
+
+# Configure capybara for integration testing
+require "capybara/rails"
+Capybara.default_driver   = :rack_test
+Capybara.default_selector = :css
+
+# Load support files
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+RSpec.configure do |config|
+  # Remove this line if you don't want RSpec's should and should_not
+  # methods or matchers
+  require 'rspec/expectations'
+  config.include RSpec::Matchers
+
+  # == Mock Framework
+  config.mock_with :rspec
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geo
 version: !ruby/object:Gem::Version
-  version: 0.5.4.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,110 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-19 00:00:00.000000000Z
+date: 2011-05-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2152630280 !ruby/object:Gem::Requirement
+  name: mongoid
+  requirement: &2155643760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2155643760
+- !ruby/object:Gem::Dependency
+  name: bson
+  requirement: &2155643160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2155643160
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2155642540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2155642540
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: &2155641820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2155641820
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2155641140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *2152630280
+  version_requirements: *2155641140
 - !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: &2152629620 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: &2155640520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: *2155640520
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2155639820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: *2155639820
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &2155629500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2155629500
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: &2155628820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *2152629620
+  version_requirements: *2155628820
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &2152629120 !ruby/object:Gem::Requirement
+  requirement: &2155628100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +120,21 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2152629120
+  version_requirements: *2155628100
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152622740 !ruby/object:Gem::Requirement
+  requirement: &2155627380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2152622740
+  version_requirements: *2155627380
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2152622280 !ruby/object:Gem::Requirement
+  requirement: &2155626680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,14 +142,33 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152622280
-description: Geo spatial extension on Mongoid 2, to add more geo-spatial capabilities
-email:
-- kmandrup@gmail.com
+  version_requirements: *2155626680
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2155625980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: *2155625980
+description: Makes it easy to use geo calculations with Mongoid
+email: kmandrup@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.textile
 files:
+- .rspec
+- Changelog.textile
+- Gemfile
+- MIT-LICENSE
+- README.textile
+- Rakefile
+- VERSION
+- lib/mongoid/geo.rb
 - lib/mongoid/geo/criteria.rb
 - lib/mongoid/geo/criteria_helpers.rb
 - lib/mongoid/geo/criterion/complex.rb
@@ -86,13 +182,59 @@ files:
 - lib/mongoid/geo/inflections.rb
 - lib/mongoid/geo/point.rb
 - lib/mongoid/geo/unit.rb
-- lib/mongoid/geo.rb
 - lib/mongoid_geo.rb
-- MIT-LICENSE
-- Rakefile
-- README.textile
-homepage: https://github.com/kristianmandrup/mongoid-geo
-licenses: []
+- sandbox/haversine.rb
+- sandbox/location.rb
+- sandbox/test.rb
+- spec/dummy/Rakefile
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/mongoid.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/javascripts/application.js
+- spec/dummy/public/javascripts/controls.js
+- spec/dummy/public/javascripts/dragdrop.js
+- spec/dummy/public/javascripts/effects.js
+- spec/dummy/public/javascripts/prototype.js
+- spec/dummy/public/javascripts/rails.js
+- spec/dummy/public/stylesheets/.gitkeep
+- spec/dummy/script/rails
+- spec/integration/navigation_spec.rb
+- spec/models/address.rb
+- spec/models/person.rb
+- spec/mongoid/db_v1_8/geo_near_places_spec.rb
+- spec/mongoid/db_v1_8/geo_near_spec.rb
+- spec/mongoid/db_v1_8/geonear_benchmark_spec.rb
+- spec/mongoid/db_v1_8/spherical_calc_spec.rb
+- spec/mongoid/geo/geo_fields_spec.rb
+- spec/mongoid/geo/geo_inclusions_spec.rb
+- spec/mongoid/geo/geo_inflections_spec.rb
+- spec/mongoid/geo/geo_near_spec.rb
+- spec/mongoid/geo/geo_near_to_model_spec.rb
+- spec/mongoid/geo/geo_spherical_mode_spec.rb
+- spec/mongoid/spec_helper.rb
+- spec/spec_helper.rb
+homepage: http://github.com/kristianmandrup/mongoid_geo
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -103,16 +245,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1498625376764748443
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.0
 signing_key: 
 specification_version: 3
-summary: Adds extra convenience methods for geo-spatial operations etc.
+summary: Mongoid geo extensions with support for native Mongo DB calculations
 test_files: []