konjac 0.2.4.1 → 0.2.5

data/README.rdoc

@@ -82,7 +82,8 @@ translate as 犬:
       en: dog
       ja:
         ja: 犬
-        en: dogs?  # i.e. the regular expression /dogs?/
+        en: dogs?
+        regex: true  # i.e. the regular expression /dogs?/
 
 == Extended Example
 
@@ -101,6 +102,7 @@ translate as 犬:
       ja:
         ja: 犬
         en: dogs?
+        regex: true  # i.e. the regular expression /dogs?/
     - # Periods
       en:
         en: ". "

data/lib/konjac/dictionary.rb

@@ -66,6 +66,7 @@ module Konjac
             to_term        = term[to_lang][to_lang]
             case_sensitive = term[to_lang]["case_sensitive"]
             no_space       = term[to_lang]["no_space"]
+            is_regex       = term[to_lang]["regex"]
 
             if term[to_lang].has_key?(from_lang)
               from_term = term[to_lang][from_lang]
@@ -76,7 +77,11 @@ module Konjac
 
           # Build from term if it doesn't already exist
           if term.has_key?(from_lang) && from_term.nil?
-            from_term = term[from_lang]
+            if term[from_lang].is_a?(Hash)
+              from_term = term[from_lang][from_lang]
+            else
+              from_term = term[from_lang]
+            end
           end
 
           unless from_term.nil?
@@ -87,8 +92,9 @@ module Konjac
             # 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]/ || case_sensitive))
+              flags = (case_sensitive || (from_term =~ /[A-Z]/)) ? nil : "i"
+              from_term = Regexp.escape(from_term) unless is_regex
+              from_term = Regexp.new(from_template % from_term, flags)
             end
 
             to_term = to_template % to_term unless to_term =~ BLANK || no_space

data/lib/konjac/version.rb

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

data/spec/dictionary_spec.rb

@@ -14,6 +14,7 @@ describe Dictionary do
                           ja:
                             ja: 猫
                             en: cats?
+                            regex: true
                         -
                           ja:
                             ja: 。
@@ -42,7 +43,7 @@ describe Dictionary do
 
   describe "when converting from English to Japanese" do
     before :each do
-      Dictionary.load "en", "ja", { :using => [@dictionary.path] }
+      Dictionary.load "en", "ja", :using => [@dictionary.path]
     end
 
     it "should correctly load a simple term" do
@@ -70,7 +71,7 @@ describe Dictionary do
 
     it "should only have a case-insensitive search if the search contains capital letters" do
       Dictionary.pairs[0][0].should == /\bdogs\b/i
-      Dictionary.pairs[4][0].should == /\bNorth Carolina\b/
+      Dictionary.pairs[4][0].should == /\bNorth\ Carolina\b/
     end
 
     it "should only force a case-insensitive search if the flag is set" do
@@ -81,7 +82,7 @@ describe Dictionary do
 
   describe "when converting from Japanese to English" do
     before :each do
-      Dictionary.load "ja", "en", { :using => [@dictionary.path] }
+      Dictionary.load "ja", "en", :using => [@dictionary.path]
     end
 
     it "should add whitespace to term replacement" do
@@ -92,7 +93,7 @@ describe Dictionary do
 
   describe "when converting from English to Spanish" do
     before :each do
-      Dictionary.load "en", "es", { :using => [@dictionary.path] }
+      Dictionary.load "en", "es", :using => [@dictionary.path]
     end
 
     it "should not add whitespace to term replacement" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.2.4.1
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amatch
-  requirement: &70330300185520 !ruby/object:Gem::Requirement
+  requirement: &70326487551740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330300185520
+  version_requirements: *70326487551740
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70330300185100 !ruby/object:Gem::Requirement
+  requirement: &70326487551280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330300185100
+  version_requirements: *70326487551280
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70330300184660 !ruby/object:Gem::Requirement
+  requirement: &70326487550840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330300184660
+  version_requirements: *70326487550840
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70330300184200 !ruby/object:Gem::Requirement
+  requirement: &70326487550340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330300184200
+  version_requirements: *70326487550340
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70330300183760 !ruby/object:Gem::Requirement
+  requirement: &70326487549760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330300183760
+  version_requirements: *70326487549760
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70330300183160 !ruby/object:Gem::Requirement
+  requirement: &70326487549160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330300183160
+  version_requirements: *70326487549160
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70330300182620 !ruby/object:Gem::Requirement
+  requirement: &70326487548480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330300182620
+  version_requirements: *70326487548480
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70330300182040 !ruby/object:Gem::Requirement
+  requirement: &70326487548060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330300182040
+  version_requirements: *70326487548060
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70330300181440 !ruby/object:Gem::Requirement
+  requirement: &70326487547640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330300181440
+  version_requirements: *70326487547640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70330300181020 !ruby/object:Gem::Requirement
+  requirement: &70326487547040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330300181020
+  version_requirements: *70326487547040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70330300180520 !ruby/object:Gem::Requirement
+  requirement: &70326487546420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330300180520
+  version_requirements: *70326487546420
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com