konjac 0.2.5.2 → 0.2.6

data/README.rdoc

@@ -39,20 +39,23 @@ Use multiple dictionaries:
     konjac translate financial_report_en.txt --to japanese --using {finance,fluffery}
     konjac translate financial_report_en.txt -t ja -u {finance,fluffery}
 
-Extract text from a .docx document (creates a plain-text <tt>test.konjac</tt> file from
-<tt>test.docx</tt>):
+Extract text from a .docx? document (creates a plain-text <tt>test.konjac</tt>
+file from <tt>test.docx</tt>):
 
-    konjac export test
+    konjac export test.doc
+    konjac export test.docx
 
 Extract text from a .docx document and process with a dictionary
 
     konjac export test.docx --from japanese --to english --using pre
     konjac export test.docx -f ja -t en -u pre
 
-Import tags file back into .docx document (file created is named
+Import tags file back into .docx document (for .doc files, this opens the file
+in word and imports the changes; for .docx files this outputs a new file named
 <tt>test_imported.docx</tt>):
 
-    konjac import test
+    konjac import test.doc
+    konjac import test.docx
 
 Add a word to your dictionary:
 
@@ -64,6 +67,11 @@ Translate a word using your dictionary:
     konjac translate dog --from english --to japanese --word
     konjac translate dog -f en -t ja -w
 
+Suggest a word using your dictionary:
+
+    konjac suggest dog --from english --to japanese
+    konjac suggest dog -f en -t ja
+
 == Dictionary Format
 
 Store terms in <tt>~/.konjac/dict.yml</tt>.

data/konjac.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths    = ["lib"]
 
   s.add_runtime_dependency "amatch"
+  s.add_runtime_dependency "highline"
   s.add_runtime_dependency "i18n"
   s.add_runtime_dependency "nokogiri"
   s.add_runtime_dependency "sdoc"

data/lib/applescripts/konjac_word_export

@@ -1,10 +1,19 @@
 #!/usr/bin/osascript
+-- round up ASCII characters used for formatting in Word
+global bell
+global line_feed
+global form_feed
+global carriage_return
+global format_chars
+
+-- strip line breaks and formatting characters
 to strip_line_breaks(this_line)
   try
-    repeat while last character of this_line is in {ASCII character 13, ASCII character 10, ASCII character 7}
+    -- remove last character until no it's no longer an excluded character
+    repeat while last character of this_line is in format_chars
       set this_line to characters 1 thru -2 of this_line as string
     end repeat
-    return this_line
+    return this_line as text
   on error
     return ""
   end try
@@ -14,60 +23,88 @@ to get_posix_path(mac_path)
   set result to POSIX path of mac_path
 end get_posix_path
 
-tell application "Microsoft Word"
-  activate
-  set active_document to active document
-  set carriage_return to ASCII character 13
-  set line_feed to ASCII character 10
-  set ignored_content to {missing value, "", line_feed}
-  
-  -- set tags path to full path to active presentation with a .tags extension
-  set tags_path to ((path of active_document) & ".diff")
-  
-  -- delete tags file if it already exists
-  tell application "Finder"
-    if exists file tags_path then
-      delete file tags_path
-    end if
-  end tell
-  
-  -- open tags file for writing
-  set tags_file to open for access file tags_path with write permission
-  set eof of tags_file to 0
+to extract(filename)
+  tell application "Microsoft Word"
+    activate
+    open filename
+    set active_document to active document
+    set ignored_content to {missing value, "", line_feed}
+    
+    -- set tags path to full path to active presentation with a .tags extension
+    set tags_path to ((path of active_document) & ".diff")
+    
+    -- delete tags file if it already exists
+    tell application "Finder"
+      if exists file tags_path then
+        delete file tags_path
+      end if
+    end tell
+    
+    -- open tags file for writing
+    set tags_file to open for access file tags_path with write permission
+    set eof of tags_file to 0
+
+    write ("--- " & my get_posix_path(path of active_document)) to tags_file
+    write line_feed to tags_file
+    write ("+++ " & my get_posix_path(path of active_document)) to tags_file
+    write line_feed to tags_file
+
+    -- iterate through paragraphs
+    set paragraph_index to 1
+    set current_paragraph to paragraph 1 in active document
 
-  write ("---" & my get_posix_path(path of active_document)) to tags_file
-  write line_feed to tags_file
-  write ("+++" & my get_posix_path(path of active_document)) to tags_file
-  write line_feed to tags_file
+    -- save old delimiters
+    
+    repeat
+      -- get text content if it's available
+      set text_content to my strip_line_breaks(content of text object of current_paragraph) as string
 
-  -- iterate through paragraphs
-  set paragraph_index to 1
-  set current_paragraph to paragraph 1 in active document
-  
-  repeat
-    -- get text content if it's available
-    set text_content to my strip_line_breaks(content of text object of current_paragraph as text)
+      -- replace "soft returns" (vertical tabs) with real returns
+      set old_delimiters to AppleScript's text item delimiters
+      set AppleScript's text item delimiters to {ASCII character 11}
+      set split_content to every text item of text_content
+      set AppleScript's text item delimiters to old_delimiters
 
-    if text_content is not in ignored_content then
-      write ("@@ " & paragraph_index & " @@") to tags_file
-      write line_feed to tags_file
-      write ("-" & text_content) to tags_file as «class utf8»
-      write line_feed to tags_file
-      write ("+" & text_content) to tags_file as «class utf8»
-      write line_feed to tags_file
-    end if
+      if text_content is not in ignored_content then
+        write ("@@ " & paragraph_index & " @@") to tags_file
+        write line_feed to tags_file
+        repeat with text_line in split_content
+          write ("-" & text_line) to tags_file as «class utf8»
+          write line_feed to tags_file
+        end repeat
+        repeat with text_line in split_content
+          write ("+" & text_line) to tags_file as «class utf8»
+          write line_feed to tags_file
+        end repeat
+      end if
 
-    -- increment paragraph index
-    set paragraph_index to (paragraph_index + 1)
+      -- increment paragraph index
+      set paragraph_index to (paragraph_index + 1)
+
+      -- try to find the next paragraph
+      try
+        set current_paragraph to next paragraph of current_paragraph
+      on error
+        exit repeat
+      end try
+    end repeat
+    
+    -- close everything
+    close access tags_file
+  end tell
+end extract
+
+-- initialize global variables, just formatting characters here
+to init_globals()
+  set bell to ASCII character 7
+  set line_feed to ASCII character 10
+  set form_feed to ASCII character 12
+  set carriage_return to ASCII character 13
+  set format_chars to {bell, line_feed, form_feed, carriage_return}
+end init_globals
 
-    -- try to find the next paragraph
-    try
-      set current_paragraph to next paragraph of current_paragraph
-    on error
-      exit repeat
-    end try
-  end repeat
-  
-  -- close everything
-  close access tags_file
-end tell
+-- main()
+on run argv
+  init_globals()
+  extract(item 1 of argv)
+end

data/lib/applescripts/konjac_word_import

@@ -1,5 +1,8 @@
 #!/usr/bin/osascript
-set numbers_as_text to {"1", "2", "3", "4", "5", "6", "7", "8", "9", "0"}
+global numbers_as_text
+global line_feed
+global vertical_tab
+global carriage_return
 
 -- parses the headers/separators inside the tags file
 to parse_header(header)
@@ -16,34 +19,87 @@ to get_posix_path(mac_path)
   set result to POSIX path of mac_path
 end get_posix_path
 
-tell application "Microsoft Word"
-  activate
-  set active_document to active document
-  set carriage_return to ASCII character 13
-  set line_feed to ASCII character 10
-  set ignored_content to {missing value, "", line_feed}
-  
-  -- set tags path to full path to active presentation with a .tags extension
-  set tags_path to ((path of active_document) & ".diff")
-  
-  -- read in tags
-  set tags_file to open for access file tags_path
-  set tags to (read tags_file for (get eof tags_file) as «class utf8» using delimiter line_feed)
-  close access tags_file
-
-  -- iterate through paragraphs
-  set paragraph_index to 0
-  repeat with current_line in tags
-    if current_line starts with "@@ " then
-      set space_offset to my parse_header(current_line)
-      set paragraph_index to text 4 thru space_offset of current_line as number
-    else if current_line starts with "+" then
-      if paragraph_index is not 0 then
-        set current_content to text object of paragraph paragraph_index of active document
-        set my_range to create range active document start (start of content of current_content) end (end of content of current_content)
+to import(filename)
+  tell application "Microsoft Word"
+    activate
+    open filename
+    set active_document to active document
+    set ignored_content to {missing value, "", line_feed}
+    
+    -- set tags path to full path to active presentation with a .tags extension
+    set tags_path to ((path of active_document) & ".diff")
+    
+    -- read in tags
+    set tags_file to open for access file tags_path
+    set tags to (read tags_file for (get eof tags_file) ¬
+                   as «class utf8» using delimiter line_feed)
+    set tag_index to 0
+    set tag_length to length of tags
+    close access tags_file
+
+    set text_content to ""
+
+    -- iterate through paragraphs
+    set paragraph_index to 0
+    set prev_paragraph_index to 0
+    set is_new_tag to false
+
+    repeat with current_line in tags
+      if current_line starts with "@@ " then
+        set space_offset to my parse_header(current_line)
+        set paragraph_index to text 4 thru space_offset ¬
+                                 of current_line as number
+        set is_new_tag to true
+      else if current_line starts with "+" then
+        if paragraph_index is not 0 then
+          set prev_paragraph_index to paragraph_index
+
+          -- handle blank lines with soft returns
+          if current_line is "+"
+            set this_content to ""
+          else
+            set this_content to text 2 thru (length of current_line) ¬
+                                  of current_line
+          end if
+
+          -- add to text content, joining with a soft return for multiple lines
+          if text_content is "" then
+            set text_content to this_content
+          else
+            set text_content to (text_content & vertical_tab & this_content)
+          end if
+          set is_new_tag to false
+        end if
+      end if
+
+      -- increment tag index
+      set tag_index to tag_index + 1
+
+      -- write if we've moved to a new tag or reached the end of the file
+      if text_content is not "" and (tag_index is tag_length or is_new_tag)
+        set current_content to text object of paragraph prev_paragraph_index ¬
+                                 of active document
+        set my_range to create range active document ¬
+                          start (start of content of current_content) ¬
+                          end (end of content of current_content)
         select my_range
-        type text selection text (text 2 thru (length of current_line) of current_line)
+        type text selection text text_content
+        set text_content to ""
       end if
-    end if
-  end repeat
-end tell
+    end repeat
+  end tell
+end import
+
+-- initialize global variables
+to init_globals()
+  set numbers_as_text to {"1", "2", "3", "4", "5", "6", "7", "8", "9", "0"}
+  set line_feed to ASCII character 10
+  set vertical_tab to ASCII character 11
+  set carriage_return to ASCII character 13
+end init_globals
+
+-- main()
+on run argv
+  init_globals()
+  import(item 1 of argv)
+end run

data/lib/konjac/cli.rb

@@ -75,6 +75,7 @@ eos
               banner sc_banner % I18n.t(:filenames_arg)
               opt :from, I18n.t(:from, :scope => :opts), :type => :string
               opt :to, I18n.t(:to, :scope => :opts), :type => :string
+              opt :output, I18n.t(:output, :scope => :opts), :type => :string
               opt :using, I18n.t(:using, :scope => :opts), :type => :string,
                 :default => "dict", :multi => true
               opt :help, I18n.t(:help, :scope => :opts)
@@ -82,14 +83,19 @@ eos
             if ARGV == ["doc"]
               system File.join(File.dirname(__FILE__), "..", "applescripts", "konjac_word_export")
             else
-              Word.export_docx_tags ARGV, opts
+              Word.export_tags ARGV, opts
             end
           when "import"
-            Trollop::options do
+            opts = Trollop::options do
               banner sc_banner % I18n.t(:filenames_arg)
+              opt :output, I18n.t(:output, :scope => :opts), :type => :string
               opt :help, I18n.t(:help, :scope => :opts)
             end
-            Word.import_docx_tags ARGV
+            if ARGV == ["doc"]
+              system File.join(File.dirname(__FILE__), "..", "applescripts", "konjac_word_import")
+            else
+              Word.import_tags ARGV, opts
+            end
           when "language"
             Trollop::options do
               banner sc_banner % I18n.t(:word_arg)
@@ -117,6 +123,9 @@ eos
               banner sc_banner % I18n.t(:filenames_or_word_arg)
               opt :from, I18n.t(:from, :scope => :opts), :type => :string
               opt :to, I18n.t(:to, :scope => :opts), :type => :string
+              opt :output, I18n.t(:output, :scope => :opts), :type => :string
+              opt :force, I18n.t(:force, :scope => :opts), :default => false,
+                :short => :y
               opt :using, I18n.t(:using, :scope => :opts), :type => :string,
                 :default => "dict", :multi => true
               opt :use_cache, I18n.t(:use_cache, :scope => :opts),

data/lib/konjac/translator.rb

@@ -25,8 +25,17 @@ module Konjac
               end
             end
           end
-          target = Utils.build_converted_file_name(source, from_lang, to_lang)
-          FileUtils.mv temp_file.path, target
+
+          # Set output file
+          if opts[:output].nil?
+            target = source
+          else
+            target = File.expand_path(opts[:output])
+          end
+
+          if Utils.user_allows_overwrite?(target, opts)
+            FileUtils.mv temp_file.path, target
+          end
         end
       end
 

data/lib/konjac/utils.rb

@@ -14,6 +14,20 @@ module Konjac
         end
       end
 
+      # Prompts user whether to overwrite the specified file. Passing
+      # <tt>:force => true</tt> after the filename will cause this message to
+      # be ignored and always return +true+
+      def user_allows_overwrite?(file, opts = {})
+        if File.exist?(File.expand_path(file)) && !opts[:force]
+          print I18n.t(:overwrite) % file
+          answer = HighLine::SystemExtensions.get_character.chr
+          puts answer
+          return answer =~ /^y/i
+        else
+          return true
+        end
+      end
+
       # Build converted file name by appending "_converted" to the file name
       def build_converted_file_name(source, from_lang, to_lang)
         # Get components of filename

data/lib/konjac/version.rb

@@ -1,4 +1,4 @@
 module Konjac
   # The current version number of Konjac
-  VERSION = "0.2.5.2"
+  VERSION = "0.2.6"
 end

data/lib/konjac/word.rb

@@ -5,51 +5,58 @@ module Konjac
     class << self
       # Imports the text content of a tag file into a {Microsoft
       # Word}[http://office.microsoft.com/en-us/word/] 2003+ document
-      def import_docx_tags(files)
-        sub_files = Utils.parse_files(files, :extension => :docx)
+      def import_tags(files)
+        sub_files = Utils.parse_files(files)
         sub_files.each do |sub_file|
-          # Build the list of paths we need to work with
-          dirname   = File.dirname(sub_file)
-          basename  = File.basename(sub_file, ".*")
-          orig_docx = "#{dirname}/#{basename}.docx"
-          new_path  = "#{dirname}/#{basename}_imported.docx"
-          xml_path  = "#{dirname}/#{basename}.xml"
-          tags_path = "#{dirname}/#{basename}.diff"
-          out_path  = "#{dirname}/word/document.xml"
-
-          # Open the original XML file and the updated tags
-          writer = Nokogiri::XML(File.read(xml_path))
-          nodes  = writer.xpath("//w:t")
-          tags   = TagManager.new(tags_path)
-
-          # Overwrite each <w:t> tag's content with the new tag
-          tags.all.each do |tag|
-            if tag.translated?
-              nodes[tag.index].content = tag.translated
+          case File.extname(sub_file)
+          when ".doc"
+            system File.join(File.dirname(__FILE__), "..", "applescripts", "konjac_word_import"), sub_file
+          when ".docx"
+            # Build the list of paths we need to work with
+            dirname   = File.dirname(sub_file)
+            basename  = File.basename(sub_file, ".*")
+            orig_docx = "#{dirname}/#{basename}.docx"
+            new_path  = "#{dirname}/#{basename}_imported.docx"
+            xml_path  = "#{dirname}/#{basename}.xml"
+            tags_path = "#{dirname}/#{basename}.diff"
+            out_path  = "#{dirname}/word/document.xml"
+
+            # Open the original XML file and the updated tags
+            writer = Nokogiri::XML(File.read(xml_path))
+            nodes  = writer.xpath("//w:t")
+            tags   = TagManager.new(tags_path)
+
+            # Overwrite each <w:t> tag's content with the new tag
+            tags.all.each do |tag|
+              if tag.translated?
+                nodes[tag.index].content = tag.translated
+              end
             end
-          end
 
-          # Create a directory for word/document.xml if necessary
-          unless File.directory?("#{dirname}/word")
-            FileUtils.mkdir "#{dirname}/word"
-          end
+            # Create a directory for word/document.xml if necessary
+            unless File.directory?("#{dirname}/word")
+              FileUtils.mkdir "#{dirname}/word"
+            end
 
-          # Write the modified XML to a file
-          File.open(out_path, "w") do |file|
-            file.write writer.to_xml.gsub(/\n\s*/, "").sub(/\?></, "?>\n<")
-          end
+            # Write the modified XML to a file
+            File.open(out_path, "w") do |file|
+              file.write writer.to_xml.gsub(/\n\s*/, "").sub(/\?></, "?>\n<")
+            end
 
-          # Copy the original file
-          FileUtils.cp orig_docx, new_path
+            # Copy the original file
+            FileUtils.cp orig_docx, new_path
 
-          # Add the new document XML to the copied file
-          system "cd #{dirname} && zip -q #{new_path} word/document.xml"
+            # Add the new document XML to the copied file
+            system "cd #{dirname} && zip -q #{new_path} word/document.xml"
+          else
+            puts I18n.t(:unknown) % sub_file
+          end
         end
       end
 
       # Exports the text content of {Microsoft
-      # Word}[http://office.microsoft.com/en-us/word/] 2003+ document
-      def export_docx_tags(files, opts = {})
+      # Word}[http://office.microsoft.com/en-us/word/] documents
+      def export_tags(files, opts = {})
         # Determine whether to attempt translating
         if opts[:from_given] && opts[:to_given]
           from_lang = Language.find(opts[:from])
@@ -60,60 +67,67 @@ module Konjac
           end
         end
 
-        sub_files = Utils.parse_files(files, :extension => :docx)
+        sub_files = Utils.parse_files(files)
         sub_files.each do |sub_file|
-          # Build a list of all the paths we're working with
-          dirname    = File.dirname(sub_file)
-          basename   = File.basename(sub_file, ".*")
-          orig_docx  = "#{dirname}/#{basename}.docx"
-          xml_path   = "#{dirname}/#{basename}_orig.xml"
-          clean_path = "#{dirname}/#{basename}.xml"
-          tags_path  = "#{dirname}/#{basename}.diff"
-
-          # Unzip the DOCX's word/document.xml file and pipe the output into
-          # an XML with the same base name as the DOCX
-          system "unzip -p #{orig_docx} word/document.xml > #{xml_path}"
-
-          # Read in the XML file and extract the content from each <w:t> tag
-          cleaner = Nokogiri::XML(File.read(xml_path))
-          File.open(tags_path, "w") do |tags_file|
-            # Remove all grammar and spellcheck tags
-            cleaner.xpath("//w:proofErr").remove
-
-            nodes = cleaner.xpath("//w:r")
-            prev = nil
-            nodes.each do |node|
-              unless prev.nil?
-                if (prev.next_sibling == node) && compare_nodes(prev, node)
-                  begin
-                    node.at_xpath("w:t").content = prev.at_xpath("w:t").content +
-                      node.at_xpath("w:t").content
-                    prev.remove
-                  rescue
+          case File.extname(sub_file)
+          when ".doc"
+            system File.join(File.dirname(__FILE__), "..", "applescripts", "konjac_word_export"), sub_file
+          when ".docx"
+            # Build a list of all the paths we're working with
+            dirname    = File.dirname(sub_file)
+            basename   = File.basename(sub_file, ".*")
+            orig_docx  = "#{dirname}/#{basename}.docx"
+            xml_path   = "#{dirname}/#{basename}_orig.xml"
+            clean_path = "#{dirname}/#{basename}.xml"
+            tags_path  = "#{dirname}/#{basename}.diff"
+
+            # Unzip the DOCX's word/document.xml file and pipe the output into
+            # an XML with the same base name as the DOCX
+            system "unzip -p #{orig_docx} word/document.xml > #{xml_path}"
+
+            # Read in the XML file and extract the content from each <w:t> tag
+            cleaner = Nokogiri::XML(File.read(xml_path))
+            File.open(tags_path, "w") do |tags_file|
+              # Remove all grammar and spellcheck tags
+              cleaner.xpath("//w:proofErr").remove
+
+              nodes = cleaner.xpath("//w:r")
+              prev = nil
+              nodes.each do |node|
+                unless prev.nil?
+                  if (prev.next_sibling == node) && compare_nodes(prev, node)
+                    begin
+                      node.at_xpath("w:t").content = prev.at_xpath("w:t").content +
+                        node.at_xpath("w:t").content
+                      prev.remove
+                    rescue
+                    end
                   end
                 end
+                
+                prev = node
               end
-              
-              prev = node
-            end
 
-            # Write the tags file
-            tags_file.puts "---" + orig_docx
-            tags_file.puts "+++" + orig_docx
-            cleaner.xpath("//w:t").each_with_index do |node, index|
-              tags_file.puts "@@ %i @@" % [index, additional_info(node)]
-              tags_file.puts "-" + node.content
-              if attempting_to_translate
-                tags_file.puts "+" + Translator.translate_content(node.content)
-              else
-                tags_file.puts "+" + node.content
+              # Write the tags file
+              tags_file.puts "---" + orig_docx
+              tags_file.puts "+++" + orig_docx
+              cleaner.xpath("//w:t").each_with_index do |node, index|
+                tags_file.puts "@@ %i @@" % [index, additional_info(node)]
+                tags_file.puts "-" + node.content
+                if attempting_to_translate
+                  tags_file.puts "+" + Translator.translate_content(node.content)
+                else
+                  tags_file.puts "+" + node.content
+                end
               end
             end
-          end
 
-          # Write the cleaned-up XML to a file for inspection
-          File.open(clean_path, "w") do |xml|
-            xml.puts cleaner.to_xml
+            # Write the cleaned-up XML to a file for inspection
+            File.open(clean_path, "w") do |xml|
+              xml.puts cleaner.to_xml
+            end
+          else
+            puts I18n.t(:unknown) % sub_file
           end
         end
       end

data/lib/konjac.rb

@@ -2,6 +2,7 @@ require "konjac/version"
 require "konjac/exception"
 autoload :Amatch,    "amatch"
 autoload :FileUtils, "fileutils"
+autoload :HighLine,  "highline/system_extensions"
 autoload :I18n,      "i18n"
 autoload :Nokogiri,  "nokogiri"
 autoload :Tempfile,  "tempfile"

data/lib/locales/en.yml

@@ -4,6 +4,7 @@ en:
   filenames_or_word_arg: <filenames>+ OR <text>
   me: Bryan McKelvey
   options: options
+  overwrite: "Overwrite %s? (y/n [n]) "
   subcommand: subcommand
   unknown_subcommand: "Unknown subcommand: %s"
   usage: "Usage:"
@@ -13,9 +14,12 @@ en:
   opts:
     dry_run: Don't actually do anything
     editor: A command to run to pass the file to an editor (e.g. vi %s)
+    force: Automatically overwrite files
     from: The language from which to translate
     help: Show this message
     original: The untranslated original text
+    output: The name of the output file
+    prompt: Prompt before overwriting a file
     quiet: Suppress error messages
     to: The language into which to translate
     translation: The translated text

data/lib/locales/ja.yml

@@ -4,6 +4,7 @@ ja:
   filenames_or_word_arg: <ファイル名>+ または <テキスト>
   me: ブライアン・マッケルビー
   options: オプション
+  overwrite: "%sを上書しますか。 (y/n [n]) "
   subcommand: サブコマンド
   unknown_subcommand: 不明なサブコマンド：%s
   usage: 使い方：
@@ -13,9 +14,12 @@ ja:
   opts:
     dry_run: 実際には何も出力しない
     editor: 結果ファイルをエディターで開くコマンド（例：vi %s）
+    force: 自動にファイルを上書する
     from: ソース言語
     help: このメッセージを表示する
     original: ソーステキスト
+    output: 出力ファイル名
+    prompt: ファイルをする場合に警告する
     quiet: エラーメッセージを抑止する
     to: ターゲット言語
     translation: ターゲットテキスト

data/spec/cli_spec.rb

@@ -31,16 +31,17 @@ describe CLI do
       @english.write "I like dogs."
       @english.rewind
 
+      @converted = Utils.build_converted_file_name(@english.path, "en", "ja")
+
       # Set ARGV
       set_argv "translate", "-t", "japanese", "-u", @dictionary.path,
-        @english.path
+        @english.path, "-y", "-o", @converted
     end
 
     it "should correctly translate English text" do
       CLI.start
-      converted_path = Utils.build_converted_file_name(@english.path, "en", "ja")
       File.read(@english.path).should == "I like dogs."
-      File.open(converted_path, "r") do |file|
+      File.open(@converted, "r") do |file|
         file.each do |line|
           line.chomp.should == "I like 犬."
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.2.5.2
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amatch
-  requirement: &70206891941760 !ruby/object:Gem::Requirement
+  requirement: &70281458370660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206891941760
+  version_requirements: *70281458370660
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &70281458369820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70281458369820
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70206891941140 !ruby/object:Gem::Requirement
+  requirement: &70281458368920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206891941140
+  version_requirements: *70281458368920
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70206891940480 !ruby/object:Gem::Requirement
+  requirement: &70281458368020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206891940480
+  version_requirements: *70281458368020
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70206891939860 !ruby/object:Gem::Requirement
+  requirement: &70281458367420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206891939860
+  version_requirements: *70281458367420
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70206891939240 !ruby/object:Gem::Requirement
+  requirement: &70281458366840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206891939240
+  version_requirements: *70281458366840
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70206891955060 !ruby/object:Gem::Requirement
+  requirement: &70281458366420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206891955060
+  version_requirements: *70281458366420
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70206891954560 !ruby/object:Gem::Requirement
+  requirement: &70281458365940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206891954560
+  version_requirements: *70281458365940
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70206891954040 !ruby/object:Gem::Requirement
+  requirement: &70281458365500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206891954040
+  version_requirements: *70281458365500
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70206891953400 !ruby/object:Gem::Requirement
+  requirement: &70281458365000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206891953400
+  version_requirements: *70281458365000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70206891952540 !ruby/object:Gem::Requirement
+  requirement: &70281458364500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206891952540
+  version_requirements: *70281458364500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70206891952120 !ruby/object:Gem::Requirement
+  requirement: &70281458363800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206891952120
+  version_requirements: *70281458363800
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com