konjac 0.1.6.2 → 0.1.6.3

data/lib/konjac/cli.rb

@@ -59,11 +59,15 @@ eos
               opt :editor, "A command indicating which editor to use (e.g. vi %s)"
             end
             Word.edit_docx_tags ARGV, opts
-          when "extract", "export"
-            Trollop::options do
+          when "export"
+            opts = Trollop::options do
               banner sc_banner
+              opt :from, "The language from which to translate", :type => :string
+              opt :to, "The language into which to translate", :type => :string
+              opt :using, "The names of dictionaries to use", :type => :string,
+                :default => "dict", :multi => true
             end
-            Word.extract_docx_tags ARGV
+            Word.export_docx_tags ARGV, opts
           when "import"
             Trollop::options do
               banner sc_banner

data/lib/konjac/dictionary.rb

@@ -86,7 +86,9 @@ module Konjac
       def verify_dictionary_exists(full_path)
         unless File.file?(full_path)
           FileUtils.mkpath File.dirname(full_path)
-          FileUtils.touch full_path
+          File.open(full_path, "w") do |file|
+            file.puts "--- []"
+          end
         end
       end
 
@@ -128,6 +130,7 @@ module Konjac
 
         dictionaries.each do |path|
           dict = ::YAML.load_file(path)
+          puts dict
           found = false
           dict.each do |term|
             if term.has_key?(to_lang)
@@ -235,8 +238,10 @@ module Konjac
             full_path = File.expand_path("~/.konjac/#{file}.yml")
           end
           
-          if File.basename(file) =~ /\*/
-            FileUtils.touch full_path unless File.exists?(full_path)
+          unless File.basename(file) =~ /\*/ || File.exists?(full_path)
+            File.open(full_path, "w") do |file|
+              file.puts "--- []"
+            end
           end
 
           paths += Dir.glob(full_path)

data/lib/konjac/translator.rb

@@ -17,12 +17,16 @@ module Konjac
         end
       end
 
+      # Loads the dictionary, then translates a word or phrase from the
+      # specified language into another language
       def translate_word(word, from_lang, to_lang, opts = {})
         load_dictionary from_lang, to_lang, opts
 
         translate_content word
       end
 
+      # Translates content according to the current dictionaries and to/from
+      # languages
       def translate_content(content)
         @pairs.each do |pair|
           search, replace = pair
@@ -32,8 +36,7 @@ module Konjac
         content
       end
 
-      private
-
+      # Loads the parsed contents of a dictionary into the translator
       def load_dictionary(from_lang, to_lang, opts)
         @pairs = Dictionary.load(from_lang, to_lang, opts)
       end

data/lib/konjac/version.rb

@@ -1,3 +1,3 @@
 module Konjac
-  VERSION = "0.1.6.2"
+  VERSION = "0.1.6.3"
 end

data/lib/konjac/word.rb

@@ -5,7 +5,7 @@ module Konjac
     class << self
       # Extracts the text content from a Microsoft Word 2003+ Document
       def import_docx_tags(files)
-        sub_files = Utils.force_extension(files, ".docx")
+        sub_files = Utils.parse_files(files, ".docx")
         sub_files.each do |sub_file|
           # Build the list of paths we need to work with
           dirname   = File.dirname(sub_file)
@@ -46,9 +46,19 @@ module Konjac
         end
       end
 
-      # Extracts the text content from a Microsoft Word 2003+ Document
-      def extract_docx_tags(files)
-        sub_files = Utils.force_extension(files, ".docx")
+      # Exports the text content from a Microsoft Word 2003+ Document
+      def export_docx_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, ".docx")
         sub_files.each do |sub_file|
           # Build a list of all the paths we're working with
           dirname    = File.dirname(sub_file)
@@ -87,9 +97,15 @@ module Konjac
 
             # 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
+              if attempting_to_translate
+                tags_file.puts Translator.translate_content(node.content)
+              else
+                tags_file.puts node.content
+              end
               index += 1
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.1.6.2
+  version: 0.1.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-15 00:00:00.000000000 Z
+date: 2012-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70333404173540 !ruby/object:Gem::Requirement
+  requirement: &70141602595920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333404173540
+  version_requirements: *70141602595920
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70333404173120 !ruby/object:Gem::Requirement
+  requirement: &70141602595480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333404173120
+  version_requirements: *70141602595480
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70333404172700 !ruby/object:Gem::Requirement
+  requirement: &70141602595060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333404172700
+  version_requirements: *70141602595060
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70333404172280 !ruby/object:Gem::Requirement
+  requirement: &70141602594640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333404172280
+  version_requirements: *70141602594640
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70333404171800 !ruby/object:Gem::Requirement
+  requirement: &70141602594220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333404171800
+  version_requirements: *70141602594220
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70333404171320 !ruby/object:Gem::Requirement
+  requirement: &70141602593800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333404171320
+  version_requirements: *70141602593800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70333404199700 !ruby/object:Gem::Requirement
+  requirement: &70141602593380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333404199700
+  version_requirements: *70141602593380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70333404199280 !ruby/object:Gem::Requirement
+  requirement: &70141602614720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333404199280
+  version_requirements: *70141602614720
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70333404198780 !ruby/object:Gem::Requirement
+  requirement: &70141602614300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333404198780
+  version_requirements: *70141602614300
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com