YatranslateAPI 0.4.2 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c495f31a55f95fbdf8ef2b3dbeab0727adbadf36
-  data.tar.gz: 02624e122eb9ea6ebae58909ab48cbc401d37d88
+  metadata.gz: 1e7dd7145a66fc4ffc2815999d638cd481634de0
+  data.tar.gz: 4bc8b9f4f621dcea9448f61345b1f52daf20e467
 SHA512:
-  metadata.gz: b8beb84d1ac20e8c450a820176fc313c1d82a42d93808c1f9f46ae9bf5c23151891523472802aaffbbfec8f72cc91de630bc0bb72ffe72ed47b88a619cb1fa2f
-  data.tar.gz: 7ea59f55752b9563a83bc06b4e4be4e951eeeb6ecfc7e526fa691fc0d44583e3c00944e96d267b00982d6d3a074e99a1db1c277d95464c3b595ea5a2624f9b30
+  metadata.gz: 9f1272e9f5c40ee85449a8b78b4a05f2239c7fc4704067e05e21078746ead31f9d3feea5355b3cd3de9063a3891e56ca2fad86342242a0c6a45d70d410858357
+  data.tar.gz: 97fbea20dd890214a4662410032ec896532b84425dabb133739c82232cd29bd299423c15506ed9f61aede83aed5b0f1f61a011a1494b5329fc53f92da0f00952

data/lib/yatranslateAPI/client.rb

@@ -1,54 +1,42 @@
-require 'yatranslateAPI/gateway'
+require 'YatranslateAPI/gateway'
 
 module YatranslateAPI
   class Client
 
-    attr_accessor :phrase
+    attr_accessor :original_phrase
     
-    #api_key = "trnsl.1.1.20170529T154416Z.047bb57fd7a8b3a1.97c5cf0ccade87d10fb983346cfb5703bf811b3e"
-    #version 1.5
-    def initialize(api_key)
-      @api_key = api_key
-      @request = YatranslateAPI::Gateway.new(@api_key)
+    #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 = " "
     end
 
     def get_langs(lang)
-      params = "ui=#{lang}
-                &key=#{@api_key}"
-      
-      @request.send_request('getLangs', params)
-      @request.get_request
-    end
+      @request.generate_request('getLangs?', ui: "#{lang}")
 
-    def print_result
-      begin
-        puts @request.get_request
-      rescue => exception
-        puts 'Request not found!'
-      end
+      @request.send_request
     end
 
     def detect_lang
-      if phrase == nil
-        puts "Phrase not found! "
-      else
-        params = "hint=en,ru,de,fr
-                &text=#{phrase}
-                &key=#{@api_key}"
-      
-        @request.send_request('detect', params)
-        @request.get_request
-      end
+      @request.generate_request('detect?', hint: "en,ru,de,fr",
+                                           text: "#{@original_phrase}")
+      @request.send_request
     end
 
     def translate(lang)
-      params = "format=plain
-                &text=#{phrase}
-                &lang=#{lang}
-                &key=#{@api_key}"
+      @request.generate_request('translate?', lang: "#{lang}",
+                                              text: "#{@original_phrase}")
+      @request.send_request
+    end
 
-      @request.send_request('translate', params)
-      @request.get_request
+    def get_result
+      begin
+        @request.get_request
+      rescue => exception
+        puts 'Request not found!'
+      end
     end
   end
-end
+end

data/lib/yatranslateAPI/errors.rb

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

data/lib/yatranslateAPI/gateway.rb

@@ -1,4 +1,4 @@
-require 'yatranslateAPI/errors'
+require 'YatranslateAPI/errors'
 require 'json'
 require 'httpclient'
 
@@ -8,12 +8,13 @@ module YatranslateAPI
     def initialize(api_key)
       @client = HTTPClient.new
       @error = YatranslateAPI::Errors.new
-      @api_key = api_key
+      @api_key = { key: "#{api_key}" }
+      @base_url = "https://translate.yandex.net/api/v1.5/tr.json/"
     end
 
-    def generate_request(type, params)
-      @url = "https://translate.yandex.net/api/v1.5/tr.json/#{type}?
-             #{params}"
+    def generate_request(method, params = {})
+      @url = @base_url + method + hash_to_param(params.merge! @api_key)
+
       @body = {
         "Host": "translate.yandex.net",
         "Accept": "*/*",
@@ -21,25 +22,21 @@ module YatranslateAPI
         "Content-Type": "application/x-www-form-urlencoded"
       }
     end
-    
-    def send_request(type, params)
-      generate_request(type, params)
 
+    def send_request
       uri = URI.parse(@url)
       @res = @client.post(uri, @body.to_json)
       @error.status_check(@res)
     end
 
     def get_request
-      @content_string = JSON.parse(@res.content)
-
-      if @content_string.include? 'dirs'
-        @content_string['dirs']
-      elsif @content_string.include? 'text'
-        @content_string['text'] 
-      else
-        @content_string['lang']     
-      end
+      @res.content
+    end
+
+    private
+
+    def hash_to_param(hash)
+      hash.to_a.map { |x| "#{x[0]}=#{x[1]}" }.join("&")
     end
   end
 end

data/lib/yatranslateAPI/version.rb

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

data/yatranslateAPI.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["shepelevgeorg@gmail.com"]
 
   spec.summary       = "This is an example!"
-  spec.description   = "Much longer explanation of the example!"
+  spec.description   = "Gem for Yandex translate API"
   spec.homepage      = "https://github.com/GeorSh/yatranslateAPI"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: YatranslateAPI
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.2
 platform: ruby
 authors:
 - GeorSh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: Much longer explanation of the example!
+description: Gem for Yandex translate API
 email:
 - shepelevgeorg@gmail.com
 executables: []