geocoder 1.1.9 → 1.2.0

data/lib/geocoder/lookups/google_premier.rb

@@ -31,7 +31,7 @@ module Geocoder::Lookup
 
     def sign(string)
       raw_private_key = url_safe_base64_decode(configuration.api_key[0])
-      digest = OpenSSL::Digest::Digest.new('sha1')
+      digest = OpenSSL::Digest.new('sha1')
       raw_signature = OpenSSL::HMAC.digest(digest, raw_private_key, string)
       url_safe_base64_encode(raw_signature)
     end

data/lib/geocoder/lookups/here.rb

@@ -0,0 +1,62 @@
+require 'geocoder/lookups/base'
+require 'geocoder/results/here'
+
+module Geocoder::Lookup
+  class Here < Base
+
+    def name
+      "Here"
+    end
+
+    def required_api_key_parts
+      []
+    end
+
+    def query_url(query)
+      "#{protocol}://#{if query.reverse_geocode? then 'reverse.' end}geocoder.api.here.com/6.2/#{if query.reverse_geocode? then 'reverse' end}geocode.json?" + url_query_string(query)
+    end
+
+    private # ---------------------------------------------------------------
+
+    def results(query)
+      return [] unless doc = fetch_data(query)
+      return [] unless doc['Response'] && doc['Response']['View']
+      if r=doc['Response']['View']
+        return [] if r.nil? || !r.is_a?(Array) || r.empty?
+        return r.first['Result']
+      end
+      []
+    end
+
+    def query_url_params(query)
+      options = {
+        :gen=>4,
+        :app_id=>api_key,
+        :app_code=>api_code
+      }
+
+      if query.reverse_geocode?
+        super.merge(options).merge(
+          :prox=>query.sanitized_text,
+          :mode=>:retrieveAddresses
+        )
+      else
+        super.merge(options).merge(
+          :searchtext=>query.sanitized_text
+        )
+      end
+    end
+
+    def api_key
+      if a=configuration.api_key
+        return a.first if a.is_a?(Array)
+      end
+    end
+
+    def api_code
+      if a=configuration.api_key
+        return a.last if a.is_a?(Array)
+      end
+    end
+  end
+end

data/lib/geocoder/lookups/mapquest.rb

@@ -14,7 +14,7 @@ module Geocoder::Lookup
     end
 
     def query_url(query)
-      domain = configuration[:licensed] ? "www" : "open"
+      domain = configuration[:open] ? "open" : "www"
       version = configuration[:version] || 1
       url = "#{protocol}://#{domain}.mapquestapi.com/geocoding/v#{version}/#{search_type(query)}?"
       url + url_query_string(query)
@@ -53,6 +53,7 @@ module Geocoder::Lookup
         raise_error(Geocoder::Error, messages) ||
           warn("Mapquest Geocoding API error: #{messages}")
       end
+      []
     end
 
   end

data/lib/geocoder/lookups/maxmind_local.rb

@@ -0,0 +1,58 @@
+require 'ipaddr'
+require 'geocoder/lookups/base'
+require 'geocoder/results/maxmind_local'
+
+module Geocoder::Lookup
+  class MaxmindLocal < Base
+
+    def initialize
+      if !configuration[:file].nil?
+        begin
+          gem = RUBY_PLATFORM == 'java' ? 'jgeoip' : 'geoip'
+          require gem
+        rescue LoadError
+          raise "Could not load geoip dependency. To use MaxMind Local lookup you must add the #{gem} gem to your Gemfile or have it installed in your system."
+        end
+      end
+      super
+    end
+
+    def name
+      "MaxMind Local"
+    end
+
+    def required_api_key_parts
+      []
+    end
+
+    private
+
+    def results(query)
+      if configuration[:file]
+        geoip_class = RUBY_PLATFORM == "java" ? JGeoIP : GeoIP
+        result = geoip_class.new(configuration[:file]).city(query.to_s)
+        result.nil? ? [] : [result.to_hash]
+      elsif configuration[:package] == :city
+        addr = IPAddr.new(query.text).to_i
+        q = "SELECT l.country, l.region, l.city
+          FROM maxmind_geolite_city_location l JOIN maxmind_geolite_city_blocks b USING (loc_id)
+          WHERE b.start_ip_num <= #{addr} AND #{addr} <= b.end_ip_num"
+        format_result(q, [:country_name, :region_name, :city_name])
+      elsif configuration[:package] == :country
+        addr = IPAddr.new(query.text).to_i
+        q = "SELECT country, country_code FROM maxmind_geolite_country
+          WHERE start_ip_num <= #{addr} AND #{addr} <= end_ip_num"
+        format_result(q, [:country_name, :country_code2])
+      end
+    end
+
+    def format_result(query, attr_names)
+      if r = ActiveRecord::Base.connection.execute(query).first
+        r = r.values if r.is_a?(Hash) # some db adapters return Hash, some Array
+        [Hash[*attr_names.zip(r).flatten]]
+      else
+        []
+      end
+    end
+  end
+end

