mongoid_geospatial 2.7.2 → 2.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ac73953bb1d3c6852d3cef4a15f7e14329742be3
+  data.tar.gz: 2ab0b1b7b534817cc8627ea154057bc436c8304e
+SHA512:
+  metadata.gz: d1927bdc7f587f7b504d9a59d9b7a698391f87582e025f8df00e0672921ba93b060b8208cda3619d1f6df2bccf8300d0d86f91c9996b86da485f3ee39778b7c9
+  data.tar.gz: e8357faab54e5f8f1d09c8dbe5fc922d9c05bf469d4132c0ffe2c21f43eae93c21b4e3aa9528bd02f8ce917ded0c3a2337f48ff951c497d1aef27a9221be2b1f

data/lib/mongoid_geospatial/fields/geometry_field.rb

@@ -17,7 +17,7 @@ module Mongoid
 
       def center_point
         min, max = *bbox
-        [min[0] + max[0] / 2.0, min[1] + max[1] / 2.0]
+        [(min[0] + max[0]) / 2.0, (min[1] + max[1]) / 2.0]
       end
       alias :center :center_point
 

data/lib/mongoid_geospatial/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Geospatial
-    VERSION = "2.7.2"
+    VERSION = "2.8.0"
   end
 end

data/lib/mongoid_geospatial/wrappers/rgeo.rb

@@ -5,7 +5,6 @@ module Mongoid
   module Geospatial
 
     class Point
-
       def to_geo
         RGeo::Geographic.spherical_factory.point x, y
       end
@@ -25,23 +24,27 @@ module Mongoid
       end
     end
 
+    class GeometryField
+      private
+      def points
+        self.map do |pair|
+          RGeo::Geographic.spherical_factory.point(*pair)
+        end
+      end
+    end
 
     class Line < GeometryField
       def to_geo
-        RGeo::Geographic.spherical_factory.line_string self
+        RGeo::Geographic.spherical_factory.line_string points
       end
 
     end
 
     class Polygon < GeometryField
       def to_geo
-        points = self.map do |pair|
-          RGeo::Geographic.spherical_factory.point *pair
-        end
         ring = RGeo::Geographic.spherical_factory.linear_ring points
         RGeo::Geographic.spherical_factory.polygon ring
       end
-
     end
   end
 end

data/mongoid_geospatial.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rspec', ['>= 2.11'])
   gem.add_development_dependency('kaminari', ['>= 0'])
   gem.add_development_dependency('will_paginate', ['>= 0'])
+  gem.add_development_dependency("rake")
 end

data/spec/mongoid_geospatial/fields/line_spec.rb

@@ -22,12 +22,12 @@ describe Mongoid::Geospatial::Line do
 
     it "should have a center point" do
       geom = Mongoid::Geospatial::Line.new [[1,1],[1,1],[9,9],[9,9]]
-      geom.center.should eq([5.5,5.5])
+      geom.center.should 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.radius(10).should eq([[5.5,5.5], 10])
+      geom.radius(10).should eq([[5.0,5.0], 10])
     end
 
     it "should have a radius sphere" do

data/spec/mongoid_geospatial/fields/point_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Mongoid::Geospatial::Point do
 
-  it "should not inferfer with mongoid" do
+  it "should not interfer with mongoid" do
     Bar.create!(name: "Moe's")
     Bar.count.should eql(1)
   end

data/spec/mongoid_geospatial/fields/polygon_spec.rb

@@ -22,12 +22,12 @@ describe Mongoid::Geospatial::Polygon do
 
     it "should have a center point" do
       geom = Mongoid::Geospatial::Polygon.new [[1,1],[1,1],[9,9],[9,9]]
-      geom.center.should eq([5.5,5.5])
+      geom.center.should eq([5.0,5.0])
     end
 
     it "should have a radius helper" do
       geom = Mongoid::Geospatial::Polygon.new [[1,1],[1,1],[9,9],[9,9]]
-      geom.radius(10).should eq([[5.5,5.5], 10])
+      geom.radius(10).should eq([[5.0,5.0], 10])
     end
 
     it "should have a radius sphere" do

data/spec/mongoid_geospatial/helpers/spatial_spec.rb

@@ -8,7 +8,7 @@ describe Mongoid::Fields do
     end
 
     it "should created indexes" do
