konjac 0.1.5 → 0.1.6

data/lib/konjac/cli.rb

@@ -9,6 +9,7 @@ module Konjac
 
     class << self
       SUB_COMMANDS = {
+        "add"       => "Add a definition to translation memory",
         "edit"      => "Edit the tags file for a .docx file",
         "export"    => "Export text tags from a .docx file",
         "import"    => "Import text tags into a .docx file",
@@ -41,6 +42,17 @@ eos
         cmd = ARGV.shift
         sc_banner = BANNER % [SUB_COMMANDS[cmd], cmd, ""]
         cmd_opts = case cmd
+          when "add"
+            opts = Trollop::options do
+              banner sc_banner
+              opt :original, "The original word or phrase", :type => :string
+              opt :translation, "The translated word or phrase", :type => :string, :short => :r
+              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
+            Dictionary.add_word opts
           when "edit"
             Trollop::options do
               banner sc_banner

data/lib/konjac/dictionary.rb

@@ -28,24 +28,11 @@ module Konjac
         cache_load from_lang, to_lang, opts[:using]
         
         # Make sure dictionary exists and load
-        @dictionary = []
-        opts[:using].each do |dict|
-          if dict =~ /[\/.]/
-            sub_dictionaries = Dir.glob(File.expand_path(dict))
-          else
-            sub_dictionaries = Dir.glob(File.expand_path("~/.konjac/#{dict}.yml"))
-          end
-
-          sub_dictionaries.each do |sub_dict|
-            verify_dictionary_exists sub_dict
-            temp = ::YAML.load_file(sub_dict)
-            @dictionary += temp if temp.is_a?(Array)
-          end
-        end
+        dictionary = build_dictionary(opts[:using])
 
         # Build a list of search and replace pairs
         @pairs = []
-        @dictionary.each do |term|
+        dictionary.each do |term|
           pair = extract_pair_from_term(term, from_lang, to_lang, from_template, to_template)
           @pairs << pair unless pair.nil?
         end
@@ -132,6 +119,55 @@ module Konjac
         end
       end
 
+      # Adds a word to the dictionary
+      def add_word(opts = {})
+        from_lang    = Language.find(opts[:from]).to_s
+        to_lang      = Language.find(opts[:to]).to_s
+        dictionaries = find_dictionaries(opts[:using])
+        counter      = dictionaries.length
+
+        dictionaries.each do |path|
+          dict = ::YAML.load_file(path)
+          found = false
+          dict.each do |term|
+            if term.has_key?(to_lang)
+              if term[to_lang].is_a?(Hash)
+                to_term   = term[to_lang][to_lang]
+                from_term = term[to_lang][from_lang]
+              else
+                to_term = term[to_lang]
+              end
+
+              from_term ||= term[from_lang]
+              puts "%s, %s" % [from_term, to_term]
+              puts "%s, %s" % [to_term == opts[:translation], (from_term.is_a?(Regexp) && from_term =~ opts[:original]) || from_term == opts[:original]]
+
+              if to_term == opts[:translation]
+                if from_term.is_a?(Regexp) && from_term =~ opts[:original]
+                  found = true
+                  break
+                elsif from_term == opts[:original]
+                  found = true
+                  break
+                end
+              end
+            end
+          end
+
+          if found
+            counter -= 1
+          else
+            dict << { to_lang => opts[:translation], from_lang => opts[:original] }
+          end
+
+          File.open(path, "w") do |file|
+            YAML.dump dict, file
+          end
+        end
+
+        counter
+      end
+
       private
 
       def parse_language(lang)
@@ -179,6 +215,36 @@ module Konjac
           Marshal.dump(pairs, file)
         end
       end
+
+      # Builds a list of dictionaries from the supplied files, defaulting to
+      # ~/.konjac/*.yml
+      def build_dictionary(files)
+        dictionary = []
+        find_dictionaries(files).each do |dict|
+          verify_dictionary_exists dict
+          temp = ::YAML.load_file(dict)
+          dictionary += temp if temp.is_a?(Array)
+        end
+        dictionary
+      end
+
+      def find_dictionaries(files)
+        paths = []
+        files.each do |file|
+          if file =~ /[\/.]/
+            full_path = File.expand_path(file)
+          else
+            full_path = File.expand_path("~/.konjac/#{file}.yml")
+          end
+          
+          if File.basename(file) =~ /\*/
+            FileUtils.touch full_path unless File.exists?(full_path)
+          end
+
+          paths += Dir.glob(full_path)
+        end
+        paths.uniq
+      end
     end
   end
 end

data/lib/konjac/version.rb

@@ -1,3 +1,3 @@
 module Konjac
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/dictionary_spec.rb

@@ -85,4 +85,20 @@ describe Dictionary do
       Dictionary.pairs[0].should == [/\bmouth\b/i, "boca"]
     end
   end
+
+  describe "when trying to add a word" do
+    before :each do
+      @opts = { :from => "en", :to => "ja", :using => [@dictionary.path] }
+    end
+
+    it "should fail if the word already exists" do
+      @opts.merge!({ :original => "dogs", :translation => "犬" })
+      Dictionary.add_word(@opts).should == 0
+    end
+
+    it "should succeed if the word does not already exist" do
+      @opts.merge!({ :original => "tree", :translation => "木" })
+      Dictionary.add_word(@opts).should == 1
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70250662109380 !ruby/object:Gem::Requirement
+  requirement: &70300369394260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250662109380
+  version_requirements: *70300369394260
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70250662108960 !ruby/object:Gem::Requirement
+  requirement: &70300369393820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250662108960
+  version_requirements: *70300369393820
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70250662108540 !ruby/object:Gem::Requirement
+  requirement: &70300369393400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250662108540
+  version_requirements: *70300369393400
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70250662124620 !ruby/object:Gem::Requirement
+  requirement: &70300369392960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250662124620
+  version_requirements: *70300369392960
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70250662124060 !ruby/object:Gem::Requirement
+  requirement: &70300369392520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250662124060
+  version_requirements: *70300369392520
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70250662123300 !ruby/object:Gem::Requirement
+  requirement: &70300369392100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250662123300
+  version_requirements: *70300369392100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70250662122840 !ruby/object:Gem::Requirement
+  requirement: &70300369391680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250662122840
+  version_requirements: *70300369391680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70250662122420 !ruby/object:Gem::Requirement
+  requirement: &70300369391260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250662122420
+  version_requirements: *70300369391260
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70250662121920 !ruby/object:Gem::Requirement
+  requirement: &70300369390840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250662121920
+  version_requirements: *70300369390840
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com