will_scan_string 0.0.3 → 0.1.0

data/lib/will_scan_string/string_scanner.rb

@@ -15,12 +15,11 @@ module WillScanString
 
 		protected
 		def get_match_and_replacement( m )
-			m = m.to_a.tap{ |m| m.shift }
-			i = m.find_index{ |v| !v.nil? }
+			matchArray = m[1..-1]
+			i = matchArray.find_index{ |v| !v.nil? }
 			r = find_replacement_by_index(i)
 			cps = [0] + (r[0].is_a?(Regexp) ? r[0].capture_groups : [])
-			m = m[i, cps.length]
-			[m, r[1]]
+			[[m]+matchArray[i+1, cps.length], r[1]]
 		end
 
 		def execute_replacement_with_match( r, m )

data/lib/will_scan_string/version.rb

@@ -1,3 +1,3 @@
 module WillScanString
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/lib/will_scan_string/string_scanner_spec.rb

@@ -35,4 +35,10 @@ describe WillScanString::StringScanner do
 		ss.register_replacement /(?:\r\n)/, "<br>"
 		ss.replace("\r\n").should eql("<br>")
 	end
+
+	it "should return match as first argument" do
+		ss = WillScanString::StringScanner.new
+		ss.register_replacement /(a)(b)/, ->(match, a, b) { a*3 + b*3 + match.class.to_s }
+		ss.replace("ab").should eql("aaabbbMatchData")
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: will_scan_string
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000Z
+date: 2012-04-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70102737497280 !ruby/object:Gem::Requirement
+  requirement: &70134888667620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102737497280
+  version_requirements: *70134888667620
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70102737425940 !ruby/object:Gem::Requirement
+  requirement: &70134888667200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102737425940
+  version_requirements: *70134888667200
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70102737417440 !ruby/object:Gem::Requirement
+  requirement: &70134888666780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102737417440
+  version_requirements: *70134888666780
 description: Gem for string replacements using multiple regular expressions in a single
   pass.
 email:
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: will_scan_string
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Gem for string replacements using multiple regular expressions in a single