konjac 0.2.6.6 → 0.2.6.7

data/lib/konjac/dictionary.rb

@@ -36,8 +36,8 @@ module Konjac
         end
         
         # Build a regex template for the from language
-        from_template = build_regex_template(from_lang)
-        to_template   = build_replacement_template(from_lang, to_lang)
+        has_spaces  = Language.has_spaces?(from_lang)
+        to_template = build_replacement_template(from_lang, to_lang)
 
         # Save variables to cache so we can avoid repetitive requests
         cache_load from_lang, to_lang, opts[:using]
@@ -48,7 +48,7 @@ module Konjac
         # Build a list of search and replace pairs
         @pairs = []
         dictionary.each do |term|
-          pair = extract_pair_from_term(term, from_lang, to_lang, from_template, to_template)
+          pair = extract_pair_from_term(term, from_lang, to_lang, has_spaces, to_template)
           @pairs << pair unless pair.nil?
         end
 
@@ -58,7 +58,7 @@ module Konjac
 
       # Extracts a regular expression and string replacement pair from a term
       # in the Dictionary, based on the supplied languages and their templates
-      def extract_pair_from_term(term, from_lang, to_lang, from_template, to_template)
+      def extract_pair_from_term(term, from_lang, to_lang, has_spaces, to_template)
         if term.has_key?(to_lang)
           # Build to term depending on whether it's a hash for complex
           # matches or a simple string
@@ -94,7 +94,11 @@ module Konjac
             unless from_term.is_a?(Regexp)
               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)
+              if has_spaces
+                from_term = Regexp.new(add_word_boundaries(from_term), flags)
+              else
+                from_term = Regexp.new(from_term, flags)
+              end
             end
 
             to_term = to_template % to_term unless to_term =~ BLANK || no_space
@@ -127,16 +131,6 @@ module Konjac
         !@pairs.nil?
       end
 
-      # Builds a regular expression template for the language depending on
-      # whether that language has word boundaries
-      def build_regex_template(lang)
-        if Language.has_spaces?(lang)
-          "\\b%s\\b"
-        else
-          "%s"
-        end
-      end
-
       # Builds a replacement template for the to language, depending on whether
       # the both from and to languages allow for whitespace
       def build_replacement_template(from_lang, to_lang)
@@ -196,6 +190,19 @@ module Konjac
 
       private
 
+      # Adds word boundaries to a term based on whether the first and last
+      # letter would support them in a regular expression
+      def add_word_boundaries(term)
+        result = ""
+
+        # First letter is a word character
+        result << "\\b" if term[0] =~ /\w/
+        result << term
+
+        # Either last letter is a word character or it's not escaped
+        result << "\\b" if term[0..1] =~ /\w$|[^\\].$/
+      end
+
       # Caches variables so we can determine later on whether to reload the
       # dictionaries or not
       def cache_load(from_lang, to_lang, dictionaries)  # :doc:

data/lib/konjac/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konjac
 version: !ruby/object:Gem::Version
-  version: 0.2.6.6
+  version: 0.2.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amatch
-  requirement: &70309718912920 !ruby/object:Gem::Requirement
+  requirement: &70302597006140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309718912920
+  version_requirements: *70302597006140
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70309718912500 !ruby/object:Gem::Requirement
+  requirement: &70302597005720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309718912500
+  version_requirements: *70302597005720
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70309718912080 !ruby/object:Gem::Requirement
+  requirement: &70302597005300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309718912080
+  version_requirements: *70302597005300
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70309718911660 !ruby/object:Gem::Requirement
+  requirement: &70302597004840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309718911660
+  version_requirements: *70302597004840
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70309718911240 !ruby/object:Gem::Requirement
+  requirement: &70302597004420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309718911240
+  version_requirements: *70302597004420
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70309718927020 !ruby/object:Gem::Requirement
+  requirement: &70302597024960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309718927020
+  version_requirements: *70302597024960
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70309718926460 !ruby/object:Gem::Requirement
+  requirement: &70302597024460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309718926460
+  version_requirements: *70302597024460
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70309718925760 !ruby/object:Gem::Requirement
+  requirement: &70302597023780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309718925760
+  version_requirements: *70302597023780
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70309718925300 !ruby/object:Gem::Requirement
+  requirement: &70302597022500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309718925300
+  version_requirements: *70302597022500
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70309718924880 !ruby/object:Gem::Requirement
+  requirement: &70302597022040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309718924880
+  version_requirements: *70302597022040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70309718924280 !ruby/object:Gem::Requirement
+  requirement: &70302597021620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309718924280
+  version_requirements: *70302597021620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70309718923700 !ruby/object:Gem::Requirement
+  requirement: &70302597021020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309718923700
+  version_requirements: *70302597021020
 description: A Ruby command-line utility for translating files using a YAML wordlist
 email:
 - bryan.mckelvey@gmail.com