oxford_dictionary 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78ec18e159b5cbee6d642ed69123ce7478c2d578c9a8cac8ebc87462eb9f44fe
-  data.tar.gz: fd8b47b41a3693f5dcd55c9fa97b260ae9278405a12b596ad3fd9276b2e7ab1c
+  metadata.gz: 1b30f885cc09faf1783a64f1b666103936d066373b0a8f2382750d1710fbe2a4
+  data.tar.gz: 9e7bb4ee4e9d066c30dcf062085159218b0540db781130ca400227bd65157725
 SHA512:
-  metadata.gz: 1e6eeb2e17ceb1be3473863ac38a94f44a0f4f4ae6101a31ccf00504d84d90380484c51a33e3e20f066dae77a70840930c334165b4689848bb27b92701d0e7e0
-  data.tar.gz: 1d57ef61a92b985d85d8ca5be8890852c8c734c7dea76f9e96c6761a03d01c15b0f1f5bf8ff58af0137138d4aad98897efedf9e8c40849597a1de0b1449df4c6
+  metadata.gz: 30b60f3fceb455902872b749b61a7c9676d6962343051234d30d08414f43f98440a10d9c6a75029676d09bc5b7f8984874fb13573d94b0992ba2dc16c13a8302
+  data.tar.gz: 7a69d03c0cab8929e9e30191d4662123823d8dd1d63be2e2a80bdb74f7aa30f5075fbbba16c9e14b41874ff05e00b82960092f41486072ed77b489ef2d44b40a

data/CHANGELOG.md

@@ -3,13 +3,13 @@
 ## OxfordDictionary 1.3.0 (2019-06-22)
 
 - Add V2 translations support
-  [\#10](https://github.com/swcraig/oxford-dictionary/pull/12)
+  [\#12](https://github.com/swcraig/oxford-dictionary/pull/12)
 - Add V2 sentences support
-  [\#10](https://github.com/swcraig/oxford-dictionary/pull/13)
+  [\#13](https://github.com/swcraig/oxford-dictionary/pull/13)
 - Add V2 thesaurus support
-  [\#10](https://github.com/swcraig/oxford-dictionary/pull/14)
+  [\#14](https://github.com/swcraig/oxford-dictionary/pull/14)
 - Add V2 search support
-  [\#10](https://github.com/swcraig/oxford-dictionary/pull/15)
+  [\#15](https://github.com/swcraig/oxford-dictionary/pull/15)
 
 ## OxfordDictionary 1.2.0 (2019-06-22)
 

data/lib/oxford_dictionary/client.rb

@@ -10,6 +10,8 @@ require 'oxford_dictionary/endpoints/sentences'
 require 'oxford_dictionary/endpoints/thesaurus'
 require 'oxford_dictionary/endpoints/search'
 
+require 'oxford_dictionary/request'
+
 module OxfordDictionary
   # The client object to interact with
   class Client

data/lib/oxford_dictionary/endpoints/endpoint.rb

@@ -12,6 +12,12 @@ module OxfordDictionary
       def deserialize
         @deserialize ||= OxfordDictionary::Deserialize.new
       end
+
+      def request_uri(path:, params:)
+        URI(path).tap do |uri|
+          uri.query = URI.encode_www_form(params) unless params.empty?
+        end
+      end
     end
   end
 end

data/lib/oxford_dictionary/endpoints/entries.rb

@@ -7,24 +7,16 @@ module OxfordDictionary
       ENDPOINT = 'entries'.freeze
 
       def entry(word:, dataset:, params: {})
-        query_string = "#{ENDPOINT}/#{dataset}/#{word}"
-        uri = URI(query_string)
-
-        unless params.empty?
-          uri.query = URI.encode_www_form(params)
-        end
+        path = "#{ENDPOINT}/#{dataset}/#{word}"
+        uri = request_uri(path: path, params: params)
 
         response = @request_client.get(uri: uri)
         deserialize.call(response.body)
       end
 
       def entry_snake_case(word:, dataset:, params: {})
-        query_string = "#{ENDPOINT}/#{dataset}/#{word}"
-        uri = URI(query_string)
-
-        unless params.empty?
-          uri.query = URI.encode_www_form(params)
-        end
+        path = "#{ENDPOINT}/#{dataset}/#{word}"
+        uri = request_uri(path: path, params: params)
 
         response = @request_client.get(uri: uri)
         snake_keys = JSON.parse(response.body).to_snake_keys

data/lib/oxford_dictionary/endpoints/lemmas.rb

@@ -6,12 +6,8 @@ module OxfordDictionary
       ENDPOINT = 'lemmas'.freeze
 
       def lemma(word:, language:, params: {})
-        query_string = "#{ENDPOINT}/#{language}/#{word}"
-        uri = URI(query_string)
-
-        unless params.empty?
-          uri.query = URI.encode_www_form(params)
-        end
+        path = "#{ENDPOINT}/#{language}/#{word}"
+        uri = request_uri(path: path, params: params)
 
         response = @request_client.get(uri: uri)
         deserialize.call(response.body)

data/lib/oxford_dictionary/endpoints/search.rb

@@ -6,25 +6,16 @@ module OxfordDictionary
       ENDPOINT = 'search'.freeze
 
       def search(language:, params: {})
-        query_string = "#{ENDPOINT}/#{language}"
-        uri = URI(query_string)
-
-        unless params.empty?
-          uri.query = URI.encode_www_form(params)
-        end
+        path = "#{ENDPOINT}/#{language}"
+        uri = request_uri(path: path, params: params)
 
         response = @request_client.get(uri: uri)
         deserialize.call(response.body)
       end
 
       def search_translation(source_language:, target_language:, params: {})
-        query_string =
-          "#{ENDPOINT}/translations/#{source_language}/#{target_language}"
-        uri = URI(query_string)
-
-        unless params.empty?
-          uri.query = URI.encode_www_form(params)
-        end
+        path = "#{ENDPOINT}/translations/#{source_language}/#{target_language}"
+        uri = request_uri(path: path, params: params)
 
         response = @request_client.get(uri: uri)
         deserialize.call(response.body)

data/lib/oxford_dictionary/endpoints/sentences.rb

@@ -6,12 +6,8 @@ module OxfordDictionary
       ENDPOINT = 'sentences'.freeze
 
       def sentence(word:, language:, params: {})
-        query_string = "#{ENDPOINT}/#{language}/#{word}"
-        uri = URI(query_string)
-
-        unless params.empty?
-          uri.query = URI.encode_www_form(params)
-        end
+        path = "#{ENDPOINT}/#{language}/#{word}"
+        uri = request_uri(path: path, params: params)
 
         response = @request_client.get(uri: uri)
         deserialize.call(response.body)

data/lib/oxford_dictionary/endpoints/thesaurus.rb

@@ -6,12 +6,8 @@ module OxfordDictionary
       ENDPOINT = 'thesaurus'.freeze
 
       def thesaurus(word:, language:, params: {})
-        query_string = "#{ENDPOINT}/#{language}/#{word}"
-        uri = URI(query_string)
-
-        unless params.empty?
-          uri.query = URI.encode_www_form(params)
-        end
+        path = "#{ENDPOINT}/#{language}/#{word}"
+        uri = request_uri(path: path, params: params)
 
         response = @request_client.get(uri: uri)
         deserialize.call(response.body)

data/lib/oxford_dictionary/endpoints/translations.rb

@@ -6,13 +6,8 @@ module OxfordDictionary
       ENDPOINT = 'translations'.freeze
 
       def translation(word:, source_language:, target_language:, params: {})
-        query_string =
-          "#{ENDPOINT}/#{source_language}/#{target_language}/#{word}"
-        uri = URI(query_string)
-
-        unless params.empty?
-          uri.query = URI.encode_www_form(params)
-        end
+        path = "#{ENDPOINT}/#{source_language}/#{target_language}/#{word}"
+        uri = request_uri(path: path, params: params)
 
         response = @request_client.get(uri: uri)
         deserialize.call(response.body)

data/lib/oxford_dictionary/version.rb

@@ -1,3 +1,3 @@
 module OxfordDictionary
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxford_dictionary
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - swcraig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-23 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler