open_dictionary 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab7e6df2573a8b1882b035027433cdb771ae70aab3f3aa0c0a3102f26ea9240d
-  data.tar.gz: 6b36c959dcf19f4d0f4e0ffc8ded42b21165e1d6ae2796f1a2e26cfa259d96d0
+  metadata.gz: e3cf18b72e6d233d04430b8051f894e23964ff23f4a4a9a897f0fcc0f766fd75
+  data.tar.gz: e5ce2d2e8a28316ed405d03bbf94a2c288eda09c4200f61a8722bbf64cb8e902
 SHA512:
-  metadata.gz: 0e7334049af2c40a258435be3e972a59697d2e09af66c3b352f677bdb4adffc54fc3cbb72fb55986ddc81e0f89a07e51dd223b5c3b961cad492b211f6957aeaf
-  data.tar.gz: 7c8f06326baffb2421e1ed6dc536012ab362a9b135fe3aa9f4dd74aced8d5191caec3236309398a76bf57bf4dd8ce9489daa9bd954dbf662786302e1d8cca9a9
+  metadata.gz: 8424b5ae72593f145a42c15de57a6511f6b02a9ff6f85b41b1b8a305e87b52dbbafdd6366d7fee7f8c0fe3d06c85b3f11ed058e60d1fbe736d0975a827707853
+  data.tar.gz: 004c04282001cc37788f37306aeb975c82f7a587432497c416244c5eeb12c439e3449a808ea356a231f830a10f267dc3a0113ac770b406c046528955cdf87efc

data/lib/open_dictionary/version.rb

@@ -1,3 +1,3 @@
 module OpenDictionary
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/lib/open_dictionary.rb

@@ -1,5 +1,6 @@
 require 'httparty'
 require 'json'
+require_relative 'open_dictionary/version'
 require_relative 'open_dictionary/word'
 require_relative 'open_dictionary/etymology'
 require_relative 'open_dictionary/part_of_speech'
@@ -16,6 +17,10 @@ module OpenDictionary
       new.lookup(word)
     end
 
+    def self.lookup!(word)
+      new.lookup!(word)
+    end
+
     def lookup(word)
       response = fetch_definition(word)
       parse_response(response, word)
@@ -25,21 +30,36 @@ module OpenDictionary
       raise Error, "JSON parsing error: #{e.message}"
     end
 
+    def lookup!(word)
+      response = fetch_definition(word, true)
+      parse_response(response, word)
+    rescue HTTParty::Error => e
+      raise Error, "HTTP Error: #{e.message}"
+    rescue JSON::ParserError => e
+      raise Error, "JSON parsing error: #{e.message}"
+    end
+
     private
 
-    def fetch_definition(word)
+    def fetch_definition(word, raise_error = false)
       path = word.downcase.chars.join('/')
       url = "#{BASE_URL}/#{path}/_.json"
       response = HTTParty.get(url)
 
       unless response.success?
-        raise Error, "Failed to fetch definition (HTTP #{response.code})"
+        if raise_error
+          raise Error, "Failed to fetch definition (HTTP #{response.code})"
+        else
+          return nil
+        end
       end
 
       response.body
     end
 
     def parse_response(response_body, original_word)
+      return nil if response_body.nil?
+
       data = JSON.parse(response_body)
       Word.new(data)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_dictionary
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Ben D'Angelo
@@ -14,16 +14,16 @@ dependencies:
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement