konjac 0.2.9.5 → 0.3

data/lib/konjac/office/windows.rb

@@ -0,0 +1,11 @@
+# coding: utf-8
+module Konjac
+  module Office
+    module Windows
+      autoload :Excel,      "konjac/office/windows/excel"
+      autoload :PowerPoint, "konjac/office/windows/power_point"
+      autoload :Shared,     "konjac/office/windows/shared"
+      autoload :Word,       "konjac/office/windows/word"
+    end
+  end
+end

data/lib/konjac/office/windows/shared.rb

@@ -0,0 +1,2 @@
+# coding: utf-8
+

data/lib/konjac/office/xml.rb

@@ -0,0 +1,11 @@
+# coding: utf-8
+module Konjac
+  module Office
+    module xml
+      autoload :Excel,      "konjac/office/xml/excel"
+      autoload :PowerPoint, "konjac/office/xml/powerpoint"
+      autoload :Shared,     "konjac/office/xml/shared"
+      autoload :Word,       "konjac/office/xml/word"
+    end
+  end
+end

data/lib/konjac/office/xml/shared.rb

@@ -0,0 +1,262 @@
+# coding: utf-8
+module Konjac
+  module Office
+    module XML
+      # Imports the text content of a tag file into a Word 2003+, utilizing a
+      # cleaned-up version of the document's original XML structure
+      def import_xml(files, opts = {})
+        sub_files = Utils.parse_files(files)
+        return if sub_files.empty?
+        sub_files.each do |sub_file|
+          case File.extname(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}.docx.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
+
+            # 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
+
+            # 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"
+          else
+            puts I18n.t(:unknown) % sub_file
+          end
+        end
+      end
+
+      # Exports the text content of Microsoft Office document
+      def export_tags(files, opts = {})
+        # Determine whether to attempt translating
+        if opts[:from_given] && opts[:to_given]
+          from_lang = Language.find(opts[:from])
+          to_lang   = Language.find(opts[:to])
+          unless from_lang.nil? || to_lang.nil?
+            Translator.load_dictionary from_lang, to_lang, opts
+            attempting_to_translate = true
+          end
+        end
+
+        sub_files = Utils.parse_files(files)
+        return if sub_files.empty?
+        sub_files.each do |sub_file|
+          case File.extname(sub_file)
+          when ".doc", ".docx"
+            return if OS.not_a_mac
+            break unless Utils.user_allows_overwrite?(sub_file + ".diff")
+
+            system File.join(File.dirname(__FILE__), "..", "applescripts", "konjac_word_export"), sub_file
+          when ".ppt", ".pptx"
+            return if OS.not_a_mac
+            break unless Utils.user_allows_overwrite?(sub_file + ".diff")
+
+            system File.join(File.dirname(__FILE__), "..", "applescripts", "konjac_powerpoint_export"), sub_file
+          when ".xls", ".xlsx"
+            return if OS.not_a_mac
+            break unless Utils.user_allows_overwrite?(sub_file + ".diff")
+
+            system File.join(File.dirname(__FILE__), "..", "applescripts", "konjac_excel_export"), sub_file
+          else
+            puts I18n.t(:unknown) % sub_file
+          end
+        end
+      end
+
+      # Exports the Word document in XML then extracts the tags and condenses
+      # like paragraphs
+      #
+      # I might deprecate this, but it exports XML. It's much faster, but
+      # supporting two methods might not be a great idea.
+      def export_xml(files, opts = {})
+        # Determine whether to attempt translating
+        if opts[:from_given] && opts[:to_given]
+          from_lang = Language.find(opts[:from])
+          to_lang   = Language.find(opts[:to])
+          unless from_lang.nil? || to_lang.nil?
+            Translator.load_dictionary from_lang, to_lang, opts
+            attempting_to_translate = true
+          end
+        end
+
+        sub_files = Utils.parse_files(files)
+        return if sub_files.empty?
+        sub_files.each do |sub_file|
+          case File.extname(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}.docx.diff"
+
+            break unless Utils.user_allows_overwrite?(tags_path)
+
+            # 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
+
+              # 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
+
+            # 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
+
+      private
+
+      # Performs a comparison between two nodes and accepts them as equivalent
+      # if the differences are very minor
+      def compare_nodes(a, b)  # :doc:
+        c = clean_hash(xml_node_to_hash(a))
+        d = clean_hash(xml_node_to_hash(b))
+        c == d
+      end
+
+      # Converts an XML node into a Ruby hash
+      def xml_node_to_hash(node)  # :doc:
+        # If we are at the root of the document, start the hash
+        if node.element?
+          result_hash = {}
+          if node.attributes != {}
+            result_hash[:attributes] = {}
+            node.attributes.keys.each do |key|
+              result_hash[:attributes][node.attributes[key].name.to_sym] = prepare(node.attributes[key].value)
+            end
+          end
+          if node.children.size > 0
+            node.children.each do |child|
+              result = xml_node_to_hash(child)
+
+              if child.name == "text"
+                unless child.next_sibling || child.previous_sibling
+                  return prepare(result)
+                end
+              elsif result_hash[child.name.to_sym]
+                if result_hash[child.name.to_sym].is_a?(Array)
+                  result_hash[child.name.to_sym] << prepare(result)
+                else
+                  result_hash[child.name.to_sym] = [result_hash[child.name.to_sym]] << prepare(result)
+                end
+              else
+                result_hash[child.name.to_sym] = prepare(result)
+              end
+            end
+
+            return result_hash
+          else
+            return result_hash
+          end
+        else
+          return prepare(node.content.to_s)
+        end
+      end
+
+      # Prepares data according to whether it's string or integer content
+      def prepare(data)  # :doc:
+        (data.class == String && data.to_i.to_s == data) ? data.to_i : data
+      end
+
+      # Delete extraneous attributes for comparison
+      def clean_hash(hash)  # :doc:
+        delete_attribute_or_child hash, :t
+        delete_attribute_or_child hash, :rPr, :rFonts, :attributes, :hint
+      end
+
+      # Get additional information on the node for context in tags file
+      def additional_info(node)  # :doc:
+        info = []
+        info << "hyperlink" if node.parent.parent.name == "hyperlink"
+
+        if info.empty?
+          ""
+        else
+          "  #=> #{info.join(", ")}"
+        end
+      end
+
+      # Deletes the specified attribute or child node for the supplied node,
+      # following the hierarchy provided
+      #
+      # Delete <tt>hash[:rPr][:rFonts][:attributes][:hint]</tt>:
+      #   delete_attribute_or_child hash, :rPr, :rFonts, :attributes, :hint
+      def delete_attribute_or_child(node, *hierarchy)  # :doc:
+        last_member = hierarchy.pop
+        
+        hierarchy.each do |member|
+          node = node[member] unless node.nil?
+        end
+
+        node.delete last_member unless node.nil?
+      end
+    end
+  end
+end

