mongoid_geospatial 1.0.0rc1 → 1.0.0

data/README.md

@@ -4,6 +4,11 @@ Mongoid Geospatial
 A Mongoid Extension that simplifies and adds support for MongoDB and
 RGeo Spatial Calculations.
 
+*WARNING* There are no plans to support MongoDB < 2.0.
+
+*WARNING* Experimental Mongoid 3.0 support.
+
+
 Quick Start
 -----------
 Add mongoid_geospatial to your Gemfile:

data/lib/mongoid_geospatial.rb

@@ -4,8 +4,6 @@ require 'active_support/core_ext/string/inflections'
 require 'active_support/concern'
 require 'mongoid_geospatial/contexts/mongo'
 require 'mongoid_geospatial/criteria'
-require 'mongoid_geospatial/criterion'
-require 'mongoid_geospatial/extensions/hash'
 require 'mongoid_geospatial/extensions/symbol'
 require 'mongoid_geospatial/field_option'
 require 'mongoid_geospatial/fields/point'

data/lib/mongoid_geospatial/contexts/mongo.rb

@@ -19,7 +19,7 @@ module Mongoid #:nodoc:
       #
       #   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
+      # @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
@@ -33,7 +33,7 @@ module Mongoid #:nodoc:
       def geo_near(center, opts = {})
         opts = self.options.merge(opts)
         # convert point
-        center = center.to_lng_lat if center.respond_to?(:to_lng_lat)
+        center = center.to_xy if center.respond_to?(:to_xy)
         center = [center.x, center.y] if center.respond_to?(:x)
 
         # set default opts
@@ -101,13 +101,11 @@ module Mongoid #:nodoc:
           query['maxDistance'] = query['maxDistance']/opts[:unit].to_f if opts[:unit]
         end
 
-        if klass.db.connection.server_version >= '1.7'
-          query['spherical']  = true if opts[:spherical]
+        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]
-        end
+        # 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

data/lib/mongoid_geospatial/criteria.rb

@@ -1,5 +1,10 @@
+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 
+    delegate :geo_near, :to => :context
   end
 end

data/lib/mongoid_geospatial/criterion/near_spatial.rb

@@ -6,9 +6,9 @@ module Mongoid #:nodoc:
     # get a shorthand syntax for where clauses.
     #
     # @example Coninputersion of a simple to complex criterion.
-    #   { :field => { "$nearSphere" => => [20,30]}, '$maxDistance' => 5 }
+    #   { :field => { "$nearSphere" => [20,30]}, '$maxDistance' => 5 }
     #   becomes:
-    #   { :field.near(:sphere) => {:point => [20,30], :max => 5, :unit => :km} }
+    #   { :field.near_sphere => {:point => [20,30], :max => 5, :unit => :km} }
     class NearSpatial < Complex
 
       # Coninputert input to query for near or nearSphere
@@ -19,9 +19,11 @@ module Mongoid #:nodoc:
       #
       # @param [Hash,Array] input input to coninputer to query
       def to_mongo_query(input)
-        if input.kind_of?(Hash)
+        if input.respond_to?(:x)
+          {"$#{operator}" => [input.x, input.y]} #, '$maxDistance' => input[1] }
+        elsif input.kind_of?(Hash)
           raise ':point required to make valid query' unless input[:point]
-          input[:point] = input[:point].to_lng_lat if input[:point].respond_to?(:to_lng_lat)
+          input[:point] = input[:point].to_xy if input[:point].respond_to?(:to_xy)
           query = {"$#{operator}" => input[:point] }
           if input[:max]
             query['$maxDistance'] = input[:max].to_f
@@ -38,7 +40,7 @@ module Mongoid #:nodoc:
           if input.first.kind_of? Numeric
             {"$#{operator}" => input }
           else
-            input[0] = input[0].to_lng_lat if input[0].respond_to?(:to_lng_lat)
+            input[0] = input[0].to_xy if input[0].respond_to?(:to_xy)
             {"$#{operator}" => input[0], '$maxDistance' => input[1] }
           end
         end

data/lib/mongoid_geospatial/criterion/within_spatial.rb

@@ -19,18 +19,20 @@ module Mongoid #:nodoc:
       #
       # @param [Hash,Array] input Variable to conver to query
       def to_mongo_query(input)
-        if ['box','polygon'].index(@operator)
+        if ['box','polygon'].include?(@operator)
           input = input.values if input.kind_of?(Hash)
           if input.respond_to?(:map)
-            input.map!{ |v| (v.respond_to?(:to_lng_lat)) ? v.to_lng_lat : v }
+            input.map! do |v|
+              v.respond_to?(:to_xy) ? v.to_xy : v
+            end
           else
             input
           end
-        elsif ['center','centerSphere'].index(@operator)
+        elsif ['center','centerSphere'].include?(@operator)
 
           if input.kind_of?(Hash) || input.kind_of?(ActiveSupport::OrderedHash)
             raise ':point required to make valid query' unless input[:point]
-            input[:point] = input[:point].to_lng_lat if input[:point].respond_to?(:to_lng_lat)
+            input[:point] = input[:point].to_xy if input[:point].respond_to?(:to_xy)
             if input[:max]
               input[:max] = input[:max].to_f
 
@@ -48,7 +50,7 @@ module Mongoid #:nodoc:
           end
 
           if input.kind_of? Array
-            input[0] = input[0].to_lng_lat if input[0].respond_to?(:to_lng_lat)
+            input[0] = input[0].to_xy if input[0].respond_to?(:to_xy)
           end
 
         end

data/lib/mongoid_geospatial/extensions/symbol.rb

@@ -2,45 +2,45 @@
 module Mongoid #:nodoc:
   module Extensions #:nodoc:
     module Symbol #:nodoc:
-      module Inflections #:nodoc:
 
-        # return a class that will accept a value to convert the query correctly for near
-        #
-        # @param [Symbol] calc This accepts :sphere
-        #
-        # @return [Criterion::NearSpatial]
+      # return a class that will accept a value to convert the query correctly for near
+      #
+      # @param [Symbol] calc This accepts :sphere
+      #
+      # @return [Criterion::NearSpatial]
 
-        def near(calc = :flat)
-          Criterion::NearSpatial.new(:operator => get_op('near',calc), :key => self)
-        end
+      def near(calc = :flat)
+        Criterion::NearSpatial.new(:operator => get_op('near',calc), :key => self)
+      end
 
-        # alias for self.near(:sphere)
-        #
-        # @return [Criterion::NearSpatial]
-        def near_sphere
-          self.near(:sphere)
-        end
+      # alias for self.near(:sphere)
+      #
+      # @return [Criterion::NearSpatial]
+      def near_sphere
+        self.near(:sphere)
+      end
 
-        # @param [Symbol] shape :box,:polygon,:center,:center_sphere
-        #
-        # @return [Criterion::WithinSpatial]
-        def within(shape)
-          shape = get_op(:center,:sphere) if shape == :center_sphere
-          Criterion::WithinSpatial.new(:operator => shape.to_s , :key => self)
-        end
+      # @param [Symbol] shape :box,:polygon,:center,:center_sphere
+      #
+      # @return [Criterion::WithinSpatial]
+      def within(shape)
+        shape = get_op(:center,:sphere) if shape == :center_sphere
+        Criterion::WithinSpatial.new(:operator => shape.to_s , :key => self)
+      end
 
-        private
+      private
 
-        def get_op operator, calc
-          if calc.to_sym == :sphere && Mongoid.master.connection.server_version >= '1.7'
-            "#{operator}Sphere"
-          elsif calc.to_sym == :sphere
-            raise "MongoDB Server version #{Mongoid.master.connection.server_version} does not have Spherical Calculation"
-          else
-            operator.to_s
-          end
+      def get_op operator, calc
+        if calc.to_sym == :sphere
+          "#{operator}Sphere"
+        else
+          operator.to_s
         end
       end
+
     end
   end
 end
+
+
+::Symbol.__send__(:include, Mongoid::Extensions::Symbol)

data/lib/mongoid_geospatial/fields/line_string.rb

@@ -2,13 +2,11 @@ module Mongoid
   module Geospatial
     class LineString
 
-      include Mongoid::Fields::Serializable
-
-      def deserialize(object)
+      def mongoize(object)
         RGeo::Geographic.spherical_factory.line_string *object
       end
 
-      def serialize(object)
+      def demongoize(object)
         object.to_a
       end
 

data/lib/mongoid_geospatial/fields/point.rb

@@ -2,15 +2,13 @@ module Mongoid
   module Geospatial
     class Point
 
-      include Mongoid::Fields::Serializable
-
-      def deserialize(object)
+      def mongoize(object)
         return unless object && !object.empty?
         RGeo::Geographic.spherical_factory.point *object
         #["x"], object["y"]
       end
 
-      def serialize(object)
+      def demongoize(object)
         object.respond_to?(:x) ? [object.x, object.y] : object
         # if object.respond_to? :x
         #   { "x" => object.x, "y" => object.y }
@@ -36,8 +34,8 @@ module Mongoid
 # -    define_method "#{field.name}=" do |arg|
 # -      if arg.kind_of?(Hash) && arg[lng_meth] && arg[lat_meth]
 # -        arg = [arg[lng_meth].to_f, arg[lat_meth].to_f]
-# -      elsif arg.respond_to?(:to_lng_lat)
-# -        arg = arg.to_lng_lat
+# -      elsif arg.respond_to?(:to_xy)
+# -        arg = arg.to_xy
 # -      end
 # -      self[field.name]=arg
 # -      arg = [nil,nil] if arg.nil?

data/lib/mongoid_geospatial/fields/polygon.rb

@@ -2,9 +2,7 @@ module Mongoid
   module Geospatial
     class Polygon
 
-      include Mongoid::Fields::Serializable
-
-      def deserialize(object)
+      def mongoize(object)
         points = object.map do |pair|
           RGeo::Geographic.spherical_factory.point *pair
         end
@@ -12,7 +10,7 @@ module Mongoid
         RGeo::Geographic.spherical_factory.polygon ring
       end
 
-      def serialize(object)
+      def demongoize(object)
         object #.flatten
       end
 

data/lib/mongoid_geospatial/geospatial.rb

@@ -19,6 +19,26 @@ module Mongoid
     }
 
     GEO_FACTORY = RGeo::Geographic.spherical_factory
+    RAD_PER_DEG = Math::PI/180
+    mattr_accessor :lng_symbols
+    @@lng_symbols = LNG_SYMBOLS.dup
+
+    mattr_accessor :lat_symbols
+    @@lat_symbols = LAT_SYMBOLS.dup
+
+    mattr_accessor :earth_radius
+    @@earth_radius = EARTH_RADIUS.dup
+
+    mattr_accessor :paginator
+    @@paginator = :array
+
+    mattr_accessor :default_per_page
+    @@default_per_page = 25
+
+    # mattr_accessor :spherical_distance_formula
+    # @@spherical_distance_formula = :n_vector
+    mattr_accessor :geo_factory
+    @@geo_factory = GEO_FACTORY.dup
 
     included do
       attr_accessor :geo
@@ -32,9 +52,13 @@ module Mongoid
       # @param [String,Symbol] name
       # @param [Hash] options options for spatial_index
 
-      def spatial_index name, *options
+      def spatial_index name, options = {}
         self.spatial_fields_indexed << name
-        index [[ name, Mongo::GEO2D ]], *options
+        if Mongoid::VERSION =~ /3.0/
+          index name => '2d', :options => options
+        else
+          index [[name, '2d']], options
+        end
       end
     end
 
@@ -60,26 +84,6 @@ module Mongoid
     #   rads
 
     # end
-    RAD_PER_DEG = Math::PI/180
-    mattr_accessor :lng_symbols
-    @@lng_symbols = LNG_SYMBOLS.dup
-
-    mattr_accessor :lat_symbols
-    @@lat_symbols = LAT_SYMBOLS.dup
-
-    mattr_accessor :earth_radius
-    @@earth_radius = EARTH_RADIUS.dup
-
-    mattr_accessor :paginator
-    @@paginator = :array
-
-    mattr_accessor :default_per_page
-    @@default_per_page = 25
-
-    # mattr_accessor :spherical_distance_formula
-    # @@spherical_distance_formula = :n_vector
-    mattr_accessor :geo_factory
-    @@lng_symbols = GEO_FACTORY.dup
 
 
   end

data/lib/mongoid_geospatial/geospatial/core_ext.rb

@@ -1,16 +1,18 @@
 class Array
-  def to_lng_lat
+  def to_xy
     self[0..1].map(&:to_f)
   end
+  alias :to_lng_lat :to_xy
 end
 
 class Hash
-  def to_lng_lat
+  def to_xy
     raise "Hash must have at least 2 items" if self.size < 2
-    [to_lng, to_lat]
+    [to_x, to_y]
   end
+  alias :to_lng_lat :to_xy
 
-  def to_lat
+  def to_y
     v = (Mongoid::Geospatial.lat_symbols & self.keys).first
     return self[v].to_f if !v.nil? && self[v]
     raise "Hash must contain #{Mongoid::Geospatial.lat_symbols.inspect} if ruby version is less than 1.9" if RUBY_VERSION.to_f < 1.9
@@ -18,7 +20,7 @@ class Hash
     self.values[1].to_f
   end
 
-  def to_lng
+  def to_x
     v = (Mongoid::Geospatial.lng_symbols & self.keys).first
     return self[v].to_f if !v.nil? && self[v]
     raise "Hash cannot contain #{Mongoid::Geospatial.lat_symbols.inspect} as the first item if there is no #{Mongoid::Geospatial.lng_symbols.inspect}" if Mongoid::Geospatial.lat_symbols.index(self.keys[0])

data/lib/mongoid_geospatial/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Geospatial
-    VERSION = "1.0.0rc1"
+    VERSION = "1.0.0"
   end
 end

data/mongoid_geospatial.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
 
   gem.add_dependency('rgeo', ['>= 0.3.5'])
-  gem.add_dependency('mongoid', ['>= 2.1.0'])
+  gem.add_dependency('mongoid', ['>= 2.0.0'])
   gem.add_dependency('activesupport', ["~> 3.0"])
   gem.add_development_dependency('yard', ["~>0.6.0"])
   gem.add_development_dependency('rspec', ['~>2.3'])

data/spec/functional/criterion/inclusion_spec.rb

@@ -249,15 +249,15 @@ describe Mongoid::Criterion::Inclusion do
         end
 
         let!(:berlin) do
-          Bar.create(:location => [ 52.30, 13.25 ])
+          Bar.create(:name => :berlin, :location => [ 52.30, 13.25 ])
         end
 
         let!(:prague) do
-          Bar.create(:location => [ 50.5, 14.26 ])
+          Bar.create(:name => :prague, :location => [ 50.5, 14.26 ])
         end
 
         let!(:paris) do
-          Bar.create(:location => [ 48.48, 2.20 ])
+          Bar.create(:name => :paris, :location => [ 48.48, 2.20 ])
         end
 
         it "returns the documents sorted closest to furthest" do
@@ -272,6 +272,10 @@ describe Mongoid::Criterion::Inclusion do
           Bar.where(:location.near_sphere => [ 41.23, 2.9 ]).should == [ paris, prague, berlin ]
         end
 
+        it "should find closest using rgeo point" do
+          Bar.where(:location.near => paris.location).should == [ paris, prague, berlin ]
+        end
+
       end
 
       context "#within" do

data/spec/mongoid_geospatial/criterion/within_spatial_spec.rb

@@ -0,0 +1,54 @@
+require "spec_helper"
+
+describe Mongoid::Criterion::WithinSpatial do
+
+  let(:within) do
+    {
+      :box     => Mongoid::Criterion::WithinSpatial.new(:key => :field, :operator => "box"),
+      :center  => Mongoid::Criterion::WithinSpatial.new(:key => :field, :operator => "center"),
+      :polygon => Mongoid::Criterion::WithinSpatial.new(:key => :field, :operator => "polygon"),
+      :center_sphere => Mongoid::Criterion::WithinSpatial.new(:key => :field, :operator => "box"),
+    }
+  end
+
+  context "#to_mongo_query" do
+
+    {
+      :box =>
+      {
+        'Array of Arrays' => [[10,20], [15,25]],
+        'Array of Hashes' => [{ x: 10, y: 20 }, { x: 15, y: 25 }],
+        'Hash of Hashes'  => { a: { x: 10, y: 20 }, b: { x: 15, y: 25 }}
+      },
+      :polygon =>
+      {
+        'Array of Arrays' => [[10,20], [15,25]],
+        'Array of Hashes' => [{ x: 10, y: 20 }, { x: 15, y: 25 }],
+        'Hash of Hashes'  => { a: { x: 10, y: 20 }, b: { x: 15, y: 25 }}
+      },
+      :center =>
+      {
+        'Point'           => [[1,2],5],
+        'Hash Point'      => {:point => [-73.98, 40.77], :max => 5},
+        'Hash Point Unit' => {:point => [-73.98, 40.77], :max => 5, :unit => :km}
+      },
+      :center_sphere =>
+      {
+        'Point'           => [[1,2],5],
+        'Hash Point'      => {:point => [-73.98, 40.77], :max => 5},
+        'Hash Point Unit' => {:point => [-73.98, 40.77], :max => 5, :unit => :km}
+      }
+    }.each do |shape, points|
+
+      points.each do |input_name,input|
+
+        it "should generate a #{shape} query with '#{input_name}'" do
+          within[shape].to_mongo_query(input).should be_a_kind_of(Hash)
+        end
+
+      end
+    end
+
+  end # context
+end # describe
+

data/spec/mongoid_geospatial/geospatial_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+describe Mongoid::Geospatial do
+
+  context "Class Stuff" do
+
+    it "should have an lng_symbols accessor" do
+      Mongoid::Geospatial.lng_symbols.should be_instance_of Array
+      Mongoid::Geospatial.lng_symbols.should include :x
+    end
+
+    it "should have an lat_symbols accessor" do
+      Mongoid::Geospatial.lat_symbols.should be_instance_of Array
+      Mongoid::Geospatial.lat_symbols.should include :y
+    end
+
+  end
+
+
+  context "Included" do
+  end
+
+
+
+end

data/spec/spec_helper.rb

@@ -19,8 +19,11 @@ if RUBY_VERSION >= '1.9.2'
 end
 
 Mongoid.configure do |config|
-  name = "mongoid_geospatial_test"
-  config.master = Mongo::Connection.new.db(name)
+  opts = YAML.load(File.read(File.dirname(__FILE__) + '/support/mongoid.yml'))["test"]
+  name = opts.delete("database")
+  host = opts.delete("host")
+  port = opts.delete("port")
+  config.master = Mongo::Connection.new(host, port, opts).db(name)
   config.logger = nil
   config.allow_dynamic_fields = true
 end

data/spec/support/mongoid.yml

@@ -0,0 +1,19 @@
+test:
+  database: mongoid_geospatial_test
+  host: localhost
+  port: 27018
+  slaves:
+    # - host: localhost
+      # port: 27018
+    # - host: localhost
+      # port: 27019
+  # allow_dynamic_fields: false
+  # include_root_in_json: true
+  # parameterize_keys: false
+  # persist_in_safe_mode: false
+  # raise_not_found_error: false
+  # reconnect_time: 5
+  # autocreate_indexes: false
+  # persist_types: false
+  # option_no_exist: false
+  # skip_version_check: false

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geospatial
 version: !ruby/object:Gem::Version
-  version: 1.0.0rc1
-  prerelease: 5
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Ryan Ong
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-31 00:00:00.000000000 Z
+date: 2012-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &17414120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,21 +22,31 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *17414120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &17412660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *17412660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &20713780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +54,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *20713780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &20713300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +70,15 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *20713300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20712820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +86,15 @@ dependencies:
         version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *20712820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &20712340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20712340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &20711860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20711860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &20711380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +134,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20711380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &20710900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +150,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20710900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: mongoid_geospatial simplifies spatial calculations. Adds integration
   into mongoid so pagination and other function continue to work. It adds symbol extensions
   to simplify query creation.
@@ -129,12 +174,10 @@ files:
 - lib/mongoid_geospatial.rb
 - lib/mongoid_geospatial/contexts/mongo.rb
 - lib/mongoid_geospatial/criteria.rb
-- lib/mongoid_geospatial/criterion.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/hash.rb
 - lib/mongoid_geospatial/extensions/symbol.rb
 - lib/mongoid_geospatial/field_option.rb
 - lib/mongoid_geospatial/fields/line_string.rb
@@ -146,12 +189,10 @@ files:
 - lib/mongoid_geospatial/geospatial/geo_near_results.rb
 - lib/mongoid_geospatial/version.rb
 - mongoid_geospatial.gemspec
-- spec/config/mongod.conf
-- spec/config/mongoid.yml
 - spec/functional/contexts/mongo_spec.rb
 - spec/functional/criterion/inclusion_spec.rb
+- spec/functional/geospatial/geo_near_results_spec.rb
 - spec/functional/mongoid_geospatial_spec.rb
-- spec/functional/spatial/geo_near_results_spec.rb
 - spec/models/account.rb
 - spec/models/acolyte.rb
 - spec/models/address.rb
@@ -222,12 +263,15 @@ files:
 - spec/models/vet_visit.rb
 - spec/models/video.rb
 - spec/models/wiki_page.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/geospatial_spec.rb
 - spec/spec_helper.rb
 - spec/support/authentication.rb
-- spec/unit/criterion/complex_spec.rb
-- spec/unit/criterion/inclusion_spec.rb
-- spec/unit/criterion/near_spatial_spec.rb
-- spec/unit/criterion/within_spatial_spec.rb
+- spec/support/mongod.conf
+- spec/support/mongoid.yml
 homepage: https://github.com/nofxx/mongoid_geospatial
 licenses: []
 post_install_message: 
@@ -243,23 +287,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Mongoid Extension that simplifies and adds support for MongoDB Geo Spatial
   Calculations.
 test_files:
-- spec/config/mongod.conf
-- spec/config/mongoid.yml
 - spec/functional/contexts/mongo_spec.rb
 - spec/functional/criterion/inclusion_spec.rb
+- spec/functional/geospatial/geo_near_results_spec.rb
 - spec/functional/mongoid_geospatial_spec.rb
-- spec/functional/spatial/geo_near_results_spec.rb
 - spec/models/account.rb
 - spec/models/acolyte.rb
 - spec/models/address.rb
@@ -330,10 +372,13 @@ test_files:
 - spec/models/vet_visit.rb
 - spec/models/video.rb
 - spec/models/wiki_page.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/geospatial_spec.rb
 - spec/spec_helper.rb
 - spec/support/authentication.rb
-- spec/unit/criterion/complex_spec.rb
-- spec/unit/criterion/inclusion_spec.rb
-- spec/unit/criterion/near_spatial_spec.rb
-- spec/unit/criterion/within_spatial_spec.rb
+- spec/support/mongod.conf
+- spec/support/mongoid.yml
 has_rdoc: 

data/lib/mongoid_geospatial/criterion.rb

@@ -1,3 +0,0 @@
-require 'mongoid_geospatial/criterion/complex'
-require 'mongoid_geospatial/criterion/near_spatial'
-require 'mongoid_geospatial/criterion/within_spatial'

data/lib/mongoid_geospatial/extensions/hash.rb

@@ -1,22 +0,0 @@
-# encoding: utf-8
-module Mongoid #:nodoc:
-  module Extensions #:nodoc:
-    module Hash #:nodoc:
-      module CriteriaHelpers #:nodoc:
-        def expand_complex_criteria
-          hsh = {}
-          each_pair do |k,v|
-            if k.respond_to?(:key) && k.respond_to?(:to_mongo_query)
-              hsh[k.key] ||= {}
-              hsh[k.key].merge!(k.to_mongo_query(v))
-            else
-              hsh[k] = v
-            end
-          end
-          hsh
-        end
-      end
-    end
-  end
-end
-

data/spec/config/mongoid.yml

@@ -1,18 +0,0 @@
-test:
-  database: mongoid_config_test
-  host: localhost
-  slaves:
-    # - host: localhost
-      # port: 27018
-    # - host: localhost
-      # port: 27019
-  allow_dynamic_fields: false
-  include_root_in_json: true
-  parameterize_keys: false
-  persist_in_safe_mode: false
-  raise_not_found_error: false
-  reconnect_time: 5
-  autocreate_indexes: false
-  persist_types: false
-  option_no_exist: false
-  skip_version_check: false

data/spec/unit/criterion/within_spatial_spec.rb

@@ -1,52 +0,0 @@
-require "spec_helper"
-
-describe Mongoid::Criterion::WithinSpatial do
-
-  let(:within) do
-    {
-      :box => Mongoid::Criterion::WithinSpatial.new(:key => :field, :operator => "box"),
-      :polygon => Mongoid::Criterion::WithinSpatial.new(:key => :field, :operator => "polygon"),
-      :center => Mongoid::Criterion::WithinSpatial.new(:key => :field, :operator => "center"),
-      :center_sphere => Mongoid::Criterion::WithinSpatial.new(:key => :field, :operator => "box"),
-    }
-  end
-  WITHIN = {
-    :box =>
-    {
-      'Array of Arrays' => [[10,20], [15,25]],
-      'Array of Hashes' => [{ x: 10, y: 20 }, { x: 15, y: 25 }],
-      'Hash of Hashes'  => { a: { x: 10, y: 20 }, b: { x: 15, y: 25 }}
-    },
-      :polygon =>
-    {
-      'Array of Arrays' => [[10,20], [15,25]],
-      'Array of Hashes' => [{ x: 10, y: 20 }, { x: 15, y: 25 }],
-      'Hash of Hashes'  => { a: { x: 10, y: 20 }, b: { x: 15, y: 25 }}
-    },
-      :center =>
-    {
-      'Point'           => [[1,2],5],
-      'Hash Point'      => {:point => [-73.98, 40.77], :max => 5},
-      'Hash Point Unit' => {:point => [-73.98, 40.77], :max => 5, :unit => :km}
-    },
-      :center_sphere =>
-    {
-      'Point'           => [[1,2],5],
-      'Hash Point'      => {:point => [-73.98, 40.77], :max => 5},
-      'Hash Point Unit' => {:point => [-73.98, 40.77], :max => 5, :unit => :km}
-    }
-  }
-
-  context "#to_mongo_query" do
-
-    WITHIN.each do |shape, points|
-      points.each do |input_name,input|
-        it "#{shape} should generate a query with #{input_name}" do
-          within[shape].to_mongo_query(input).should be_a_kind_of(Hash)
-        end
-      end
-    end
-  end
-
-end
-