pg_json 0.1.11 → 0.1.12

data/bin/pg_json

@@ -89,7 +89,7 @@ simple :time do
 end
 simple :timestamp do
   # "extract(epoch from data)::integer::text"
-  "'{\"__type__\":\"timestamp\",\"value\":\"'||extract(epoch from data)::integer::text||'\"}'"
+  "'{\"__type__\":\"timestamp\",\"value\":'||extract(epoch from data)::integer::text||'}'"
 end
 
 while composite = ARGV.slice!(0)

data/lib/pg_json/sequel/pg_json.rb

@@ -1,4 +1,38 @@
+JSON_TYPES = {} unless defined? JSON_TYPES
+JSON_TYPES[:date] = lambda do |v|
+  v.nil? ? nil : v.to_date
+end
+JSON_TYPES[:time] = lambda do |v|
+  v.nil? ? nil : v.to_time
+end
+JSON_TYPES[:datetime] = lambda do |v|
+  v.nil? ? nil : v.to_datetime
+end
+
 class Hash
+  def json_typify!
+    replacements = []
+    self.each do |k, v|
+      if v.is_a? Hash
+        if h[:__type__]
+          if h[:value]
+            replacements << [k, JSON_TYPES[h[:__type__]].call(h[:value])]
+          else
+            replacements << [k, nil]
+          end
+        else
+          v.json_typify!
+        end
+      elsif v.is_a? Array
+        v.json_typify!
+      end
+    end
+    replacements.each do |r|
+      k, v = r
+      self[k] = v
+    end
+  end
+  
   def recursively_symbolize_keys!
     self.symbolize_keys!
     self.values.each do |v|
@@ -13,6 +47,16 @@ class Hash
 end
 
 class Array
+  def json_typify!
+    self.each do |item|
+      if item.is_a? Hash
+        item.json_typify!
+      elsif item.is_a? Array
+        item.json_typify!
+      end
+    end
+  end
+  
   def recursively_symbolize_keys!
     self.each do |item|
       if item.is_a? Hash
@@ -31,6 +75,7 @@ module Sequel
         if self.first
           JSON.parse(self.first[:to_json]).tap do |h|
             h.recursively_symbolize_keys!
+            h.json_typify!
           end
         else
           nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_json
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
   prerelease: 
 platform: ruby
 authors: