mongoid_spacial 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/mongoid_spacial/contexts/mongo.rb

@@ -37,7 +37,7 @@ module Mongoid #:nodoc:
 
         # set default opts
         opts[:skip] ||= 0
-        
+
         if unit = Mongoid::Spacial.earth_radius[opts[:unit]]
           opts[:unit] = (opts[:spherical]) ? unit : unit * Mongoid::Spacial::RAD_PER_DEG
         end
@@ -47,13 +47,14 @@ module Mongoid #:nodoc:
         end
 
         opts[:distance_multiplier] = opts[:unit] if opts[:unit].kind_of?(Numeric)
-  
+
         # setup paging.
         if opts.has_key?(:page)
           opts[:page] ||= 1
           opts[:paginator] ||= Mongoid::Spacial.paginator()
 
-          opts[:per_page] ||= case opts[:paginator]
+           if opts[:per_page].blank?
+             opts[:per_page] = case opts[:paginator]
                               when :will_paginate
                                 @document.per_page
                               when :kaminari
@@ -61,6 +62,8 @@ module Mongoid #:nodoc:
                               else
                                 Mongoid::Spacial.default_per_page
                               end
+           end
+
         end
         opts[:query] = create_geo_near_query(center,opts)
         results = klass.db.command(opts[:query])
@@ -78,11 +81,11 @@ module Mongoid #:nodoc:
 
         # create limit and use skip
         if opts[:num]
-          query['num']         = opts[:skip] + opts[:num].to_i
+          query['num']         = opts[:skip].to_i + opts[:num].to_i
         elsif opts[:limit]
-          query['num']         = opts[:skip] + opts[:limit]
+          query['num']         = opts[:skip].to_i + opts[:limit].to_i
         elsif opts[:page]
-          query['num'] = opts[:skip] +(opts[:page] * opts[:per_page])
+          query['num'] = opts[:skip].to_i + (opts[:page].to_i * opts[:per_page].to_i)
         end
 
         # allow the use of complex werieis
@@ -93,8 +96,8 @@ module Mongoid #:nodoc:
         end
 
         if opts[:max_distance]
-          query['maxDistance'] = opts[:max_distance]
-          query['maxDistance'] = query['maxDistance']/opts[:unit] if opts[:unit]
+          query['maxDistance'] = opts[:max_distance].to_f
+          query['maxDistance'] = query['maxDistance']/opts[:unit].to_f if opts[:unit]
         end
 
         if klass.db.connection.server_version >= '1.7'
@@ -102,7 +105,7 @@ module Mongoid #:nodoc:
 
           # 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] if opts[:distance_multiplier]
+          query['distanceMultiplier'] = opts[:distance_multiplier].to_f if opts[:distance_multiplier]
         end
         query
       end

data/lib/mongoid_spacial/criterion/near_spacial.rb

@@ -5,38 +5,41 @@ module Mongoid #:nodoc:
     # NearSpecial criterion is used when performing #near with symbols to get
     # get a shorthand syntax for where clauses.
     #
-    # @example Conversion of a simple to complex criterion.
+    # @example Coninputersion of a simple to complex criterion.
     #   { :field => { "$nearSphere" => => [20,30]}, '$maxDistance' => 5 }
     #   becomes:
     #   { :field.near(:sphere) => {:point => [20,30], :max => 5, :unit => :km} }
     class NearSpacial < Complex
 
-      # Convert input to query for near or nearSphere
+      # Coninputert input to query for near or nearSphere
       #
       # @example
       #   near = NearSpacial.new(:key => :field, :operator => "near")
-      #   near.to_mongo_query({:point => [:50,50], :max_distance => 5, :unit => :km}) => { '$near : [50,50]' , '$maxDistance' : 5 }
+      #   near.to_mongo_query({:point => [:50,50], :max => 5, :unit => :km}) => { '$near : [50,50]' , '$maxDistance' : 5 }
       #
-      # @param [Hash,Array] v input to conver to query
-      def to_mongo_query(v)
-        if v.kind_of? Hash
-          v[:point] = v[:point].to_lng_lat if v[:point].respond_to?(:to_lng_lat)
-          query = {"$#{operator}" => v[:point] }
-          if v[:max]
-            if unit = Mongoid::Spacial.earth_radius[v[:unit]]
+      # @param [Hash,Array] input input to coninputer to query
+      def to_mongo_query(input)
+        if 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)
+          query = {"$#{operator}" => input[:point] }
+          if input[:max]
+            query['$maxDistance'] = input[:max].to_f
+
+            if unit = Mongoid::Spacial.earth_radius[input[:unit]]
               unit *= Mongoid::Spacial::RAD_PER_DEG unless operator =~ /sphere/i
-              query['$maxDistance'] = v[:max]/unit
-            else
-              query['$maxDistance'] = v[:max]
+              input[:unit] = unit
             end
+
+            query['$maxDistance'] = query['$maxDistance']/input[:unit].to_f if input[:unit]
           end
           query
-        elsif v.kind_of? Array
-          if v.first.kind_of? Numeric
-            {"$#{operator}" => v }
+        elsif input.kind_of? Array
+          if input.first.kind_of? Numeric
+            {"$#{operator}" => input }
           else
-            v[0] = v[0].to_lng_lat if v[0].respond_to?(:to_lng_lat)
-            {"$#{operator}" => v[0], '$maxDistance' => v[1] }
+            input[0] = input[0].to_lng_lat if input[0].respond_to?(:to_lng_lat)
+            {"$#{operator}" => input[0], '$maxDistance' => input[1] }
           end
         end
       end

data/lib/mongoid_spacial/criterion/within_spacial.rb

@@ -28,20 +28,22 @@ module Mongoid #:nodoc:
           end
         elsif ['center','centerSphere'].index(@operator)
 
-          if input.kind_of? Hash
-            if input[:point]
-              input[:point] = input[:point].to_lng_lat if input[:point].respond_to?(:to_lng_lat)
-              if input[:max]
-                if unit = Mongoid::Spacial.earth_radius[input[:unit]]
-                  unit *= Mongoid::Spacial::RAD_PER_DEG unless operator =~ /sphere/i
-                  input[:max] = input[:max]/unit
-                end
-                input = [input[:point],input[:max]]
-              else
-                input = input[:point]
+          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)
+            if input[:max]
+              input[:max] = input[:max].to_f
+
+              if unit = Mongoid::Spacial.earth_radius[input[:unit]]
+                unit *= Mongoid::Spacial::RAD_PER_DEG unless operator =~ /sphere/i
+                input[:unit] = unit
               end
-            elsif RUBY_VERSION.to_f > 1.9
-              input = input.values
+
+              input[:max] = input[:max]/input[:unit].to_f if input[:unit]
+
+              input = [input[:point],input[:max]]
+            else
+              input = input[:point]
             end
           end
 

data/lib/mongoid_spacial/spacial/core_ext.rb

@@ -2,7 +2,7 @@ class Array
   def to_lng_lat
     self[0..1].map(&:to_f)
   end
-end  
+end
 
 class Hash
   def to_lng_lat
@@ -12,16 +12,16 @@ class Hash
 
   def to_lat
     v = (Mongoid::Spacial.lat_symbols & self.keys).first
-    return self[v] if !v.nil? && self[v]
+    return self[v].to_f 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::Spacial.lng_symbols.index(self.keys[1])    
-    self.values[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].to_f
   end
 
   def to_lng
     v = (Mongoid::Spacial.lng_symbols & self.keys).first
-    return self[v] if !v.nil? && self[v]
+    return self[v].to_f 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::Spacial.lat_symbols.index(self.keys[0])
-    self.values[0]
+    self.values[0].to_f
   end
-end 
+end

data/lib/mongoid_spacial/spacial/document.rb

@@ -1,6 +1,6 @@
 module Mongoid
   module Spacial
-    module Document 
+    module Document
       extend ActiveSupport::Concern
 
       included do
@@ -22,7 +22,7 @@ module Mongoid
 
       module InstanceMethods #:nodoc:
         def distance_from(key,p2, unit = nil, formula = nil)
-          p1 = res.send(key)
+          p1 = self.send(key)
           Mongoid::Spacial.distance(p1, p2, unit, formula = nil)
         end
       end

data/mongoid_spacial.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_spacial}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   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-24}
+  s.date = %q{2011-06-28}
   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 = [

metadata

@@ -2,7 +2,7 @@
 name: mongoid_spacial
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Ryan Ong
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 Z
+date: 2011-06-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongoid
@@ -262,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1587512017172586641
+      hash: -3361697488491906909
       segments: 
       - 0
       version: "0"