will_scan_string 0.1.1 → 0.1.2

data/lib/will_scan_string.rb

@@ -3,5 +3,7 @@ require "will_scan_string/string_scanner"
 require "will_scan_string/regexp_traits"
 
 module WillScanString
+	GLOBAL_REPLACEMENT = 1
+
 	Regexp.send( :include, RegexpTraits )
 end

data/lib/will_scan_string/string_scanner.rb

@@ -7,10 +7,18 @@ module WillScanString
 		end
 
 		def replace( string )
-			string.gsub(replacement_regexp) do
-				m, r = *get_match_and_replacement( $~ )
-				execute_replacement_with_match r, m
+			result = string.dup
+			result_offset = 0
+			string.scan replacement_regexp do
+				match = $~
+				r = *execute_replacement_with_match(*get_match_and_replacement(match).reverse)
+				replacement = r.last
+				is_global = r.first == 1
+				return replacement if is_global
+				result[(result_offset+match.begin(0))...(result_offset+match.end(0))] = replacement
+				result_offset += replacement.length - (match.end(0)-match.begin(0))
 			end
+			result
 		end
 
 		protected

data/lib/will_scan_string/version.rb

@@ -1,3 +1,3 @@
 module WillScanString
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/lib/will_scan_string/string_scanner_spec.rb

@@ -20,7 +20,7 @@ describe WillScanString::StringScanner do
 		ss.register_replacement ">", ">"
 		ss.register_replacement "\"", """
 		ss.register_replacement "&", "&"
-		ss.replace("& :)").should eql %{&amp; <img src="happy.png" alt=":)" title=":)">}
+		ss.replace("& :) <").should eql %{&amp; <img src="happy.png" alt=":)" title=":)"> &lt;}
 	end
 
 	it "should be able to use multiple regular expressions to replace with" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: will_scan_string
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70325947050920 !ruby/object:Gem::Requirement
+  requirement: &70208318032560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70325947050920
+  version_requirements: *70208318032560
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70325947050500 !ruby/object:Gem::Requirement
+  requirement: &70208318032140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70325947050500
+  version_requirements: *70208318032140
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70325950995280 !ruby/object:Gem::Requirement
+  requirement: &70208318031720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70325950995280
+  version_requirements: *70208318031720
 description: Gem for string replacements using multiple regular expressions in a single
   pass.
 email: