yandex_dictionary_api 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34e76bdb7d5419b0e4c976f955e77d104c8eab85
-  data.tar.gz: 7a3360ce89a10f218b78de0c9e64c1631419977d
+  metadata.gz: f018c202409347b65b1fed4dae758b50280eac60
+  data.tar.gz: 98d4435440f9852037edf65be3475334b98636bc
 SHA512:
-  metadata.gz: edae715beae7c2594c3d9e2ea3c805c0cf02f2649425de32cfd21aec498ded1b8342acc4594c046d6a61a931aec39e8620b10ba4161aa8d929e6c7133b7cddae
-  data.tar.gz: e9670c646adfee781b57c28416f8c4e5df303b72289d75a6099d8aefd8bcc08226964cd80d385a0c041a2f7ed5ce0acab9005dba184ef00a7e6f3adc338be614
+  metadata.gz: b8783ebad70308b0115e511b8bca52ab3ff065170d031f2598817e8626dfc93211a50b56d95dbe13d47fd69f46dd61990d2bab2bb2326ffe77312f9ca96b42ae
+  data.tar.gz: 6f7937130e173bbdb1997c082848c65f443cb0d02ce0f8eb5f61f578d21dd24136083de0aa2c451cb1df0bbfa061bf8aba71f5b589819b026f91c97ab581ddf8

data/lib/yandex_dictionary_api.rb

@@ -62,25 +62,10 @@ module YandexDictionaryApi
     def read_lookup_response(hash)
       res = Array.new
       hash["def"].each do |hash|
-        res << read_response_hash(hash)
+        res << Article::recognize_article(hash)
       end
       res
     end
 
-    def read_response_hash(hash)
-      res = Article.new
-      hash.each_pair do |key, value|
-        unless value.is_a? Array
-          res.text = res.text << value << " "
-        else
-          if key == "tr"
-            res.recognize_translation(value)
-          else
-            raise StandardError.new("Unknown format of response message. Please, contact the developer.")
-          end
-        end
-      end
-      res
-    end
   end
 end

data/lib/yandex_dictionary_api/article.rb

@@ -1,5 +1,10 @@
 module YandexDictionaryApi
-  
+  TEXT = 1.freeze
+  TRANSLATIONS = 2.freeze
+  SYNONYMS = 3.freeze
+  MEANS = 4.freeze
+  EXAMPLES = 5.freeze
+
   # Includes containing of interpretation article, that returns lookup request
   class Article
     attr_accessor :text
@@ -16,47 +21,49 @@ module YandexDictionaryApi
       @examples = ""
     end
 
-    def recognize_translation(array)
-      array.each do |hash|
-        read_hash(hash)
-      end
+    def self.recognize_article(hash)
+      res = Article.new
+      res.read_hash(hash, TEXT)
+      res
     end
 
-    protected
-
-    def read_hash(hash)
+    def read_hash(hash, data_kind)
       hash.each_pair do |key, value|
         unless value.is_a? Array
-          @translations << value << " "
+          txt = value + " "
+          case data_kind
+          when TEXT
+            @text << txt
+          when TRANSLATIONS
+            @translations << txt
+          when SYNONYMS
+            @synonyms << txt
+          when MEANS
+            @means << txt
+          when EXAMPLES
+            @examples << txt
+          end
         else
           case key
+          when "tr"
+            read_array(value, TRANSLATIONS)
           when "syn"
-            @synonyms << read_attr_string(value)
+            read_array(value, SYNONYMS)
           when "mean"
-            @means << read_attr_string(value)
+            read_array(value, MEANS)
           when "ex"
-            @examples << read_attr_string(value)
+            read_array(value, EXAMPLES)
           end
         end
       end
     end
 
-    def read_attr_string(list)
-      str_res = ""
-      if list.is_a? Array
-        list.each do |hash|
-          str_res << read_attr_string(hash)
-        end
-        return str_res
-      end
-      list.each_pair do |key, value|
-        if value.is_a? Array
-          str_res << read_attr_string(value)
-        else
-          str_res << "#{value}" << " "
-        end
+    protected
+
+    def read_array(array, data_kind)
+      array.each do |hash|
+        read_hash(hash, data_kind)
       end
-      str_res
     end
 
   end

data/lib/yandex_dictionary_api/version.rb

@@ -1,3 +1,3 @@
 module YandexDictionaryApi
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/spec_yandex_dictionary_api.rb

@@ -1,9 +1,10 @@
 require "spec_helper"
+require "/home/user/git/dictionary/config/initializers/constants"
 
 describe YandexDictionaryApi do 
 
   before do
-    $interface = YandexDictionaryApi::ApiInterface.new(ENV["KEY"])
+    $interface = YandexDictionaryApi::ApiInterface.new(Constants::API_KEY)
   end
 
   it "should return a list of supported languages" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yandex_dictionary_api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - IronSerj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler