yandex_dictionary_api 0.0.1 → 0.0.2

data/lib/yandex_dictionary_api.rb

@@ -7,20 +7,43 @@ module YandexDictionaryApi
 
   class ApiInterface
 
-    def initialize( api_key )
+    def initialize(api_key)
       @client = YandexDictionaryApi::ApiClient.new( api_key )
     end
 
     #Executes getLangs (list of supported languages) request to YandexDictionaryApi api
     def get_langs
-      response = @client.execute_get_langs
-      JSON.parse( response.body )
+      response = @client.execute("getLangs", Hash.new)
+      self.check_response(response)
+      JSON.parse(response.body)
     end
 
     #Executes lookup (Interpretation and translate) request to yandex dictionary api 
-    def lookup( params_hash )
-      response = @client.execute_lookup( params_hash )
-      JSON.parse( response.body )
+    def lookup(params_hash)
+      response = @client.execute("lookup", params_hash)
+      self.check_response(response)
+      JSON.parse(response.body)
+    end
+
+    protected
+
+    def check_response(response)
+      case response.code
+      when 200
+        response
+      when 401
+        raise ApiError.new("Invalid api key.")
+      when 402
+        raise ApiError.new("Spicified api key is blocked.")
+      when 403
+        raise ApiError.new("The daily limit on the number of requests exceeded.")
+      when 413
+        raise ApiError.new("Limit on the size of text exceeded.")
+      when 501
+        raise ApiError.new("Spicified direction of translation is not supported.")
+      else 
+        raise ApiError.new("Try again later.")
+      end
     end
   end
 end

data/lib/yandex_dictionary_api/api_client.rb

@@ -1,31 +1,26 @@
-gem "httpclient"
 require "httpclient"
 
 module YandexDictionaryApi
 
   class ApiClient
 
-    GET_LANGS_HTTP_REQUEST_TMPL = "https://dictionary.yandex.net/api/v1/dicservice.json/getLangs?".freeze
-    LOOKUP_HTTP_REQUEST_TMPL = "https://dictionary.yandex.net/api/v1/dicservice.json/lookup?".freeze
+    BASE_URI = "https://dictionary.yandex.net/api/v1/dicservice.json"
 
-    def initialize( api_key )
+    def initialize(api_key)
       @http_client = HTTPClient.new
       @api_key = api_key
     end
 
-    def execute_get_langs
-      str_request = self.add_parameters_to_request(GET_LANGS_HTTP_REQUEST_TMPL, Hash.new)
-      self.exec_request_http( str_request )
-    end
-
-    def execute_lookup( params_hash )
-      str_request = self.add_parameters_to_request(LOOKUP_HTTP_REQUEST_TMPL, params_hash)
-      self.exec_request_http( str_request )
+    def execute(str_req_type, params_hash)
+      str_request = BASE_URI + "/#{str_req_type}?"
+      params_hash["key"] = @api_key
+      #str_request = self.add_parameters_to_request(str_request, params_hash)
+      self.exec_request_http(str_request, params_hash)
     end
 
     protected
 
-    def add_parameters_to_request( str_request, params_hash )
+    def add_parameters_to_request(str_request, params_hash)
       str_res = str_request + "key=#{@api_key}"
       params_hash.each do |(key, value)|
         str_res += "&#{key}=#{value}"
@@ -33,9 +28,8 @@ module YandexDictionaryApi
       str_res
     end
 
-    def exec_request_http( str_request )
-      response = @http_client.get( str_request )
-      ApiError.check( response )
+    def exec_request_http(str_uri, params_hash)
+      @http_client.post(str_uri, params_hash)
     end
   end
 

data/lib/yandex_dictionary_api/api_error.rb

@@ -2,24 +2,6 @@ module YandexDictionaryApi
 
 	class ApiError < StandardError
 
-		def self.check( response )
-			case response.code
-			when 200
-				response
-			when 401
-				raise ApiError.new("Invalid api key.")
-			when 402
-				raise ApiError.new("Spicified api key is blocked.")
-			when 403
-				raise ApiError.new("The daily limit on the number of requests exceeded.")
-			when 413
-				raise ApiError.new("Limit on the size of text exceeded.")
-			when 501
-				raise ApiError.new("Spicified direction of translation is not supported.")
-			else 
-				raise ApiError.new("Try again later.")
-			end
-		end
 	end
 
 end

data/lib/yandex_dictionary_api/version.rb

@@ -1,3 +1,3 @@
 module YandexDictionaryApi
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/spec_yandex_dictionary_api.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe YandexDictionaryApi do 
 
 	before do
-		$interface = YandexDictionaryApi::ApiInterface.new(ENV['YANDEX_API_KEY'])
+		$interface = YandexDictionaryApi::ApiInterface.new("dict.1.1.20140904T085142Z.bc794363dea5e8da.bcafbef2c018fc447d8de5c67ff8e2dd7f57481f")
 	end
 
 	it "should return a list of supported languages" do

data/yandex_dictionary_api.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "httpclient"
-  spec.add_development_dependency "json"
+  spec.add_dependency "httpclient"
+  spec.add_dependency "json"
   spec.add_development_dependency "rspec"
 end
 

metadata

@@ -2,7 +2,7 @@
 name: yandex_dictionary_api
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - IronSerj
@@ -51,7 +51,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: httpclient
-  type: :development
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: json
-  type: :development
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: