opencage-geocoder 0.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bb44eb7c577cea9176bf884e83a94160c8068f12
-  data.tar.gz: 3918ebe495c93729197ccad7d6eee5f8451a74c2
+SHA256:
+  metadata.gz: 9387f3afdae67089dd88dd309545efd8b30eee350854997f95ea601ba3c7d1fd
+  data.tar.gz: 59b024e2f184416fd1bb2ed4a0d88b14103bf2eea04a9120eb205dec98ef22fd
 SHA512:
-  metadata.gz: 7b838c50be09b64555f86e365ed03337e3ec2a1017af020f0fd4dc6877daeb765dbb8e60b1ae42255b356e4bc8ea7f61114c931561974d1fe61525b95fbafee4
-  data.tar.gz: d9d5e5d5ae02e553880a98829bec8048f5ce7eb77b6a86338b2accdd62d66c9ca5e2d2b653078a6c0df0cc5526d44717b49a5abd9b683c6c385ec0f51ad8a41f
+  metadata.gz: 7f918f4608b65658723695f443936430ff9b01c3f52dbeacb8b285844d51923e38945659923708f3dca63ebd180771016e6d539ae1bcf8b6adc32307000bef81
+  data.tar.gz: 6dc61251619fb97db4813a4f63d89cfeb254e62e976476f1494f784f019cbb3db3f14c41ca5b7780078e849b838e62c0a98cdf16e4c1bcfc574e069d80b577d2

data/lib/opencage/geocoder.rb

@@ -1,31 +1,42 @@
 require 'opencage/geocoder/location'
+require 'opencage/geocoder/request'
+require 'open-uri'
+require 'json'
 
 module OpenCage
   class Geocoder
     GeocodingError = Class.new(StandardError)
 
-    BASE_URL = "http://api.opencagedata.com/geocode/v1/json"
+    def initialize(default_options = {})
+      @api_key = default_options.fetch(:api_key) { raise GeocodingError, 'missing API key' }
+    end
+
+    def geocode(location, options = {})
+      request = Request.new(@api_key, location, options)
 
-    attr_reader :api_key
+      results = fetch(request.to_s)
+      return [] unless results
 
-    def initialize(options={})
-      @api_key = options.fetch(:api_key) { raise GeocodingError.new('missing API key') }
+      results.map { |r| Location.new(r) }
     end
 
-    def geocode(location)
-      Location.new(self, name: location).coordinates
+    def reverse_geocode(lat, lng, options = {})
+      lat = Float(lat)
+      lng = Float(lng)
+
+      geocode("#{lat},#{lng}", options).first
     end
 
-    def reverse_geocode(*coordinates)
-      # Accept input as numbers, strings or an array. Raise an error
-      # for anything that cannot be interpreted as a pair of floats.
-      lat, lng = coordinates.flatten.compact.map { |coord| Float(coord) }
+    private
 
-      Location.new(self, lat: lat, lng: lng).name
+    def fetch(url)
+      JSON.parse(URI(url).open.read)['results']
+    rescue OpenURI::HTTPError => error
+      raise GeocodingError, error_message(error)
     end
 
-    def url
-      "#{BASE_URL}?key=#{api_key}"
+    def error_message(error)
+      String(error).start_with?('403') ? 'invalid API key' : error
     end
   end
 end

data/lib/opencage/geocoder/location.rb

@@ -1,64 +1,32 @@
-require 'open-uri'
-require 'json'
-
 module OpenCage
   class Geocoder
     class Location
-      attr_reader :geo, :name
+      def initialize(result, _options = {})
+        @result = result
+      end
 
-      def initialize(geo, options={})
-        @geo  = geo
-        @lat  = options[:lat]
-        @lng  = options[:lng]
-        @name = options[:name]
+      def raw
+        @result
       end
 
       def lat
-        @lat ||= results.first['geometry']['lat'].to_f
+        @result['geometry']['lat'].to_f
       end
 
       def lng
-        @lng ||= results.first['geometry']['lng'].to_f
+        @result['geometry']['lng'].to_f
       end
 
-      def name
-        @name ||= results.first['formatted']
+      def components
+        @result['components']
       end
 
-      def coordinates
-        [ lat, lng ]
+      def address
+        @result['formatted']
       end
 
-      private
-
-      def results
-        @results ||= Array(fetch).tap do |results|
-          raise GeocodingError.new('location not found') if results.empty?
-        end
-      end
-
-      def fetch
-        JSON.parse(open(url).read)['results']
-      rescue OpenURI::HTTPError => error
-        raise GeocodingError.new(error_message(error))
-      end
-
-      def url
-        uri = URI.parse(geo.url)
-        uri.query = [uri.query, "q=#{query}"].join('&')
-        uri
-      end
-
-      def query
-        if @lat && @lng && !@name
-          "#{lat},#{lng}"
-        elsif @name
-          URI::encode(@name)
-        end
-      end
-
-      def error_message(error)
-        (String(error) =~ /\A403/) ? 'invalid API key' : error
+      def coordinates
+        [lat, lng]
       end
     end
   end

data/lib/opencage/geocoder/request.rb

@@ -0,0 +1,20 @@
+module OpenCage
+  class Geocoder
+    class Request
+      def initialize(api_key, query, options = {})
+        @host = options.fetch(:host, 'api.opencagedata.com')
+        @params = options.merge(key: api_key, q: query)
+      end
+
+      def url
+        uri = URI::HTTPS.build(host: @host, path: '/geocode/v1/json')
+        uri.query = URI.encode_www_form(@params)
+        uri
+      end
+
+      def to_s
+        url.to_s
+      end
+    end
+  end
+end

data/lib/opencage/version.rb

@@ -1,3 +1,3 @@
 module OpenCage
-  VERSION = '0.1.2'
+  VERSION = '2.0.0'.freeze
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: opencage-geocoder
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Samuel Scully
+- Marc Tobias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2018-12-31 00:00:00.000000000 Z
 dependencies: []
-description: A client for the OpenCage Data geocoder API - http://geocoder.opencagedata.com/
-email: dev@lokku.com
+description: A client for the OpenCage Data geocoding API - https://opencagedata.com/
+email: support@opencagedata.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -19,11 +20,13 @@ files:
 - lib/opencage.rb
 - lib/opencage/geocoder.rb
 - lib/opencage/geocoder/location.rb
+- lib/opencage/geocoder/request.rb
 - lib/opencage/version.rb
-homepage: https://github.com/lokku/ruby-opencage-geocoder
+homepage: https://opencagedata.com/tutorials/geocode-in-ruby
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/opencagedata/ruby-opencage-geocoder
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -40,7 +43,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A client for the OpenCage Data geocoder API