logaling-command 0.1.4 → 0.1.5

data/CHANGES

@@ -1,3 +1,9 @@
+= 0.1.5 / 2012-05-02
+
+* TMX形式の用語集をインポートできるようにしました。
+
+* loga import mozilla_japan すると訳語が空のエントリが複数登録される不具合を修正しました。
+
 = 0.1.4 / 2012-03-29
 
 * インデックス時にオフラインインデックスを利用することで速度が改善されました。（groonga >= 2.0.0）

data/lib/logaling/command/application.rb

@@ -74,7 +74,7 @@ module Logaling::Command
           @dotfile_path = options["logaling-config"] ? options["logaling-config"] : find_dotfile
           @project_config_path = File.join(@dotfile_path, 'config')
           @config.load(@project_config_path)
-          register
+          register_and_index
         end
         say "Successfully created #{logaling_config_path}"
       else
@@ -84,29 +84,39 @@ module Logaling::Command
 
     desc 'import', 'Import external glossary'
     method_option "list", type: :boolean, default: false
-    def import(external_glossary=nil)
+    def import(external_glossary=nil, *args)
       require "logaling/external_glossary"
       Logaling::ExternalGlossary.load
       if options["list"]
         Logaling::ExternalGlossary.list.each {|glossary| say "#{glossary.name.bright} : #{glossary.description}" }
       else
-        @repository.import(Logaling::ExternalGlossary.get(external_glossary))
-        @repository.index
+        case external_glossary
+        when 'tmx'
+          glossary_info = initialize_import_parameter(args)
+          check_import_parameter(glossary_info)
+          @repository.import_tmx(Logaling::ExternalGlossary.get(external_glossary), glossary_info)
+          @repository.index
+        else
+          @repository.import(Logaling::ExternalGlossary.get(external_glossary))
+          @repository.index
+        end
       end
     rescue Logaling::CommandFailed => e
       say e.message
     rescue Logaling::ExternalGlossaryNotFound
       say "'#{external_glossary}' can't find in import list."
       say "Try 'loga import --list' and confirm import list."
+    rescue Logaling::GlossaryNotFound => e
+      say e.message
     end
 
     desc 'register', 'Register .logaling'
     def register
-      @config.check_required_option("glossary" => "input glossary name '-g <glossary name>'")
+      raise Logaling::CommandFailed, "Can't use '-g <glossary>' option." if options["glossary"]
+      @config.check_required_option("glossary" => "Do 'loga register' at project directory.")
       raise Logaling::CommandFailed, "Try 'loga new' first." unless File.exist?(@dotfile_path)
 
-      @repository.register(@dotfile_path, @config.glossary)
-      @repository.index
+      register_and_index
       say "#{@config.glossary} is now registered to logaling."
     rescue Logaling::CommandFailed => e
       say e.message
@@ -116,7 +126,8 @@ module Logaling::Command
 
     desc 'unregister', 'Unregister .logaling'
     def unregister
-      @config.check_required_option("glossary" => "input glossary name '-g <glossary name>'")
+      raise Logaling::CommandFailed, "Can't use '-g <glossary>' option." if options["glossary"]
+      @config.check_required_option("glossary" => "Do 'loga unregister' at project directory.")
 
       @repository.unregister(@config.glossary)
       @repository.index
@@ -132,7 +143,7 @@ module Logaling::Command
    def config(key, value)
      if options["global"]
        unless File.exist?(@logaling_home)
-         FileUtils.mkdir_p(@logaling_home) rescue raise Logaling::CommandFailed, "Imput existing directory as logaling-home."
+         FileUtils.mkdir_p(@logaling_home) rescue raise Logaling::CommandFailed, "Input existing directory as logaling-home."
        end
        config_path = File.join(@logaling_home, "config")
      else
@@ -378,7 +389,7 @@ module Logaling::Command
 
     def check_logaling_home_exists
       unless File.exist?(@logaling_home)
-        raise Logaling::CommandFailed, "Imput existing directory as logaling-home."
+        raise Logaling::CommandFailed, "Input existing directory as logaling-home."
       end
     end
 
@@ -408,5 +419,29 @@ module Logaling::Command
         puts("\n]") if i == last-1
       end
     end
+
+    def check_import_parameter(glossary_info)
+      unless glossary_info[:name] && glossary_info[:url]
+        raise Logaling::CommandFailed, "Do 'loga import tmx <glossary name> <url or path>'"
+      end
+    end
+
+    def initialize_import_parameter(arr)
+      glossary_info = {}
+      url = arr[1]
+      if url && !URI.parse(url).host
+        url = File::expand_path(url)
+      end
+      glossary_info[:name] = arr[0]
+      glossary_info[:url] = url
+      glossary_info[:source_language] = arr[2]
+      glossary_info[:target_language] = arr[3]
+      glossary_info
+    end
+
+    def register_and_index
+      @repository.register(@dotfile_path, @config.glossary)
+      @repository.index
+    end
   end
 end

data/lib/logaling/command/version.rb

@@ -17,6 +17,6 @@
 
 module Logaling
   module Command
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/lib/logaling/external_glossaries/mozilla_japan.rb

@@ -32,7 +32,7 @@ module Logaling
       doc.css("dl[@class='terminology en-ja']").each do |dl|
         dl.children.each_slice(2) do |dt, dd|
           dd.text.split("|").each do |ddt|
-            ddt = ddt.gsub(/\s/, '')
+            ddt = ddt.gsub(/\s|\u{a0}/, '')
             unless ddt.empty?
               csv << [dust_to_tilda(dt.text), dust_to_tilda(ddt)]
             end

data/lib/logaling/external_glossaries/tmx.rb

@@ -0,0 +1,58 @@
+# Copyright (C) 2012  Miho SUZUKI
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'open-uri'
+require 'nokogiri'
+module Logaling
+  class Tmx < ExternalGlossary
+    description     'TMX 1.4b formatted glossary (http://www.gala-global.org/oscarStandards/tmx/)'
+    source_language 'en'
+    target_language 'ja'
+    output_format   'csv'
+
+    private
+    def convert_to_csv(csv, glossary_info)
+      doc = ::Nokogiri::XML(open(glossary_info[:url], "r"))
+      tu_nodes = doc.xpath('//tmx/body/tu')
+      tu_nodes.each do |tu|
+        original = ""
+        translation = ""
+        notes = []
+        tu.children.each do |tuv|
+          if tuv.name == "tuv"
+            lang = convert_language_code_iso_639(tuv["lang"])
+            if lang == glossary_info[:source_language]
+              tuv.children.each do |child|
+                original = child.text.strip if child.name == "seg"
+                notes << child.text.strip if child.name == "note"
+              end
+            elsif lang == glossary_info[:target_language]
+              tuv.children.each do |child|
+                translation = child.text.strip if child.name == "seg"
+                notes << child.text.strip if child.name == "note"
+              end
+            end
+          end
+        end
+        csv << [original, translation, notes.join(" | ")] if original && translation
+      end
+    end
+
+    def convert_language_code_iso_639(code)
+      # use two-letter codes
+      code.downcase.sub(/-.*\z/, "")
+    end
+  end
+end

data/lib/logaling/external_glossary.rb

@@ -14,6 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'active_support/inflector'
+require 'open-uri'
+require 'net/http'
 
 class Logaling::ExternalGlossary
   class << self
@@ -66,13 +68,22 @@ class Logaling::ExternalGlossary
     end
   end
 
-  def import
-    File.open(import_file_name, "w") do |output|
+  def import(glossary_info=nil)
+    if glossary_info && glossary_info[:url]
+      unless file_exists?(glossary_info[:url])
+        raise Logaling::GlossaryNotFound, "Failed open url/path <#{glossary_info[:url]}>"
+      end
+    end
+    File.open(import_file_name(glossary_info), "w") do |output|
       output_format = self.class.output_format
       output_format = output_format.to_s if output_format.is_a?(Symbol)
       case output_format
       when "csv"
-        convert_to_csv(CSV.new(output))
+        if glossary_info
+          convert_to_csv(CSV.new(output), glossary_info)
+        else
+          convert_to_csv(CSV.new(output))
+        end
       else
         raise UnsupportedFormat, "unsupported format: <#{output_format}>"
       end
@@ -80,8 +91,28 @@ class Logaling::ExternalGlossary
   end
 
   private
-  def import_file_name
-    [self.class.name, self.class.source_language,
-     self.class.target_language, self.class.output_format].join('.')
+  def import_file_name(glossary_info=nil)
+    if glossary_info
+      glossary_info[:name] ||= self.class.name
+      glossary_info[:source_language] ||= self.class.source_language
+      glossary_info[:target_language] ||= self.class.target_language
+
+      [glossary_info[:name], glossary_info[:source_language],
+       glossary_info[:target_language], self.class.output_format].join('.')
+    else
+      [self.class.name, self.class.source_language,
+       self.class.target_language, self.class.output_format].join('.')
+    end
+  end
+
+  def file_exists?(url_org)
+    url = URI.parse(url_org)
+    if url.host
+      Net::HTTP.start(url.host, url.port) do |http|
+        http.head(url.request_uri).code == "200"
+      end
+    else
+      File.exist?(url_org)
+    end
   end
 end

data/lib/logaling/glossary_db.rb

@@ -108,7 +108,7 @@ module Logaling
         {:key=>"source_term", :order=>'ascending'},
         {:key=>"target_term", :order=>'ascending'}])
 
-      options = {:width => 100,
+      options = {:width => 5000,
                  :html_escape => true,
                  :normalize => true}
       snippet = records_selected.expression.snippet(["<snippet>", "</snippet>"], options)
@@ -144,7 +144,7 @@ module Logaling
         {:key=>"source_term", :order=>'ascending'},
         {:key=>"target_term", :order=>'ascending'}])
 
