marty 1.0.37 → 1.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e2be11ff162cb9ff6d61e1f98f91e3c24b692a8
-  data.tar.gz: ecc6fa69360347e2ac3b607adeb495534323b68c
+  metadata.gz: 5da04fa860827fce8185e800389eb73a792061a9
+  data.tar.gz: e722057ed242f9090f05d1c916ccb729d055c728
 SHA512:
-  metadata.gz: 49984e9ef1fa5e9c0145404a78a175f9c1dd333c2db218d083451e13a16f7a0e3b1b2233edee9e0e5b74d6eb996407640eb25ac695eaa32b4319ea1ab8046945
-  data.tar.gz: 0c7dba4c68ad11fb575c73801ce8d49d782f8d04b31733d7017b4b33fef779a2419f382364956bc2ffe984429ac1d6e457cc3ab4f4508c777be36091564f3019
+  metadata.gz: '058dda8d8f51acba402b91a95204ad19eca47e4e142c502bd18f6a03556f8e91ef713b1ad1931c813d21824e3db4fd035a9b6cf05b07cad696f2d96df6f3db43'
+  data.tar.gz: 91c8ab2dddb5ab07e27547dd7eef1280b9828e1930a3bd6864bbcfb70aeac8fdb8faa592181459e0221c7caf85781340a3e679bf4f585cd1a2c7b6b123977aea

data/app/components/marty/config_view.rb

@@ -1,28 +1,28 @@
 class Marty::ConfigView < Marty::Grid
-  has_marty_permissions \
-  create: :admin,
-  read: :admin,
-  update: :admin,
-  delete: :admin
+  has_marty_permissions create: :admin,
+                        read: :admin,
+                        update: :admin,
+                        delete: :admin
 
   include Marty::Extras::Layout
 
   def configure(c)
     super
 
-    c.title   = I18n.t('config', default: "Config")
-    c.model   = "Marty::Config"
+    c.title      = I18n.t('config', default: "Config")
+    c.model      = "Marty::Config"
     c.attributes = [:key, :value, :description]
-    c.store_config.merge!({sorters: [{property: :key, direction: 'ASC'}]})
-    c.editing = :both
+    c.editing    = :both
+    c.store_config.merge!(sorters: [{property: :key, direction: 'ASC'}])
   end
 
   def my_jsonb_getter
-    lambda { |r| v = Marty::Config[r.key]; v && v.to_json || '' }
+    lambda { |r| v = Marty::Config[r.key]; !v.nil? && v.to_json || '' }
   end
+
   def my_jsonb_pretty_getter
     lambda { |r| v = Marty::Config[r.key]
-      v && (JSON.pretty_generate(v) rescue v.to_json) || '' }
+      !v.nil? && (JSON.pretty_generate(v) rescue v.to_json) || '' }
   end
 
   def my_jsonb_setter
@@ -37,8 +37,8 @@ class Marty::ConfigView < Marty::Grid
     [
       :key,
       jsonb_field(:value, {
-                    getter:  my_jsonb_pretty_getter,
-                    setter:  my_jsonb_setter,
+                    getter: my_jsonb_pretty_getter,
+                    setter: my_jsonb_setter,
                   }),
       textarea_field(:description),
     ]
@@ -49,14 +49,14 @@ class Marty::ConfigView < Marty::Grid
   end
 
   column :value do |c|
-    c.flex = 3
-    c.getter  = my_jsonb_getter
-    c.setter  = my_jsonb_setter
+    c.flex   = 3
+    c.getter = my_jsonb_getter
+    c.setter = my_jsonb_setter
   end
+
   attribute :description do |c|
     c.flex = 1
   end
-
 end
 
 ConfigView = Marty::ConfigView

data/app/models/marty/config.rb

@@ -2,7 +2,7 @@ class Marty::Config < Marty::Base
   class ConfigValidator < ActiveModel::Validator
     def validate(entry)
       v = entry.get_value
-      entry.errors[:base] = "bad JSON value" if !v
+      entry.errors[:base] = "bad JSON value" if v.nil?
       v
     end
   end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.37"
+  VERSION = "1.0.38"
 end

data/spec/controllers/rpc_controller_spec.rb

@@ -826,7 +826,7 @@ describe Marty::RpcController do
       attrs: attrs,
       params: params
     }
-    expect = '""res""=>[""Class error: \'Beans\' not contained in FruitsEnum'
+    expect = "property '#/f' value 'Beans' not contained in FruitsEnum"
     expect(response.body).to include(expect)
   end
 
@@ -845,7 +845,7 @@ describe Marty::RpcController do
       attrs: attrs,
       params: params
     }
-    expect = "Unrecognized PgEnum for attribute res"
+    expect = "property '#/b': 'NonExistantEnum' is not a pg_enum"
     res_hsh = JSON.parse(response.body)
     expect(res_hsh.keys.size).to eq(1)
     expect(res_hsh.keys[0]).to eq("error")

data/spec/models/config_spec.rb

@@ -15,6 +15,11 @@ module Marty
         expect(Marty::Config["testval"]).to eq(val)
       end
 
+      def testval_fail(val)
+        expect{testval(val)}.to raise_error(ActiveRecord::RecordInvalid,
+                                            'Validation failed: bad JSON value')
+      end
+
       it "should handle various structures correctly" do
         testval("[1,2,3]")
         testval("[1,\"2,3\"]")
@@ -46,6 +51,20 @@ module Marty
           expect(Marty::Config["k#{i}"]).to eq(nil)
         }
       end
+
+      it "should allow the assignment of individual boolean values" do
+        testval(true)
+        testval(false)
+      end
+
+      it "should not allow the assignment of individual nil (null) values" do
+        testval_fail(nil)
+      end
+
+      it "should allow nil (null) to exist in other structures" do
+        testval([nil, 1, 2, nil])
+        testval({"key1"  => nil, "key2" => false, "key3" => 'val'})
+      end
     end
   end
 end

metadata

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