konjac 0.1.9.2 → 0.2

data/konjac.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths    = ["lib"]
 
+  s.add_runtime_dependency "amatch"
   s.add_runtime_dependency "i18n"
   s.add_runtime_dependency "nokogiri"
   s.add_runtime_dependency "sdoc"

data/lib/konjac/cli.rb

@@ -12,7 +12,8 @@ module Konjac
 
     class << self
       # A list of valid subcommands
-      SUB_COMMANDS = ["add", "edit", "export", "import", "language", "translate"]
+      SUB_COMMANDS = ["add", "edit", "export", "import", "language", "suggest",
+        "translate"]
 
       # The banner to displaying when requesting help through the command line
       BANNER = <<-eos
@@ -21,7 +22,7 @@ module Konjac
 #{Color.bold "%s"}
 
 #{Color.bold I18n.t :usage}
-       konjac %s [#{Color.underscore I18n.t :options}] <#{I18n.t :filenames}>+%s
+       konjac %s [#{Color.underscore I18n.t :options}] %s
 #{I18n.t(:where_options) % Color.underscore(I18n.t(:options))}
 eos
 
@@ -34,6 +35,7 @@ eos
           banner BANNER % [
             I18n.t(:banner),
             "[#{Color.underscore I18n.t :subcommand}]",
+            I18n.t(:filenames_or_word_arg),
             "\n\n" + (I18n.t(:where_subcommand) % Color.underscore(I18n.t(:subcommand))) + ("\n%s\n" %
               Konjac::CLI.describe_subcommands)
           ]
@@ -47,11 +49,11 @@ eos
         # Get subcommand
         cmd = ARGV.shift
         ARGV << "-h" if ARGV.empty?
-        sc_banner = BANNER % [I18n.t(cmd, :scope => :subcommands), cmd, "\n"]
+        sc_banner = BANNER % [I18n.t(cmd, :scope => :subcommands), cmd, "%s", "\n"]
         cmd_opts = case cmd
           when "add"
             opts = Trollop::options do
-              banner sc_banner
+              banner sc_banner % I18n.t(:filenames_arg)
               opt :original, I18n.t(:original, :scope => :opts), :type => :string
               opt :translation, I18n.t(:translation, :scope => :opts), :type => :string, :short => :r
               opt :from, I18n.t(:from, :scope => :opts), :type => :string
@@ -63,14 +65,14 @@ eos
             Dictionary.add_word opts
           when "edit"
             Trollop::options do
-              banner sc_banner
+              banner sc_banner % I18n.t(:filenames_arg)
               opt :editor, I18n.t(:editor, :scope => :opts), :type => :string
               opt :help, I18n.t(:help, :scope => :opts)
             end
             Word.edit_docx_tags ARGV, opts
           when "export"
             opts = Trollop::options do
-              banner sc_banner
+              banner sc_banner % I18n.t(:filenames_arg)
               opt :from, I18n.t(:from, :scope => :opts), :type => :string
               opt :to, I18n.t(:to, :scope => :opts), :type => :string
               opt :using, I18n.t(:using, :scope => :opts), :type => :string,
@@ -80,20 +82,35 @@ eos
             Word.export_docx_tags ARGV, opts
           when "import"
             Trollop::options do
-              banner sc_banner
+              banner sc_banner % I18n.t(:filenames_arg)
               opt :help, I18n.t(:help, :scope => :opts)
             end
             Word.import_docx_tags ARGV
           when "language"
             Trollop::options do
-              banner sc_banner
+              banner sc_banner % I18n.t(:word_arg)
               opt :help, I18n.t(:help, :scope => :opts)
             end
             Config.language = ARGV[0]
             Config.save
+          when "suggest"
+            opts = Trollop::options do
+              banner sc_banner % I18n.t(:word_arg)
+              opt :from, I18n.t(:from, :scope => :opts), :type => :string
+              opt :to, I18n.t(:to, :scope => :opts), :type => :string
+              opt :using, I18n.t(:using, :scope => :opts), :type => :string,
+                :default => "dict", :multi => true
+              opt :use_cache, I18n.t(:use_cache, :scope => :opts),
+                :default => false, :short => :c
+              opt :help, I18n.t(:help, :scope => :opts)
+            end
+            results = suggest(ARGV[0].dup, opts)
+            results.each_with_index do |result, index|
+              puts "%i: %s (%i%%)" % [index + 1, result[2], result[0] * 100]
+            end
           when "translate"
             opts = Trollop::options do
-              banner sc_banner
+              banner sc_banner % I18n.t(:filenames_or_word_arg)
               opt :from, I18n.t(:from, :scope => :opts), :type => :string
               opt :to, I18n.t(:to, :scope => :opts), :type => :string
               opt :using, I18n.t(:using, :scope => :opts), :type => :string,
@@ -126,6 +143,12 @@ eos
 
       private
       
+      def suggest(word, opts = {})
+        to_lang = Language.find(opts[:to]).to_s
+        from_lang = Language.find(opts[:from]).to_s
+        Suggestor.new(from_lang, to_lang, opts).suggest word
+      end
+
       # Parse commands to determine what should be translated and how
       def translate(files, opts = {})  # :doc:
         to_lang = Language.find(opts[:to]).to_s

data/lib/konjac/dictionary.rb

@@ -84,6 +84,7 @@ module Konjac
             # create a regular expression in the dictionary file.
             # Matching is case-insensitive unless the expression contains a
             # capital letter.
+            from_fuzzy = from_term
             unless from_term.is_a?(Regexp)
               from_term = Regexp.new(from_template % from_term,
                                      ("i" unless from_term =~ /[A-Z]/))
@@ -91,7 +92,7 @@ module Konjac
 
             to_term = to_template % to_term unless to_term =~ BLANK || no_space
 
-            return [ from_term, to_term ]
+            return [ from_term, to_term, from_fuzzy ]
           end
         end
 

data/lib/konjac/suggestor.rb

@@ -0,0 +1,45 @@
+module Konjac
+  # A class for suggesting translations
+  class Suggestor
+    # A list of all pairs available
+    attr_accessor :pairs
+
+    # The default suggested count
+    SUGGEST_COUNT  = 10
+
+    # The default suggest cutoff
+    SUGGEST_CUTOFF = 0.5
+
+    # Creates a new Suggestor object
+    def initialize(from_lang, to_lang, opts = {})
+      @pairs = Dictionary.load(from_lang, to_lang, opts)
+    end
+
+    # Provides suggested translations for a word, providing an array containing
+    # the pair distance, fuzzy match used and the suggested replacement
+    def suggest(word, opts = {})
+      # Set defaults for optional arguments
+      opts = {
+        :count  => SUGGEST_COUNT,
+        :cutoff => SUGGEST_CUTOFF
+      }.merge opts
+
+      results = []
+      matcher = Amatch::PairDistance.new(word)
+      @pairs.each do |search, replace, fuzzy|
+        if fuzzy.is_a?(String)
+          value = matcher.match(fuzzy)
+        else
+          value = (search =~ word ? 1 : 0)
+        end
+
+        if (results.empty? || value > results[0][0]) && value >= opts[:cutoff]
+          results << [value, fuzzy, replace]
+          results.sort!
+          results.shift if results.length > opts[:count]
+        end
+      end
+      results.reverse
+    end
+  end
+end

data/lib/konjac/version.rb

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

data/lib/konjac.rb

@@ -1,5 +1,6 @@
 require "konjac/version"
 require "konjac/exception"
+autoload :Amatch,    "amatch"
 autoload :FileUtils, "fileutils"
 autoload :I18n,      "i18n"
 autoload :Nokogiri,  "nokogiri"
@@ -12,6 +13,7 @@ module Konjac
   autoload :Config,     "konjac/config"
   autoload :Dictionary, "konjac/dictionary"
   autoload :Language,   "konjac/language"
+  autoload :Suggestor,  "konjac/suggestor"
   autoload :Tag,        "konjac/tag"
   autoload :TagManager, "konjac/tag_manager"
   autoload :Translator, "konjac/translator"

data/locales/en.yml

@@ -1,6 +1,7 @@
 en:
   banner: Konjac is a Ruby command-line utility for translating files using a YAML wordlist
-  filenames: filenames
+  filenames_arg: <filenames>+
+  filenames_or_word_arg: <filenames>+ OR <text>
   me: Bryan McKelvey
   options: options
   subcommand: subcommand
@@ -8,6 +9,7 @@ en:
   usage: "Usage:"
   where_options: "where [%s] are:"
   where_subcommand: "where [%s] is any one of:"
+  word_arg: <text>
   opts:
     dry_run: Don't actually do anything
     editor: A command to run to pass the file to an editor (e.g. vi %s)
@@ -27,4 +29,5 @@ en:
     export: Export text tags from a .docx file
     import: Import text tags into a .docx file
     language: Sets the default language
+    suggest: Suggest similar words using fuzzy matching
     translate: Translate a file, word or phrase

data/locales/ja.yml

@@ -1,24 +1,26 @@
 ja:
   banner: KonjacはYAML辞書でファイルを翻訳するRubyのコマンドライン・ユーティリティです。
-  filenames: ファイル名
+  filenames_arg: <ファイル名>+
+  filenames_or_word_arg: <ファイル名>+ または <テキスト>
   me: ブライアン・マッケルビー
   options: オプション
   subcommand: サブコマンド
   unknown_subcommand: 不明なサブコマンド：%s
   usage: 使い方：
-  where_options: "使用できる[%s]は"
-  where_subcommand: "使用できる[%s]は"
+  where_options: "使用可能な[%s]は、以下のとおりです："
+  where_subcommand: "使用可能な[%s]は、以下のとおりです："
+  word_arg: <テキスト>
   opts:
-    dry_run: 何もしない
+    dry_run: 実際には何も出力しない
     editor: 結果ファイルをエディターで開くコマンド（例：vi %s）
-    from: 原文の言語
+    from: ソース言語
     help: このメッセージを表示する
-    original: 翻訳されなかった元の言語の言葉
+    original: ソーステキスト
     quiet: エラーメッセージを抑止する
-    to: 訳文の言語
-    translation: 翻訳された言葉
+    to: ターゲット言語
+    translation: ターゲットテキスト
     using: 使用したい辞書の名前
-    use_cache: キャッシュした辞書を使用する
+    use_cache: キャッシュした翻訳メモリを適用する
     version: バーションを表示し終了する
     word: 文字列を翻訳する
   subcommands:
@@ -27,4 +29,5 @@ ja:
     export: .docxファイルからタグを抽出する
     import: .docxファイルにタグをインポートする
     language: 言語を設定する
+    suggest: Suggest similar words
     translate: ファイル・文字列を翻訳する

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.1.9.2
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -11,9 +11,20 @@ bindir: bin
 cert_chain: []
 date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: amatch
+  requirement: &70272603688640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70272603688640
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70168651073560 !ruby/object:Gem::Requirement
+  requirement: &70272603688020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168651073560
+  version_requirements: *70272603688020
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70168651073120 !ruby/object:Gem::Requirement
+  requirement: &70272603708460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168651073120
+  version_requirements: *70272603708460
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70168651072660 !ruby/object:Gem::Requirement
+  requirement: &70272603708020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168651072660
+  version_requirements: *70272603708020
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70168651072140 !ruby/object:Gem::Requirement
+  requirement: &70272603707580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168651072140
+  version_requirements: *70272603707580
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70168651071580 !ruby/object:Gem::Requirement
+  requirement: &70272603707160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70168651071580
+  version_requirements: *70272603707160
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70168651070920 !ruby/object:Gem::Requirement
+  requirement: &70272603706740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70168651070920
+  version_requirements: *70272603706740
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70168651070260 !ruby/object:Gem::Requirement
+  requirement: &70272603706300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70168651070260
+  version_requirements: *70272603706300
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70168651096260 !ruby/object:Gem::Requirement
+  requirement: &70272603705820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70168651096260
+  version_requirements: *70272603705820
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70168651095640 !ruby/object:Gem::Requirement
+  requirement: &70272603705300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70168651095640
+  version_requirements: *70272603705300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70168651095000 !ruby/object:Gem::Requirement
+  requirement: &70272603704760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70168651095000
+  version_requirements: *70272603704760
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com
@@ -145,6 +156,7 @@ files:
 - lib/konjac/dictionary.rb
 - lib/konjac/exception.rb
 - lib/konjac/language.rb
+- lib/konjac/suggestor.rb
 - lib/konjac/tag.rb
 - lib/konjac/tag_manager.rb
 - lib/konjac/translator.rb