pg-hstore 1.1.3 → 1.1.4

data/lib/pg_hstore.rb

@@ -1,94 +1,81 @@
-require 'strscan'
-
 module PgHstore
   SINGLE_QUOTE = "'"
   DOUBLE_QUOTE = '"'
 
-  extend self
-  
-  def parse(string)
-    hash = {}
-
-    # remove single quotes around literal if necessary
-    string = string[1..-2] if string[0] == SINGLE_QUOTE and string[-1] == SINGLE_QUOTE
-
-    scanner = StringScanner.new(string)
-    while !scanner.eos?
-      k = parse_quotable_string(scanner)
-      skip_key_value_delimiter(scanner)
-      v = parse_quotable_string(scanner)
-      skip_pair_delimiter(scanner)
-      # controversial...
-      # to_sym, or what?
-      hash[k.to_sym] = v
+  QUOTED_LITERAL = /"[^"\\]*(?:\\.[^"\\]*)*"/
+  UNQUOTED_LITERAL = /[^\s=,][^\s=,\\]*(?:\\.[^\s=,\\]*|=[^,>])*/
+  LITERAL = /(#{QUOTED_LITERAL}|#{UNQUOTED_LITERAL})/
+  PAIR = /#{LITERAL}\s*=>\s*#{LITERAL}/
+  NULL = /\ANULL\z/i
+  # set symbolize_keys = false if you want string keys
+  # thanks to https://github.com/engageis/activerecord-postgres-hstore for regexps!
+  def PgHstore.load(hstore, symbolize_keys = true)
+    hstore = unquote hstore, SINGLE_QUOTE
+    hstore.scan(PAIR).inject({}) do |memo, (k, v)|
+      k = unescape unquote(k, DOUBLE_QUOTE)
+      k = k.to_sym if symbolize_keys
+      v = (v =~ NULL) ? nil : unescape(unquote(v, DOUBLE_QUOTE))
+      memo[k] = v
+      memo
     end
-    
-    hash
   end
 
   # set for_parameter = true if you're using the output for a bind variable
-  def dump(hash, for_parameter = false)
-    string = hash.map do |k, v|
+  def PgHstore.dump(hash, for_parameter = false)
+    memo = hash.map do |k, v|
       if v.nil?
-        # represent nil as NULL without quotes
         v = "NULL"
       else
-        v = double_quote_escape v
+        v = escape v
         unless for_parameter
-          v = single_quote_escape v
+          v = escape_single_quotes v
         end
-        # otherwise, write a double-quoted string with backslash escapes for quotes
         v = DOUBLE_QUOTE + v + DOUBLE_QUOTE
       end
-      k = double_quote_escape k
+      k = escape k
       unless for_parameter
-        k = single_quote_escape k
+        k = escape_single_quotes k
       end
       k = DOUBLE_QUOTE + k + DOUBLE_QUOTE
-
-      # TODO: throw an error if there is a NULL key
       [k, v].join ' => '
-    end.join(", ")
+    end.join(', ')
     if for_parameter
-      string
+      memo
     else
-      SINGLE_QUOTE + string + SINGLE_QUOTE
+      SINGLE_QUOTE + memo + SINGLE_QUOTE
     end
   end
 
-  private
-  
-  def quoted_string(scanner)
-    key = scanner.scan(/(\\"|[^"])*/)
-    key = key.gsub(/\\(.)/, '\1')
-    scanner.skip(/"/)
-    key
+  class << self
+    # deprecated; use PgHstore.load
+    alias parse load
   end
-  
-  def parse_quotable_string(scanner)
-    if scanner.scan(/"/)
-      value = quoted_string(scanner)
+
+  private
+
+  def PgHstore.unquote(string, quote_char)
+    if string.start_with? quote_char
+      string[1..-2]
     else
-      value = scanner.scan(/\w+/)
-      value = nil if value == "NULL"
-      # TODO: values but not keys may be NULL
+      string
     end
   end
 
-  def skip_key_value_delimiter(scanner)
-    scanner.skip(/\s*=>\s*/) 
+  ESCAPED_CHAR = /\\(.)/
+  def PgHstore.unescape(literal)
+    literal.gsub(ESCAPED_CHAR, '\1').gsub ESCAPED_SINGLE_QUOTE, SINGLE_QUOTE
   end
-
-  def skip_pair_delimiter(scanner)
-    scanner.skip(/,\s*/)
-  end
-
-  def double_quote_escape(str)
-    str.to_s.gsub DOUBLE_QUOTE, '\"'
+  
+  NON_ESCAPE_SLASH = '\\'
+  ESCAPED_SLASH = '\\\\'
+  ESCAPED_DOUBLE_QUOTE = '\"'
+  def PgHstore.escape(string)
+    string.to_s.gsub(NON_ESCAPE_SLASH) {ESCAPED_SLASH}.gsub DOUBLE_QUOTE, ESCAPED_DOUBLE_QUOTE
   end
 
-  def single_quote_escape(str)
-    str.to_s.gsub(/\\(?!")/) {'\\\\'}.gsub(SINGLE_QUOTE, "''")
+  ESCAPED_SINGLE_QUOTE = "''"
+  def PgHstore.escape_single_quotes(literal)
+    literal.to_s.gsub SINGLE_QUOTE, ESCAPED_SINGLE_QUOTE
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg-hstore
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -28,7 +28,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.0
-description: postgresql hstore parser/deparser - provides PgHstore.dump and PgHstore.parse
+description: postgresql hstore parser/deparser - provides PgHstore.dump and PgHstore.load
+  (aka parse)
 email:
 - pvh@heroku.com
 - seamus@abshere.net
@@ -57,9 +58,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: ''
 test_files: []
 has_rdoc: