google-translate 0.8.5 → 0.8.6

data/.ruby-gemset

@@ -0,0 +1 @@
+google-translate

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3

data/CHANGES

@@ -43,4 +43,8 @@
 
 == Version 0.8.5
 
-* Stop using translate API, start using scraping google translate
+* Stop using translate API, start using scraping google translate
+
+== Version 0.8.6
+
+* Fix auto detect source language; fix countries list; refactoring code

data/Gemfile

@@ -0,0 +1,21 @@
+source "https://rubygems.org"
+
+group :default do
+  gem "json_pure"
+end
+
+group :development do
+  gem "gemspec_deps_gen"
+  gem "gemcutter"
+end
+
+group :test do
+  gem "rspec"
+end
+
+group :debug do
+  gem "ruby-debug-base19x", "0.11.30.pre12"
+  gem "ruby-debug-ide", "0.4.17"
+end
+
+

data/Gemfile.lock

@@ -0,0 +1,35 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    debugger-ruby_core_source (1.2.3)
+    diff-lcs (1.1.3)
+    file_utils (1.0.6)
+    gemcutter (0.7.1)
+    gemspec_deps_gen (1.0.5)
+      file_utils
+    json_pure (1.6.5)
+    rake (10.1.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    ruby-debug-base19x (0.11.30.pre12)
+      debugger-ruby_core_source (>= 1.1.4)
+      rake (>= 0.8.1)
+    ruby-debug-ide (0.4.17)
+      rake (>= 0.8.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  gemcutter
+  gemspec_deps_gen
+  json_pure
+  rspec
+  ruby-debug-base19x (= 0.11.30.pre12)
+  ruby-debug-ide (= 0.4.17)

data/Rakefile

@@ -1,104 +1,37 @@
-# Rakefile for google-translate
+#!/usr/bin/env rake
 
-require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
+$LOAD_PATH.unshift File.expand_path("lib", File.dirname(__FILE__))
 
-require 'rake/gempackagetask'
-require 'rake/testtask'
+require "rspec/core/rake_task"
+require "google_translate/version"
+require "gemspec_deps_gen/gemspec_deps_gen"
 
-task :default => :gemspec
-
-begin
-  require 'bundler'
-  
-  begin
-    require 'jeweler'
-    
-    Jeweler::Tasks.new do |gemspec|
-      gemspec.name = "google-translate"
-      gemspec.summary = "Simple client for Google Translate API (Summary)."
-      gemspec.description = "Simple client for Google Translate API."
-      gemspec.email = "alexander.shvets@gmail.com"
-      gemspec.homepage = "http://github.com/shvets/google-translate"
-      gemspec.authors = ["Alexander Shvets"]
-      gemspec.files = FileList["CHANGES", "google-translate.gemspec", "Rakefile", "README", "VERSION",
-                               "lib/**/*", "bin/**/*"]
-      gemspec.add_dependency "json_pure", ">= 1.1.4"   
-
-      gemspec.executables = ['translate', 't']
-      gemspec.requirements = ["none"]
-      gemspec.bindir = "bin"
-    
-      gemspec.add_bundler_dependencies
-    end
-  rescue LoadError
-    puts "Jeweler not available. Install it s with: [sudo] gem install jeweler"
-  end
-rescue LoadError
-  puts "Bundler not available. Install it s with: [sudo] gem install bundler"
+def version
+  GoogleTranslate::VERSION
 end
 
-desc "Release the gem"
-task :"release:gem" do
-  %x(
-      rake gemspec
-      rake build
-      rake install
-      git add .  
-  )  
-  puts "Commit message:"  
-  message = STDIN.gets
+def project_name
+  File.basename(Dir.pwd)
+end
 
-  version = "#{File.open(File::dirname(__FILE__) + "/VERSION").readlines().first}"
+task :build do
+  system "rm #{project_name}.gemspec"
+  generator = GemspecDepsGen.new
 
-  %x(
-    git commit -m "#{message}"
-    
-    git push origin master
+  generator.generate_dependencies "#{project_name}.gemspec.erb", "#{project_name}.gemspec"
 
-    gem push pkg/google-translate-#{version}.gem      
-  )
+  system "gem build #{project_name}.gemspec"
 end
 
-desc "Run gem code locally"
-task :"run:gem" do
-  command = "bin/translate " + (ENV['params'].nil? ? '' : ENV['params'])
-  puts ruby("#{command}")
+task :install do
+  system "gem install #{project_name}-#{version}.gem"
 end
 
-#Spec::Rake::SpecTask.new do |task|
-#  task.libs << 'lib'
-#  task.pattern = 'spec/**/*_spec.rb'
-#  task.verbose = false
-#end
-
-if defined? RSpec::Core::RakeTask
-  require 'rspec/core/rake_task'
-  
-  RSpec::Core::RakeTask.new do |task|
-    task.pattern = 'spec/**/*_spec.rb'
-    task.verbose = false
-  end  
-end  
-
-if defined? Rake::RDocTask
-  require 'rake/rdoctask'
-
-  Rake::RDocTask.new do |rdoc|
-    rdoc.rdoc_dir = 'rdoc'
-    rdoc.title    = 'teststuff'
-    rdoc.options << '--line-numbers' << '--inline-source'
-    rdoc.rdoc_files.include('README*')
-    rdoc.rdoc_files.include('lib/**/*.rb')
-  end
+task :release => :build do
+  system "gem push #{project_name}-#{version}.gem"
 end
 
-if defined? Rcov::RcovTask
-  require 'rcov/rcovtask'
-
-  Rcov::RcovTask.new do |task|
-    task.libs << 'test'
-    task.test_files = FileList['test/**/*_test.rb']
-    task.verbose = true
-  end
+RSpec::Core::RakeTask.new do |task|
+  task.pattern = 'spec/**/*_spec.rb'
+  task.verbose = false
 end
-

data/bin/translate

@@ -2,7 +2,7 @@
 
 $:.unshift(File::join(File::dirname(File::dirname(__FILE__)), "lib"))
 
-require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
+require 'rubygems' unless defined?(Gem)
 require 'google_translate'
 
 #$KCODE='u'
@@ -17,7 +17,7 @@ class Translate
   TEXT
 
   def initialize
-    @translator = Google::Translator.new
+    @translator = GoogleTranslate.new
   end
 
   def print_languages list, title
@@ -59,27 +59,23 @@ class Translate
 
       print_languages hash[:from_languages], "From Languages:"
       print_languages hash[:to_languages], "To Languages:"
-    #when 'detect' then
-    #  language = @translator.detect_language(ARGV.shift)
-    #
-    #  puts "Language: #{language.inspect}"
     when /(.*):(.*)/ then
       from_text = ARGV.join(' ')
       from = $1
       to = $2
 
       display(@translator.translate(from.to_sym, to.to_sym, from_text))
-    #when /(.*)/ then
-    #  from_text = ARGV.join(' ')
-    #
-    #  from = @translator.detect_language(from_text)['language']
-    #  to = $1
-    #
-    #  begin
-    #    display(@translator.translate(from.to_sym, to.to_sym, from_text))
-    #  rescue Exception => e
-    #    puts "Error: " + e.message
-    #  end
+    when /(.*)/ then
+      from_text = ARGV.join(' ')
+
+      from = "auto"
+      to = $1
+
+      begin
+        display(@translator.translate(from.to_sym, to.to_sym, from_text))
+      rescue Exception => e
+        puts "Error: " + e.message
+      end
     end
   end
 end

data/google-translate.gemspec

@@ -1,67 +1,22 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{google-translate}
-  s.version = "0.8.5"
+require File.expand_path(File.dirname(__FILE__) + '/lib/google_translate/version')
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alexander Shvets"]
-  s.date = %q{2011-10-13}
-  s.description = %q{Simple client for Google Translate API.}
-  s.email = %q{alexander.shvets@gmail.com}
-  s.executables = ["translate", "t"]
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    "CHANGES",
-    "README",
-    "Rakefile",
-    "VERSION",
-    "bin/t",
-    "bin/t.bat",
-    "bin/translate",
-    "bin/translate.bat",
-    "google-translate.gemspec",
-    "lib/google_translate.rb"
-  ]
-  s.homepage = %q{http://github.com/shvets/google-translate}
-  s.require_paths = ["lib"]
-  s.requirements = ["none"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Simple client for Google Translate API (Summary).}
+Gem::Specification.new do |spec|
+  spec.name          = "google-translate"
+  spec.summary       = %q{Simple client for Google Translate API.}
+  spec.description   = %q{Simple client for Google Translate API.}
+  spec.email         = "alexander.shvets@gmail.com"
+  spec.authors       = ["Alexander Shvets"]
+  spec.homepage      = "http://github.com/shvets/google-translate"
+  spec.executables = ["translate", "t"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<gemcutter>, [">= 0"])
-      s.add_runtime_dependency(%q<json_pure>, [">= 1.1.4"])
-      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<gemcutter>, [">= 0"])
-    else
-      s.add_dependency(%q<json_pure>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<gemcutter>, [">= 0"])
-      s.add_dependency(%q<json_pure>, [">= 1.1.4"])
-      s.add_dependency(%q<json_pure>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<gemcutter>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<json_pure>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<gemcutter>, [">= 0"])
-    s.add_dependency(%q<json_pure>, [">= 1.1.4"])
-    s.add_dependency(%q<json_pure>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<gemcutter>, [">= 0"])
-  end
+  spec.files         = `git ls-files`.split($\)
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+  spec.version       = GoogleTranslate::VERSION
 end
 
+
+
+

data/google-translate.gemspec.erb

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+
+require File.expand_path(File.dirname(__FILE__) + '/lib/google_translate/version')
+
+Gem::Specification.new do |spec|
+  spec.name          = "google-translate"
+  spec.summary       = %q{Simple client for Google Translate API.}
+  spec.description   = %q{Simple client for Google Translate API.}
+  spec.email         = "alexander.shvets@gmail.com"
+  spec.authors       = ["Alexander Shvets"]
+  spec.homepage      = "http://github.com/shvets/google-translate"
+  spec.executables = ["translate", "t"]
+
+  spec.files         = `git ls-files`.split($\)
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+  spec.version       = GoogleTranslate::VERSION
+end
+
+
+
+

data/lib/google_translate.rb

@@ -1,132 +1,2 @@
-# google_translate.rb
-
-require 'open-uri'
-
-require 'cgi'
-require 'json'
-
-module Google
-
-  Language = Struct.new(:name, :code) do
-    def to_s
-      "(" + code + ": " + name + ")"
-    end
-  end
-
-  class Translator
-    GOOGLE_TRANSLATE_SERVICE_URL = "http://translate.google.com"
-
-    def self.Exception(*names)
-      cl = Module === self ? self : Object
-      names.each {|n| cl.const_set(n, Class.new(Exception))}
-    end
-
-    Exception :MissingFromLanguage, :MissingToLanguage, :MissingTextLanguage,
-              :TranslateServerIsDown, :InvalidResponse, :MissingText, :MissingTestText
-
-    def translate(from, to, from_text, options={})
-      raise(MissingFromLanguage) if from.nil?
-      raise(MissingToLanguage) if to.nil?
-      raise(MissingTextLanguage) if from_text.nil?
-
-      begin
-        url = GOOGLE_TRANSLATE_SERVICE_URL + "/translate_a/t?client=t&text=#{from_text}&hl=#{from}&sl=auto&tl=#{to}&multires=1&prev=btn&ssel=0&tsel=4&uptl=#{to}&alttl=#{from}&sc=1"
-
-        open(URI.escape(url)) do |stream|
-          content = stream.read
-
-          s = content.split(',').collect {|s| s == '' ? "\"\"" : s}.join(",")
-
-          result = JSON.parse(s)
-
-          raise(TranslateServerIsDown) if (!result || result.empty?)
-
-  #        raise(InvalidResponse, result["responseDetails"]) if response.code.to_i != 200 # success
-
-          r1 = result[0][0][0]
-          r2 = result[0][0][2]
-
-          [r1, r2]
-        end
-      rescue Exception => e
-         raise(TranslateServerIsDown)
-      end
-    end
-
-#    def detect_language(test_text)
-  
-      # raise(MissingTestText) if test_text.nil?
-
-      # begin
-      #   response = self.class.get("/detect", :query => {:q => test_text})
-      #   response = (response && response.parsed_response) ? response.parsed_response : nil
-      #   raise(TranslateServerIsDown) if (!response || response.empty?)
-      #   response_data = response["responseData"]
-      #   return response_data
-      # rescue HTTParty::ResponseError
-      #   raise(TranslateServerIsDown)
-      # end
-    #end
-  
-    def supported_languages
-      fetch_languages(GOOGLE_TRANSLATE_SERVICE_URL , [])
-    end
-
-    private
-
-    def fetch_languages(request, keys)
-      response = {}
-
-      open(URI.escape(request)) do |stream|
-        content = stream.read
-
-        from_languages = collect_languages content, 0, 'sl', 'gt-sl'
-        to_languages = collect_languages content, 1, 'tl', 'gt-tl'
-
-        response[:from_languages] = from_languages
-        response[:to_languages] = to_languages
-      end
-
-      response
-    end
-
-    def collect_languages buffer, index, tag_name, tag_id
-      languages = []
-
-      spaces = '\s?'
-      quote = '(\s|\'|")?'
-
-
-      id_part = "id#{spaces}=#{spaces}#{quote}#{tag_id}#{quote}"
-      name_part = "name#{spaces}=#{spaces}#{quote}#{tag_name}#{quote}"
-      tabindex_part = "tabindex#{spaces}=#{spaces}#{quote}0#{quote}"
-      phrase = "#{spaces}#{id_part}#{spaces}#{name_part}#{spaces}#{tabindex_part}#{spaces}"
-
-      re1 = buffer.split(%r{<select#{phrase}>(.*)?</select>}).select{|x| x =~ %r{<option} }
-
-      stopper = "</select></div>"
-
-      text = re1[index]
-      
-      if index == 0
-        pos = text.index(stopper)
-        text = text[0..pos]
-      end
-
-      re2 = /<option(\s*)value="([a-z|A-Z|-]*)">([a-z|A-Z|\(|\)|\s]*)<\/option>/
-      matches = text.gsub(/selected/i, '').squeeze.scan(re2)
-
-      if matches.size == 0
-        re2 = /<option(\s*)value=([a-z|A-Z|-]*)>([a-z|A-Z|\(|\)|\s]*)<\/option>/
-        matches = text.gsub(/selected/i, '').squeeze.scan(re2)
-      end
-
-      matches.each do |m|
-         languages << Language.new(m[2], m[1])
-      end
-
-      languages
-    end
-  end
-
-end
+require 'google_translate/language'
+require 'google_translate/google_translate'