activerecord-postgres-hstore 0.7.1 → 0.7.2

data/CHANGELOG

@@ -0,0 +1,10 @@
+0.7.2 / 2013-02-07
+
+* Bug fixes
+
+  * Properly quote/escape double quotes https://github.com/engageis/activerecord-postgres-hstore/issues/78
+
+* Enhancements
+
+  * Delegate hstore dumping/loading to https://github.com/seamusabshere/pg-hstore
+  * Add a CHANGELOG!

data/activerecord-postgres-hstore.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name = "activerecord-postgres-hstore"
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.platform    = Gem::Platform::RUBY
   s.license     = "MIT"
@@ -16,8 +16,9 @@ Gem::Specification.new do |s|
   s.required_ruby_version     = ">= 1.8.7"
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency "rails"
+  s.add_dependency "rails", ">= 3.1"
   s.add_dependency "rake"
+  s.add_dependency 'pg-hstore', '>=1.1.5'
   s.add_development_dependency "bundler"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "rspec", "~> 2.11"

data/lib/activerecord-postgres-hstore/coder.rb

@@ -1,3 +1,5 @@
+require 'pg_hstore'
+
 module ActiveRecord
   module Coders
     class Hstore
@@ -22,39 +24,13 @@ module ActiveRecord
       end
 
       private
-      # Escapes values such that they will work in an hstore string
-      def hstore_escape(str)
-        return 'NULL' if str.nil?
-        return str if str =~ /^".*"$/
-        '"%s"' % str
-      end
 
       def to_hstore obj
-        return "" if obj.empty?
-        obj.map do |idx, val| 
-          "%s=>%s" % [hstore_escape(idx), hstore_escape(val)]
-        end * ","
-      end
-
-      def hstore_pair
-        quoted_string = /"[^"\\]*(?:\\.[^"\\]*)*"/
-        unquoted_string = /[^\s=,][^\s=,\\]*(?:\\.[^\s=,\\]*|=[^,>])*/
-        string = /(#{quoted_string}|#{unquoted_string})/
-        /#{string}\s*=>\s*#{string}/
+        PgHstore.dump obj, true
       end
 
       def from_hstore hstore
-        token_pairs = (hstore.scan(hstore_pair)).map { |k,v| [k,v =~ /^NULL$/i ? nil : v] }
-        token_pairs = token_pairs.map { |k,v|
-          [k,v].map { |t| 
-            case t
-            when nil then t
-            when /\A"(.*)"\Z/m then $1.gsub(/\\(.)/, '\1')
-            else t.gsub(/\\(.)/, '\1')
-            end
-          }
-        }
-        Hash[ token_pairs ]
+        PgHstore.load hstore, false
       end
     end
   end

data/spec/activerecord-coders-hstore_spec.rb

@@ -82,6 +82,17 @@ describe ActiveRecord::Coders::Hstore do
       let(:value){ {'a' => 'a'} }
       it{ should eql('"a"=>"a"') }
     end
+
+    context 'when value has double quotes' do
+      let(:value){ {"a" => "\"a\""} }
+      it{ should eql(%q("a"=>"\"a\"")) }
+    end
+
+    # @seamusabshere not sure about this test
+    # context 'when value has double-escaped double quotes' do
+    #   let(:value){ {"a" => "\\\"a\\\""} }
+    #   it{ should eql(%q("a"=>"\"a\"")) }
+    # end
   end
 
   describe ".load" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgres-hstore
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +44,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg-hstore
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +119,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG
 - Gemfile
 - LICENSE
 - README.md