YatranslateAPI 0.5.2 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e7dd7145a66fc4ffc2815999d638cd481634de0
-  data.tar.gz: 4bc8b9f4f621dcea9448f61345b1f52daf20e467
+  metadata.gz: dfb9d7a244474016864a64696eacb73c8d97fbcd
+  data.tar.gz: 96dadf2455ceefb49978cc6fba44a94ee07b23e7
 SHA512:
-  metadata.gz: 9f1272e9f5c40ee85449a8b78b4a05f2239c7fc4704067e05e21078746ead31f9d3feea5355b3cd3de9063a3891e56ca2fad86342242a0c6a45d70d410858357
-  data.tar.gz: 97fbea20dd890214a4662410032ec896532b84425dabb133739c82232cd29bd299423c15506ed9f61aede83aed5b0f1f61a011a1494b5329fc53f92da0f00952
+  metadata.gz: ce830a537adf5fbb9a67ff2c47a1cc836f1bb64c52dd3a4ad7adcdb7681a8dbe7623f5e7efcdba0ebb018d373c259486201c5b7927d327e1bb76bef5dc2ae8ae
+  data.tar.gz: 42f39166de1b9f66a8800220ebdd5423062e44c3e7746dc5de4373c8db85e9f00a3c21953be992a629de1982de6541db812e94d793b416b1adce981def6a4a18

data/lib/yatranslateAPI/client.rb

@@ -1,42 +1,25 @@
+# encoding: UTF-8
 require 'YatranslateAPI/gateway'
 
 module YatranslateAPI
   class Client
 
-    attr_accessor :original_phrase
+    attr_accessor :text
     
     #API_KEY = "trnsl.1.1.20170529T154416Z.047bb57fd7a8b3a1.97c5cf0ccade87d10fb983346cfb5703bf811b3e"
     #VERSION 1.5
 
-    def initialize
-      @request = YatranslateAPI::Gateway.new("trnsl.1.1.20170529T154416Z.047bb57fd7a8b3a1.97c5cf0ccade87d10fb983346cfb5703bf811b3e")
-      @original_phrase = " "
+    def initialize(api_key)
+      @request = YatranslateAPI::Gateway.new
+      @text = " "
+      @params = {
+        key: "#{api_key}"
+      }
     end
 
-    def get_langs(lang)
-      @request.generate_request('getLangs?', ui: "#{lang}")
-
+    def submit(method, params={})
+      @request.generate_request(method, @params.merge!(params))
       @request.send_request
     end
-
-    def detect_lang
-      @request.generate_request('detect?', hint: "en,ru,de,fr",
-                                           text: "#{@original_phrase}")
-      @request.send_request
-    end
-
-    def translate(lang)
-      @request.generate_request('translate?', lang: "#{lang}",
-                                              text: "#{@original_phrase}")
-      @request.send_request
-    end
-
-    def get_result
-      begin
-        @request.get_request
-      rescue => exception
-        puts 'Request not found!'
-      end
-    end
   end
 end

data/lib/yatranslateAPI/errors.rb

@@ -5,11 +5,14 @@ module YatranslateAPI
   class Errors
     
     def status_check(status)
-      status.status
+      if status.status != 200
+        print_error(status)
+        status.status
+      else
+        JSON.parse(status.content)
+      end
     end
 
-    protected
-
     def print_error(status)
       puts JSON.parse(status.content)['message']
     end

data/lib/yatranslateAPI/gateway.rb

@@ -5,16 +5,10 @@ require 'httpclient'
 module YatranslateAPI
   class Gateway
 
-    def initialize(api_key)
+    def initialize
       @client = HTTPClient.new
       @error = YatranslateAPI::Errors.new
-      @api_key = { key: "#{api_key}" }
       @base_url = "https://translate.yandex.net/api/v1.5/tr.json/"
-    end
-
-    def generate_request(method, params = {})
-      @url = @base_url + method + hash_to_param(params.merge! @api_key)
-
       @body = {
         "Host": "translate.yandex.net",
         "Accept": "*/*",
@@ -23,14 +17,14 @@ module YatranslateAPI
       }
     end
 
-    def send_request
-      uri = URI.parse(@url)
-      @res = @client.post(uri, @body.to_json)
-      @error.status_check(@res)
+    def generate_request(method, params = {})
+      @url = @base_url + method + hash_to_param(params)
     end
 
-    def get_request
-      @res.content
+    def send_request
+      uri = URI.parse(@url)
+      res = @client.post(uri, @body)
+      @error.status_check(res)
     end
 
     private

data/lib/yatranslateAPI/version.rb

@@ -1,3 +1,3 @@
 module YatranslateAPI
-  VERSION = "0.5.2"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: YatranslateAPI
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.2
 platform: ruby
 authors:
 - GeorSh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler