google_web_translate 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7223fdbd591202fc83a78b390c03e29cc48e6de
-  data.tar.gz: 8c00a999400be1a01f40e69d9fbc0786232c2288
+  metadata.gz: a801716622f94a6f87ac50ea1e348d0c9d91e155
+  data.tar.gz: 4913fdab2c0ee17de89447b7292d13d1730ddf87
 SHA512:
-  metadata.gz: aeb626c15ad4c175a9f83cdedd78ee60918fd5641555fee7f99d7370d0d8d7ce3ef8667f918f552ab3939f23f6e746a91328446884bd5dd8f31bb118bb6694d4
-  data.tar.gz: 61899a7e320e66ab08b1170699856e7ccd1255f734b63e6166972b04d41fbd2d604796e7807b9a082985f1770843d28730fed577c9126df8d7126c7febe0f309
+  metadata.gz: 8741be3763bc8f09111bf2f9fd7fb7dc00c75b6304ce9fe4e447a29fabba1d3c3553b7019e9012269d80ea88ab7d49ef51c1744c65d1b8b7f1a76da1063cc2cf
+  data.tar.gz: 7c440c5f7fb0a4f21efb82b4cd0bcc6322ad3ed003713b0650f7b2864a0fd712830a97eac637aa9517a84be1e8e10960d4d2cc028f5c6bb0e8a862a578214598

data/.gitignore

@@ -1,14 +1,14 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/generated.js
-/spec.out
-/Gemfile.lock
-
-# rspec failure tracking
-.rspec_status
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/generated.js
+/spec.out
+/Gemfile.lock
+
+# rspec failure tracking
+.rspec_status

data/.rspec

@@ -1,3 +1,3 @@
---format documentation
---color
---require spec_helper
+--format documentation
+--color
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,9 @@
+Metrics/BlockLength:
+  Exclude:
+    - 'Rakefile'
+    - '**/*.rake'
+    - 'spec/**/*.rb'
+
+Style/MixinUsage:
+  Exclude:
+    - 'spec/**/*.rb'

data/.travis.yml

@@ -1,5 +1,7 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.1
-before_install: gem install bundler -v 1.16.1
+sudo: false
+language: ruby
+rvm:
+  - 2.2
+  - 2.3
+  - 2.4
+before_install: gem install bundler -v 1.16.1

data/CODE_OF_CONDUCT.md

@@ -1,74 +1,74 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at sobakasu@gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at sobakasu@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Andrew
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2018 Andrew
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,49 +1,53 @@
-# GoogleWebTranslate
-
-Translates text using the Google translate web interface.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'google_web_translate'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install google_web_translate
-
-## Usage
-
-### Command line
-
-    google_web_translate "Hello" en de
-
-### API
-
-    api = GoogleWebTranslate::API.new
-    result = api.translate("Hello", "en", "de")
-    puts result.translation
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/sobakasu/google_web_translate. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the GoogleWebTranslate project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/sobakasu/google_web_translate/blob/master/CODE_OF_CONDUCT.md).
+[![Documentation](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/gems/google_web_translate)
+[![Gem Version](https://badge.fury.io/rb/google_web_translate.svg)](https://badge.fury.io/rb/google_web_translate)
+[![Build Status](https://travis-ci.org/sobakasu/google_web_translate.svg?branch=master)](https://travis-ci.org/sobakasu/google_web_translate)
+
+# GoogleWebTranslate
+
+Translates text using the Google translate web interface.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'google_web_translate'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install google_web_translate
+
+## Usage
+
+### Command line
+
+    google_web_translate "Hello" en de
+
+### API
+
+    api = GoogleWebTranslate::API.new
+    result = api.translate("Hello", "en", "de")
+    puts result.translation
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/sobakasu/google_web_translate. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the GoogleWebTranslate project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/sobakasu/google_web_translate/blob/master/CODE_OF_CONDUCT.md).

data/google-web-translate.gemspec

@@ -26,6 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock'
 
   spec.add_dependency 'execjs'
-  spec.add_dependency 'rest-client'
   spec.add_dependency 'thor'
 end

data/lib/google_web_translate/api.rb

@@ -1,14 +1,14 @@
 require 'execjs'
 require 'json'
-require 'rest-client'
 
 module GoogleWebTranslate
+  # interface to the google web translation api
   class API
     def initialize(options = {})
       @dt = options[:dt] || DEFAULT_DT
       @token_ttl = options[:token_ttl] || DEFAULT_TOKEN_TTL
       @debug = options[:debug]
-      @user_agent = options[:user_agent] || DEFAULT_USER_AGENT
+      @http_client = options[:http_client] || HTTPClient.new(options)
     end
 
     def translate(string, from, to)
@@ -22,7 +22,6 @@ module GoogleWebTranslate
     URL_TRANSLATE_1 = URL_MAIN + '/translate_a/single'.freeze
     DEFAULT_DT = %w[at bd ex ld md qca rw rm ss t].freeze
     DEFAULT_TOKEN_TTL = 3600
-    DEFAULT_USER_AGENT = "GoogleWebTranslate #{VERSION}".freeze
 
     def fetch_translation(string, from, to)
       json = fetch_url_body(translate_url(string, from, to))
@@ -31,7 +30,7 @@ module GoogleWebTranslate
     end
 
     def fetch_url_response(url)
-      RestClient.get(url.to_s)
+      @http_client.get(url.to_s)
     end
 
     def fetch_url_body(url)
@@ -95,13 +94,13 @@ module GoogleWebTranslate
     end
 
     def extract_tkk(html)
-      raise 'TKK not found' unless html =~ /TKK=.*?\{(.*?)\}/
+      raise 'TKK not found' unless html =~ /TKK=eval\('(.*?)'\);/
       tkk_code = Regexp.last_match(1)
       # tkk_code = Translatomatic::StringEscaping.unescape(tkk_code)
       tkk_code = StringEscaping.unescape(tkk_code)
       debug("tkk code unescaped: #{tkk_code}")
-      context = ExecJS.compile(tkk_code)
-      tkk = context.call(nil)
+      tkk = ExecJS.eval(tkk_code)
+      # tkk = context.call(nil)
       debug("evaluated tkk: #{tkk}")
       tkk
     end
@@ -110,20 +109,10 @@ module GoogleWebTranslate
       tk = tk(string)
       debug("tk: #{tk}")
       query = {
-        sl: from,
-        tl: to,
-        ie: 'UTF-8',
-        oe: 'UTF-8',
-        q: string,
-        dt: @dt,
-        tk: tk,
+        sl: from, tl: to, ie: 'UTF-8', oe: 'UTF-8',
+        q: string, dt: @dt, tk: tk,
         # not sure what these are for
-        client: 't',
-        hl: 'en',
-        otf: 1,
-        ssel: 4,
-        tsel: 6,
-        kc: 5
+        client: 't', hl: 'en', otf: 1, ssel: 4, tsel: 6, kc: 5
       }
       url = URI.parse(URL_TRANSLATE_1)
       url.query = URI.encode_www_form(query)

data/lib/google_web_translate/cli.rb

@@ -1,6 +1,8 @@
 require 'thor'
+require 'pp'
 
 module GoogleWebTranslate
+  # Command line interface
   class CLI < Thor
     desc 'string from to', 'translate a string from one language to another'
     method_option :dt, type: :array, desc: 'data types'
@@ -10,7 +12,7 @@ module GoogleWebTranslate
 
       api = API.new(api_options)
       result = api.translate(string, from, to)
-      p result.to_h
+      pp result.to_h
     end
   end
 end

data/lib/google_web_translate/http_client.rb

@@ -0,0 +1,26 @@
+require 'net/http'
+
+module GoogleWebTranslate
+  # HTTP client functionality
+  class HTTPClient
+    def self.user_agent
+      gem_version = "GoogleWebTranslate/#{VERSION}"
+      platform_version = "(#{RUBY_PLATFORM}) #{RUBY_ENGINE}/#{RUBY_VERSION}"
+      gem_version + ' ' + platform_version
+    end
+
+    def initialize(options = {})
+      @user_agent = options[:user_agent] || self.class.user_agent
+    end
+
+    def get(url)
+      uri = URI.parse(url)
+      request = Net::HTTP::Get.new(uri)
+      request['User-Agent'] = @user_agent
+      options = { use_ssl: uri.scheme == 'https' }
+      Net::HTTP.start(uri.host, uri.port, options) do |http|
+        http.request(request)
+      end
+    end
+  end
+end

data/lib/google_web_translate/result.rb

@@ -1,24 +1,30 @@
 module GoogleWebTranslate
+  # Translation results
   class Result
     attr_reader :raw
 
-    attr_reader :translation
-    attr_reader :alternatives
-    attr_reader :dictionary
-    attr_reader :examples
+    # @private
+    DATA_INDICES = {
+      translation: [0, 0, 0], # dt:t
+      alternatives: [5, 0, 2], # dt:at
+      dictionary: [1], # dt: bd
+      synonyms: [11], # dt:ss
+      definitions: [12, 0], # dt:md
+      examples: [13, 0], # dt:ex
+      see_also: [14, 0], # dt:rw
+    }.freeze
+
+    DATA_INDICES.each_key { |key| attr_reader key }
 
     def initialize(data)
       @raw = data
       @keys = []
       @properties = {}
 
-      extract_data(:translation, 0, 0, 0) # dt:t
-      extract_data(:alternatives, 5, 0, 2) # dt:at
-      extract_data(:dictionary, 1) # dt: bd
-      extract_data(:synonyms, 11) # dt:ss
-      extract_data(:definitions, 12, 0) # dt:md
-      extract_data(:examples, 13, 0) # dt:ex
-      extract_data(:see_also, 14, 0) # dt:rw
+      DATA_INDICES.each do |key, indices|
+        indices = indices.dup
+        extract_data(key, *indices)
+      end
 
       @alternatives = @alternatives.collect { |i| i[0] } if @alternatives
       @keys.each { |key| @properties[key] = instance_variable_get("@#{key}") }

data/lib/google_web_translate/version.rb

@@ -1,3 +1,3 @@
 module GoogleWebTranslate
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/lib/google_web_translate.rb

@@ -1,4 +1,5 @@
 require 'google_web_translate/version.rb'
 require 'google_web_translate/string_escaping.rb'
+require 'google_web_translate/http_client.rb'
 require 'google_web_translate/result.rb'
 require 'google_web_translate/api.rb'

data/lib/js/window.js

@@ -1,17 +1,17 @@
-var window = {
-  jstiming: {
-    load: {
-      tick: function() {}
-    }
-  }
-};
-var navigator = {};
-var document = {};
-
-function setWindowProperty(key, value) {
-  window[key] = value;
-}
-function generateToken(string, tkk) {
-  setWindowProperty("TKK", tkk);
-  return wq(string);
-}
+var window = {
+  jstiming: {
+    load: {
+      tick: function() {}
+    }
+  }
+};
+var navigator = {};
+var document = {};
+
+function setWindowProperty(key, value) {
+  window[key] = value;
+}
+function generateToken(string, tkk) {
+  setWindowProperty("TKK", tkk);
+  return wq(string);
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_web_translate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -145,6 +132,7 @@ files:
 - lib/google_web_translate.rb
 - lib/google_web_translate/api.rb
 - lib/google_web_translate/cli.rb
+- lib/google_web_translate/http_client.rb
 - lib/google_web_translate/result.rb
 - lib/google_web_translate/string_escaping.rb
 - lib/google_web_translate/version.rb
@@ -169,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Text translation using the google web interface