m_translator 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cf87d592a2ae54397bef50ef590645e8ac04f7a2
-  data.tar.gz: 59a086e33e71aab6601767a002c9acd03e2d7130
+SHA256:
+  metadata.gz: 45790d5eac3144fa5ee06d24c429e5fd9df58c9da3cde5bad06295811960b77e
+  data.tar.gz: 1f3713312bf8add06796dfca0464f2b6238749a28842de10c3078d523e1b4712
 SHA512:
-  metadata.gz: a2c29c8f9eaa2b8abc9188f582872f487246c4ef0f80f8fba85e0ad0af4a4ada5ae2ead98a917bf1193db22f3a4196c905829636153eb12344fd3b077f793acf
-  data.tar.gz: 423c8cb9236aa6130301599f152afbba2abe61455c00046e617c3498feecf6cb7875749498f495cb3b88fdb2daab64d7201ba651808138d7e882cf3c916ad8fe
+  metadata.gz: 1e3980401a58319c653c2ded7cb3dfe66dba2230e3020dbb3601e2f1ffe7fbdf2094406c820a16b7e74e6d6e5fa5383bdd5aace6c8e73e3043828d103fb878fa
+  data.tar.gz: abb9b0329906b2f7df8b3459145f3010559dea1f9f99786360cd1a3af9dc2773b83e0e91c68ad5868750ccec3e65913d0909838f203ef18fef9d3ccaa040e589

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    m_translator (0.1.0)
+    m_translator (0.1.3)
       activesupport
       execjs (>= 2.7.0)
       json (>= 1.8.6)
@@ -10,28 +10,31 @@ PATH
 GEM
   remote: https://gems.ruby-china.com/
   specs:
-    activesupport (5.0.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.0.5)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     execjs (2.7.0)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (0.9.5)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    json (1.8.6)
-    mime-types (3.1)
+    json (2.3.1)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    minitest (5.11.3)
+    mime-types-data (3.2020.0512)
+    minitest (5.14.1)
     netrc (0.11.0)
     rake (10.5.0)
-    rest-client (2.0.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
@@ -49,11 +52,12 @@ GEM
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.7)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -65,4 +69,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.14.5
+   1.16.6

data/README.md

@@ -23,10 +23,14 @@ Or install it yourself as:
 ## Usage
 
   ``` ruby
-    g =MTranslator::Google.new("en","zh-CN","Hello, Who are you")
+    g = MTranslator::Google.new("en","zh-CN","Hello, Who are you")
     g.translator
-    y =MTranslator::Youdao.new("zh-CHS","en","你是谁")
+    y = MTranslator::Youdao.new("zh-CHS","en","你是谁")
     y.translator
+    b = MTranslator::Baidu.new('zh','en','你好,我的世界')
+    b.translator
+    s = MTranslator::Sogou.new("zh-CHS","en","你好")
+    s.translator
   ```
 
 ## Development

data/lib/m_translator/baidu.rb

@@ -4,7 +4,7 @@ module MTranslator
       @url = "https://fanyi.baidu.com/v2transapi"
       @from = from
       @to = to
-      @text = text
+      p @text = CGI::unescape(text)
     end
 
     def translator
@@ -14,11 +14,11 @@ module MTranslator
 
     private
 
-    def token(text,gtk)
+    def get_sign(text)
       f_path = File.join(File.dirname(__FILE__), '../tk/Baidu.js' )
       f = File.read(f_path)
       context = ExecJS.compile(f)
-      context.call('token', text,gtk)
+      context.call('e', text)
     end
 
     def req_params
@@ -28,14 +28,15 @@ module MTranslator
       params["query"] = @text
       params["transtype"] = "translang"
       params["simple_means_flag"] = "3"
-      params["sign"] = token(@text,"320305.131321201")
-      params["token"] = "7b35624ba7fe34e692ea909140d9582d"
+      params["sign"] = get_sign(@text)
+      params["token"] = "372a653a84ba137c63c4d87461d5736e"
       params
     end
 
     def req_headers
       headers = {}
-      headers["Cookie"] = "BAIDUID=16FFA1EAAF1A387C647A22DB9FC81DAE:FG=1; BIDUPSID=16FFA1EAAF1A387C647A22DB9FC81DAE; PSTM=1514024118; __cfduid=d2f7fd3a024d1ee90b8a817ddd866d9bc1514812370; REALTIME_TRANS_SWITCH=1; FANYI_WORD_SWITCH=1; HISTORY_SWITCH=1; SOUND_SPD_SWITCH=1; SOUND_PREFER_SWITCH=1; BDUSS=E83bFplYnBRen5hV3FKNDZCM3ZSZldWMVBjV1ZGbW9uTTVwcjFYVDQzTGVFTlJhQVFBQUFBJCQAAAAAAAAAAAEAAADnIjgkcG9obG9ndTQxNTA3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN6DrFreg6xaS; BDORZ=B490B5EBF6F3CD402E515D22BCDA1598; H_PS_PSSID=1429_21103_18559_22075; PSINO=3; locale=zh; Hm_lvt_64ecd82404c51e03dc91cb9e8c025574=1525654866,1525657996,1525658015,1525671031; Hm_lpvt_64ecd82404c51e03dc91cb9e8c025574=1525671031; to_lang_often=%5B%7B%22value%22%3A%22en%22%2C%22text%22%3A%22%u82F1%u8BED%22%7D%2C%7B%22value%22%3A%22zh%22%2C%22text%22%3A%22%u4E2D%u6587%22%7D%5D; from_lang_often=%5B%7B%22value%22%3A%22zh%22%2C%22text%22%3A%22%u4E2D%u6587%22%7D%2C%7B%22value%22%3A%22en%22%2C%22text%22%3A%22%u82F1%u8BED%22%7D%5D"
+      # headers["Cookie"] = "BAIDUID=16FFA1EAAF1A387C647A22DB9FC81DAE:FG=1; BIDUPSID=16FFA1EAAF1A387C647A22DB9FC81DAE; PSTM=1514024118; __cfduid=d2f7fd3a024d1ee90b8a817ddd866d9bc1514812370; REALTIME_TRANS_SWITCH=1; FANYI_WORD_SWITCH=1; HISTORY_SWITCH=1; SOUND_SPD_SWITCH=1; SOUND_PREFER_SWITCH=1; BDUSS=E83bFplYnBRen5hV3FKNDZCM3ZSZldWMVBjV1ZGbW9uTTVwcjFYVDQzTGVFTlJhQVFBQUFBJCQAAAAAAAAAAAEAAADnIjgkcG9obG9ndTQxNTA3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN6DrFreg6xaS; BDORZ=B490B5EBF6F3CD402E515D22BCDA1598; H_PS_PSSID=1429_21103_18559_22075; PSINO=3; locale=zh; Hm_lvt_64ecd82404c51e03dc91cb9e8c025574=1525654866,1525657996,1525658015,1525671031; Hm_lpvt_64ecd82404c51e03dc91cb9e8c025574=1525671031; to_lang_often=%5B%7B%22value%22%3A%22en%22%2C%22text%22%3A%22%u82F1%u8BED%22%7D%2C%7B%22value%22%3A%22zh%22%2C%22text%22%3A%22%u4E2D%u6587%22%7D%5D; from_lang_often=%5B%7B%22value%22%3A%22zh%22%2C%22text%22%3A%22%u4E2D%u6587%22%7D%2C%7B%22value%22%3A%22en%22%2C%22text%22%3A%22%u82F1%u8BED%22%7D%5D"
+      headers["Cookie"] = "BIDUPSID=D3290C65C03AEF0E98D97B8641DFFB15; PSTM=1570785944; REALTIME_TRANS_SWITCH=1; FANYI_WORD_SWITCH=1; HISTORY_SWITCH=1; SOUND_SPD_SWITCH=1; SOUND_PREFER_SWITCH=1; BAIDUID=0CC6F13854E81A68D3C564D36E7C8A03:FG=1; APPGUIDE_8_2_2=1; BDORZ=B490B5EBF6F3CD402E515D22BCDA1598; BDSFRCVID=wt_OJeC626EDLgju-c_JbHce7gSxbKcTH6aoxbIy4_AgXmAxrp74EG0PJf8g0Ku-dWitogKKBmOTHg-F_2uxOjjg8UtVJeC6EG0Ptf8g0M5; H_BDCLCKID_SF=JJkO_D_atKvjDbTnMITHh-F-5fIX5-RLf5TuLPOF5lOTJh0RbtOkjnQD-UL82bT2fRcQ0tJLb4DaStJbLjbke6cbDa_fJ5Fs-I5O0R4854QqqR5R5bOq-PvHhxoJqbbJX2OZ0l8KtDQpshRTMR_V-p4p-472K6bML5baabOmWIQHDPnPyJuMBU_sWMcChnjjJbn4KKJxWJLWeIJo5Dcf3PF3hUJiBMjLBan7056IXKohJh7FM4tW3J0ZyxomtfQxtNRJ0DnjtpChbRO4-TF-D5jXeMK; delPer=0; PSINO=2; H_PS_PSSID=1435_21104_18560_26350; Hm_lvt_64ecd82404c51e03dc91cb9e8c025574=1580216234,1580216243,1580458514,1580458537; Hm_lpvt_64ecd82404c51e03dc91cb9e8c025574=1580458539; __yjsv5_shitong=1.0_7_ed303110bee0e644d4985049ba8a5cd1f28d_300_1580458537306_120.10.109.208_66a3b40c; yjs_js_security_passport=630340c0505f771135167fa6df3e5215699dcf0b_1580458538_js; to_lang_often=%5B%7B%22value%22%3A%22zh%22%2C%22text%22%3A%22%u4E2D%u6587%22%7D%2C%7B%22value%22%3A%22en%22%2C%22text%22%3A%22%u82F1%u8BED%22%7D%5D; from_lang_often=%5B%7B%22value%22%3A%22vie%22%2C%22text%22%3A%22%u8D8A%u5357%u8BED%22%7D%2C%7B%22value%22%3A%22en%22%2C%22text%22%3A%22%u82F1%u8BED%22%7D%2C%7B%22value%22%3A%22zh%22%2C%22text%22%3A%22%u4E2D%u6587%22%7D%5D"
       headers["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36"
       headers
     end

data/lib/m_translator/google.rb

@@ -4,7 +4,7 @@ module MTranslator
       @url = "https://translate.google.cn/translate_a/single"
       @from = from
       @to = to
-      @text = text
+      @text = CGI::unescape(text)
     end
 
     def translator

data/lib/m_translator/version.rb

@@ -1,3 +1,3 @@
 module MTranslator
-  VERSION = "0.1.1"
+  VERSION = "0.1.4"
 end

data/lib/m_translator/youdao.rb

@@ -7,7 +7,7 @@ module MTranslator
       @to = to
       @text = text
       @u = "fanyideskweb"
-      @c = "ebSeFb%=XZ%T[KZ)c(sy!"
+      @c = "n%A-rKaT5fb[Gy?;N5@Tj"
       @f = "#{ctime}"+"#{rand(10 + 1)}"
     end
 
@@ -27,17 +27,19 @@ module MTranslator
       params["client"] = "fanyideskweb"
       params["salt"] = @f
       params["sign"] = sign
+      params["ts"] = ctime
+      params["bv"] = '53539dde41bde18f4a71bb075fcf2e66'
       params["doctype"] = "json"
       params["version"] = "2.1"
       params["keyfrom"] = "fanyi.web"
       params["action"] = "FY_BY_CLICKBUTTION"
-      params["typoResult"] = "false"
       params
     end
 
     def req_headers
       headers = {}
-      headers["Cookie"] = "OUTFOX_SEARCH_USER_ID_NCOO=1537643834.9570553; OUTFOX_SEARCH_USER_ID=1799185238@10.169.0.83; fanyi-ad-id=43155; fanyi-ad-closed=1; JSESSIONID=aaaBwRanNsqoobhgvaHmw; _ntes_nnid=07e771bc10603d984c2dc8045a293d30,1525267244050; ___rl__test__cookies=#{ctime}"
+      #headers["Cookie"] = "OUTFOX_SEARCH_USER_ID_NCOO=1537643834.9570553; OUTFOX_SEARCH_USER_ID=1799185238@10.169.0.83; fanyi-ad-id=43155; fanyi-ad-closed=1; JSESSIONID=aaaBwRanNsqoobhgvaHmw; _ntes_nnid=07e771bc10603d984c2dc8045a293d30,1525267244050; ___rl__test__cookies=#{ctime}"
+      headers["Cookie"] = "OUTFOX_SEARCH_USER_ID=-352392290@116.136.20.84; P_INFO=a121bc; OUTFOX_SEARCH_USER_ID_NCOO=710017829.1902944; JSESSIONID=aaaDa3sqezCDY-snjj91w; SESSION_FROM_COOKIE=unknown; ___rl__test__cookies=#{ctime}"
       headers["Referer"] = "http://fanyi.youdao.com/"
       headers["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36"
       headers

data/lib/tk/Baidu.js

@@ -1,31 +1,42 @@
-function a(r, o) {
+function n(r, o) {
     for (var t = 0; t < o.length - 2; t += 3) {
         var a = o.charAt(t + 2);
         a = a >= "a" ? a.charCodeAt(0) - 87 : Number(a),
-        a = "+" === o.charAt(t + 1) ? r >>> a: r << a,
-        r = "+" === o.charAt(t) ? r + a & 4294967295 : r ^ a
+            a = "+" === o.charAt(t + 1) ? r >>> a : r << a,
+            r = "+" === o.charAt(t) ? r + a & 4294967295 : r ^ a
     }
     return r
 }
-var C = null;
-var token = function(r, _gtk) {
-    var o = r.length;
-    o > 30 && (r = "" + r.substr(0, 10) + r.substr(Math.floor(o / 2) - 5, 10) + r.substring(r.length, r.length - 10));
-    var t = void 0,
-    t = null !== C ? C: (C = _gtk || "") || "";
-    for (var e = t.split("."), h = Number(e[0]) || 0, i = Number(e[1]) || 0, d = [], f = 0, g = 0; g < r.length; g++) {
-        var m = r.charCodeAt(g);
-        128 > m ? d[f++] = m: (2048 > m ? d[f++] = m >> 6 | 192 : (55296 === (64512 & m) && g + 1 < r.length && 56320 === (64512 & r.charCodeAt(g + 1)) ? (m = 65536 + ((1023 & m) << 10) + (1023 & r.charCodeAt(++g)), d[f++] = m >> 18 | 240, d[f++] = m >> 12 & 63 | 128) : d[f++] = m >> 12 | 224, d[f++] = m >> 6 & 63 | 128), d[f++] = 63 & m | 128)
-    }
-    for (var S = h,
-    u = "+-a^+6",
-    l = "+-3^+b+-f",
-    s = 0; s < d.length; s++) S += d[s],
-    S = a(S, u);
 
-    return S = a(S, l),
-    S ^= i,
-    0 > S && (S = (2147483647 & S) + 2147483648),
-    S %= 1e6,
-    S.toString() + "." + (S ^ h)
+function e(r) {
+    var o = r.match(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g);
+    if (null === o) {
+        var t = r.length;
+        t > 30 && (r = "" + r.substr(0, 10) + r.substr(Math.floor(t / 2) - 5, 10) + r.substr(-10, 10))
+    } else {
+        for (var e = r.split(/[\uD800-\uDBFF][\uDC00-\uDFFF]/), C = 0, h = e.length, f = []; h > C; C++)
+            "" !== e[C] && f.push.apply(f, a(e[C].split(""))),
+            C !== h - 1 && f.push(o[C]);
+        var g = f.length;
+        g > 30 && (r = f.slice(0, 10).join("") + f.slice(Math.floor(g / 2) - 5, Math.floor(g / 2) + 5).join("") + f.slice(-10).join(""))
+    }
+    var u = void 0
+        , l = "" + String.fromCharCode(103) + String.fromCharCode(116) + String.fromCharCode(107);
+    u ='320305.131321201';
+    for (var d = u.split("."), m = Number(d[0]) || 0, s = Number(d[1]) || 0, S = [], c = 0, v = 0; v < r.length; v++) {
+        var A = r.charCodeAt(v);
+        128 > A ? S[c++] = A : (2048 > A ? S[c++] = A >> 6 | 192 : (55296 === (64512 & A) && v + 1 < r.length && 56320 === (64512 & r.charCodeAt(v + 1)) ? (A = 65536 + ((1023 & A) << 10) + (1023 & r.charCodeAt(++v)),
+            S[c++] = A >> 18 | 240,
+            S[c++] = A >> 12 & 63 | 128) : S[c++] = A >> 12 | 224,
+            S[c++] = A >> 6 & 63 | 128),
+            S[c++] = 63 & A | 128)
+    }
+    for (var p = m, F = "" + String.fromCharCode(43) + String.fromCharCode(45) + String.fromCharCode(97) + ("" + String.fromCharCode(94) + String.fromCharCode(43) + String.fromCharCode(54)), D = "" + String.fromCharCode(43) + String.fromCharCode(45) + String.fromCharCode(51) + ("" + String.fromCharCode(94) + String.fromCharCode(43) + String.fromCharCode(98)) + ("" + String.fromCharCode(43) + String.fromCharCode(45) + String.fromCharCode(102)), b = 0; b < S.length; b++)
+        p += S[b],
+            p = n(p, F);
+    return p = n(p, D),
+        p ^= s,
+    0 > p && (p = (2147483647 & p) + 2147483648),
+        p %= 1e6,
+    p.toString() + "." + (p ^ m)
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m_translator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - jack
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2020-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: a gem is translation package