google-translate 0.6.9 → 0.7.0

data/CHANGES

@@ -32,3 +32,8 @@
 == Version 0.6.7
 
 * Deploy on gemcutter
+
+== Version 0.7.0
+
+* Fix changes in detect languages service
+

data/README

@@ -3,8 +3,7 @@
 = Installing Google-Translate
 
 == Installing the Gem
-    $ sudo gem sources -a http://gemcutter.org
-    $ sudo gem install google-translate
+    $ gem install google-translate
 
 == Usage
 

data/Rakefile

@@ -7,14 +7,43 @@ require 'spec/rake/spectask'
 require 'rake/rdoctask'
 require 'rcov/rcovtask'
 
-# spec_name = 'google_translate.gemspec'
-# 
-# SPEC = Gem::Specification.load(spec_name)
+task :default => :package
 
-# Rake::GemPackageTask.new(SPEC) do |pkg| 
-#   #pkg.need_tar = true 
-#   #pkg.need_zip = true
-# end 
+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"
+end
+
+desc "Run gem code locally"
+task :"run:gem" do
+  command = "bin/translate " + (ENV['params'].nil? ? '' : ENV['params'])
+  puts ruby("#{command}")
+end
 
 Spec::Rake::SpecTask.new do |task|
   task.libs << 'lib'
@@ -36,110 +65,3 @@ Rcov::RcovTask.new do |task|
   task.verbose = true
 end
 
-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"    
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalsteaks-jeweler -s http://gems.github.com"
-end
-
-desc "Run gem code locally"
-task :"run:gem" do
-  command = "bin/translate " + (ENV['params'].nil? ? '' : ENV['params'])
-  puts ruby("#{command}")
-end
-
-# desc "test gem compatibility with github"
-# task :"github:validate" do
-#   require 'yaml'
-#    
-#   require 'rubygems/specification'
-#   data = File.read(spec_name)
-#   spec = nil
-#    
-#   if data !~ %r{!ruby/object:Gem::Specification}
-#     Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join
-#   else
-#     spec = YAML.load(data)
-#   end
-#    
-#   spec.validate
-#    
-#   puts spec
-#   puts "OK"
-# end
-
-task :default => :package
-
-
-require 'yaml'
-
-# See: http://underpantsgnome.com/2007/1/16/managing-gems-with-rake
-
-class Util
-  def self.load_gems
-    config = YAML.load_file(
-      File.join(RAILS_ROOT, 'config', 'gems.yml'))
-    gems = config[:gems].reject {|gem| ! gem[:load] }
-    gems.each do |gem|
-      require_gem gem[:name], gem[:version]
-      require gem[:name]
-    end
-  end
-end
-
-namespace :gems do
-  require 'rubygems' if RUBY_VERSION.to_f < 1.9
-
-  desc "Download and install all gems required by development"
-  task :install do
-    # defaults to --no-rdoc, set DOCS=(anything) to build docs
-    docs = (ENV['DOCS'].nil? ? '--no-rdoc' : '')
-    #grab the list of gems/version to check
-    config = YAML.load_file(File.join('config', 'gems.yml'))
-    gems = config[:gems]
-
-    gems.each do |gem|
-      # load the gem spec
-      gem_spec = YAML.load(`gem spec #{gem[:name]} 2> /dev/null`)
-      gem_loaded = false
-      begin
-        gem_loaded = require_gem gem[:name], gem[:version]
-      rescue Exception
-      end
-
-      # if forced
-      # or there is no gem_spec
-      # or the spec version doesn't match the required version
-      # or require_gem returns false
-      # (return false also happens if the gem has already been loaded)
-      if !ENV['FORCE'].nil? ||!gem_spec ||
-         (gem_spec.version.version != gem[:version] && !gem_loaded)
-        gem_config = gem[:config] ? " -- #{gem[:config]}" : ''
-        source = gem[:source] || config[:source] || nil
-        source = "--source #{source}" if source
-        ret = system "gem install #{gem[:name]} -v #{gem[:version]} #{source} #{docs} #{gem_config}" 
-        # something bad happened, pass on the message
-        p $? unless ret
-      else
-        puts "#{gem[:name]} #{gem[:version]} already installed" 
-      end
-    end
-  end
-end
-

data/VERSION

@@ -1 +1 @@
-0.6.9
+0.7.0

data/bin/translate

@@ -42,6 +42,8 @@ class Translate
 
     case ARGV.shift
 
+    when /(-v)|(--version)/ then
+      p "Version: #{File.open(File::dirname(__FILE__) + "/../VERSION").readlines()}"
     when 'list' then
       hash = @translator.supported_languages
 

data/google-translate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google-translate}
-  s.version = "0.6.9"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Shvets"]
-  s.date = %q{2010-08-26}
+  s.date = %q{2010-09-14}
   s.description = %q{Simple client for Google Translate API.}
   s.email = %q{alexander.shvets@gmail.com}
   s.executables = ["translate", "t"]
@@ -45,11 +45,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json_pure>, [">= 1.1.4"])
+      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<gemcutter>, [">= 0"])
     else
       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>, [">= 1.1.4"])
+    s.add_dependency(%q<json_pure>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<gemcutter>, [">= 0"])
   end
 end
 

data/lib/google_translate.rb

@@ -98,8 +98,8 @@ module Google
       open(URI.escape(request)) do |stream|
         content = stream.read
 
-        from_languages = collect_languages content, 0, 'sllangdropdown', 'sl', 'old_sl'
-        to_languages = collect_languages content, 1, 'tllangdropdown', 'tl', 'old_tl'
+        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
@@ -108,22 +108,26 @@ module Google
       response
     end
 
-    def collect_languages buffer, index, class_name, tag_name, tag_id
+    def collect_languages buffer, index, tag_name, tag_id
       languages = []
 
       spaces = '\s?'
       quote = '(\s|\'|")?'
 
-      class_part = "class#{spaces}=#{spaces}#{quote}#{class_name}#{quote}"
-      name_part = "name#{spaces}=#{spaces}#{quote}#{tag_name}#{quote}"
+
       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}"
-      re1 = buffer.split(%r{<select#{spaces}#{class_part}#{spaces}#{name_part}#{spaces}#{id_part}#{spaces}#{tabindex_part}#{spaces}>(.*)?</select>}).select{|x| x =~ %r{<option} }
+      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('</select><span class=langselect')
+        pos = text.index(stopper)
         text = text[0..pos]
       end
 
@@ -132,7 +136,7 @@ module Google
       matches = text.gsub(/selected/i, '').squeeze.scan(re2)
 
       matches.each do |m|
-        languages << Language.new(m[2], m[1])
+         languages << Language.new(m[2], m[1])
       end
 
       languages

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: google-translate
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 9
-  version: 0.6.9
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Alexander Shvets
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 -04:00
+date: 2010-09-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: json_pure
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,8 +33,49 @@ dependencies:
         - 1
         - 4
         version: 1.1.4
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: json_pure
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  name: jeweler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: gemcutter
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
 description: Simple client for Google Translate API.
 email: alexander.shvets@gmail.com
 executables: