konjac 0.0.4 → 0.0.5

data/README.md

@@ -59,6 +59,9 @@ Utilize a document's implied language (English) and translate into Japanese:
 
     konjac translate test_en.txt into japanese
 
+Use multiple dictionaries:
+
+    konjac translate financial_report_en.txt into japanese using finance
 
 Extended Example
 ----------------
@@ -90,7 +93,7 @@ Extended Example
         en: " "
         ja: !ruby/regexp /\s{2,}/
       ja:
-        ja: \\1\\2
+        ja: "\\1\\2"
         en: !ruby/regexp /([^\w])\s([^\w])/
     - # Delete extraneous spaces
       en:

data/lib/konjac/cli.rb

@@ -12,7 +12,7 @@ module Konjac
         when "help"
           show_help
         else
-          raise ArgumentError.new("Valid commands are translate or add")
+          raise InvalidCommandError.new("Valid commands are translate or add")
         end
       end
 
@@ -24,6 +24,16 @@ module Konjac
       private
 
       def translate
+        # Get dictionaries
+        using_index = ARGV.index("using")
+        unless using_index.nil?
+          ARGV.delete_at using_index
+          dictionaries = []
+          while ARGV.length > using_index && !["from", "to", "into"].include?(ARGV[using_index])
+            dictionaries << ARGV.delete_at(using_index)
+          end
+        end
+        
         # Get from language
         from_index = ARGV.index("from")
         unless from_index.nil?
@@ -34,7 +44,7 @@ module Konjac
         # Get to language
         to_index = ARGV.index("to") || ARGV.index("into")
         if to_index.nil?
-          raise Exception::InvalidLanguageError.new("You must supply a to language")
+          raise InvalidLanguageError.new("You must supply a to language")
         else
           ARGV.delete_at to_index
           to_lang = ARGV.delete_at(to_index)
@@ -45,21 +55,21 @@ module Konjac
         while !ARGV.empty?
           files += Dir.glob(File.expand_path(ARGV.shift))
         end
-        raise Exception::FileNotFoundError.new("File not found") if files.empty?
+        raise FileNotFoundError.new("File not found") if files.empty?
         files.uniq!
 
         # Determine from language from first filename if not overridden
         if from_lang.nil?
           from_lang = Utils.extract_language_code_from_filename(files[0])
           if from_lang.nil?
-            raise Exception::InvalidLanguageError.new("You must supply a to language")
+            raise InvalidLanguageError.new("You must supply a to language")
           end
         end
 
         from_lang = Language.find(from_lang).to_s
         to_lang   = Language.find(to_lang).to_s
 
-        Translator.translate files, from_lang, to_lang
+        Translator.translate files, from_lang, to_lang, dictionaries
       end
     end
   end

data/lib/konjac/dictionary.rb

@@ -3,13 +3,14 @@ require "yaml"
 module Konjac
   module Dictionary
     class << self
-      attr_accessor :from_lang, :to_lang, :path
+      attr_accessor :from_lang, :to_lang, :dictionaries, :pairs
 
       BLANK = /^\s*$/
 
-      def load(from_lang, to_lang, opts = {})
+      def load(from_lang, to_lang, dictionaries, opts = {})
         # Set defaults for optional arguments
-        opts = { :force => false, :name => "dict" }.merge(opts)
+        opts = { :force => false }.merge(opts)
+        dictionaries = ["dict"] if dictionaries.nil?
         
         # Allow both symbol and string arguments for languages
         from_lang = from_lang.to_s
@@ -20,16 +21,27 @@ module Konjac
         to_template   = build_replacement_template(from_lang, to_lang)
 
         # Get full path from name
-        full_path = File.expand_path("~/.konjac/#{opts[:name]}.yml")
         
-        return @pairs if loaded?(from_lang, to_lang, full_path) || opts[:force]
+        return @pairs if loaded?(from_lang, to_lang, dictionaries) || opts[:force]
 
         # Save variables to cache so we can avoid repetitive requests
-        cache_load from_lang, to_lang, opts
+        cache_load from_lang, to_lang, dictionaries
         
         # Make sure dictionary exists and load
-        verify_dictionary_exists full_path
-        @dictionary = ::YAML.load_file(full_path)
+        @dictionary = []
+        dictionaries.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
 
         # Build a list of search and replace pairs
         @pairs = []
@@ -81,10 +93,10 @@ module Konjac
 
       # Tests whether the same from language, to language and dictionary path
       # have been loaded before
-      def loaded?(from_lang, to_lang, full_path)
-        (@from_lang == from_lang) &&
-        (@to_lang   == to_lang  ) &&
-        (@path      == full_path)
+      def loaded?(from_lang, to_lang, dictionaries)
+        (@from_lang    == from_lang) &&
+        (@to_lang      == to_lang  ) &&
+        (@dictionaries == dictionaries)
       end
 
       # Builds a regular expression template for the language depending on
@@ -123,10 +135,12 @@ module Konjac
         end
       end
 
-      def cache_load(from_lang, to_lang, opts)
-        @from_lang = from_lang
-        @to_lang   = to_lang
-        @path      = path
+      # Caches variables so we can determine later on whether to reload the
+      # dictionaries or not
+      def cache_load(from_lang, to_lang, dictionaries)
+        @from_lang    = from_lang
+        @to_lang      = to_lang
+        @dictionaries = dictionaries
       end
     end
   end

data/lib/konjac/exception.rb

@@ -1,6 +1,5 @@
 module Konjac
-  module Exception
-    class FileNotFoundError < StandardError; end
-    class InvalidLanguageError < StandardError; end
-  end
+  class FileNotFoundError < StandardError; end
+  class InvalidCommandError < StandardError; end
+  class InvalidLanguageError < StandardError; end
 end

data/lib/konjac/language.rb

@@ -231,7 +231,7 @@ module Konjac
           end
 
           # Return nil if nothing found
-          raise Exception::InvalidLanguageError.new("Language not found: #{lang}")
+          raise InvalidLanguageError.new("Language not found: #{lang}")
         end
       end
 

data/lib/konjac/translator.rb

@@ -2,15 +2,14 @@
 module Konjac
   module Translator
     class << self
-      def translate(files, from_lang, to_lang)
-        pairs = Dictionary.load(from_lang, to_lang)
+      def translate(files, from_lang, to_lang, dictionaries)
+        pairs = Dictionary.load(from_lang, to_lang, dictionaries)
         
         files.each do |source|
           # Read in file and replace matches in content
           content = File.read(source)
           pairs.each do |pair|
             search, replace = pair
-            puts "search = '%s', replace = '%s'" % [search, replace]
             content.gsub! search, replace
           end
 

data/lib/konjac/version.rb

@@ -1,3 +1,3 @@
 module Konjac
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/konjac.rb

@@ -1,11 +1,11 @@
 require "konjac/version"
+require "konjac/exception"
 autoload :FileUtils, "fileutils"
 
 module Konjac
   # Set up autoload for all modules
   autoload :CLI,        "konjac/cli"
   autoload :Dictionary, "konjac/dictionary"
-  autoload :Exception,  "konjac/exception"
   autoload :Language,   "konjac/language"
   autoload :Translator, "konjac/translator"
   autoload :Utils,      "konjac/utils"

data/spec/cli_spec.rb

@@ -0,0 +1,42 @@
+# coding: utf-8
+require File.dirname(__FILE__) + "/spec_helper"
+require "tempfile"
+
+describe CLI do
+  it "should fail on an invalid subcommand" do
+    ARGV = ["invalid"]
+    lambda { CLI.start }.should raise_error InvalidCommandError
+  end
+
+  describe "temporary files" do
+    before :each do
+      # Create dictionary
+      @dictionary = Tempfile.new(["dict", ".yml"])
+      @dictionary.write <<-eos
+                          -
+                           en: dogs
+                           ja: 犬
+                        eos
+      @dictionary.rewind
+
+      # Create English text to translate
+      @english = Tempfile.new(["english", "_en.txt"])
+      @english.write "I like dogs."
+      @english.rewind
+    end
+
+    it "should correctly translate English text" do
+      begin
+        ARGV = ["translate", @english.path, "into", "japanese", "using", @dictionary.path]
+        CLI.start
+        converted_path = Utils.build_converted_file_name(@english.path, "en", "ja")
+        puts File.read(@english.path).should == "I like dogs."
+        File.read(converted_path).should == "I like 犬.\n"
+      ensure
+        @dictionary.close!
+        @english.close!
+        File.delete converted_path
+      end
+    end
+  end
+end

data/spec/dictionary_spec.rb

@@ -1,9 +1,20 @@
+# coding: utf-8
 require File.dirname(__FILE__) + "/spec_helper"
+require "tempfile"
 
 describe Dictionary do
   before :each do
-
+    @dictionary = Tempfile.new(["dict", ".yml"])
+    @dictionary.write <<-eos
+                        -
+                         en: dogs
+                         ja: 犬
+                      eos
+    @dictionary.rewind
   end
 
-  it "should correctly load YAML"
+  it "should correctly load YAML" do
+    Dictionary.load "en", "ja", [@dictionary.path]
+    Dictionary.pairs.should == [[/\bdogs\b/, "犬"]]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70123693467000 !ruby/object:Gem::Requirement
+  requirement: &70364018145820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123693467000
+  version_requirements: *70364018145820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70123693404260 !ruby/object:Gem::Requirement
+  requirement: &70364018145360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123693404260
+  version_requirements: *70364018145360
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70123693403660 !ruby/object:Gem::Requirement
+  requirement: &70364018144900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123693403660
+  version_requirements: *70364018144900
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70123693403240 !ruby/object:Gem::Requirement
+  requirement: &70364018144480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123693403240
+  version_requirements: *70364018144480
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70123693402820 !ruby/object:Gem::Requirement
+  requirement: &70364018144020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123693402820
+  version_requirements: *70364018144020
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70123693402380 !ruby/object:Gem::Requirement
+  requirement: &70364018143580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123693402380
+  version_requirements: *70364018143580
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com
@@ -102,6 +102,7 @@ files:
 - lib/konjac/translator.rb
 - lib/konjac/utils.rb
 - lib/konjac/version.rb
+- spec/cli_spec.rb
 - spec/dictionary_spec.rb
 - spec/language_spec.rb
 - spec/spec_helper.rb
@@ -131,6 +132,7 @@ signing_key:
 specification_version: 3
 summary: A Ruby command-line utility for translating files using a YAML wordlist
 test_files:
+- spec/cli_spec.rb
 - spec/dictionary_spec.rb
 - spec/language_spec.rb
 - spec/spec_helper.rb