active_record_hstore_serializer 0.0.3 → 0.0.4

data/active_record_hstore_serializer.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'active_record_hstore_serializer'
-  s.version       = '0.0.3'
+  s.version       = '0.0.4'
   s.date          = '2011-11-19'
   s.summary       = "Serialize attributes using HStore in ActiveRecord / Rails 3.1+"
   s.description   = "Leverage Postgres HStore for awesome attribute serialization."

data/lib/active_record_hstore_serializer/string.rb

@@ -9,27 +9,35 @@ class String
   # Validates the hstore format. Valid formats are:
   # * An empty string
   # * A string like %("foo"=>"bar"). I'll call it a "double quoted hstore format".
-  # * A string like %('foo'=>'bar'). I'll call it a "single quoted hstore format".
+  # * A string like %(foo=>bar). Postgres doesn't emit this but it does accept it as input, we should accept any input Postgres does
+
   def valid_hstore?
-    return true if empty? || self == "''"
-    # This is what comes from the database
-    dbl_quotes_re = /"([^"]+)"=>"([^"]+)"/
-    # TODO
-    # This is what comes from the plugin
-    # this is a big problem, 'cause regexes does not know how to count...
-    # how should i very values quoted with two single quotes? using .+ sux.
-    sngl_quotes_re = /'(.+)'=>'(.+)'/
-    self.match(dbl_quotes_re) || self.match(sngl_quotes_re)
+    pair = hstore_pair
+    !!match(/^\s*(#{pair}\s*(,\s*#{pair})*)?\s*$/)
   end
 
   # Creates a hash from a valid double quoted hstore format, 'cause this is the format
   # that postgresql spits out.
   def from_hstore
-    Hash[ scan(/"([^"]+)"=>"([^"]+)"/) ]
+    token_pairs = (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 /^"(.*)"$/ then $1.gsub(/\\(.)/, '\1')
+        else t.gsub(/\\(.)/, '\1')
+        end
+      }
+    }
+    Hash[ token_pairs ]
   end
 
-  def escape_quotes
-    self.gsub(/'/,"''")
-  end
+  private
 
+  def hstore_pair
+    quoted_string = /"[^"\\]*(?:\\.[^"\\]*)*"/
+    unquoted_string = /[^\s=,][^\s=,\\]*(?:\\.[^\s=,\\]*|=[^,>])*/
+    string = /(#{quoted_string}|#{unquoted_string})/
+    /#{string}\s*=>\s*#{string}/
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Cody Caughlan