vocabulary 0.0.2 → 0.0.3

data/lib/vocabulary.rb

@@ -2,16 +2,34 @@ require 'httparty'
 require "vocabulary/version"
 
 module Vocabulary
+  class LookUpError < ::StandardError
+    attr_accessor :summary
+    def initialize(summary)
+      super "Error while parsing Dictionary API response, may be you requested non-existent word. Response: #{summary}"
+      @summary = summary
+    end
+  end
+  
   class Word
     attr_accessor :part_of_speech, :meanings
     
-    def initialize summary
-      raise ArgumentError, "Bad summary" unless summary
-      @part_of_speech = summary["primaries"][0]["entries"][0]["labels"][0]["text"]
+    def initialize summary, source_lang
+      begin
+        @meanings = []
+      
+        if source_lang == :en
+          @part_of_speech = summary["primaries"][0]["terms"][0]["labels"][0]["text"]
+          collection = summary["primaries"][0]["entries"]
+        else
+          @part_of_speech = summary["primaries"][0]["entries"][0]["labels"][0]["text"]
+          collection = summary["primaries"][0]["entries"][0]["entries"]
+        end
       
-      @meanings = []
-      summary["primaries"][0]["entries"][0]["entries"].each do |meaning|
-        @meanings << meaning["terms"][0]["text"]
+        collection.each do |meaning|
+          @meanings << meaning["terms"][0]["text"]
+        end
+      rescue
+        raise Vocabulary::LookUpError.new(summary)
       end
     end
   end
@@ -28,8 +46,8 @@ module Vocabulary
       options[:query] = {
         :callback => "substr",
         :q => word,
-        :sl => target_lang,
-        :tl => source_lang
+        :sl => target_lang, # source lang
+        :tl => source_lang # target lang
       }
       
       response = self.class.get("/dictionary/json", options)
@@ -43,7 +61,9 @@ module Vocabulary
   
   def self.lookup(word, source_lang, target_lang = nil)
     target_lang ||= :en
-    data = Dictionary.new.get(word, source_lang.to_s, target_lang.to_s)
-    Word.new(data)
+    raise ArgumentError, "Word can't be blank" unless word.present?
+    data = Vocabulary::Dictionary.new.get(word, source_lang.to_s, target_lang.to_s)
+    # return data
+    Vocabulary::Word.new(data, source_lang)
   end
-end
+end

data/lib/vocabulary/version.rb

@@ -1,3 +1,3 @@
 module Vocabulary
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vocabulary
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-23 00:00:00.000000000Z
+date: 2011-11-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70101139724680 !ruby/object:Gem::Requirement
+  requirement: &70110412886780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70101139724680
+  version_requirements: *70110412886780
 description: 
 email:
 - razor.psp@gmail.com