-      options = {:width => 100,
+      options = {:width => 5000,
                  :html_escape => true,
                  :normalize => true}
       snippet = records_selected.expression.snippet(["<snippet>", "</snippet>"], options)

data/lib/logaling/repository.rb

@@ -54,6 +54,17 @@ module Logaling
       raise Logaling::CommandFailed, "Failed import #{glossary.class.name} to #{cache_path}."
     end
 
+    def import_tmx(glossary, glossary_info)
+      FileUtils.mkdir_p(cache_path) unless File.exist?(cache_path)
+      Dir.chdir(cache_path) do
+        glossary.import(glossary_info)
+      end
+    rescue Logaling::GlossaryNotFound => e
+      raise e
+    rescue
+      raise Logaling::CommandFailed, "Failed import_tmx #{glossary.class.name} to #{cache_path}."
+    end
+
     def lookup(source_term, glossary_source, dictionary=false)
       raise GlossaryDBNotFound unless File.exist?(logaling_db_home)
 

data/spec/logaling/command_spec.rb

@@ -90,6 +90,7 @@ describe Logaling::Command::Application do
     context "when can not find .logaling" do
       before(:all) do
         FileUtils.rm_rf(logaling_config)
+        base_options["glossary"] = nil
         @stdout = capture(:stdout) {command.register}
       end
 
@@ -97,8 +98,8 @@ describe Logaling::Command::Application do
         Dir[File.join(logaling_home, "projects", "*")].size.should == @n_projects
       end
 
-      it "print message \"Try 'loga new' first.\"" do
-        @stdout.should be_include "Try 'loga new' first.\n"
+      it "print message \"Do 'loga register' at project directory.\"" do
+        @stdout.should be_include "Do 'loga register' at project directory."
       end
     end
 
@@ -131,13 +132,14 @@ describe Logaling::Command::Application do
           @stdout = capture(:stdout) {command.unregister}
         end
 
-        it "should print message 'input glossary name ...'" do
-          @stdout.should be_include "input glossary name"
+        it "should print message 'Do \'loga unregister\' at ...'" do
+          @stdout.should be_include "Do 'loga unregister' at project directory."
         end
       end
 
       context "and call with option" do
         before do
+          command.options = base_options.merge("glossary" => nil)
           command.new('spec', 'en', 'ja')
           @stdout = capture(:stdout) {command.unregister}
         end
@@ -150,6 +152,7 @@ describe Logaling::Command::Application do
     context 'when find .logaling' do
       context 'and .logaling registered' do
         before do
+          command.options = base_options.merge("glossary" => nil)
           command.new('spec', 'en', 'ja')
           command.register
           command.unregister
@@ -163,7 +166,7 @@ describe Logaling::Command::Application do
 
       context "and .logaling is not registered" do
         before do
-          command.options = base_options.merge("no-register" => true)
+          command.options = base_options.merge("no-register" => true, "glossary" => nil)
           command.new('spec', 'en', 'ja')
           @stdout = capture(:stdout) {command.unregister}
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logaling-command
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000Z
+date: 2012-05-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2154363820 !ruby/object:Gem::Requirement
+  requirement: &2161067140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2154363820
+  version_requirements: *2161067140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154363340 !ruby/object:Gem::Requirement
+  requirement: &2161066660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,10 +36,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154363340
+  version_requirements: *2161066660
 - !ruby/object:Gem::Dependency
   name: rroonga
-  requirement: &2154362860 !ruby/object:Gem::Requirement
+  requirement: &2161066180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -47,10 +47,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154362860
+  version_requirements: *2161066180
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &2154362480 !ruby/object:Gem::Requirement
+  requirement: &2161065800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -58,10 +58,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154362480
+  version_requirements: *2161065800
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2154362020 !ruby/object:Gem::Requirement
+  requirement: &2161065340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,10 +69,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154362020
+  version_requirements: *2161065340
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154361600 !ruby/object:Gem::Requirement
+  requirement: &2161064920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -80,10 +80,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154361600
+  version_requirements: *2161064920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154361180 !ruby/object:Gem::Requirement
+  requirement: &2153870360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -91,10 +91,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154361180
+  version_requirements: *2153870360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154360760 !ruby/object:Gem::Requirement
+  requirement: &2153869940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -102,7 +102,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154360760
+  version_requirements: *2153869940
 description: A command line interface for logaling.
 email:
 - koji.shimada@enishi-tech.com
@@ -135,6 +135,7 @@ files:
 - lib/logaling/external_glossaries/gnome_project.rb
 - lib/logaling/external_glossaries/mozilla_japan.rb
 - lib/logaling/external_glossaries/postgresql_manual.rb
+- lib/logaling/external_glossaries/tmx.rb
 - lib/logaling/external_glossary.rb
 - lib/logaling/glossary.rb
 - lib/logaling/glossary_db.rb