geocoder 1.4.9 → 1.5.0

data/lib/geocoder/results/ip2location.rb

@@ -0,0 +1,22 @@
+require 'geocoder/results/base'
+
+module Geocoder::Result
+  class Ip2location < Base
+
+    def address(format = :full)
+      "#{city_name} #{zip_code}, #{country_name}".sub(/^[ ,]*/, '')
+    end
+
+    def self.response_attributes
+      %w[country_code country_name region_name city_name latitude longitude
+        zip_code time_zone isp domain net_speed idd_code area_code usage_type
+        weather_station_code weather_station_name mcc mnc mobile_brand elevation]
+    end
+
+    response_attributes.each do |attr|
+      define_method attr do
+        @data[attr] || ""
+      end
+    end
+  end
+end

data/lib/geocoder/results/ipdata_co.rb

@@ -3,11 +3,6 @@ require 'geocoder/results/base'
 module Geocoder::Result
   class IpdataCo < Base
 
-    def address(format = :full)
-      s = state_code.to_s == "" ? "" : ", #{state_code}"
-      "#{city}#{s} #{postal_code}, #{country}".sub(/^[ ,]*/, "")
-    end
-
     def city
       @data['city']
     end

data/lib/geocoder/results/maxmind.rb

@@ -87,11 +87,6 @@ module Geocoder::Result
       [data_hash[:latitude].to_f, data_hash[:longitude].to_f]
     end
 
-    def address(format = :full)
-      s = state_code.to_s == "" ? "" : ", #{state_code}"
-      "#{city}#{s} #{postal_code}, #{country_code}".sub(/^[ ,]*/, "")
-    end
-
     def city
       data_hash[:city_name]
     end

data/lib/geocoder/results/maxmind_local.rb

@@ -3,11 +3,6 @@ require 'geocoder/results/base'
 module Geocoder::Result
   class MaxmindLocal < Base
 
-    def address(format = :full)
-      s = state.to_s == "" ? "" : ", #{state}"
-      "#{city}#{s} #{postal_code}, #{country}".sub(/^[ ,]*/, "")
-    end
-
     def coordinates
       [@data[:latitude], @data[:longitude]]
     end

data/lib/geocoder/results/telize.rb

@@ -3,11 +3,6 @@ require 'geocoder/results/base'
 module Geocoder::Result
   class Telize < Base
 
-    def address(format = :full)
-      s = state_code.to_s == "" ? "" : ", #{state_code}"
-      "#{city}#{s} #{postal_code}, #{country}".sub(/^[ ,]*/, "")
-    end
-
     def city
       @data['city']
     end

data/lib/geocoder/results/test.rb

@@ -15,7 +15,7 @@ module Geocoder
         end
       end
 
-      %w[latitude longitude neighborhood city state state_code sub_state
+      %w[coordinates neighborhood city state state_code sub_state
       sub_state_code province province_code postal_code country
       country_code address street_address street_number route geometry].each do |attr|
         add_result_attribute(attr)

data/lib/geocoder/stores/active_record.rb

@@ -166,8 +166,6 @@ module Geocoder::Store
         }
       end
 
-      private # ----------------------------------------------------------------
-
       ##
       # SQL for calculating distance based on the current database's
       # capabilities (trig functions?).

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.4.9"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.0
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-27 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies: []
 description: Provides object geocoding (by street or IP address), reverse geocoding
   (coordinates to street address), distance queries for ActiveRecord and Mongoid,
@@ -68,6 +68,7 @@ files:
 - lib/geocoder/lookups/google_places_search.rb
 - lib/geocoder/lookups/google_premier.rb
 - lib/geocoder/lookups/here.rb
+- lib/geocoder/lookups/ip2location.rb
 - lib/geocoder/lookups/ipapi_com.rb
 - lib/geocoder/lookups/ipdata_co.rb
 - lib/geocoder/lookups/ipinfo_io.rb
@@ -81,9 +82,7 @@ files:
 - lib/geocoder/lookups/maxmind_geoip2.rb
 - lib/geocoder/lookups/maxmind_local.rb
 - lib/geocoder/lookups/nominatim.rb
-- lib/geocoder/lookups/okf.rb
 - lib/geocoder/lookups/opencagedata.rb
-- lib/geocoder/lookups/ovi.rb
 - lib/geocoder/lookups/pelias.rb
 - lib/geocoder/lookups/pickpoint.rb
 - lib/geocoder/lookups/pointpin.rb
@@ -121,6 +120,7 @@ files:
 - lib/geocoder/results/google_places_search.rb
 - lib/geocoder/results/google_premier.rb
 - lib/geocoder/results/here.rb
+- lib/geocoder/results/ip2location.rb
 - lib/geocoder/results/ipapi_com.rb
 - lib/geocoder/results/ipdata_co.rb
 - lib/geocoder/results/ipinfo_io.rb
@@ -134,9 +134,7 @@ files:
 - lib/geocoder/results/maxmind_geoip2.rb
 - lib/geocoder/results/maxmind_local.rb
 - lib/geocoder/results/nominatim.rb
-- lib/geocoder/results/okf.rb
 - lib/geocoder/results/opencagedata.rb
-- lib/geocoder/results/ovi.rb
 - lib/geocoder/results/pelias.rb
 - lib/geocoder/results/pickpoint.rb
 - lib/geocoder/results/pointpin.rb
@@ -175,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/geocoder/lookups/okf.rb

@@ -1,44 +0,0 @@
-require 'geocoder/lookups/base'
-require "geocoder/results/okf"
-
-module Geocoder::Lookup
-  class Okf < Base
-
-    def name
-      "Okf"
-    end
-
-    def query_url(query)
-      "#{protocol}://data.okf.fi/gis/1/geocode/json?" + url_query_string(query)
-    end
-
-    private # ---------------------------------------------------------------
-
-    def valid_response?(response)
-      json = parse_json(response.body)
-      status = json["status"] if json
-      super(response) and ['OK', 'ZERO_RESULTS'].include?(status)
-    end
-
-    def results(query)
-      return [] unless doc = fetch_data(query)
-      case doc['status']; when "OK" # OK status implies >0 results
-        return doc['results']
-      end
-      return []
-    end
-
-    def query_url_okf_params(query)
-      params = {
-        (query.reverse_geocode? ? :latlng : :address) => query.sanitized_text,
-        :sensor => "false",
-        :language => (query.language || configuration.language)
-      }
-      params
-    end
-
-    def query_url_params(query)
-      query_url_okf_params(query).merge(super)
-    end
-  end
-end

data/lib/geocoder/lookups/ovi.rb

@@ -1,62 +0,0 @@
-require 'geocoder/lookups/base'
-require 'geocoder/results/ovi'
-
-module Geocoder::Lookup
-  class Ovi < Base
-
-    def name
-      "Ovi"
-    end
-
-    def required_api_key_parts
-      []
-    end
-
-    def query_url(query)
-      "#{protocol}://lbs.ovi.com/search/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=>1,
-        :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/results/okf.rb

@@ -1,106 +0,0 @@
-require 'geocoder/results/base'
-
-module Geocoder::Result
-  class Okf < Base
-
-    def coordinates
-      ['lat', 'lng'].map{ |i| geometry['location'][i] }
-    end
-
-    def address(format = :full)
-      formatted_address
-    end
-
-    def city
-      fields = [:locality, :sublocality,
-        :administrative_area_level_3,
-        :administrative_area_level_2]
-      fields.each do |f|
-        if entity = address_components_of_type(f).first
-          return entity['long_name']
-        end
-      end
-      return nil # no appropriate components found
-    end
-
-  def state
-    ""
-  end
-
-  def sub_state
-    ""
-  end
-
-  def state_code
-    ""
-  end
-
-    def country
-      if country = address_components_of_type(:country).first
-        country['long_name']
-      end
-    end
-
-    def country_code
-      if country = address_components_of_type(:country).first
-        country['short_name']
-      end
-    end
-
-    def postal_code
-      if postal = address_components_of_type(:postal_code).first
-        postal['long_name']
-      end
-    end
-
-    def route
-      if route = address_components_of_type(:route).first
-        route['long_name']
-      end
-    end
-
-    def street_number
-      if street_number = address_components_of_type(:street_number).first
-        street_number['long_name']
-      end
-    end
-
-    def street_address
-      [route, street_number].compact.join(' ')
-    end
-
-    def types
-      @data['types']
-    end
-
-    def formatted_address
-      @data['formatted_address']
-    end
-
-    def address_components
-      @data['address_components']
-    end
-
-    ##
-    # Get address components of a given type. Valid types are defined in
-    # Google's Geocoding API documentation and include (among others):
-    #
-    #   :street_number
-    #   :locality
-    #   :neighborhood
-    #   :route
-    #   :postal_code
-    #
-    def address_components_of_type(type)
-      address_components.select{ |c| c['types'].include?(type.to_s) }
-    end
-
-    def geometry
-      @data['geometry']
-    end
-
-    def precision
-      geometry['location_type'] if geometry
-    end
-  end
-end

data/lib/geocoder/results/ovi.rb

@@ -1,71 +0,0 @@
-require 'geocoder/results/base'
-
-module Geocoder::Result
-  class Ovi < Base
-
-    ##
-    # A string in the given format.
-    #
-    def address(format = :full)
-      address_data['Label']
-    end
-
-    ##
-    # A two-element array: [lat, lon].
-    #
-    def coordinates
-      fail unless d = @data['Location']['DisplayPosition']
-      [d['Latitude'].to_f, d['Longitude'].to_f]
-    end
-
-    def state
-      address_data['County']
-    end
-
-    def province
-      address_data['County']
-    end
-
-    def postal_code
-      address_data['PostalCode']
-    end
-
-    def city
-      address_data['City']
-    end
-
-    def state_code
-      address_data['State']
-    end
-
-    def province_code
-      address_data['State']
-    end
-
-    def country
-      fail unless d = address_data['AdditionalData']
-      if v = d.find{|ad| ad['key']=='CountryName'}
-        return v['value']
-      end
-    end
-
-    def country_code
-      address_data['Country']
-    end
-
-    def viewport
-      map_view = data['Location']['MapView'] || fail
-      south = map_view['BottomRight']['Latitude']
-      west = map_view['TopLeft']['Longitude']
-      north = map_view['TopLeft']['Latitude']
-      east = map_view['BottomRight']['Longitude']
-      [south, west, north, east]
-    end
-
-    private # ----------------------------------------------------------------
-
-    def address_data
-      @data['Location']['Address'] || fail
-    end
-  end
-end