google-translate-free 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d07599110943c837b830702a549267348e5daafc7e6a37c4b0fd8bba7a2419b
-  data.tar.gz: 8bd83c3cf57e6d2c34a9ece07939288d0005205c555513d6e43babe0286a5755
+  metadata.gz: 1d3fd60f4568dc83874d13438966ba1f023478c17fc66aac29ed2be8d49d53d6
+  data.tar.gz: 725f4b0cfbddd7f5f9b9e8f5053e24dc6db36e383f7d23b0f2132957ab25f727
 SHA512:
-  metadata.gz: 872978126e335d6f2c4aab8fbe709ce069aff046fe4499d75d4a5ecbe6f28d832f0ae958c32f7448161d347ac009d912d39d66eaba63b8f5f16854ed8c58105f
-  data.tar.gz: 8670acf54fd88cf533f933532cd8d635f0e6eaa783c32fb39a7a1208cc31acaf3cd801ada3179e679d14e1c798447f800777dfdd411cdda3dded0e47ac10bc9c
+  metadata.gz: 7b3778029f925f80a3a3f2e454e0f99cc7403e2ef572d4bfb339f844e512678d26222373e7272678f3615e83f5066e7f3e6e88823958af3cd4de478ef135d96e
+  data.tar.gz: 754166a4969111a33f373f04dea81f4e05e9e19c01aace59afefe6ba7a494d2cfb80a8f0ec54e09968ffcf3b699bfc3c30b39d3cc190413c8609a175b58e17f6

data/CHANGELOG.md

@@ -1 +1,6 @@
 # Changelog
+
+### v1.0.2
+* Refactored code to follow a more object-oriented approach.
+* Created `BaseClient` class to handle HTTP requests.
+* Updated `Translator` class to inherit from `BaseClient`.

data/README.md

@@ -9,7 +9,7 @@ Let's read the [documents](https://api.datpmt.com) before using it.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'google-translate-free', '~> 1.0'
+gem 'google-translate-free', '~> 1.0.1'
 ```
 
 And then execute:

data/lib/google-translate-free.rb

@@ -1,126 +1,52 @@
 require 'cgi'
 require 'net/http'
 require 'json'
+require_relative 'translate_lib/translator'
 require_relative 'translate_lib/validation'
 
 module Translate
-  VERSION = '1.0.1'.freeze
-
   def self.translate(string, to_lang, from_lang = :auto)
-    validate_language_code(from_lang, to_lang)
-    encode = encode_url(string)
-    uri = URI("https://translate.googleapis.com/translate_a/t?client=gtx&sl=#{from_lang}&tl=#{to_lang}&dt=t&q=#{encode}")
-    result = net_get(uri)&.first
-    from_lang.to_sym == :auto ? result&.first : result
+    translator = TranslateLib::Translator.new
+    translator.translate(string, to_lang, from_lang)
   end
 
   def self.alternate_translations(string, to_lang, from_lang = :auto)
-    validate_language_code(from_lang, to_lang)
-    uri = URI(url(:at, encode_url(string), from_lang, to_lang))
-    result = net_get(uri).dig(5, 0, 2)
-    return if result.nil?
-
-    result.map { |arr| arr[0].downcase }.uniq
+    translator = TranslateLib::Translator.new
+    translator.alternate_translations(string, to_lang, from_lang)
   end
 
   def self.definitions(keyword)
-    validate_keyword(keyword)
-    # [ preposition: [desc ex sysnonyms] ]
-    uri = URI(url(:md, keyword, :auto))
-    result = net_get(uri)[12]
-    return if result.nil?
-
-    result.map do |preposition|
-      pre = preposition[0]
-      {
-        "#{pre}": preposition[1].map do |arr|
-          code = arr.last
-          [arr[0], examples(keyword, code)&.first, synonyms(pre, keyword, code)]
-        end
-      }
-    end
+    translator = TranslateLib::Translator.new
+    translator.definitions(keyword)
   end
 
   def self.synonyms(pre, keyword, code)
-    uri = URI(url(:ss, keyword, :auto))
-    result = net_get(uri)[11]
-    return if result.nil?
-
-    rs_response = ''
-
-    result.each do |preposition|
-      rs_response = preposition[1].map { |arr| arr[0] if arr[1] == code }.compact.join(', ') if pre == preposition[0]
-    end
-
-    rs_response == '' ? nil : rs_response
+    translator = TranslateLib::Translator.new
+    translator.synonyms(pre, keyword, code)
   end
 
   def self.examples(keyword, code = nil)
-    validate_keyword(keyword)
-    uri = URI(url(:ex, keyword, :auto))
-    result = net_get(uri)[13]
-    return unless result
-
-    last_rs = if code.nil?
-                result[0].map { |ex| ex[0] }
-              else
-                result[0].map { |ex| ex[0] if ex.last == code }.compact
-              end
-    last_rs.map do |ex|
-      "#{ex}."
-    end
+    translator = TranslateLib::Translator.new
+    translator.examples(keyword, code)
   end
 
   def self.transliteration(keyword)
-    validate_keyword(keyword)
-    uri = URI(url(:rm, keyword, :auto))
-    net_get(uri)&.dig(0, 0, 3)
+    translator = TranslateLib::Translator.new
+    translator.transliteration(keyword)
   end
 
   def self.suggest(string)
-    encode = encode_url(string)
-    uri = URI(url(:qca, encode, :auto, detection(string).first == 'en' ? :vi : :en))
-    net_get(uri)&.dig(7, 1) || string
+    translator = TranslateLib::Translator.new
+    translator.suggest(string)
   end
 
   def self.see_more(keyword)
-    # ex [kids -> kid, tables -> table]
-    validate_keyword(keyword)
-    uri = URI(url(:rw, keyword, :auto))
-    net_get(uri)&.dig(14, 0, 0) || keyword
+    translator = TranslateLib::Translator.new
+    translator.see_more(keyword)
   end
 
   def self.detection(string)
-    uri = URI(url(:rm, encode_url(string), :auto))
-    response = net_get(uri)
-    [response&.dig(2), response&.dig(6)]
-  end
-
-  def self.url(dt_value, q_value, from_lang, to_lang = nil)
-    "https://translate.googleapis.com/translate_a/single?client=gtx&sl=#{from_lang}&tl=#{to_lang}&dt=#{dt_value}&q=#{q_value}"
-  end
-
-  def self.encode_url(string)
-    TranslateLib::Validation.validate_string(string)
-    CGI.escape(string)
-  end
-
-  def self.net_get(uri)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
-    request = Net::HTTP::Get.new(uri.request_uri)
-
-    response = http.request(request)
-    JSON.parse(response.body)
-  rescue StandardError => e
-    raise StandardError, e.message
-  end
-
-  def self.validate_language_code(from_lang, to_lang)
-    TranslateLib::Validation.validate_language_code(from_lang, to_lang)
-  end
-
-  def self.validate_keyword(keyword)
-    TranslateLib::Validation.validate_keyword(keyword)
+    translator = TranslateLib::Translator.new
+    translator.detection(string)
   end
 end

data/lib/translate_lib/base_client.rb

@@ -0,0 +1,26 @@
+require 'net/http'
+require 'json'
+
+module TranslateLib
+  class BaseClient
+    CLIENT = 'gtx'.freeze
+    COMMON_TYPE = 'translate_a/single'.freeze
+    TRANSLATE_TYPE = 'translate_a/t'.freeze
+    BASE_URL = 'https://translate.googleapis.com'.freeze
+
+    def translate_uri(**args)
+      URI("#{BASE_URL}/#{args[:type]}?client=#{CLIENT}&sl=#{args[:sl]}&tl=#{args[:tl]}&dt=#{args[:dt]}&q=#{args[:q]}")
+    end
+
+    def get(uri)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      request = Net::HTTP::Get.new(uri.request_uri)
+
+      response = http.request(request)
+      JSON.parse(response.body)
+    rescue StandardError => e
+      raise StandardError, e.message
+    end
+  end
+end

data/lib/translate_lib/translator.rb

@@ -0,0 +1,102 @@
+require 'cgi'
+require_relative 'base_client'
+require_relative 'validation'
+
+module TranslateLib
+  class Translator < BaseClient
+    def translate(string, to_lang, from_lang = :auto)
+      Validation.validate_language_code(from_lang, to_lang)
+      encode = encode_url(string)
+      uri = translate_uri(type: TRANSLATE_TYPE, sl: from_lang, tl: to_lang, dt: :t, q: encode)
+      result = get(uri)&.first
+      from_lang.to_sym == :auto ? result&.first : result
+    end
+
+    def alternate_translations(string, to_lang, from_lang = :auto)
+      Validation.validate_language_code(from_lang, to_lang)
+      uri = translate_uri(type: COMMON_TYPE, sl: from_lang, tl: to_lang, dt: :at, q: encode_url(string))
+      result = get(uri).dig(5, 0, 2)
+      return if result.nil?
+
+      result.map { |arr| arr[0].downcase }.uniq
+    end
+
+    def definitions(keyword)
+      Validation.validate_keyword(keyword)
+      uri = translate_uri(type: COMMON_TYPE, sl: :auto, tl: :auto, dt: :md, q: keyword)
+      result = get(uri)[12]
+      return if result.nil?
+
+      result.map do |preposition|
+        pre = preposition[0]
+        {
+          "#{pre}": preposition[1].map do |arr|
+            code = arr.last
+            [arr[0], examples(keyword, code)&.first, synonyms(pre, keyword, code)]
+          end
+        }
+      end
+    end
+
+    def synonyms(pre, keyword, code)
+      uri = translate_uri(type: COMMON_TYPE, sl: :auto, tl: :auto, dt: :ss, q: keyword)
+      result = get(uri)[11]
+      return if result.nil?
+
+      rs_response = ''
+
+      result.each do |preposition|
+        rs_response = preposition[1].map { |arr| arr[0] if arr[1] == code }.compact.join(', ') if pre == preposition[0]
+      end
+
+      rs_response == '' ? nil : rs_response
+    end
+
+    def examples(keyword, code = nil)
+      Validation.validate_keyword(keyword)
+      uri = translate_uri(type: COMMON_TYPE, sl: :auto, tl: :auto, dt: :ex, q: keyword)
+      result = get(uri)[13]
+      return unless result
+
+      last_rs = if code.nil?
+                  result[0].map { |ex| ex[0] }
+                else
+                  result[0].map { |ex| ex[0] if ex.last == code }.compact
+                end
+      last_rs.map do |ex|
+        "#{ex}."
+      end
+    end
+
+    def transliteration(keyword)
+      Validation.validate_keyword(keyword)
+      uri = translate_uri(type: COMMON_TYPE, sl: :auto, tl: :auto, dt: :rm, q: keyword)
+      get(uri)&.dig(0, 0, 3)
+    end
+
+    def suggest(string)
+      encode = encode_url(string)
+      uri = translate_uri(type: COMMON_TYPE, sl: detection(string).first, tl: detection(string).first == 'en' ? :vi : :en, dt: :qca, q: encode)
+      get(uri)&.dig(7, 1) || string
+    end
+
+    def see_more(keyword)
+      Validation.validate_keyword(keyword)
+      uri = translate_uri(type: COMMON_TYPE, sl: :auto, tl: :auto, dt: :rw, q: keyword)
+      get(uri)&.dig(14, 0, 0) || keyword
+    end
+
+    def detection(string)
+      uri = translate_uri(type: COMMON_TYPE, sl: :auto, tl: :auto, dt: :rm, q: encode_url(string))
+      response = get(uri)
+      [response&.dig(2), response&.dig(6)]
+    end
+
+    private
+
+    def encode_url(string)
+      Validation.validate_string(string)
+      CGI.escape(string)
+    end
+  end
+end

data/lib/translate_lib/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Translate
+  VERSION = '1.0.2'.freeze
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: google-translate-free
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - datpmt
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-27 00:00:00.000000000 Z
+date: 2025-01-09 00:00:00.000000000 Z
 dependencies: []
 description: Translation service designed to help you with a variety of language-based
   features including direct translations, alternate translations, definitions, examples,
@@ -23,15 +22,17 @@ files:
 - LICENSE
 - README.md
 - lib/google-translate-free.rb
+- lib/translate_lib/base_client.rb
 - lib/translate_lib/exception.rb
+- lib/translate_lib/translator.rb
 - lib/translate_lib/validation.rb
+- lib/translate_lib/version.rb
 homepage: https://rubygems.org/gems/google-translate-free
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/datpmt/google-translate-free
   changelog_uri: https://github.com/datpmt/google-translate-free/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -46,8 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Supports APIs related to Google Translate and more!
 test_files: []