acts_as_geocodable 2.0.0 → 2.0.1

data/lib/acts_as_geocodable.rb

@@ -76,7 +76,7 @@ module ActsAsGeocodable #:nodoc:
     #   declaration.
     #
     scope :origin, lambda {|*args|
-      origin = args[0]
+      origin = location_to_geocode(args[0])
       options = {
         :units => acts_as_geocodable_options[:units],
       }.merge(args[1] || {})
@@ -86,7 +86,9 @@ module ActsAsGeocodable #:nodoc:
            #{acts_as_geocodable_options[:distance_column]}")
 
       scope = scope.where("#{distance_sql} >  #{options[:beyond]}") if options[:beyond]
-      scope = scope.where("#{distance_sql} <= #{options[:within]}") if options[:within]
+      if options[:within]
+        scope = scope.where("(#{distance_sql} <= #{options[:within]}) OR (geocodes.latitude = :lat AND geocodes.longitude = :long)", {:lat => origin.latitude, :long => origin.longitude})
+      end
       scope
     }
 
@@ -122,7 +124,7 @@ module ActsAsGeocodable #:nodoc:
         case location
         when Geocode then location
         when InstanceMethods then location.geocode
-        when String, Fixnum then Geocode.find_or_create_by_query(location)
+        when String, Fixnum then Geocode.find_or_create_by_query(location.to_s)
         end
       end
 
@@ -159,7 +161,6 @@ module ActsAsGeocodable #:nodoc:
     private
 
       def sql_for_distance(origin, units = acts_as_geocodable_options[:units])
-        origin = location_to_geocode(origin)
         Graticule::Distance::Spherical.to_sql(
           :latitude => origin.latitude,
           :longitude => origin.longitude,

data/lib/acts_as_geocodable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsGeocodable
-  VERSION = '2.0.0' unless defined?(::ActsAsGeocodable::VERSION)
+  VERSION = '2.0.1' unless defined?(::ActsAsGeocodable::VERSION)
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_geocodable
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Daniel Morrison
@@ -16,70 +17,79 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 -04:00
+date: 2010-11-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
         version: 2.0.0
   requirement: *id001
+  type: :runtime
   name: graticule
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   requirement: *id002
+  type: :development
   name: rails
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 2
         - 5
         version: 1.2.5
   requirement: *id003
+  type: :development
   name: sqlite3-ruby
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 45
         segments: 
         - 2
         - 8
         - 1
         version: 2.8.1
   requirement: *id004
+  type: :development
   name: mysql
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31098209
         segments: 
         - 2
         - 0
@@ -87,42 +97,49 @@ dependencies:
         - beta
         version: 2.0.0.beta
   requirement: *id005
+  type: :development
   name: rspec
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   requirement: *id006
+  type: :development
   name: factory_girl
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
   version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   requirement: *id007
+  type: :development
   name: database_cleaner
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
   version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   requirement: *id008
+  type: :development
   name: ruby-debug
 description: Simple geocoding for Rails ActiveRecord models. See the README for more details.
 email: info@collectiveidea.com
@@ -154,23 +171,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple geocoding for Rails ActiveRecord models