linguify 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/linguify/linguified.rb

@@ -51,7 +51,7 @@ module Linguify
                                              :regexp   => rule[:match].inspect,
                                              :args     => rule[:match].match(str).to_a[1..-1]
 
-        str = reduce_string(str,rule[:match],reduction.to_rexp)
+        str = Linguified.reduce_string(str,rule[:match],reduction.to_rexp)
         break if /^{.*}$/ =~ str
       end
 
@@ -92,10 +92,28 @@ module Linguify
     # @param [ String ] the replacement
     # @returns [ String ] the reduced string
     #
-    def reduce_string str,match_expression,reduction
+    def self.reduce_string str,match_expression,reduction
       match = match_expression.match(str).to_a
       if match.size == 1
-        str.gsub(match_expression,reduction)
+        needle = match[0]
+        splitted = Linguified.informative_split(str,needle)
+        prev = ' '
+        i = -1
+        splitted.map! do |split|
+          prev = splitted[i] if i>=0
+          nxt  = splitted[i+2] || ' '
+          i += 1
+          if split.kind_of?(Symbol)
+            if prev[-1] == ' ' and nxt[0] == ' '
+              reduction
+            else
+              needle
+            end
+          else
+            split
+          end
+        end
+        splitted.join
       else
         needle = match[0]
         splitted = Linguified.informative_split(str,needle)
@@ -113,11 +131,7 @@ module Linguify
     def self.informative_split str,needle
       splitted = str.split(needle)
       if str.index(needle) > 0
-        if splitted.size & 1 == 0
-          splitted.map{ |m| [m,:needle] }.flatten[0..-2]
-        else
-          splitted.map{ |m| [m,:needle] }.flatten
-        end
+        splitted.map{ |m| [m,:needle] }.flatten[0..splitted.size+str.scan(needle).size-1]
       else
         if splitted.size > 0
           splitted.map{ |m| [m,:needle] }.flatten[1..-2]

data/linguify.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "linguify"
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Hanevold"]

data/spec/linguify/linguify_spec.rb

@@ -26,17 +26,25 @@ require 'linguify'
 describe Linguify::Linguified, "#linguify" do
 
   it "finds words in sentences" do
-    Linguify::Linguified.informative_split("I fight for the users","users").should       == ["I fight for the ", :needle]
-    Linguify::Linguified.informative_split("I fight for the users","for the").should     == ["I fight ", :needle, " users"]
-    Linguify::Linguified.informative_split("I fight for the users","t for the u").should == ["I figh", :needle, "sers"]
-    Linguify::Linguified.informative_split("I fight for the users","I").should           == [:needle, " fight for the users"]
+    l = Linguify::Linguified
+    l.informative_split("I fight for the users","users").should       == ["I fight for the ", :needle]
+    l.informative_split("I fight for the users","for the").should     == ["I fight ", :needle, " users"]
+    l.informative_split("I fight for the users","t for the u").should == ["I figh", :needle, "sers"]
+    l.informative_split("I fight for the users","I").should           == [:needle, " fight for the users"]
+    l.informative_split('I fight for the users with email "user@domain.com"',"user").should == ["I fight for the ", :needle, "s with email \"", :needle, "@domain.com\""]
   end
 
   it "respects word boundaries" do
-    Linguify::Linguified.has_needle_on_word_boundary?(Linguify::Linguified.informative_split("I fight for the users","users")).should       == true
-    Linguify::Linguified.has_needle_on_word_boundary?(Linguify::Linguified.informative_split("I fight for the users","for the")).should     == true
-    Linguify::Linguified.has_needle_on_word_boundary?(Linguify::Linguified.informative_split("I fight for the users","t for the u")).should == false
-    Linguify::Linguified.has_needle_on_word_boundary?(Linguify::Linguified.informative_split("I fight for the users","I")).should           == true
+    l = Linguify::Linguified
+    l.has_needle_on_word_boundary?(Linguify::Linguified.informative_split("I fight for the users","users")).should       == true
+    l.has_needle_on_word_boundary?(Linguify::Linguified.informative_split("I fight for the users","for the")).should     == true
+    l.has_needle_on_word_boundary?(Linguify::Linguified.informative_split("I fight for the users","t for the u")).should == false
+    l.has_needle_on_word_boundary?(Linguify::Linguified.informative_split("I fight for the users","I")).should           == true
+  end
+
+  it "respects word boundaries on reductions" do
+    l = Linguify::Linguified
+    l.reduce_string('I fight for a user with email "user@domain.com"',/user/,"{needle}").should == 'I fight for a {needle} with email "user@domain.com"'
   end
 
   it "should reduce multiple rules into ruby code" do

metadata

@@ -2,7 +2,7 @@
 name: linguify
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Patrick Hanevold
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2420952439541187421
+      hash: -1602177770022402179
       segments: 
       - 0
       version: "0"