-      Bar.index_options.keys.should include({'location' => '2d'})
+      Bar.index_options.keys.should include({:location => '2d'})
     end
 
     it "should set spatial fields" do

data/spec/mongoid_geospatial/wrappers/georuby_spec.rb

@@ -10,7 +10,7 @@ describe Mongoid::Geospatial::Point do
     load "#{File.dirname(__FILE__)}/../../models/place.rb"
   end
 
-  it "should not inferfer with mongoid" do
+  it "should not interfer with mongoid" do
     Place.create!(name: "Moe's")
     Place.count.should eql(1)
   end

data/spec/mongoid_geospatial/wrappers/rgeo_spec.rb

@@ -1,61 +1,119 @@
 require "spec_helper"
 
-describe Mongoid::Geospatial::Point do
+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
 
-  it "should not inferfer with mongoid" do
-    Bar.create!(name: "Moe's")
-    Bar.count.should eql(1)
+  describe Mongoid::Geospatial::Point do
+    it "should not interfer with mongoid" do
+      Bar.create!(name: "Moe's")
+      Bar.count.should eql(1)
+    end
+
+    it "should not respond to distance before loading external" do
+      bar = Bar.create!(location: [5,5])
+      bar.location.should_not respond_to(:distance)
+    end
   end
 
-  it "should not respond to distance before loading external" do
-    bar = Bar.create!(location: [5,5])
-    bar.location.should_not respond_to(:distance)
+  describe Mongoid::Geospatial::Polygon do
+    it "should not interfer with mongoid" do
+      Farm.create!(name: "Springfield Nuclear Power Plant")
+      Farm.count.should eql(1)
+    end
+
+    it "should not respond to to_geo before loading external" do
+      farm = Farm.create!(area: [[5,5],[6,5],[6,6],[5,6]])
+      farm.area.should_not respond_to(:to_geo)
+    end
   end
 
+  describe Mongoid::Geospatial::Line do
+    it "should not interfer with mongoid" do
+      River.create!(name: "Mississippi")
+      River.count.should eql(1)
+    end
+
+    it "should not respond to to_geo before loading external" do
+      river = River.create!(source: [[5,5],[6,5],[6,6],[5,6]])
+      river.source.should_not respond_to(:to_geo)
+    end
+  end
 
   describe "queryable" do
 
     before do
       Mongoid::Geospatial.use_rgeo
       Bar.create_indexes
+      Farm.create_indexes
+      River.create_indexes
     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
+      describe Mongoid::Geospatial::Point 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 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
-        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)
+        it "should accept an RGeo object" do
+          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
+
+        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)
+          bar.location.distance(bar2.location).to_i.should be_within(1).of(3978262)
+        end
       end
 
-      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)
-        bar.location.distance(bar2.location).to_i.should be_within(1).of(3978262)
+      describe Mongoid::Geospatial::Polygon do
+        it "should mongoize array" do
+          geom = Farm.create!(area: [[5,5],[6,5],[6,6],[5,6]]).area
+          geom.class.should eql(Mongoid::Geospatial::Polygon)
+          geom.to_geo.class.should eql(RGeo::Geographic::SphericalPolygonImpl)
+          geom.to_geo.to_s.should eq "POLYGON ((5.0 5.0, 6.0 5.0, 6.0 6.0, 5.0 6.0, 5.0 5.0))"
+        end
       end
 
+      describe Mongoid::Geospatial::Line do
+        it "should mongoize array" do
+          geom = River.create!(source: [[5,5],[6,5],[6,6],[5,6]]).source
+          geom.class.should eql(Mongoid::Geospatial::Line)
+          geom.to_geo.class.should eql(RGeo::Geographic::SphericalLineStringImpl)
+          geom.to_geo.to_s.should eq "LINESTRING (5.0 5.0, 6.0 5.0, 6.0 6.0, 5.0 6.0)"
+        end
+      end
     end
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geospatial
 version: !ruby/object:Gem::Version
-  version: 2.7.2
-  prerelease: 
+  version: 2.8.0
 platform: ruby
 authors:
 - Ryan Ong
@@ -10,102 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Mongoid Extension that simplifies spatial calculations. Adds integration
@@ -167,27 +168,26 @@ files:
 - spec/support/mongoid.yml
 homepage: https://github.com/nofxx/mongoid_geospatial
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Mongoid Extension that simplifies and adds support for MongoDB Geo Spatial
   Calculations.
 test_files: