Merge pull request #41 from Arkham/fix_adapter

revert to previous regexp; added regression test

lib/wordmove/sql_mover.rb

@@ -41,10 +41,19 @@ def replace_field!(source_field, dest_field)
     end
 
     def serialized_replace!(source_field, dest_field)
-      sql_content.gsub!(/s:(?:\d+):(\\*['"])(.*?)\1;/) do |match|
-        delimiter, string = $1, $2
-        string.gsub!(/#{Regexp.escape(source_field)}/, dest_field)
-        %(s:#{string.length}:#{delimiter}#{string}#{delimiter};)
+      length_delta = source_field.length - dest_field.length
+
+      sql_content.gsub!(/s:(\d+):([\\]*['"])(.*?)\2;/) do |match|
+        length = $1.to_i
+        delimiter = $2
+        string = $3
+
+        string.gsub!(/#{Regexp.escape(source_field)}/) do |match|
+          length -= length_delta
+          dest_field
+        end
+
+        %(s:#{length}:#{delimiter}#{string}#{delimiter};)
       end
     end
 

lib/wordmove/version.rb

@@ -1,3 +1,3 @@
 module Wordmove
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end

spec/sql_mover_spec.rb

@@ -109,6 +109,15 @@
       end
     end
 
+    context "given strings with escaped content" do
+      let(:content) { 's:6:"dump\"\"";' }
+
+      it "should calculate the correct final length" do
+        sql_mover.serialized_replace!('dump', 'sausage')
+        sql_mover.sql_content.should == 's:9:"sausage\"\"";'
+      end
+    end
+
     context "given multiple types of string quoting" do
       let(:content) { "a:3:{s:20:\\\"http://dump.com/spam\\\";s:6:'foobar';s:22:'http://dump.com/foobar';s:8:'sausages';}" }