Merge pull request #33 from newspaperclub/master

Correctly parse double quoted hstore format on multiple lines
diogob · Sep 14, 2012 · 053ea4c · 053ea4c
2 parents c1291ac + 1ee3f4b
commit 053ea4c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/activerecord-postgres-hstore/string.rb b/lib/activerecord-postgres-hstore/string.rb
@@ -24,7 +24,7 @@ def from_hstore
       [k,v].map { |t| 
         case t
         when nil then t
-        when /^"(.*)"$/ then $1.gsub(/\\(.)/, '\1')
+        when /\A"(.*)"\Z/m then $1.gsub(/\\(.)/, '\1')
         else t.gsub(/\\(.)/, '\1')
         end
       }

diff --git a/spec/activerecord-postgres-hstore_spec.rb b/spec/activerecord-postgres-hstore_spec.rb
@@ -78,5 +78,11 @@
     ''.from_hstore.should eq({})
     '         '.from_hstore.should eq({})
   end
+
+  it "should not change values with line breaks" do
+    input = { "a" => "foo\n\nbar" }
+    output = input.to_hstore
+    output.from_hstore.should eq(input)
+  end
 
 end