data/lib/geocoder/lookups/nominatim.rb

@@ -25,6 +25,14 @@ module Geocoder::Lookup
       doc.is_a?(Array) ? doc : [doc]
     end
 
+    def parse_raw_data(raw_data)
+      if raw_data.include?("Bandwidth limit exceeded")
+        raise_error(Geocoder::OverQueryLimitError) || warn("Over API query limit.")
+      else
+        super(raw_data)
+      end
+    end
+
     def query_url_params(query)
       params = {
         :format => "json",

data/lib/geocoder/lookups/smarty_streets.rb

@@ -0,0 +1,45 @@
+require 'geocoder/lookups/base'
+require 'geocoder/results/smarty_streets'
+
+module Geocoder::Lookup
+  class SmartyStreets < Base
+    def name
+      "SmartyStreets"
+    end
+
+    def required_api_key_parts
+      %w(auth-token)
+    end
+
+    def query_url(query)
+      path = zipcode_only?(query) ? "zipcode" : "street-address"
+      "#{protocol}://api.smartystreets.com/#{path}?#{url_query_string(query)}"
+    end
+
+    private # ---------------------------------------------------------------
+
+    def zipcode_only?(query)
+      !query.text.is_a?(Array) and query.to_s.strip =~ /\A\d{5}(-\d{4})?\Z/
+    end
+
+    def query_url_params(query)
+      params = {}
+      if zipcode_only?(query)
+        params[:zipcode] = query.sanitized_text
+      else
+        params[:street] = query.sanitized_text
+      end
+      if configuration.api_key.is_a?(Array)
+        params[:"auth-id"] = configuration.api_key[0]
+        params[:"auth-token"] = configuration.api_key[1]
+      else
+        params[:"auth-token"] = configuration.api_key
+      end
+      params.merge(super)
+    end
+
+    def results(query)
+      fetch_data(query) || []
+    end
+  end
+end

data/lib/geocoder/lookups/yahoo.rb

@@ -50,7 +50,7 @@ module Geocoder::Lookup
     # to warning message.
     #
     def parse_raw_data(raw_data)
-      if raw_data.match /^<\?xml/
+      if raw_data.match(/^<\?xml/)
         if raw_data.include?("Rate Limit Exceeded")
           raise_error(Geocoder::OverQueryLimitError) || warn("Over API query limit.")
         elsif raw_data =~ /<yahoo:description>(Please provide valid credentials.*)<\/yahoo:description>/i

data/lib/geocoder/models/active_record.rb

@@ -16,7 +16,8 @@ module Geocoder
           :longitude     => options[:longitude] || :longitude,
           :geocode_block => block,
           :units         => options[:units],
-          :method        => options[:method]
+          :method        => options[:method],
+          :lookup        => options[:lookup]
         )
       end
 
@@ -30,8 +31,9 @@ module Geocoder
           :latitude        => latitude_attr,
           :longitude       => longitude_attr,
           :reverse_block   => block,
-          :units         => options[:units],
-          :method        => options[:method]
+          :units           => options[:units],
+          :method          => options[:method],
+          :lookup          => options[:lookup]
         )
       end
 

data/lib/geocoder/models/base.rb

@@ -1,5 +1,3 @@
-require 'geocoder'
-
 module Geocoder
 
   ##
@@ -29,7 +27,7 @@ module Geocoder
       private # ----------------------------------------------------------------
 
       def geocoder_init(options)
-        unless @geocoder_options
+        unless defined?(@geocoder_options)
           @geocoder_options = {}
           require "geocoder/stores/#{geocoder_file_name}"
           include Geocoder::Store.const_get(geocoder_module_name)
@@ -39,4 +37,3 @@ module Geocoder
     end
   end
 end
-

data/lib/geocoder/models/mongo_base.rb

@@ -19,7 +19,8 @@ module Geocoder
           :geocode_block => block,
           :units         => options[:units],
           :method        => options[:method],
-          :skip_index    => options[:skip_index] || false
+          :skip_index    => options[:skip_index] || false,
+          :lookup        => options[:lookup]
         )
       end
 
@@ -34,7 +35,8 @@ module Geocoder
           :reverse_block   => block,
           :units           => options[:units],
           :method          => options[:method],
-          :skip_index      => options[:skip_index] || false
+          :skip_index      => options[:skip_index] || false,
+          :lookup          => options[:lookup]
         )
       end
 

data/lib/geocoder/query.rb

@@ -33,9 +33,9 @@ module Geocoder
     #
     def lookup
       if ip_address?
-        name = Configuration.ip_lookup || Geocoder::Lookup.ip_services.first
+        name = options[:ip_lookup] || Configuration.ip_lookup || Geocoder::Lookup.ip_services.first
       else
-        name = Configuration.lookup || Geocoder::Lookup.street_services.first
+        name = options[:lookup] || Configuration.lookup || Geocoder::Lookup.street_services.first
       end
       Lookup.get(name)
     end
@@ -63,14 +63,14 @@ module Geocoder
     # dot-delimited numbers.
     #
     def ip_address?
-      !!text.to_s.match(/\A(::ffff:)?(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\z/)
+      IpAddress.new(text).valid? rescue false
     end
 
     ##
     # Is the Query text a loopback IP address?
     #
     def loopback_ip_address?
-      !!(self.ip_address? and (text == "0.0.0.0" or text.to_s.match(/\A127/)))
+      ip_address? && IpAddress.new(text).loopback?
     end
 
     ##

data/lib/geocoder/railtie.rb

@@ -1,4 +1,3 @@
-require 'geocoder'
 require 'geocoder/models/active_record'
 
 module Geocoder
@@ -12,6 +11,7 @@ module Geocoder
       end
       rake_tasks do
         load "tasks/geocoder.rake"
+        load "tasks/maxmind.rake"
       end
     end
   end

data/lib/geocoder/request.rb

@@ -1,17 +1,19 @@
-require 'geocoder'
-
 module Geocoder
   module Request
 
     def location
-      unless defined?(@location)
-        if env.has_key?('HTTP_X_REAL_IP')
-          @location = Geocoder.search(env['HTTP_X_REAL_IP']).first
-        elsif env.has_key?('HTTP_X_FORWARDED_FOR')
-          @location = Geocoder.search(env['HTTP_X_FORWARDED_FOR'].split(/\s*,\s*/)[0]).first
+      @location ||= begin
+        detected_ip = env['HTTP_X_REAL_IP'] || (
+          env['HTTP_X_FORWARDED_FOR'] &&
+          env['HTTP_X_FORWARDED_FOR'].split(",").first.strip
+        )
+        detected_ip = IpAddress.new(detected_ip.to_s)
+        if detected_ip.valid? and !detected_ip.loopback?
+          real_ip = detected_ip.to_s
         else
-          @location = Geocoder.search(ip).first
+          real_ip = self.ip
         end
+        Geocoder.search(real_ip).first
       end
       @location
     end

data/lib/geocoder/results/baidu_ip.rb

@@ -0,0 +1,62 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class BaiduIp < Base
+    def coordinates
+      [point['y'].to_f, point['x'].to_f]
+    end
+
+    def address
+      @data['address']
+    end
+
+    def state
+      province
+    end
+
+    def province
+      address_detail['province']
+    end
+
+    def city
+      address_detail['city']
+    end
+
+    def district
+      address_detail['district']
+    end
+
+    def street
+      address_detail['street']
+    end
+
+    def street_number
+      address_detail['street_number']
+    end
+
+    def state_code
+      ""
+    end
+
+    def postal_code
+      ""
+    end
+
+    def country
+      "China"
+    end
+
+    def country_code
+      "CN"
+    end
+
+    private
+    def address_detail
+      @data['address_detail']
+    end
+
+    def point
+      @data['point']
+    end
+  end
+end

data/lib/geocoder/results/cloudmade.rb

@@ -0,0 +1,39 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class Cloudmade < Base
+
+    def coordinates
+      @data["centroid"]["coordinates"]
+    end
+
+    def street
+      @data["location"]["road"]
+    end
+
+    def city
+      @data["location"]["city"]
+    end
+    
+    def state
+      @data["location"]["county"]
+    end
+    alias_method :state_code, :state
+
+    def country
+      @data["location"]["country"]
+    end
+    alias_method :country_code, :country
+
+    def postal_code
+      @data["location"]["postcode"]
+    end
+
+    def address
+      [street, city, state, postal_code, country].compact.reject{|s| s.length == 0 }.join(", ")
+    end
+
+  end
+end
+
+