langouste 0.1.2 → 0.1.3

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Gem and console tool for translation through various online services (google translate, babelfish, pereklad, etc).
 
-With the configuration yaml-file can be configured to work with another service (look at langouste.yaml).
+With the configuration yaml-file can be configured to work with another service (look at config/langouste.yaml).
 
 Full list of service defined in config:
   langouste --list
@@ -20,7 +20,7 @@ Or shorter:
   langouste -f ru -t en Я список кораблей прочел до середины
 
 Or even so:
-  langouste -f e -t r Я список кораблей прочел до середины
+  langouste -f r -t e Я список кораблей прочел до середины
 
 More help:
   langouste --help

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.executables = %w(langouste)
     gem.authors = ["Hariton Mizgir"]
     gem.add_dependency "mechanize", ">= 1.0.0"
+    gem.add_dependency "symboltable", ">= 0.2.0"
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.files.include %w(config/langouste.yaml)

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/langouste

@@ -6,6 +6,7 @@ options = {
   :from_lang  => :russian,
   :to_lang    => :english,
   :service    => :google,
+  :path       => nil
 }
 
 if ARGV.any?
@@ -13,15 +14,15 @@ if ARGV.any?
   opts = OptionParser.new {|op|
     op.banner = "Usage: #{File.basename($0)} [options] text"
 
-    op.on('-f language', '--from language', "") {|v| options[:from_lang] = v.to_sym }
-    op.on('-t language', '--to language', "") {|v| options[:to_lang] = v.to_sym }
-    op.on('-l', '--list', 'List of available services') { puts Langouste.list }
-    op.on('-s', '--service services', "") {|v| options[:services] = v.to_sym }
-    op.on('-c path', '--config path', "Path to config yaml-file") {|v| options[:config] = v }
+    op.on('-f language', '--from language', 'Source language') {|v| options[:from_lang] = v.to_sym }
+    op.on('-t language', '--to language', 'Destination language') {|v| options[:to_lang] = v.to_sym }
+    op.on('-s', '--service services', 'Service (google translate, babelfish, etc)') {|v| options[:service] = v.to_sym }
+    op.on('-c path', '--config path', 'Path to config file') {|v| options[:path] = v }
+    op.on('-l', '--list', 'List of available services') { puts Langouste::Configuration.list options[:path] }
     op.on('-h', '--help', 'Shows this help message') {puts op; exit}
 
   }.parse!(ARGV.dup)
   text = opts.join(' ')
 end
 
-puts Langouste.new(options).translate(text)
+puts Langouste::Translator.new(options).translate(text) if text.any?

data/config/langouste.yaml

@@ -17,154 +17,6 @@ google_languages: &google_languages
   :french: fr
   :italian: it
 
-:google:
-  url: 'http://translate.google.com'
-  input:
-    form:
-      selector: {:name: 'text_form'}
-      from:
-        field:
-          selector: {:name: 'sl'}
-        languages:
-          <<: *google_languages
-      to:
-        field:
-          selector: {:name: 'tl'}
-        languages: 
-          <<: *google_languages
-      text:
-        selector: {:name: 'text'}
-  output:
-    form:
-      selector: {:action: '/translate_suggestion'}
-      text:
-        selector: {:name: 'gtrans'}
-
-:babelfish:
-  url: 'http://babelfish.yahoo.com/'
-  input:
-    form:
-      selector: {:name: 'frmTrText'}
-      directions:
-        field:
-          selector: {:name: 'lp'}
-        directions:
-          :'english-dutch': en_nl
-          :'english-french': en_fr
-          :'english-german': en_de
-          :'english-greek': en_el
-          :'english-italian': en_it
-          :'english-japanese': en_ja
-          :'english-korean': en_ko
-          :'english-portuguese': en_pt
-          :'english-russian': en_ru
-          :'english-spanish': en_es
-          :'dutch-english': nl_en
-          :'dutch-french': nl_fr
-          :'french-dutch': fr_nl
-          :'french-english': fr_en
-          :'french-german': fr_de
-          :'french-greek': fr_el
-          :'french-italian': fr_it
-          :'french-portuguese': fr_pt
-          :'french-spanish': fr_es
-          :'german-english': de_en
-          :'german-french': de_fr
-          :'greek-english': el_en
-          :'greek-french': el_fr
-          :'italian-english': it_en
-          :'italian-french': it_fr
-          :'japanese-english': ja_en
-          :'korean-english': ko_en
-          :'portuguese-english': pt_en
-          :'portuguese-french': pt_fr
-          :'russian-english': ru_en
-          :'spanish-english': es_en
-          :'spanish-french': es_fr
-      text:
-        selector: {:name: 'trtext'}
-  output:
-    xpath: '//div[@id="result"]/div/text()'
-
-:pereklad:
-  url: 'http://pereklad.online.ua'
-  input:
-    form:
-      selector: {:name: 'transl'}
-      from:
-        field:
-          selector: {:name: 'TranFrom'}
-        languages:
-          <<: *pereklad_languages
-      to:
-        field:
-          selector: {:name: 'TranTo'}
-        languages: 
-          <<: *pereklad_languages
-      text:
-        selector: {:name: 'SrcTxt'}
-  output:
-    form:
-      selector: {:name: 'transl'}
-      text:
-        selector: {:name: 'DstTxt'}
-
-:meta:
-  url: 'http://translate.meta.ua'
-  input:
-    form:
-      selector: {:name: 'form1'}
-      directions:
-        field:
-          selector: {:name: 'language'}
-        directions:
-          :'russian-english': Rus-Eng
-          :'english-russian': Eng-Rus
-          :'ukrainian-english': Ukr-Eng
-          :'english-ukrainian': Eng-Ukr
-          :'russian-ukrainian': Rus-Ukr
-          :'ukrainian-russian': Ukr-Rus
-          :'russian-german': Rus-Ger
-          :'german-russian': Ger-Rus
-          :'ukrainian-german': Ukr-Ger
-          :'german-ukrainian': Ger-Ukr
-          :'english-german': Eng-Ger
-          :'german-english': Ger-Eng
-          :'russian-latvian': Rus-Lat
-          :'latvian-russian': Lat-Rus
-          :'ukrainian-latvian': Ukr-Lat
-          :'latvian-ukrainian': Lat-Ukr
-          :'english-latvian': Eng-Lat
-          :'latvian-english': Lat-Eng
-          :'german-latvian': Ger-Lat
-          :'latvian-german': Lat-Ger
-      text:
-        selector: {:name: 'SrcTxt'}
-  output:
-    form:
-      selector: {:name: 'form1'}
-      text:
-        selector: {:name: 'DstTxt'}
-
-:prompt:
-  url: 'http://online.perevodov.net/Perevodov.net/online-dictionaries/promt.php4'
-  input:
-    form:
-      selector: {:name: 'trans'}
-      directions:
-        field:
-          selector: {:name: 'direction'}
-        directions:
-          :'russian-english': re
-          :'english-russian': er
-      text:
-        selector: {:name: 'source'}
-  output:
-    form:
-      selector: {:name: 'trans'}
-      text:
-        selector: {:name: 'result'}
-
 abbreviations:
   languages:
     :ru: :russian
@@ -183,3 +35,152 @@ abbreviations:
     :b: :babelfish
     :p: :pereklad
     :t: :prompt
+
+services:
+  :google:
+    url: 'http://translate.google.com'
+    input:
+      form:
+        selector: {:name: 'text_form'}
+        from:
+          field:
+            selector: {:name: 'sl'}
+          languages:
+            <<: *google_languages
+        to:
+          field:
+            selector: {:name: 'tl'}
+          languages: 
+            <<: *google_languages
+        text:
+          selector: {:name: 'text'}
+    output:
+      form:
+        selector: {:action: '/translate_suggestion'}
+        text:
+          selector: {:name: 'gtrans'}
+
+  :babelfish:
+    url: 'http://babelfish.yahoo.com/'
+    input:
+      form:
+        selector: {:name: 'frmTrText'}
+        directions:
+          field:
+            selector: {:name: 'lp'}
+          directions:
+            :'english-dutch': en_nl
+            :'english-french': en_fr
+            :'english-german': en_de
+            :'english-greek': en_el
+            :'english-italian': en_it
+            :'english-japanese': en_ja
+            :'english-korean': en_ko
+            :'english-portuguese': en_pt
+            :'english-russian': en_ru
+            :'english-spanish': en_es
+            :'dutch-english': nl_en
+            :'dutch-french': nl_fr
+            :'french-dutch': fr_nl
+            :'french-english': fr_en
+            :'french-german': fr_de
+            :'french-greek': fr_el
+            :'french-italian': fr_it
+            :'french-portuguese': fr_pt
+            :'french-spanish': fr_es
+            :'german-english': de_en
+            :'german-french': de_fr
+            :'greek-english': el_en
+            :'greek-french': el_fr
+            :'italian-english': it_en
+            :'italian-french': it_fr
+            :'japanese-english': ja_en
+            :'korean-english': ko_en
+            :'portuguese-english': pt_en
+            :'portuguese-french': pt_fr
+            :'russian-english': ru_en
+            :'spanish-english': es_en
+            :'spanish-french': es_fr
+        text:
+          selector: {:name: 'trtext'}
+    output:
+      xpath: '//div[@id="result"]/div/text()'
+
+  :pereklad:
+    url: 'http://pereklad.online.ua'
+    input:
+      form:
+        selector: {:name: 'transl'}
+        from:
+          field:
+            selector: {:name: 'TranFrom'}
+          languages:
+            <<: *pereklad_languages
+        to:
+          field:
+            selector: {:name: 'TranTo'}
+          languages: 
+            <<: *pereklad_languages
+        text:
+          selector: {:name: 'SrcTxt'}
+    output:
+      form:
+        selector: {:name: 'transl'}
+        text:
+          selector: {:name: 'DstTxt'}
+
+  :meta:
+    url: 'http://translate.meta.ua'
+    input:
+      form:
+        selector: {:name: 'form1'}
+        directions:
+          field:
+            selector: {:name: 'language'}
+          directions:
+            :'russian-english': Rus-Eng
+            :'english-russian': Eng-Rus
+            :'ukrainian-english': Ukr-Eng
+            :'english-ukrainian': Eng-Ukr
+            :'russian-ukrainian': Rus-Ukr
+            :'ukrainian-russian': Ukr-Rus
+            :'russian-german': Rus-Ger
+            :'german-russian': Ger-Rus
+            :'ukrainian-german': Ukr-Ger
+            :'german-ukrainian': Ger-Ukr
+            :'english-german': Eng-Ger
+            :'german-english': Ger-Eng
+            :'russian-latvian': Rus-Lat
+            :'latvian-russian': Lat-Rus
+            :'ukrainian-latvian': Ukr-Lat
+            :'latvian-ukrainian': Lat-Ukr
+            :'english-latvian': Eng-Lat
+            :'latvian-english': Lat-Eng
+            :'german-latvian': Ger-Lat
+            :'latvian-german': Lat-Ger
+        text:
+          selector: {:name: 'SrcTxt'}
+    output:
+      form:
+        selector: {:name: 'form1'}
+        text:
+          selector: {:name: 'DstTxt'}
+
+  :prompt:
+    url: 'http://online.perevodov.net/Perevodov.net/online-dictionaries/promt.php4'
+    input:
+      form:
+        selector: {:name: 'trans'}
+        directions:
+          field:
+            selector: {:name: 'direction'}
+          directions:
+            :'russian-english': re
+            :'english-russian': er
+        text:
+          selector: {:name: 'source'}
+    output:
+      form:
+        selector: {:name: 'trans'}
+        text:
+          selector: {:name: 'result'}

data/langouste.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{langouste}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hariton Mizgir"]
-  s.date = %q{2010-05-05}
+  s.date = %q{2010-05-07}
   s.default_executable = %q{langouste}
   s.email = %q{hmizgir@gmail.com}
   s.executables = ["langouste"]
@@ -47,13 +47,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mechanize>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<symboltable>, [">= 0.2.0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
       s.add_dependency(%q<mechanize>, [">= 1.0.0"])
+      s.add_dependency(%q<symboltable>, [">= 0.2.0"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
     s.add_dependency(%q<mechanize>, [">= 1.0.0"])
+    s.add_dependency(%q<symboltable>, [">= 0.2.0"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end

data/lib/langouste.rb

@@ -2,117 +2,122 @@
 
 require 'rubygems'
 require 'mechanize'
+require 'symboltable'
 
-class Langouste
-  attr_accessor :from_lang, :to_lang, :service, :config
+# Translation through various online services
+module Langouste
 
-  @@config_path = File.join(File.expand_path(File.dirname(__FILE__)), '../config/langouste.yaml')
+  # Singleton configuration class
+  class Configuration
+    attr_accessor :path, :data
 
-  def self.config
-    @@config ||= YAML.load(File.open(@@config_path))
-  end
-
-  def self.config=(config)
-    @@config = config
-  end
+    def initialize(path = nil)
+      @path = path || File.join(File.expand_path(File.dirname(__FILE__)), '../config/langouste.yaml')
+      @data = SymbolTable.new YAML.load_file @path
+    end
 
-  def initialize(options = {})
-    options = {
-      :from_lang  => :russian,
-      :to_lang    => :english,
-      :service    => :google,
-      :config     => @@config_path
-    }.merge options
+    def self.instance(path = nil)
+        @__instance__ ||= new
+    end
 
-    Langouste.config = YAML.load(File.open(options[:config]))
+    def self.list(config_path = nil)
+      Configuration.instance(config_path).data.services.keys
+    end
 
-    @from_lang   = deabbreviate_language(options[:from_lang])
-    @to_lang     = deabbreviate_language(options[:to_lang])
-    @service     = deabbreviate_service(options[:service])
-    @config      = Langouste.config[@service]
   end
 
-  def translate(input_text)
+  # Langouste translator
+  class Translator
+    attr_accessor :service, :from_lang, :to_lang
 
-    output_text = ''
+    def initialize(options = {})
+      options = {
+        :from_lang  => :russian,
+        :to_lang    => :english,
+        :service    => :google,
+        :path       => nil
+      }.merge options
 
-    begin
-      input_form = config['input']['form']
-    rescue
-      raise "Bad service: '#{service}'"
-    end
+      config = Configuration.instance(options[:path])
 
-    # если у переводчика нет нужных языков - запрос не выполняется
-    if input_form['to'] and input_form['from']
-      return '' unless input_form['to']['languages'][to_lang] and input_form['from']['languages'][from_lang]
-    elsif input_form['directions']
-      return '' unless input_form['directions']['directions']["#{from_lang}-#{to_lang}".to_sym]
-    else
-      raise "Bad YAML-config for service: '#{service}'"
-    end
+      @service     = deabbreviate_service(options[:service])
+      @from_lang   = deabbreviate_language(options[:from_lang])
+      @to_lang     = deabbreviate_language(options[:to_lang])
+      @direction   = "#{@from_lang}-#{@to_lang}"
+      @config      = config.data.services[@service]
 
-    agent = Mechanize.new {|a| a.user_agent_alias = 'Linux Konqueror'}
-
-    agent.get(config['url']) do |page|
-
-      translated_page = page.form_with(input_form['selector']) do |form|
-
-        text = form.field_with(input_form['text']['selector'])
-        text.value = input_text
+    end
 
-        if input_form['directions'] and input_form['directions']['field']['selector']
+    def translate(input_text)
 
-          value = input_form['directions']['directions']["#{from_lang}-#{to_lang}".to_sym]
-          direction = form.field_with(input_form['directions']['field']['selector'])
-          direction.option_with(:value => value).select
+      return '' if not has_languages? or input_text.empty?
 
-        else
+      agent = Mechanize.new {|a| a.user_agent_alias = 'Linux Konqueror'}
 
-          if input_form['from'] and input_form['from']['field'] and input_form['from']['field']['selector']
+      input_form = @config.input.form
+      page = agent.get(@config.url)
+      translated_page = page.form_with(input_form.selector) do |form|
+        fill_form form, input_form, input_text
+      end.submit
 
-            value = input_form['from']['languages'][from_lang]
-            from_lang = form.field_with(input_form['from']['field']['selector'])
-            from_lang.option_with(:value => value).select
+      get_translation translated_page, @config.output
 
-          end
+    end
 
-          if input_form['to'] and input_form['to']['field'] and input_form['to']['field']['selector']
+    private
 
-            value = input_form['to']['languages'][to_lang]
-            to_lang = form.field_with(input_form['to']['field']['selector'])
-            to_lang.option_with(:value => value).select
+    def deabbreviate_language(language)
+      Configuration.instance.data.abbreviations.languages[language] || language
+    end
 
-          end
+    def deabbreviate_service(service)
+      Configuration.instance.data.abbreviations.services[service] || service
+    end
 
-        end
+    def has_languages?
+      input_form = @config.input.form
+      if input_form.to and input_form.from
+        return false unless input_form.to.languages[@to_lang] and input_form.from.languages[@from_lang]
+      elsif input_form.directions
+        return false unless input_form.directions.directions[@direction]
+      end
+      return true
+    end
 
-      end.submit
+    def fill_form(form, config_form, input_text)
+      to, from, directions, text = config_form.to, config_form.from, config_form.directions, config_form.text
 
-      output_text = if config['output']['xpath']
-        xpath = config['output']['xpath']
-        translated_page.search(xpath)
+      if directions and directions.field and directions.field.selector
+        set_form_option form.field_with(directions.field.selector), directions.directions[@direction]
       else
-        output_form = config['output']['form']
-        translated_page.form_with(output_form['selector']).field_with(output_form['text']['selector']).value
+        if from and from.field and from.field.selector
+          set_form_option form.field_with(from.field.selector), from.languages[@from_lang]
+        end
+        if to and to.field and to.field.selector
+          set_form_option form.field_with(to.field.selector), to.languages[@to_lang]
+        end
       end
 
+      form_text_field = form.field_with(text.selector)
+      form_text_field.value = input_text
     end
 
-    output_text.to_s
-  end
+    def set_form_option(field, value)
+      field.option_with(:value => value).select
+    end
 
-  def self.list(config_path = nil)
-    Langouste.config.keys.select{|k| k.is_a?(Symbol)}
-  end
+    def get_translation(page, config_output)
 
-  private
+      translation = if config_output.xpath
+        page.search(config_output.xpath)
+      else
+        output_form = config_output.form
+        page.form_with(output_form.selector).field_with(output_form.text.selector).value
+      end
 
-  def deabbreviate_language(language)
-    Langouste.config['abbreviations']['languages'][language] || language
-  end
+      translation ? translation.to_s : ''
+    end
 
-  def deabbreviate_service(services)
-    Langouste.config['abbreviations']['services'][services] || services
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Hariton Mizgir
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 +04:00
+date: 2010-05-07 00:00:00 +04:00
 default_executable: langouste
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,9 +32,23 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: symboltable
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -42,7 +56,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: 
 email: hmizgir@gmail.com
 executables: