mongoid_geospatial 1.0.0 → 2.0.0

data/Gemfile

@@ -1,11 +1,12 @@
 source 'http://rubygems.org'
-
-# Specify  gem's dependencies in mongoid_geospatial.gemspec
-gemspec
+gemspec # Specify  gem's dependencies in mongoid_geospatial.gemspec
 
 gem 'rgeo'
+gem 'mongoid', '~> 3.0'
 
 group :development do
   gem 'rspec'
-  gem 'fuubar'
+  gem 'guard-rspec'
+  gem 'pry'
+  # gem 'fuubar'
 end

data/Guardfile

@@ -0,0 +1,24 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+require 'guard'
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { "spec" } # { |m| "spec spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  # watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  # watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  # watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  # watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  # watch('config/routes.rb')                           { "spec/routing" }
+  # watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara request specs
+  # watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  # watch(%r{^spec/acceptance/(.+)\.feature$})
+  # watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end

data/README.md

@@ -4,9 +4,16 @@ 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.
+** On beta again **
+
+Removing some trash, improving and adding support for RGeo and GeoRuby.
+Version 2+ is going to be beta testing, when it's ready I'll release v3,
+So the major version stays the same as mongoid.
+
+
+There are no plans to support MongoDB < 2.0
+There are no plans to support Mongoid <= 2.0
 
-*WARNING* Experimental Mongoid 3.0 support.
 
 
 Quick Start
@@ -335,4 +342,3 @@ Copyright
 -----------
 Copyright (c) 2011 Ryan Ong. See LICENSE.txt for
 further details.
-

data/lib/mongoid_geospatial/{contexts → contextual}/mongo.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mongoid #:nodoc:
-  module Contexts #:nodoc:
+  module Contextual #:nodoc:
     class Mongo #:nodoc:
 
       # Fetches rows from the data base sorted by distance.
@@ -31,7 +31,7 @@ module Mongoid #:nodoc:
       #
       # @return [ Array ] Sorted Rows
       def geo_near(center, opts = {})
-        opts = self.options.merge(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)
@@ -68,7 +68,8 @@ module Mongoid #:nodoc:
 
         end
         opts[:query] = create_geo_near_query(center,opts)
-        results = klass.db.command(opts[:query])
+        results = klass.mongo_session.command(opts[:query])
+
         Mongoid::Geospatial::GeoNearResults.new(klass,results,opts)
       end
 
@@ -76,7 +77,7 @@ module Mongoid #:nodoc:
 
       def create_geo_near_query(center,opts)
         # minimum query
-        query = BSON::OrderedHash.new
+        query = {}
         query[:geoNear] = klass.collection_name
         query[:near] = center
 
@@ -92,8 +93,8 @@ module Mongoid #:nodoc:
         # allow the use of complex werieis
         if opts[:query]
           query['query']         = self.criteria.where(opts[:query]).selector
-        elsif self.selector != {}
-          query['query']         = self.selector
+        elsif self.criteria.selector != {}
+          query['query']         = self.criteria.selector
         end
 
         if opts[:max_distance]
@@ -101,6 +102,10 @@ module Mongoid #:nodoc:
           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

data/lib/mongoid_geospatial/criterion/complex.rb

@@ -10,6 +10,13 @@ module Mongoid #:nodoc:
     # 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}

data/lib/mongoid_geospatial/criterion/inclusion.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
-module Mongoid #:nodoc:
-  module Criterion #:nodoc:
-    module Inclusion
-      def near(attributes = {})
-        update_selector(attributes, "$near")
-      end
+# 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
+#       def near_sphere(attributes = {})
+#         update_selector(attributes, "$near")
+#       end
+#     end
+#   end
+# end

data/lib/mongoid_geospatial/extensions/rgeo_spherical_point_impl.rb

@@ -0,0 +1,13 @@
+module RGeo
+  module Geographic
+    class SphericalPointImpl
+      def to_a
+        [x, y, z]
+      end
+
+      def [] index
+        to_a[index]
+      end
+    end
+  end
+end

data/lib/mongoid_geospatial/fields/line_string.rb

@@ -2,15 +2,16 @@ module Mongoid
   module Geospatial
     class LineString
 
-      def mongoize(object)
-        RGeo::Geographic.spherical_factory.line_string *object
-      end
-
-      def demongoize(object)
-        object.to_a
+      def mongoize
+        to_a
       end
 
+      class << self
+        def demongoize(object)
+          RGeo::Geographic.spherical_factory.line_string object
+        end
 
+      end
     end
   end
 end

data/lib/mongoid_geospatial/fields/point.rb

@@ -2,19 +2,32 @@ module Mongoid
   module Geospatial
     class Point
 
-      def mongoize(object)
-        return unless object && !object.empty?
-        RGeo::Geographic.spherical_factory.point *object
-        #["x"], object["y"]
+      def mongoize
+        [x, y]
       end
 
-      def demongoize(object)
-        object.respond_to?(:x) ? [object.x, object.y] : object
-        # if object.respond_to? :x
-        #   { "x" => object.x, "y" => object.y }
-        # else
-        #   { "x" => object[0], "y" => object[1] }
-        # end
+      class << self
+
+        def demongoize(object)
+          return unless object && !object.empty?
+          RGeo::Geographic.spherical_factory.point *object
+          #["x"], object["y"]
+        end
+
+        def mongoize(object)
+          #return new.mongoize if object.respond_to?(:x)
+          case object
+          when Point then object.mongoize
+          when Hash then [object[:x], object[:y]]
+          else object
+          end
+        end
+
+        # Converts the object that was supplied to a criteria and converts it
+        # into a database friendly form.
+        def evolve(object)
+          object.respond_to?(:x) ? object.mongoize : object
+        end
       end
 
 #       -    self.spacial_fields ||= []

data/lib/mongoid_geospatial/fields/polygon.rb

@@ -2,19 +2,23 @@ module Mongoid
   module Geospatial
     class Polygon
 
-      def mongoize(object)
-        points = object.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
-
-      def demongoize(object)
-        object #.flatten
+      def mongoize
+        self #.flatten
       end
 
+      class << self
+        def demongoize(object)
+          points = object.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
 
+        # def evolve(object)
+        #   { "$gte" => object.first, "$lte" => object.last }
+        # end
+      end
     end
   end
 end

data/lib/mongoid_geospatial/geospatial/geo_near_results.rb

@@ -113,7 +113,7 @@ module Mongoid
       alias_method :per_page, :limit_value
 
       def num_pages
-        (self.total_entries && @opts[:per_page]) ? (total_entries.to_f / @opts[:per_page]).ceil : nil
+        (total_entries && @opts[:per_page]) ? (total_entries.to_f / @opts[:per_page]).ceil : nil
       end
       alias_method :total_pages, :num_pages
 

data/lib/mongoid_geospatial/geospatial.rb

@@ -54,37 +54,9 @@ module Mongoid
 
       def spatial_index name, options = {}
         self.spatial_fields_indexed << name
-        if Mongoid::VERSION =~ /3.0/
-          index name => '2d', :options => options
-        else
-          index [[name, '2d']], options
-        end
+        index({name => '2d'}, options)
       end
     end
 
-    # def distance(p2, opts = {})
-    #   p1 = self.send(key)
-      #   Mongoid::Geospatial.distance(p1, p2, opts)
-      # end
-
-
-
-    # def self.distance(p1,p2,opts = {})
-    #   opts[:formula] ||= (opts[:spherical]) ? @@spherical_distance_formula : :pythagorean_theorem
-    #   p1 = p1.to_lng_lat if p1.respond_to?(:to_lng_lat)
-    #   p2 = p2.to_lng_lat if p2.respond_to?(:to_lng_lat)
-
-    #   rads = Formulas.send(opts[:formula], p1, p2)
-
-    #   if unit = earth_radius[opts[:unit]]
-    #     opts[:unit] = (rads.instance_variable_get("@radian")) ? unit : unit * RAD_PER_DEG
-    #   end
-
-    #   rads *= opts[:unit].to_f if opts[:unit]
-    #   rads
-
-    # end
-
-
   end
 end

data/lib/mongoid_geospatial/version.rb

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

data/lib/mongoid_geospatial.rb

@@ -2,13 +2,17 @@ require 'rgeo'
 require 'mongoid'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/concern'
-require 'mongoid_geospatial/contexts/mongo'
+require 'mongoid_geospatial/contextual/mongo'
 require 'mongoid_geospatial/criteria'
 require 'mongoid_geospatial/extensions/symbol'
+require 'mongoid_geospatial/extensions/rgeo_spherical_point_impl'
 require 'mongoid_geospatial/field_option'
-require 'mongoid_geospatial/fields/point'
-require 'mongoid_geospatial/fields/polygon'
-require 'mongoid_geospatial/fields/line_string'
+
+fields_path = 'mongoid_geospatial/fields'
+
+%w{point polygon line_string}.each do |type|
+  require "#{fields_path}/#{type}"
+end
+
 require 'mongoid_geospatial/finders'
 require 'mongoid_geospatial/geospatial'
-

data/mongoid_geospatial.gemspec

@@ -16,12 +16,11 @@ Gem::Specification.new do |gem|
   gem.version       = Mongoid::Geospatial::VERSION
 
 
-  gem.add_dependency('rgeo', ['>= 0.3.5'])
-  gem.add_dependency('mongoid', ['>= 2.0.0'])
-  gem.add_dependency('activesupport', ["~> 3.0"])
+  gem.add_dependency('rgeo', ['>= 0.3.15'])
+  gem.add_dependency('mongoid', ['>= 3.0.0'])
+  gem.add_dependency('activesupport', ["~> 3.2"])
   gem.add_development_dependency('yard', ["~>0.6.0"])
-  gem.add_development_dependency('rspec', ['~>2.3'])
-  gem.add_development_dependency('rcov', ['>= 0'])
+  gem.add_development_dependency('rspec', ['~>2.11'])
   gem.add_development_dependency('mocha', ['>= 0'])
   gem.add_development_dependency('will_paginate', ['>= 0'])
   gem.add_development_dependency('kaminari', ['>= 0'])

data/spec/models/address.rb

@@ -1,21 +1,26 @@
 class Address
   include Mongoid::Document
 
+  field :_id, type: String, default: ->{ street.try(:parameterize) }
+
   attr_accessor :mode
 
   field :address_type
-  field :number, :type => Integer
+  field :number, type: Integer
   field :street
   field :city
   field :state
   field :post_code
   field :parent_title
-  field :services, :type => Array
-  field :latlng, :type => Array
-  key :street
-  embeds_many :locations
+  field :services, type: Array
+  field :latlng, type: Array
+  field :map, type: Hash
+
+  embeds_many :locations, validate: false
+  embeds_one :code, validate: false
+  embeds_one :target, as: :targetable, validate: false
 
-  embedded_in :addressable, :polymorphic => true do
+  embedded_in :addressable, polymorphic: true do
     def extension
       "Testing"
     end
@@ -24,19 +29,19 @@ class Address
     end
   end
 
-  accepts_nested_attributes_for :locations
+  accepts_nested_attributes_for :locations, :code, :target
 
-  referenced_in :account
+  belongs_to :account
 
-  scope :without_postcode, where(:postcode => nil)
-  named_scope :rodeo, where(:street => "Rodeo Dr") do
+  scope :without_postcode, where(postcode: nil)
+  scope :rodeo, where(street: "Rodeo Dr") do
     def mansion?
       all? { |address| address.street == "Rodeo Dr" }
     end
   end
 
-  validates_presence_of :street, :on => :update
-  validates_format_of :street, :with => /\D/, :allow_nil => true
+  validates_presence_of :street, on: :update
+  validates_format_of :street, with: /\D/, allow_nil: true
 
   def set_parent=(set = false)
     self.parent_title = addressable.title if set
@@ -48,11 +53,11 @@ class Address
 
   class << self
     def california
-      where(:state => "CA")
+      where(state: "CA")
     end
 
     def homes
-      where(:address_type => "Home")
+      where(address_type: "Home")
     end
 
     def streets

data/spec/models/bar.rb

@@ -4,6 +4,8 @@ class Bar
 
   field :name, :type => String
   field :location, :type => Point, :spatial => true
-  references_one :rating, :as => :ratable
+
+  has_one :rating, :as => :ratable
+
   spatial_index :location
 end

data/spec/models/event.rb

@@ -3,12 +3,12 @@ class Event
 
   field :title
   field :date, :type => Date
-  references_and_referenced_in_many \
+  has_and_belongs_to_many \
     :administrators,
     :class_name => 'Person',
     :inverse_of => :administrated_events,
     :dependent => :nullify
-  referenced_in :owner
+  belongs_to :owner
 
   def self.each_day(start_date, end_date)
     groups = only(:date).asc(:date).where(:date.gte => start_date, :date.lte => end_date).group

data/spec/models/farm.rb

@@ -2,9 +2,8 @@ class Farm
   include Mongoid::Document
   include Mongoid::Geospatial
 
-  field :name, :type => String
-  #field :location, :type => Point #, :spatial => true
-  field :area, :type => Polygon
+  field :name,              type: String
+  field :area,              type: Polygon,    spatial: true
 
-  #spatial_index :location
+  spatial_index :area
 end

data/spec/models/person.rb

@@ -25,14 +25,14 @@ class Person
   field :owner_id, :type => Integer
   field :security_code
   field :reading, :type => Object
-  field :bson_id, :type => BSON::ObjectId
+  field :bson_id, :type => bson_object_id_class
 
-  index :age
-  index :addresses
-  index :dob
-  index :name
-  index :title
-  index :ssn, :unique => true
+  index age: 1
+  index addresses: 1
+  index dob: 1
+  index name: 1
+  index title: 1
+  index({ssn: 1}, :unique => true)
 
   validates_format_of :ssn, :without => /\$\$\$/
 
@@ -40,9 +40,6 @@ class Person
 
   attr_protected :security_code, :owner_id
 
-  embeds_many :favorites, :order => :title.desc, :inverse_of => :perp
-  embeds_many :videos, :order => [[ :title, :asc ]]
-  embeds_many :phone_numbers, :class_name => "Phone"
   embeds_many :addresses, :as => :addressable do
     def extension
       "Testing"
@@ -51,61 +48,22 @@ class Person
       @target.select { |doc| doc.street == street }
     end
   end
-  embeds_many :address_components
-  embeds_many :services
 
-  embeds_one :pet, :class_name => "Animal"
-  embeds_one :name, :as => :namable do
-    def extension
-      "Testing"
-    end
-    def dawkins?
-      first_name == "Richard" && last_name == "Dawkins"
-    end
-  end
-  embeds_one :quiz
+  # embeds_many :services
+
+
+  # has_many \
+  #   :posts,
+  #   :dependent => :delete,
+  #   :order => :rating.desc do
+  #   def extension
+  #     "Testing"
+  #   end
+  # end
 
   accepts_nested_attributes_for :addresses
   accepts_nested_attributes_for :name, :update_only => true
-  accepts_nested_attributes_for :pet, :allow_destroy => true
-  accepts_nested_attributes_for :game, :allow_destroy => true
-  accepts_nested_attributes_for :favorites, :allow_destroy => true, :limit => 5
-  accepts_nested_attributes_for :posts
-  accepts_nested_attributes_for :preferences
-  accepts_nested_attributes_for :quiz
-
-  references_one :game, :dependent => :destroy do
-    def extension
-      "Testing"
-    end
-  end
 
-  references_many \
-    :posts,
-    :dependent => :delete,
-    :order => :rating.desc do
-    def extension
-      "Testing"
-    end
-  end
-  references_many :paranoid_posts
-  references_and_referenced_in_many \
-    :preferences,
-    :index => true,
-    :dependent => :nullify,
-    :autosave => true,
-    :order => :value.desc
-  references_and_referenced_in_many :user_accounts
-  references_and_referenced_in_many :houses
-
-  references_many :drugs, :autosave => true
-  references_one :account, :autosave => true
-
-  references_and_referenced_in_many \
-    :administrated_events,
-    :class_name => 'Event',
-    :inverse_of => :administrators,
-    :dependent  => :nullify
 
   scope :minor, where(:age.lt => 18)
   scope :without_ssn, without(:ssn)

data/spec/models/phone.rb

@@ -1,7 +1,9 @@
 class Phone
   include Mongoid::Document
   field :number
-  key :number
+  if Mongoid::VERSION <  '3'
+    key :number
+  end
   embeds_one :country_code
   embedded_in :person
 end

data/spec/models/river.rb

@@ -5,9 +5,9 @@ class River
   field :name,              type: String
   field :length,            type: Integer
   field :average_discharge, type: Integer
-  field :source,            type: Array,    spatial: true
+  field :source,            type: LineString,    spatial: true
   # set return_array to true if you do not want a hash returned all the time
-  field :mouth,             type: Array,    spatial: {lat: 'latitude', lng: 'longitude'}
+  field :mouth,             type: Point,    spatial: {lat: 'latitude', lng: 'longitude'}
   field :mouth_array,       type: Array,    spatial: {return_array: true}
 
   # simplified spatial indexing