mongoid_geo 0.1.0 → 0.1.1

data/lib/mongoid/geo/criterion/outer_operator.rb

@@ -44,7 +44,7 @@ module Mongoid #:nodoc:
         when Hash
           [v[:center], v[:radius]]
         else
-          v.respond_to?(:center) ? [v.center, v.radius] : raise("Can't extract box from: #{v}, must have :center and :radius methods or hash keys")
+          v.respond_to?(:center) ? [v.center, v.radius] : raise("Can't extract box from: #{v}, must have :center and :radius methods or equivalent hash keys in Hash")
         end
       end
       
@@ -53,7 +53,7 @@ module Mongoid #:nodoc:
         when Hash
           [v[:lower_left], v[:upper_right]]
         else
-          v.respond_to?(:lower_left) ? [v.lower_left, v.upper_right] : raise("Can't extract box from: #{v}, must have :lower_left and :upper_right methods or hash keys")
+          v.respond_to?(:lower_left) ? [v.lower_left, v.upper_right] : raise("Can't extract box from: #{v}, must have :lower_left and :upper_right methods or equivalent hash keys in Hash")
         end
       end
     end

data/lib/mongoid/geo/criterion/twin_operators.rb

@@ -18,7 +18,8 @@ module Mongoid #:nodoc:
         @op_b = opts[:op_b]        
       end
 
-      def make_hash v
+      def make_hash v     
+        v = extract_nearMax(v) if !v.kind_of?(Array) && op_b =~ /max/i
         {"$#{op_a}" => v.first, "$#{op_b}" => v.last }
       end
 
@@ -34,6 +35,20 @@ module Mongoid #:nodoc:
         return false unless other.is_a?(self.class)        
         self.op_a == other.op_a && self.op_b == other.op_b && self.key == other.key 
       end
+      
+      protected
+      
+      protected
+
+      def extract_nearMax(v)
+        case v
+        when Hash
+          [v[:point], v[:distance]]
+        else
+          v.respond_to?(:point) ? [v.point, v.distance] : raise("Can't extract nearMax values from: #{v}, must have :point and :maxDistance methods or equivalent hash keys in Hash")
+        end
+      end
+      
     end
   end
 end

data/lib/mongoid/geo/fields.rb

@@ -5,11 +5,14 @@ module Mongoid #:nodoc
       def create_accessors(name, meth, options = {})
         generated_field_methods.module_eval do
           define_method(meth) { read_attribute(name) }
-          options
           define_method("#{meth}=") do |value| 
-            value = if options[:type] == Array && options[:geo]
-              value.kind_of?(String) ? value.split(",") : value
-            end.map(&:to_f)
+            if options[:type] == Array && options[:geo]
+              value = case value
+                when String then value.split(",").map(&:to_f)
+                when Array then value.map(&:to_f)
+                else value
+              end
+            end
             write_attribute(name, value) 
           end
           define_method("#{meth}?") do

data/lib/mongoid/geo/inflections.rb

@@ -16,8 +16,16 @@ module Mongoid #:nodoc:
           Criterion::Complex.new(:operator => 'nearSphere', :key => self)          
         end
 
-        def nearMax calc = :flat
-          Criterion::TwinOperators.new(:op_a => get_op(calc, 'near'), :op_b => get_op(calc, 'maxDistance'), :key => self)
+        def nearMax *calcs
+          calcs = (!calcs || calcs.empty?) ? [:flat] : calcs
+          case calcs.size
+          when 1
+            Criterion::TwinOperators.new(:op_a => get_op(calcs.first, 'near'), :op_b => get_op(calcs.first, 'maxDistance'), :key => self)
+          when 2
+            Criterion::TwinOperators.new(:op_a => get_op(calcs.first, 'near'), :op_b => get_op(calcs.last, 'maxDistance'), :key => self)            
+          else
+            raise "method nearMax takes one or two symbols as arguments, each symbol must be either :flat or :sphere"
+          end
         end
 
         def withinBox calc = :flat

metadata

@@ -1,19 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_geo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: !!null 
 platform: ruby
-authors: []
+authors:
+- Kristian Mandrup
 autorequire: !!null 
 bindir: bin
 cert_chain: []
 date: 2011-02-05 00:00:00.000000000 +01:00
 default_executable: !!null 
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156773960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156773960
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2159951560 !ruby/object:Gem::Requirement
+  requirement: &2156773320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +33,10 @@ dependencies:
         version: 2.0.0.rc.6
   type: :runtime
   prerelease: false
-  version_requirements: *2159951560
+  version_requirements: *2156773320
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2159950420 !ruby/object:Gem::Requirement
+  requirement: &2156772700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,9 +44,10 @@ dependencies:
         version: 1.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *2159950420
+  version_requirements: *2156772700
 description: Geo spatial extension on Mongoid 2, to add more geo-spatial capabilities
-email: !!null 
+email:
+- kmandrup@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -70,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
 rubyforge_project: !!null 
 rubygems_version: 1.5.0