open_street_map 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7d3812ea48a5dba602beacb20452580f56111a0
-  data.tar.gz: c3bb9aafae81eeb69b2ced468fc6ecc347f504d4
+  metadata.gz: ef13982f80f3101da6717ce75cbf3d853e7dbaa2
+  data.tar.gz: d38d83c223e35c0fcf941fc7e8833ebda8f99735
 SHA512:
-  metadata.gz: 766efc9713d8d1923ee0722c8640fb7d08145523b57baa5b3139a2562d5f12892e5f32e940a8c4923981e54d8f15be614264c785a8cb1726827afa4bdd2a2483
-  data.tar.gz: 68d27db98d11eda52c04db1973ab680af380866669bba851041aa0aa7d90591c89e585ae229daece18865f9422d304633cff918d2430278492a25988bb2eba14
+  metadata.gz: d01b5afab4da89cc08a4dfe8cb221f1233b01a4148f266b4b22a30a7d31a3ca07b0325eb9962cc6ecb034c930a76381882482bb97da7b6d0ccb4b1b18916a352
+  data.tar.gz: 8af45e7070eae2e6b6fa9fc32d9812ae88ade2c5019a23e2688abfeeb22138dbbc7eaf17ab6c1015eacb5d451656c8b93448394151ca1e19c21d981f578e4aa1

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/README.md

@@ -7,7 +7,7 @@ Integration of OpenStreetMap api from [Nominatim](https://wiki.openstreetmap.org
 This project requires:
 
 * Ruby >= 2.3.1, but can work with earlier versions
-* RestClient >= 2.0.2
+* HTTParty >= 0.16
 
 ## Installation
 

data/lib/open_street_map/client/request.rb

@@ -4,71 +4,28 @@ module OpenStreetMap
     module Request
       private
 
-      def call(type, args)
-        url = generate_url(type, args)
-        response = fetch(url, args)
-        sleep(REQUEST_TIMEOUT)
-        parse(response, args[:format])
-      rescue
-        { 'errors' => 'Bad request' }
-      end
-
-      # generate url from args
-      def generate_url(type, args)
-        valid_args_list = valid_args(type)
-        args = args.select { |key, _value| valid_args_list.include?(key) }
-        url = args.inject('') { |acc, (key, value)| acc + add_to_options(key, value, acc) }
-        type + url
-      end
-
       # make request to API
-      def fetch(url, args)
-        url = hostname(args[:hostname]) + url
-        RestClient.get(url, user_agent: user_agent(args[:user_agent]))
+      def call(type, args)
+        url = hostname(args[:hostname]) + type
+        headers = { 'User-Agent' => user_agent(args[:user_agent]) }
+        self.class.get(url, query: generate_body(type, args), headers: headers).parsed_response
       end
 
-      # parse response
-      def parse(response, format)
-        if json_parse_valid?(format)
-          JSON.parse(response.body)
-        else
-          response.body
-        end
+      # generate body from args
+      def generate_body(type, args)
+        args['accept-language'.to_sym] = args[:accept_language] if args.key?(:accept_language)
+        args.select { |key, _| valid_args(type).include?(key) }
       end
 
       # get list of permitted args
       def valid_args(type)
         case type
-          when 'search' then %i[q format addressdetails extratags namedetails viewbox bounded exclude_place_ids limit accept_language email]
-          when 'reverse' then %i[format lat lon zoom addressdetails extratags namedetails accept_language email]
+          when 'search' then %i[q format addressdetails extratags namedetails viewbox bounded exclude_place_ids limit accept-language email]
+          when 'reverse' then %i[format lat lon zoom addressdetails extratags namedetails accept-language email]
           else []
         end
       end
 
-      # make combination of special symbol and param with value
-      def add_to_options(key, value, acc)
-        symbol_for_param(acc) + key_value_param(key, remove_spaces(value))
-      end
-
-      # select special symbol
-      def symbol_for_param(acc)
-        acc == '' ? '?' : '&'
-      end
-
-      # make combination of param with value
-      def key_value_param(key, value)
-        if key == :accept_language
-          "accept-language=#{value}"
-        else
-          "#{key}=#{value}"
-        end
-      end
-
-      # replace spaces with + for values
-      def remove_spaces(value)
-        value.gsub(/\s+/, '+')
-      end
-
       # select hostname for request
       def hostname(value)
         value || BASE_URI
@@ -78,11 +35,6 @@ module OpenStreetMap
       def user_agent(value)
         value || DEFAULT_USER_AGENT
       end
-
-      # if format equal json then allow parsing
-      def json_parse_valid?(format)
-        format == 'json' || format == 'jsonv2'
-      end
     end
   end
 end

data/lib/open_street_map/client.rb

@@ -1,15 +1,14 @@
-require 'rest-client'
-require 'json'
+require 'httparty'
 require_relative 'client/request'
 
 module OpenStreetMap
   # Client requests
   class Client
+    include HTTParty
     include OpenStreetMap::Client::Request
 
     BASE_URI = 'https://nominatim.openstreetmap.org/'.freeze
     DEFAULT_USER_AGENT = "webgents/open_street_map_gem_#{SecureRandom.urlsafe_base64}".freeze
-    REQUEST_TIMEOUT = 1
 
     # Search objects by query
     def search(args = {})

data/lib/open_street_map/version.rb

@@ -1,3 +1,3 @@
 module OpenStreetMap
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/open_street_map.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.57.2'
-  spec.add_dependency 'rest-client', '>= 2.0.2'
+  spec.add_dependency 'httparty', '~> 0.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_street_map
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - JungleCoders
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,19 +68,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.57.2
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0.16'
 description: Integration with OpenStrretMap API
 email:
 - kortirso@gmail.com
@@ -91,6 +91,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile