konjac 0.2.2 → 0.2.4

data/bin/konjac_word_export

@@ -0,0 +1,73 @@
+#!/usr/bin/osascript
+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}
+      set this_line to characters 1 thru -2 of this_line as string
+    end repeat
+    return this_line
+  on error
+    return ""
+  end try
+end strip_line_breaks
+
+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
+
+  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
+  
+  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)
+
+    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
+
+    -- 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

data/bin/konjac_word_import

@@ -0,0 +1,49 @@
+#!/usr/bin/osascript
+set numbers_as_text to {"1", "2", "3", "4", "5", "6", "7", "8", "9", "0"}
+
+-- parses the headers/separators inside the tags file
+to parse_header(header)
+  set at_offset to 4
+  
+  repeat while character at_offset of header is in my numbers_as_text
+    set at_offset to (at_offset + 1)
+  end repeat
+  
+  return at_offset
+end parse_header
+
+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)
+        select my_range
+        type text selection text (text 2 thru (length of current_line) of current_line)
+      end if
+    end if
+  end repeat
+end tell

data/lib/konjac/tag_manager.rb

@@ -5,12 +5,14 @@ module Konjac
     # A list of the Tag objects current being managed
     attr_accessor :tags
 
-    # A regex to match lines that start with <tt>> </tt>, that is, lines that
+    # A regex to match lines that start with <tt>-</tt>, that is, lines that
     # indicate original text in .konjac files
-    STARTS_WITH_CLOSE_TAG = /^\>/
+    OLD_TAG = /^-[^-]/
+
+    NEW_TAG = /^\+[^+]/
 
     # Regex for matching index numbers
-    KONJAC_TAG = /^\[\[KJ\-(\d+)\]\]/
+    KONJAC_TAG = /^@@\s(\d+).*@@$/
 
     # Creates a new TagManager
     def initialize(path)
@@ -34,10 +36,10 @@ module Konjac
           end
 
           index = line.match(KONJAC_TAG)[1].to_i
-        elsif line =~ STARTS_WITH_CLOSE_TAG
-          orig = line[2..-1].chomp
-        else
-          trans = line.chomp
+        elsif line =~ OLD_TAG
+          orig = line[1..-1].chomp
+        elsif line =~ NEW_TAG
+          trans = line[1..-1].chomp
           unless index.nil?
             @tags << Tag.new(index, orig, trans)
             index = nil

data/lib/konjac/translator.rb

@@ -2,6 +2,7 @@
 module Konjac
   # A class consisting of functions for translation
   module Translator
+    DIFF_ADD = /^\+(?!\+\+ )/
     class << self
       # Translates a file or list of files
       #
@@ -11,14 +12,21 @@ module Konjac
         load_dictionary from_lang, to_lang, opts
         
         files.each do |source|
-          # Read in file and replace matches in content
-          content = File.read(source)
-          content = translate_content(content)
+          # Handle .diff files differently (har har)
+          is_diff = (File.extname(source) == ".diff")
 
-          # Write changed content to file
-          File.open(Utils.build_converted_file_name(source, from_lang, to_lang), "w") do |file|
-            file.puts content
+          temp_file = Tempfile.new("konjac")
+          File.open(source, "r") do |file|
+            file.each_line do |line|
+              if is_diff && line !~ DIFF_ADD
+                temp_file.puts line
+              else
+                temp_file.puts translate_content(line)
+              end
+            end
           end
+          target = Utils.build_converted_file_name(source, from_lang, to_lang)
+          FileUtils.mv temp_file.path, target
         end
       end
 

data/lib/konjac/utils.rb

@@ -38,7 +38,7 @@ module Konjac
             file = opts[:directory] + "/" + file
           end
           unless opts[:extension].nil?
-            file = file.sub(/\.[^\\\/]*$/, "") + opts[:extension].to_s.tr(".", "")
+            file = file.sub(/\.[^\\\/]*$/, "") + "." + opts[:extension].to_s.tr(".", "")
           end
           parsed_files += Dir.glob(File.expand_path(file))
         end

data/lib/konjac/version.rb

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

data/lib/konjac/word.rb

@@ -6,7 +6,7 @@ module Konjac
       # 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, ".docx")
+        sub_files = Utils.parse_files(files, :extension => :docx)
         sub_files.each do |sub_file|
           # Build the list of paths we need to work with
           dirname   = File.dirname(sub_file)
@@ -14,7 +14,7 @@ module Konjac
           orig_docx = "#{dirname}/#{basename}.docx"
           new_path  = "#{dirname}/#{basename}_imported.docx"
           xml_path  = "#{dirname}/#{basename}.xml"
-          tags_path = "#{dirname}/#{basename}.konjac"
+          tags_path = "#{dirname}/#{basename}.diff"
           out_path  = "#{dirname}/word/document.xml"
 
           # Open the original XML file and the updated tags
@@ -60,7 +60,7 @@ module Konjac
           end
         end
 
-        sub_files = Utils.parse_files(files, ".docx")
+        sub_files = Utils.parse_files(files, :extension => :docx)
         sub_files.each do |sub_file|
           # Build a list of all the paths we're working with
           dirname    = File.dirname(sub_file)
@@ -68,7 +68,7 @@ module Konjac
           orig_docx  = "#{dirname}/#{basename}.docx"
           xml_path   = "#{dirname}/#{basename}_orig.xml"
           clean_path = "#{dirname}/#{basename}.xml"
-          tags_path  = "#{dirname}/#{basename}.konjac"
+          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
@@ -98,17 +98,16 @@ module Konjac
             end
 
             # Write the tags file
-            index = 0
-
-            cleaner.xpath("//w:t").each do |node|
-              tags_file.puts "[[KJ-%i]]%s" % [index, additional_info(node)]
-              tags_file.puts "> %s" % node.content
+            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)
+                tags_file.puts "+" + Translator.translate_content(node.content)
               else
-                tags_file.puts node.content
+                tags_file.puts "+" + node.content
               end
-              index += 1
             end
           end
 

data/lib/konjac.rb

@@ -4,6 +4,7 @@ autoload :Amatch,    "amatch"
 autoload :FileUtils, "fileutils"
 autoload :I18n,      "i18n"
 autoload :Nokogiri,  "nokogiri"
+autoload :Tempfile,  "tempfile"
 
 # Konjac is a Ruby command-line utility for translating files using a YAML
 # wordlist

data/spec/cli_spec.rb

@@ -40,7 +40,11 @@ describe CLI do
       CLI.start
       converted_path = Utils.build_converted_file_name(@english.path, "en", "ja")
       File.read(@english.path).should == "I like dogs."
-      File.read(converted_path).should == "I like 犬.\n"
+      File.open(converted_path, "r") do |file|
+        file.each do |line|
+          line.chomp.should == "I like 犬."
+        end
+      end
     end
   end
 end

data/spec/tag_spec.rb

@@ -6,20 +6,22 @@ describe Tag do
   before :each do
     @tags_file = Tempfile.new(["tags", ".tags"])
     @tags_file.write <<-eos.gsub(/^\s+/, "")
-                       [[KJ-0]]
-                       > 犬
-                       dog
-                       [[KJ-1]]
-                       > 何ですか。
-                       What is it?
-                       [[KJ-2]]
-                       > 空白
-                       [[KJ-3]]  #=> comment
-                       > コメント
-                       Comment
-                       [[KJ-5]]
-                       > 以上
-                       -- end --
+                       --- /path/to/old
+                       +++ /path/to/new
+                       @@ 0 @@
+                       -犬
+                       +dog
+                       @@ 1 @@
+                       -何ですか。
+                       +What is it?
+                       @@ 2 @@
+                       -空白
+                       @@ 3 comment @@
+                       -コメント
+                       +Comment
+                       @@ 5 @@
+                       -以上
+                       +--- end --
                      eos
     @tags_file.rewind
     @manager = TagManager.new(@tags_file.path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-19 00:00:00.000000000 Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amatch
-  requirement: &70292727602840 !ruby/object:Gem::Requirement
+  requirement: &70275492952780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292727602840
+  version_requirements: *70275492952780
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70292727602280 !ruby/object:Gem::Requirement
+  requirement: &70275492973220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292727602280
+  version_requirements: *70275492973220
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70292727601660 !ruby/object:Gem::Requirement
+  requirement: &70275492972580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292727601660
+  version_requirements: *70275492972580
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70292727601020 !ruby/object:Gem::Requirement
+  requirement: &70275492971960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292727601020
+  version_requirements: *70275492971960
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70292727600580 !ruby/object:Gem::Requirement
+  requirement: &70275492971540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292727600580
+  version_requirements: *70275492971540
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70292727600160 !ruby/object:Gem::Requirement
+  requirement: &70275492971120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292727600160
+  version_requirements: *70275492971120
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70292727599560 !ruby/object:Gem::Requirement
+  requirement: &70275492970680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70292727599560
+  version_requirements: *70275492970680
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70292727598960 !ruby/object:Gem::Requirement
+  requirement: &70275492970240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70292727598960
+  version_requirements: *70275492970240
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70292727598300 !ruby/object:Gem::Requirement
+  requirement: &70275492969820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70292727598300
+  version_requirements: *70275492969820
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70292727597880 !ruby/object:Gem::Requirement
+  requirement: &70275492969400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70292727597880
+  version_requirements: *70275492969400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70292727597460 !ruby/object:Gem::Requirement
+  requirement: &70275492968980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,12 +131,14 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70292727597460
+  version_requirements: *70275492968980
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com
 executables:
 - konjac
+- konjac_word_export
+- konjac_word_import
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -149,6 +151,8 @@ files:
 - README.rdoc
 - Rakefile
 - bin/konjac
+- bin/konjac_word_export
+- bin/konjac_word_import
 - konjac.gemspec
 - lib/konjac.rb
 - lib/konjac/cli.rb