data/lib/konjac/version.rb

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

data/lib/locales/en.yml

@@ -11,6 +11,7 @@ en:
   script_arg: dictionaries|vim
   script_not_found: "Script not found: %s"
   subcommand: subcommand
+  unimplemented_virtual: "Unimplemented virtual method: %s"
   unknown_subcommand: "Unknown subcommand: %s"
   usage: "Usage:"
   where_options: "where [%s] are:"

data/lib/locales/ja.yml

@@ -11,6 +11,7 @@ ja:
   script_arg: dictionaries|vim
   script_not_found: "スクリプトは見つかりません：%s"
   subcommand: サブコマンド
+  unimplemented_virtual: "Unimplemented virtual method: %s"
   unknown_subcommand: 不明なサブコマンド：%s
   usage: 使い方：
   where_options: "使用可能な[%s]は、以下のとおりです："

data/spec/office/generic_spec.rb

@@ -0,0 +1,72 @@
+# coding: utf-8
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe Office::Generic do
+  before :each do
+    # Nuke initializer
+    class Office::Generic
+      def initialize
+        @parse_order = [:paragraph]
+      end
+    end
+
+    @generic = Office::Generic.new
+  end
+
+  describe "argument parsing" do
+    describe "the first time" do
+      it "should handle no arguments" do
+        @generic.send(:parse_args).should == nil
+      end
+
+      it "should handle one hash" do
+        @generic.send(:parse_args, :paragraph => 1).should == { :paragraph => 1 }
+      end
+
+      it "should handle one argument" do
+        @generic.send(:parse_args, 1).should == { :paragraph => 1 }
+      end
+
+      it "should give a hash precedence over another argument" do
+        @generic.send(:parse_args, 1, :paragraph => 2).should == { :paragraph => 2 }
+      end
+
+      describe "document types with multiple levels" do
+        before :each do
+          @generic.instance_variable_set :@parse_order, [:sheet, :row, :cell]
+        end
+
+        it "should handle a hash with several values" do
+          @generic.send(:parse_args, :sheet => 1, :row => 2, :cell => 3)
+            .should == { :sheet => 1, :row => 2, :cell => 3 }
+        end
+
+        it "should handle several arguments" do
+          @generic.send(:parse_args, 1, 2, 3).should == { :sheet => 1, :row => 2, :cell => 3 }
+        end
+      end
+    end
+
+    describe "multiple times" do
+      before :each do
+        @result   = nil
+        @multiple = 3
+      end
+
+      it "should correctly handle no arguments" do
+        @multiple.times do
+          @result = @generic.send(:parse_args)
+          @result.should == nil
+        end
+      end
+
+      it "should correctly handle a completed hash" do
+        @generic.instance_variable_set :@parse_order, []
+        @multiple.times do
+          @result = @generic.send(:parse_args, :sheet => 1, :row => 2, :cell => 3)
+          @result.should == { :sheet => 1, :row => 2, :cell => 3 }
+        end
+      end
+    end
+  end
+end

data/spec/office_spec.rb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe Office do
+  before :each do
+    @env = Office.environment
+
+    module Office::Mac
+      class Excel;      def initialize; end; end
+      class PowerPoint; def initialize; end; end
+      class Word;       def initialize; end; end
+    end
+
+    module Office::Windows
+      class Excel;      def initialize; end; end
+      class PowerPoint; def initialize; end; end
+      class Word;       def initialize; end; end
+    end
+  end
+
+  describe "dynamic methods" do
+    it "should fail to detect something made-up" do
+      lambda { Office.something_made_up }.should raise_error NoMethodError
+    end
+
+    it "should detect Excel" do
+      Office.excel.should be_an_instance_of @env::Excel
+    end
+
+    it "should detect PowerPoint" do
+      Office.power_point.should be_an_instance_of @env::PowerPoint
+    end
+
+    it "should detect Word" do
+      Office.word.should be_an_instance_of @env::Word
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.2.9.5
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000 Z
+date: 2012-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amatch
-  requirement: &70336008294400 !ruby/object:Gem::Requirement
+  requirement: &70292199617680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336008294400
+  version_requirements: *70292199617680
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70336008293040 !ruby/object:Gem::Requirement
+  requirement: &70292199617240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336008293040
+  version_requirements: *70292199617240
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70336008291780 !ruby/object:Gem::Requirement
+  requirement: &70292199616720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336008291780
+  version_requirements: *70292199616720
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70336008288780 !ruby/object:Gem::Requirement
+  requirement: &70292199616220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336008288780
+  version_requirements: *70292199616220
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70336008286240 !ruby/object:Gem::Requirement
+  requirement: &70292199615660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336008286240
+  version_requirements: *70292199615660
+- !ruby/object:Gem::Dependency
+  name: rb-appscript
+  requirement: &70292199614620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70292199614620
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70336008284120 !ruby/object:Gem::Requirement
+  requirement: &70292199613940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336008284120
+  version_requirements: *70292199613940
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70336008283400 !ruby/object:Gem::Requirement
+  requirement: &70292199599480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336008283400
+  version_requirements: *70292199599480
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70336008282660 !ruby/object:Gem::Requirement
+  requirement: &70292199598700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336008282660
+  version_requirements: *70292199598700
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70336008281420 !ruby/object:Gem::Requirement
+  requirement: &70292199597260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336008281420
+  version_requirements: *70292199597260
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70336008280040 !ruby/object:Gem::Requirement
+  requirement: &70292199596780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336008280040
+  version_requirements: *70292199596780
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70336008277940 !ruby/object:Gem::Requirement
+  requirement: &70292199596360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336008277940
+  version_requirements: *70292199596360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70336008275980 !ruby/object:Gem::Requirement
+  requirement: &70292199595740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336008275980
+  version_requirements: *70292199595740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70336008275180 !ruby/object:Gem::Requirement
+  requirement: &70292199594940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336008275180
+  version_requirements: *70292199594940
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com
@@ -172,12 +183,6 @@ files:
 - Rakefile
 - bin/konjac
 - konjac.gemspec
-- lib/applescripts/konjac_excel_export
-- lib/applescripts/konjac_excel_import
-- lib/applescripts/konjac_powerpoint_export
-- lib/applescripts/konjac_powerpoint_import
-- lib/applescripts/konjac_word_export
-- lib/applescripts/konjac_word_import
 - lib/konjac.rb
 - lib/konjac/cli.rb
 - lib/konjac/config.rb
@@ -186,10 +191,22 @@ files:
 - lib/konjac/installer.rb
 - lib/konjac/language.rb
 - lib/konjac/office.rb
-- lib/konjac/os.rb
+- lib/konjac/office/generic.rb
+- lib/konjac/office/mac.rb
+- lib/konjac/office/mac/excel.rb
+- lib/konjac/office/mac/power_point.rb
+- lib/konjac/office/mac/shared.rb
+- lib/konjac/office/mac/word.rb
+- lib/konjac/office/os.rb
+- lib/konjac/office/tag.rb
+- lib/konjac/office/windows.rb
+- lib/konjac/office/windows/excel.rb
+- lib/konjac/office/windows/power_point.rb
+- lib/konjac/office/windows/shared.rb
+- lib/konjac/office/windows/word.rb
+- lib/konjac/office/xml.rb
+- lib/konjac/office/xml/shared.rb
 - lib/konjac/suggestor.rb
-- lib/konjac/tag.rb
-- lib/konjac/tag_manager.rb
 - lib/konjac/translator.rb
 - lib/konjac/utils.rb
 - lib/konjac/version.rb
@@ -199,8 +216,9 @@ files:
 - spec/config_spec.rb
 - spec/dictionary_spec.rb
 - spec/language_spec.rb
+- spec/office/generic_spec.rb
+- spec/office_spec.rb
 - spec/spec_helper.rb
-- spec/tag_spec.rb
 - spec/utils_spec.rb
 homepage: http://brymck.herokuapp.com/
 licenses: []
@@ -231,6 +249,7 @@ test_files:
 - spec/config_spec.rb
 - spec/dictionary_spec.rb
 - spec/language_spec.rb
+- spec/office/generic_spec.rb
+- spec/office_spec.rb
 - spec/spec_helper.rb
-- spec/tag_spec.rb
 - spec/utils_spec.rb