diff --git a/lib/geocoder/stores/mongo_base.rb b/lib/geocoder/stores/mongo_base.rb
new file mode 100644
index 0000000000000000000000000000000000000000..9203e2147b8dc0a0a4542bb76576cefbceaaef68
--- /dev/null
+++ b/lib/geocoder/stores/mongo_base.rb
@@ -0,0 +1,81 @@
+module Geocoder::Store
+ module MongoBase
+
+ def self.included_by_model(base)
+ base.class_eval do
+
+ scope :geocoded, lambda {
+ where(geocoder_options[:coordinates].ne => nil)
+ }
+
+ scope :not_geocoded, lambda {
+ where(geocoder_options[:coordinates] => nil)
+ }
+
+ scope :near, lambda{ |location, *args|
+ coords = Geocoder::Calculations.extract_coordinates(location)
+
+ # no results if no lat/lon given
+ return where(:id => false) unless coords.is_a?(Array)
+
+ radius = args.size > 0 ? args.shift : 20
+ options = args.size > 0 ? args.shift : {}
+
+ # Use BSON::OrderedHash if Ruby's hashes are unordered.
+ # Conditions must be in order required by indexes (see mongo gem).
+ empty = RUBY_VERSION.split('.')[1].to_i < 9 ? BSON::OrderedHash.new : {}
+
+ conds = empty.clone
+ field = geocoder_options[:coordinates]
+ conds[field] = empty.clone
+ conds[field]["$nearSphere"] = coords.reverse
+ conds[field]["$maxDistance"] = \
+ Geocoder::Calculations.distance_to_radians(radius, options[:units] || :mi)
+
+ if obj = options[:exclude]
+ conds[:_id.ne] = obj.id
+ end
+ where(conds)
+ }
+ end
+ end
+
+ ##
+ # Coordinates [lat,lon] of the object.
+ # This method always returns coordinates in lat,lon order,
+ # even though internally they are stored in the opposite order.
+ #
+ def to_coordinates
+ coords = send(self.class.geocoder_options[:coordinates])
+ coords.is_a?(Array) ? coords.reverse : []
+ end
+
+ ##
+ # Look up coordinates and assign to +latitude+ and +longitude+ attributes
+ # (or other as specified in +geocoded_by+). Returns coordinates (array).
+ #
+ def geocode
+ do_lookup(false) do |o,rs|
+ r = rs.first
+ unless r.coordinates.nil?
+ o.send :write_attribute, self.class.geocoder_options[:coordinates], r.coordinates.reverse
+ end
+ r.coordinates
+ end
+ end
+
+ ##
+ # Look up address and assign to +address+ attribute (or other as specified
+ # in +reverse_geocoded_by+). Returns address (string).
+ #
+ def reverse_geocode
+ do_lookup(true) do |o,rs|
+ r = rs.first
+ unless r.address.nil?
+ o.send :write_attribute, self.class.geocoder_options[:fetched_address], r.address
+ end
+ r.address
+ end
+ end
+ end
+end
diff --git a/lib/geocoder/stores/mongo_mapper.rb b/lib/geocoder/stores/mongo_mapper.rb
index 0b1b44e6a9188930857fab03ef65e635569f957f..c3db437f9a0ed728fc19092ae149c91bc5f72838 100644
--- a/lib/geocoder/stores/mongo_mapper.rb
+++ b/lib/geocoder/stores/mongo_mapper.rb
@@ -1,79 +1,13 @@
require 'geocoder/stores/base'
+require 'geocoder/stores/mongo_base'
module Geocoder::Store
module MongoMapper
include Base
+ include MongoBase
def self.included(base)
- base.class_eval do
-
- scope :geocoded, lambda {
- where(geocoder_options[:coordinates].ne => nil)
- }
-
- scope :not_geocoded, lambda {
- where(geocoder_options[:coordinates] => nil)
- }
-
- scope :near, lambda{ |location, *args|
- coords = Geocoder::Calculations.extract_coordinates(location)
- radius = args.size > 0 ? args.shift : 20
- options = args.size > 0 ? args.shift : {}
-
- # Use BSON::OrderedHash if Ruby's hashes are unordered.
- # Conditions must be in order required by indexes (see mongo gem).
- empty = RUBY_VERSION.split('.')[1].to_i < 9 ? BSON::OrderedHash.new : {}
-
- conds = empty.clone
- conds[:coordinates] = empty.clone
- conds[:coordinates]["$nearSphere"] = coords.reverse
- conds[:coordinates]["$maxDistance"] = \
- Geocoder::Calculations.distance_to_radians(radius, options[:units] || :mi)
-
- if obj = options[:exclude]
- conds[:_id.ne] = obj.id
- end
- where(conds)
- }
- end
- end
-
- ##
- # Coordinates [lat,lon] of the object.
- # This method always returns coordinates in lat,lon order,
- # even though internally they are stored in the opposite order.
- #
- def to_coordinates
- coords = send(self.class.geocoder_options[:coordinates])
- coords.is_a?(Array) ? coords.reverse : []
- end
-
- ##
- # Look up coordinates and assign to +latitude+ and +longitude+ attributes
- # (or other as specified in +geocoded_by+). Returns coordinates (array).
- #
- def geocode
- do_lookup(false) do |o,rs|
- r = rs.first
- unless r.coordinates.nil?
- o.send :write_attribute, self.class.geocoder_options[:coordinates], r.coordinates.reverse
- end
- r.coordinates
- end
- end
-
- ##
- # Look up address and assign to +address+ attribute (or other as specified
- # in +reverse_geocoded_by+). Returns address (string).
- #
- def reverse_geocode
- do_lookup(true) do |o,rs|
- r = rs.first
- unless r.address.nil?
- o.send :write_attribute, self.class.geocoder_options[:fetched_address], r.address
- end
- r.address
- end
+ MongoBase.included_by_model(base)
end
end
end
diff --git a/lib/geocoder/stores/mongoid.rb b/lib/geocoder/stores/mongoid.rb
index cf06817b5f94e2e6953020db159354dcee40c6d5..ca5841366909f985aa44cf30fd3e44889259f872 100644
--- a/lib/geocoder/stores/mongoid.rb
+++ b/lib/geocoder/stores/mongoid.rb
@@ -1,84 +1,13 @@
require 'geocoder/stores/base'
+require 'geocoder/stores/mongo_base'
module Geocoder::Store
module Mongoid
include Base
+ include MongoBase
def self.included(base)
- base.class_eval do
-
- scope :geocoded, lambda {
- where(geocoder_options[:coordinates].ne => nil)
- }
-
- scope :not_geocoded, lambda {
- where(geocoder_options[:coordinates] => nil)
- }
-
- scope :near, lambda{ |location, *args|
- coords = Geocoder::Calculations.extract_coordinates(location)
-
- # no results if no lat/lon given
- return criteria.where(:id => false) unless coords.is_a?(Array)
-
- radius = args.size > 0 ? args.shift : 20
- options = args.size > 0 ? args.shift : {}
-
- # Use BSON::OrderedHash if Ruby's hashes are unordered.
- # Conditions must be in order required by indexes (see mongo gem).
- empty = RUBY_VERSION.split('.')[1].to_i < 9 ? BSON::OrderedHash.new : {}
-
- conds = empty.clone
- field = geocoder_options[:coordinates]
- conds[field] = empty.clone
- conds[field]["$nearSphere"] = coords.reverse
- conds[field]["$maxDistance"] = \
- Geocoder::Calculations.distance_to_radians(radius, options[:units] || :mi)
-
- if obj = options[:exclude]
- conds[:_id.ne] = obj.id
- end
- criteria.where(conds)
- }
- end
- end
-
- ##
- # Coordinates [lat,lon] of the object.
- # This method always returns coordinates in lat,lon order,
- # even though internally they are stored in the opposite order.
- #
- def to_coordinates
- coords = send(self.class.geocoder_options[:coordinates])
- coords.is_a?(Array) ? coords.reverse : []
- end
-
- ##
- # Look up coordinates and assign to +latitude+ and +longitude+ attributes
- # (or other as specified in +geocoded_by+). Returns coordinates (array).
- #
- def geocode
- do_lookup(false) do |o,rs|
- r = rs.first
- unless r.coordinates.nil?
- o.send :write_attribute, self.class.geocoder_options[:coordinates], r.coordinates.reverse
- end
- r.coordinates
- end
- end
-
- ##
- # Look up address and assign to +address+ attribute (or other as specified
- # in +reverse_geocoded_by+). Returns address (string).
- #
- def reverse_geocode
- do_lookup(true) do |o,rs|
- r = rs.first
- unless r.address.nil?
- o.send :write_attribute, self.class.geocoder_options[:fetched_address], r.address
- end
- r.address
- end
+ MongoBase.included_by_model(base)
end
end
end