dictionary_api 0.1.11 → 0.1.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjYyMDMxN2JlZDQ0MzJmNGU0OWJmY2YxMmY4YmUwYmM0ZGQxZWE0Mg==
+    MWM3NGVjMDAxN2VkNmNjNjM0NGJlZmQ5ODFhMTE0Y2UwMDE5NTAzNQ==
   data.tar.gz: !binary |-
-    MTM3MGQ2ZTdhNDMyZmUzOGNmOWJhZTk4ZmRlZGVjMGYzZTczZWJhNA==
+    MTkwYzIzNmE1ZTJlZTQyOGJmZDNjMWY0MWEwOWE4YzVkMjI5YjQ5OQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDY2MWMwOTc0NWVkYjBkMmUyMzFlNDYzNWM5YTY1YzgzYjVjZGMwYjAwNzU0
-    ZjgxMzE2ZTc2OTI2NmU1NzY5YmIyMTI1ZTUzMjZkNTlhZmNhMWM3YWJlMjk3
-    OTFhMzU5ZDQ1YTQ0ZDZhZjNlZWFhZWZlYWY2OTNlYmExODFmMTc=
+    YTZmNDE3MjFmODg1MWMxNzNjNzVkNDBiMTMwMGFlNWRiMzY0ZWY3MDY1ODEy
+    NjBmYzViZGU4ZTEyZjc1NGFiZDAyNTgyZjFkYzc3ODY4NGIwMzJjMjFkMjEz
+    MDc3YTNlMGI0ZDJhM2I0MTcyZTc5ZjM1YTE1NGMxZmRjZTliOTM=
   data.tar.gz: !binary |-
-    MzAwYzBmMDhjZTNiNDkwOTQ1NDNmNjg0Yzg0NTk2OTFhNTJiOTdiM2EwODA0
-    NDRhZTc5ZTZkZmZlZjJiZmJjZjE4ODdhOTNkZjU4Y2JiMzVhNzgxZmNjZjJm
-    Y2FmZWJiNzA1MDNmMWU1NzMxYTI2MzA0OGEwNjUwMWJmNzhmMDM=
+    YWNkOGE3YmZiMmEwYmJmZjU2OGI3NGU2Y2E2MTk0ZGI3ZGM2ZmYyZmEyOGQ2
+    OTU5ZmYwNWVmN2ZjNWU0OGY5MmZmY2E0NjVjNzAwM2U5YWE4NWI2ZmNmNDI1
+    YWRhNDI4MWI1ZjdiNmU5ZDdhNmI1OTI1NDM3MGJiMTA2MGEyODk=

data/lib/dictionary_api/article.rb

@@ -1,3 +1,7 @@
-class Article
-	attr_accessor :text, :position, :transcription, :translation
+module DictionaryAPI
+
+	class Article
+		attr_accessor :text, :position, :transcription, :translation
+	end
+
 end

data/lib/dictionary_api/client.rb

@@ -1,4 +1,4 @@
-require 'httparty'
+require 'httpclient'
 
 module DictionaryAPI
 
@@ -8,12 +8,8 @@ module DictionaryAPI
 
 		BASE_URL = "https://dictionary.yandex.net/api/v1/dicservice.json/"
 
-		def initialize(key)
-			@api_key = key
-		end
-
 		def execute(path, options = {})
-			response = HTTParty.post(self.build_url(path, options))		
+			response = HTTPClient.post(BASE_URL + path, options)	
 			self.check_errors(response)
 		end
 
@@ -29,11 +25,6 @@ module DictionaryAPI
 			when 501 then raise 'Translate direction is not supported'
 			end
 		end
-
-		def build_url(path, options = {})
-			request = BASE_URL + path + "?key=#{@api_key}"
-			options.each_pair { |key, value| request += '&' + key + '=' + value }
-			request
-		end	
 	end
+	
 end

data/lib/dictionary_api/translation_article.rb

@@ -1,3 +1,7 @@
-class TranslationArticle
-	attr_accessor :text, :position, :gender, :animated, :synonym, :meaning, :example, :aspect
+module DictionaryAPI
+
+	class TranslationArticle
+		attr_accessor :text, :position, :gender, :animated, :synonym, :meaning, :example, :aspect
+	end
+
 end

data/lib/dictionary_api.rb

@@ -18,15 +18,18 @@ module DictionaryAPI
 
 		def lookup(lang, text)
 			text.gsub!(' ', '%20')
-			response= JSON.parse client.execute('lookup', {'lang'=>lang, 'text'=>text}).body
-			parser = Parser.new
+			response= JSON.parse client.execute('lookup', {key: @api_key, lang: lang, text: text}).body
 			parser.parse(response)
 		end
 
 	protected
 
 		def client	
-			@client ||= Client.new(api_key)
+			@client ||= Client.new
+		end
+
+		def parser
+			@parser ||= Parser.new
 		end
 	end 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dictionary_api
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - spitsman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '2.6'
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '2.6'
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement