pg_json 0.1.23 → 0.1.24

data/bin/pg_json

@@ -81,18 +81,20 @@ simple :text do
 end
 simple :date do
   # "'\"'||to_char(data, 'YYYY-MM-DD')::text||'\"'"
-  "'{\"__type__\":\"date\",\"value\":\"'||to_char(data, 'YYYY-MM-DD')::text||'\"}'"
+  # "'{\"__type__\":\"date\",\"value\":\"'||to_char(data, 'YYYY-MM-DD')::text||'\"}'"
+  "'date:'||to_char(data, 'YYYY-MM-DD')"
 end
 simple :time do
   # "'\"'||to_char(data, 'HH24:MI:SS')::text||'\"'"
-  "'{\"__type__\":\"time\",\"value\":\"'||to_char(data, 'HH24:MI:SS')::text||'\"}'"
+  "'time:'||to_char(data, 'HH24:MI:SS')"
 end
 # simple :timestamp do
 #   # "extract(epoch from data)::integer::text"
 #   "'{\"__type__\":\"timestamp\",\"value\":'||extract(epoch from data)::integer::text||'}'"
 # end
 simple :timestamp do
-  "'{\"__type__\":\"timestamp\",\"value\":\"'||to_char(data, 'YYYY-MM-DD\"T\"HH24:MI:SS\"+02:00\"')||'\"}'"
+  # "'{\"__type__\":\"timestamp\",\"value\":\"'||to_char(data, 'YYYY-MM-DD\"T\"HH24:MI:SS\"+02:00\"')||'\"}'"
+  "'timestamp:'||to_char(data, 'YYYY-MM-DD\"T\"HH24:MI:SS\"+02:00\"')"
 end
 
 while composite = ARGV.slice!(0)

data/lib/pg_json/sequel/pg_json.rb

@@ -1,44 +1,63 @@
 require "date"
-
-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
+# 
+# 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
+# JSON_TYPES[:timestamp] = lambda do |v|
+#   # format '2012-04-21T00:00:00+0200'
+#   v.nil? ? nil : DateTime.parse(v).to_time
 # end
-JSON_TYPES[:timestamp] = lambda do |v|
-  # format '2012-04-21T00:00:00+0200'
-  v.nil? ? nil : DateTime.parse(v).to_time
-end
 
 class Hash
   def json_typify!
-    replacements = []
     self.each do |k, v|
       if v.is_a? Hash
-        if v[:__type__]
-          if v[:value]
-            # puts "::: #{v.inspect}"
-            replacements << [k, JSON_TYPES[v[:__type__].to_sym].call(v[:value])]
-          else
-            replacements << [k, nil]
-          end
-        else
-          v.json_typify!
-        end
+        v.json_typify!
       elsif v.is_a? Array
         v.json_typify!
+      else
+        if !v.nil? && v.is_a? String
+          if m = (v =~ /^date:/)
+            self[k] = v[5..-1]
+          elsif m = (v =~ /^timestamp:/)
+            self[k] = v[10..-1]
+          elsif m = (v =~ /^time:/)
+            self[k] = v[5..-1]
+          end
+        end
       end
     end
-    replacements.each do |r|
-      k, v = r
-      self[k] = v
-    end
   end
+  # def json_typify!
+  #   replacements = []
+  #   self.each do |k, v|
+  #     if v.is_a? Hash
+  #       if v[:__type__]
+  #         if v[:value]
+  #           # puts "::: #{v.inspect}"
+  #           replacements << [k, JSON_TYPES[v[:__type__].to_sym].call(v[: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!

metadata

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