marty 1.0.32 → 1.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 671ef9c9aeda422910eead24aa88e4c086f27661
-  data.tar.gz: 27c540837c2e1ca61c82f13491cbf42a737d3d91
+  metadata.gz: 7f81ea6f27f1cb8c9671b8e4dc1c6d32ab3e782e
+  data.tar.gz: 839a0aa364eb2a4991d3b49bbb729e63c620ea45
 SHA512:
-  metadata.gz: 4231463e4c8d857aab0f957d6d2cce95070a52c6ab0454b7f96fee8d4a27c5f2ab6cc9cc9bd002768c5a8c189b741752cd25dc5c982657d0b1963ef0c173f760
-  data.tar.gz: 3a9d6e936a78ce5dd43e8e5aa69f543b46327110dfb29e71fd97f38acd75780f4b49f85c484e3e8f8269f3cf01349212c21b31f40792923d6b9aa67aa61100d8
+  metadata.gz: a2bde0eae1e81e2189f3d5d53c88a25d6c317f40fe46309a0b330f0fdb71c77414230bd62a211f98f348c20807985b167c8a8bf38e9e8ce8a0b7105630c1060f
+  data.tar.gz: 3b49c4026098a1ff32e15c8684096fd8fe786361dafca179ce60eeb793fc1166fbd91fd7193d4c7b39fc479269bf16ca0d99d93751fac61feb1755323b702e4e

data/app/components/marty/config_view.rb

@@ -17,14 +17,17 @@ class Marty::ConfigView < Marty::Grid
     c.editing = :both
   end
 
-  # need a getter / setter to call the []= and [] methods now
-  # since value is no longer stored as is
   def my_jsonb_getter
-    lambda { |r| Marty::Config[r.key].to_json }
+    lambda { |r| v = Marty::Config[r.key]; v && v.to_json || '' }
+  end
+  def my_jsonb_pretty_getter
+    lambda { |r| v = Marty::Config[r.key]
+      v && JSON.pretty_generate(v) || '' }
   end
 
   def my_jsonb_setter
     lambda { |r, v|
+      return r.set_value(nil) if v.blank?
       decoded = ActiveSupport::JSON.decode(v) rescue nil
       r.set_value(decoded)
     }
@@ -33,21 +36,10 @@ class Marty::ConfigView < Marty::Grid
   def default_form_items
     [
       :key,
-      {
-        name:        :value,
-        width:       "100%",
-        height:      150,
-        xtype:       :textareafield,
-        auto_scroll: true,
-        spellcheck:  false,
-        allow_blank: false,
-        field_style: {
-          font_family: 'courier new',
-          font_size:   '12px'
-        },
-        getter:  my_jsonb_getter,
-        setter:  my_jsonb_setter,
-      },
+      jsonb_field(:value, {
+                    getter:  my_jsonb_pretty_getter,
+                    setter:  my_jsonb_setter,
+                  }),
       textarea_field(:description),
     ]
   end
@@ -56,7 +48,7 @@ class Marty::ConfigView < Marty::Grid
     c.flex = 1
   end
 
-  attribute :value do |c|
+  column :value do |c|
     c.flex = 3
     c.getter  = my_jsonb_getter
     c.setter  = my_jsonb_setter

data/app/components/marty/extras/layout.rb

@@ -54,6 +54,22 @@ module Layout
     } + options
   end
 
+  def jsonb_field(name, options={})
+    {
+        name:        name,
+        width:       "100%",
+        height:      150,
+        xtype:       :textareafield,
+        auto_scroll: true,
+        spellcheck:  false,
+        allow_blank: false,
+        field_style: {
+          font_family: 'courier new',
+          font_size:   '12px'
+        },
+    }.merge(options)
+  end
+
   ######################################################################
   # PG ENUM field handling
 

data/lib/marty/data_conversion.rb

@@ -72,7 +72,8 @@ class Marty::DataConversion
     when :numrange, :int4range, :int8range
       v.to_s
     when :float_array, :json, :jsonb
-      JSON.parse Marty::DataExporter.decode_json(v)
+      # v might be base64 or might be a readable string
+      JSON.parse Marty::DataExporter.decode_json(v) rescue JSON.parse(v)
     else
       raise "unknown type #{type} for #{v.inspect}}"
     end
@@ -189,7 +190,6 @@ class Marty::DataConversion
       |(k,v), h|
       h[k.to_s] = v == '' ? nil : v
     }
-
     key_groups.each_with_object({}) do
       |(ga, g), h|
 

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.32"
+  VERSION = "1.0.33"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.32
+  version: 1.0.33
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg