marty 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2610538f904b7fcf434d0543e100dbd861578723
-  data.tar.gz: 412cabe5e809b1c7bb44ffcb272bb4f0b6664b9d
+  metadata.gz: 6f9329ef429a6180b90811a7f0f438395a06a51f
+  data.tar.gz: 53eb8d02f9e32fb11f44f8a091a037d7758349b5
 SHA512:
-  metadata.gz: 221af9e171749a9f470c5ecda41782a416fb76797887d04a6951a88ced0f32259fd865605f54be701df7b56007d97badc12687167234e857de88e6e0591b2939
-  data.tar.gz: 4ffdd8ba934c805e0e663829bd083854a8e93ad6fe94cf6524a85e28057d251183cc4bee0c6b2032a4878173a49c4bfe97b948d1d58e04b856afda4af4127091
+  metadata.gz: cb21b47adbdc2a81981d9b1334e6e1e9ab93d989bcaa51c166ed20e99b2b9ead53d0725497fd5e43879d99029255ecfd189adadf0a69367061610a9e426fc675
+  data.tar.gz: 738b139779f6d7a000b210b998a2c485fda2d47ffee0d9e463678fa41498290ccb8662d8af54b9c3b18c7c43ac52fef0e9464ff6de0819ac0c940b6466121629

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (1.2.8)
+    marty (1.2.9)
       axlsx (= 3.0.0pre)
       coderay
       delorean_lang (~> 0.3.33)

data/app/components/marty/base_rule_view.rb

@@ -103,13 +103,19 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
     }
   end
 
-  def self.jsonb_field_getter(j, c)
-    lambda { |r| r.send(j)[c]||"" }
+  def self.jsonb_field_getter(j, c, nullbool=nil)
+    lambda do |r|
+      rv = r.send(j)[c]
+      v = nullbool ? (rv == true ? 'True' :
+                        rv == false ? 'False' : rv) : rv
+      v || ""
+    end
   end
 
-  def self.jsonb_field_setter(j, c)
-    lambda do |r, v|
-      v.blank? ||  v == '---' ? r.send(j).delete(c) : r.send(j)[c] = v
+  def self.jsonb_field_setter(j, c, bool=nil)
+    lambda do |r, rv|
+      v = bool ? rv.to_s.downcase == 'true' : rv
+      rv == '' || rv == '---' ? r.send(j).delete(c) : r.send(j)[c] = v
     end
   end
 
@@ -212,26 +218,35 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
 
   def self.field_maker(namestr, h, meth)
     name = namestr.to_sym
+    nullbool = h[:type] == :boolean && (h[:null] == true || !h.include?(:null))
     attribute name do |c|
       c.width = h[:width] || 150
-      case h[:type]
-      when :datetime; c.format = 'Y-m-d H:i'
-      when :date; c.format = 'Y-m-d'
-      else c.type = h[:type] || :string
+      case
+      when h[:type] == :datetime
+        c.format = 'Y-m-d H:i'
+      when h[:type] == :date
+        c.format = 'Y-m-d'
+      when nullbool
+          c.type = :string
+          enum_column(c, ['True', 'False'])
+      else
+        c.type = h[:type] || :string
       end
       c.label = h[:label] if h[:label]
-      if h[:enum]
+      if h[:enum] || (h[:type] == :string && h[:values].present?)
+        vals = h[:enum] || h[:values]
         if h[:multi]
-          enum_array(c, h[:enum])
+          enum_array(c, vals)
         else
-          enum_column(c, h[:enum])
+          enum_column(c, vals)
         end
       end
       # for some unexplained reason the getter/setter need the full
       # class qualification
       if h[:type] != :range
-        c.getter = Marty::DeloreanRuleView.jsonb_field_getter(meth, namestr)
-        c.setter = Marty::DeloreanRuleView.jsonb_field_setter(meth, namestr)
+        c.getter = Marty::BaseRuleView.jsonb_field_getter(meth, namestr, nullbool)
+        c.setter = Marty::BaseRuleView.jsonb_field_setter(meth, namestr,
+                                                          h[:type]==:boolean)
         c.filter_with = lambda do |rel, value, op|
           v = ActiveRecord::Base.connection.quote(value)[1..-2]
           rel.where("#{meth}->>'#{namestr}' like '%#{v}%'")

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

@@ -73,13 +73,14 @@ module Layout
   ######################################################################
   # PG ENUM field handling
 
-  def enum_column(c, klass)
+  def enum_column(c, class_or_array)
+    vals = class_or_array.is_a?(Array) ? class_or_array : class_or_array::VALUES
     editor_config = {
       trigger_action: :all,
       xtype:          :combo,
 
       # hacky: extjs has issues with forceSelection true and clearing combos
-      store:          klass::VALUES + ['---'],
+      store:          vals + ['---'],
 
       # we can dynamically add enums (i.e. they're not in VALUES) --
       # turn off forced selection.

data/app/models/marty/base_rule.rb

@@ -17,7 +17,7 @@ class Marty::BaseRule < Marty::Base
     types << :date if Date.parse(v) rescue nil
     types << :datetime if DateTime.parse(v) rescue nil
     types << :range if chkrange(v) rescue nil
-    types << :boolean if [true, false].include?(v)
+    types << :boolean if [true, false, 'True', 'False'].include?(v)
     types
   end
   def check(name, h)
@@ -72,7 +72,7 @@ class Marty::BaseRule < Marty::Base
 
   before_create do
     self.class.guard_info.each do |k,v|
-      next if v[:default].blank? || self.simple_guards.include?(k)
+      next if !v.include?(:default) || self.simple_guards.include?(k)
       self.simple_guards[k] = v[:default]
     end
   end
@@ -108,7 +108,7 @@ class Marty::BaseRule < Marty::Base
 
       q = q.where("(#{isn} #{filts})")
     end
-   # print q.to_sql
+    #print q.to_sql
     q.order(:name)
   end
 

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.2.8"
+  VERSION = "1.2.9"
 end

data/spec/dummy/app/models/gemini/my_rule.rb

@@ -22,13 +22,24 @@ class Gemini::MyRule < Marty::DeloreanRule
                              values: ["Hi Mom", "abc", "def", "zzz"],
                              width: 100},
              "g_bool" => { type: :boolean,
+                           width: 100,
+                           null: false},
+             "g_nullbool" => { type: :boolean,
                            width: 100},
              "g_range" => { type: :range,
                             width: 100},
              "g_integer" => { type: :integer,
                               width: 100},
              "g_has_default" => { type:  :string,
-                                  default: "string default"}}
+                                  default: "string default"},
+             "g_bool_def" => { type: :boolean,
+                               width: 100,
+                               default: true,
+                               null: false},
+             "g_nbool_def" => { type: :boolean,
+                                default: false,
+                               width: 100},
+    }
   end
   def self.results_cfg_var
     'RULEOPTS_MYRULE'

data/spec/dummy/app/models/gemini/xyz_rule.rb

@@ -27,7 +27,8 @@ class Gemini::XyzRule < Marty::DeloreanRule
              "g_string" => { type: :string,
                               width: 100},
              "g_bool" => { type: :boolean,
-                              width: 100},
+                           width: 100,
+                           null: false},
              "g_range1" => { type: :range,
                               width: 100},
              "g_range2" => { type: :range,

data/spec/dummy/config/locales/en.yml

@@ -9,7 +9,12 @@ en:
     g_array: "Array Guard"
     g_single: "Single Guard"
     g_bool: "Bool Guard"
+    g_string: "String list Guard"
+    g_has_default: "Defaulted String"
+    g_nullbool: "NullBool Guard"
     g_range: "Range Guard"
     g_range1: "Range Guard 1"
     g_range2: "Range Guard 2"
-    other_flag: "Other"
+    other_flag: "Other"
+    g_bool_def: "Bool def Guard"
+    g_nbool_def: "NBool def Guard"

data/spec/features/rule_spec.rb

@@ -94,7 +94,7 @@ feature 'rule view', js: true do
     time_fill_in(1, '08:03:01')
     press("OK")
     wait_for_ajax
-    expect(mrv.row_count()).to eq(8)
+    expect(mrv.row_count()).to eq(9)
     expect(mrv.get_row_vals(1)).to include({"name"=>"abc",
                                             "rule_type"=>"SimpleRule",
                                             "start_dt"=>"2013-01-01T19:03:01.000Z",
@@ -104,8 +104,12 @@ feature 'rule view', js: true do
                                             "g_single"=>"",
                                             "g_string"=>"",
                                             "g_bool"=>nil,
+                                            "g_nullbool"=>"",
+                                            "g_bool_def"=>nil,
+                                            "g_nbool_def"=>"False",
                                             "g_range"=>nil,
                                             "g_integer"=>nil,
+                                            "g_has_default"=>"string default",
                                             "computed_guards"=>"",
                                             "grids"=>"",
                                             "results"=>"",
@@ -116,7 +120,10 @@ feature 'rule view', js: true do
                                   "name"=>"abc",
                                   "engine"=>"Gemini::MyRuleScriptSet",
                                   "rule_type"=>"SimpleRule",
-                                  "simple_guards"=>{"g_has_default"=>
+                                  "simple_guards"=>{"g_bool"=>false,
+                                                    "g_bool_def"=>false,
+                                                    "g_nbool_def"=>false,
+                                                    "g_has_default"=>
                                                     "string default"},
                                   "computed_guards"=>{},
                                   "grids"=>{},
@@ -125,14 +132,11 @@ feature 'rule view', js: true do
     # type validation (string with values list)
     mrv.select_row(1)
     press("Edit")
-    fill_in(:g_string, with: "12345")
-    press("OK")
-    wait_for_ajax
-    expect(page).to have_content("Bad value '12345' for 'g_string'")
     # type validation (range)
-    fill_in(:g_string, with: "Hi Mom")
+    netzke_find("String list Guard", 'combobox').select_values("Hi Mom")
     click_checkbox("Bool Guard")
     click_checkbox("Other")
+    netzke_find("NullBool Guard", 'combobox').select_values("False")
     netzke_find('Array Guard', 'combobox').select_values("G1V1,G1V3")
     netzke_find('Single Guard', 'combobox').select_values("G2V2")
     fill_in(:g_integer, with: 123)
@@ -144,6 +148,7 @@ feature 'rule view', js: true do
     fill_in(:g_range, with: "<=100")
     netzke_find('Grid1', 'combobox').select_values("DataGrid1")
     netzke_find('Grid2', 'combobox').select_values("DataGrid2")
+    fill_in("Defaulted String", with: "12345")
     press("OK")
     wait_for_ajax
     exp = {"name"=>"abc",
@@ -155,12 +160,16 @@ feature 'rule view', js: true do
            "g_single"=>"G2V2",
            "g_string"=>"Hi Mom",
            "g_bool"=>true,
+           "g_nullbool"=>"False",
            "g_range"=>"<=100",
            "g_integer"=>123,
+           "g_has_default"=>"12345",
            "computed_guards"=>"",
            "grids"=>"{\"grid1\":\"DataGrid1\",\"grid2\":\"DataGrid2\"}",
            "results"=>"",
           }
+    r = Gemini::MyRule.lookup('infinity','abc')
+    expect(r.as_json["simple_guards"]["g_nullbool"]).to eq(false)
     expect(mrv.get_row_vals(1)).to include(exp)
     # grid edits
     press("Edit")
@@ -169,6 +178,15 @@ feature 'rule view', js: true do
     wait_for_ajax
     expect(mrv.get_row_vals(1)).to include(exp+{"grids"=>
                                                 "{\"grid1\":\"DataGrid1\"}"})
+    press("Edit")
+    netzke_find("NullBool Guard", 'combobox').select_values("---")
+    press("OK")
+    wait_for_ajax
+    expect(mrv.get_row_vals(1)).to include(exp+{"g_nullbool"=>"",
+                                                "grids"=>
+                                                "{\"grid1\":\"DataGrid1\"}"})
+    r = Gemini::MyRule.lookup('infinity','abc')
+    expect(r.as_json["simple_guards"]).not_to include('g_nullbool')
     # computed fields
     press("Edit")
     fill_in(:computed_guards, with: 'sadf asdf ljsf')
@@ -220,6 +238,7 @@ feature 'rule view', js: true do
     press("OK")
     r = Gemini::XyzRule.get_matches('infinity', {}, {"g_range1"=> 150,
                                                      "g_range2"=> 35})
+
     expect(r.to_a.count).to eq(1)
     exp = {"user_id"=>1,
            "o_user_id"=>nil,
@@ -227,7 +246,8 @@ feature 'rule view', js: true do
            "engine"=>"Gemini::XyzRuleScriptSet",
            "rule_type"=>"ZRule",
            "start_dt"=>DateTime.parse("2017-1-1 08:01:00"),
-           "simple_guards"=>{"g_date"=>"2017-1-1",
+           "simple_guards"=>{"g_bool"=>false,
+                             "g_date"=>"2017-1-1",
                              "g_range1"=>"[100,200)",
                              "g_range2"=>"[30,40)",
                              "g_string"=>"aaa",
@@ -242,13 +262,13 @@ feature 'rule view', js: true do
     expect(r.first.as_json).to include(exp)
     expect(xrv.col_values(:g_string, 5, 0)).to eq(["aaa", "bbb", "ccc",
                                                    "ddd", "eee"])
-    click_column(xrv, "G string")
+    click_column(xrv, "String list Guard")
     expect(xrv.col_values(:g_string, 5, 0)).to eq(["eee", "ddd", "ccc",
                                                    "bbb", "aaa"])
-    column_filter(xrv, "G string", "eee")
+    column_filter(xrv, "String list Guard", "eee")
     rc = xrv.row_count
     expect(xrv.col_values(:g_string,rc,0)).to eq(["eee"])
-    column_filter_toggle(xrv, "G string")
+    column_filter_toggle(xrv, "String list Guard")
     rc = xrv.row_count
     expect(xrv.col_values(:g_string,rc,0)).to eq(["eee", "ddd", "ccc",
                                                    "bbb", "aaa"])
@@ -293,9 +313,9 @@ feature 'rule view', js: true do
     go_to_my_rules
     wait_for_ajax
 
-    names = mrv.col_values(:name, 8, 0)
-    gvs = mrv.col_values(:grids, 8, 0)
-    rvs = mrv.col_values(:results, 8, 0)
+    names = mrv.col_values(:name, 9, 0)
+    gvs = mrv.col_values(:grids, 9, 0)
+    rvs = mrv.col_values(:results, 9, 0)
     expect(JSON.parse(gvs[names.index('abc')])).to eq(g1h)
     expect(JSON.parse(gvs[names.index('Rule2b')])).to eq(g1h +
                                                          {"grid2"=>"DataGrid2"})

data/spec/fixtures/csv/rule/MyRule.csv

@@ -1,5 +1,5 @@
 name,rule_type,start_dt,end_dt,other_flag,simple_guards,computed_guards,grids,results
-Rule1,SimpleRule,2017-1-1 12:00:00,2017-4-1,,"{""g_has_default"":""different"",""g_array"":[""G1V1"",""G1V3""],""g_single"":""G2V2"",""g_string"":""Hi Mom"",""g_bool"":true,""g_range"":""[50,)"",""g_integer"":10}",,,"{""simple_result"":""\""a value\""""}"
+Rule1,SimpleRule,2017-1-1 12:00:00,2017-4-1,,"{""g_has_default"":""different"",""g_array"":[""G1V1"",""G1V3""],""g_single"":""G2V2"",""g_string"":""Hi Mom"",""g_bool"":true,""g_bool_def"":false,""g_nbool_def"":true,""g_range"":""[50,)"",""g_integer"":10}",,,"{""simple_result"":""\""a value\""""}"
 Rule2,SimpleRule,2017-2-1 14:00:00,2017-4-1,true,"{""g_array"":[""G1V2""],""g_single"":""G2V3"",""g_string"":""abc"",""g_bool"":true,""g_range"":""(,50]"",""g_integer"":11}",,,"{
 ""simple_result"":""\""b value\"" # with comment "", 
 ""sr2"":""true # with comment"", 
@@ -9,6 +9,7 @@ Rule2,SimpleRule,2017-2-1 14:00:00,2017-4-1,true,"{""g_array"":[""G1V2""],""g_si
 ""stringwithhash"": ""\"" string that contains a # character\""""}"
 Rule2a,SimpleRule,2017-2-1 14:00:00,2017-4-1,true,"{""g_array"":[""G1V2""],""g_single"":""G2V3"",""g_string"":""abc"",""g_bool"":true,""g_range"":""(,50]"",""g_integer"":99}",,,"{""simple_result"":""\""b value\"""", ""sr2"":""true"", ""sr3"": ""123""}"
 Rule2b,SimpleRule,2017-2-1 14:00:00,2017-4-1,true,"{""g_array"":[""G1V2""],""g_single"":""G2V3"",""g_string"":""abc"",""g_bool"":true,""g_range"":""(,50]"",""g_integer"":999}",,"{""grid1"":""DataGrid1"",""grid2"":""DataGrid2""}",
+Rule2c,SimpleRule,2017-2-1 14:00:00,2017-4-1,true,"{""g_array"":[""G1V2""],""g_single"":""G2V3"",""g_string"":""abc"",""g_bool"":false,""g_range"":""(,50]"",""g_integer"":10}",,"{""grid1"":""DataGrid1"",""grid2"":""DataGrid2""}",
 Rule3,ComplexRule,2017-3-1 00:00:00,2017-4-1,false,"{""g_array"":[""G1V2"",""G1V3""],""g_string"":""def"",""g_integer"":11}","{""cguard1"":""1==1"",""cguard2"":""param2 == 'abc'""}","{""grid1"":""DataGrid1"",""grid2"":""DataGrid2""}","{""simple_result"":""\""c value\"""",""computed_value"":""if paramb then param1 / (grid1_grid_result||1) else (grid2_grid_result||1) / param1""}"
 Rule4,ComplexRule,2017-4-1 15:00:01,2017-5-1,,"{""g_array"":[""G1V2"",""G1V3""],""g_string"":""Hi Mom"",""g_integer"":11}","{""cguard1"":""1==1"",""cguard2"":""param2 == \""abc\""""}","{""grid1"":""DataGrid1"",""grid2"":""DataGrid2""}","{""computed_name_grid"":""\""DataGrid\""+\""X\"""", ""simple_result"":""computed_name_grid"",""grid_sum"":""computed_name_grid_result + (grid1_grid_result||0)+(grid2_grid_result||0)""}"
 Rule5,ComplexRule,2017-4-2 15:00:01,2017-5-1,,"{""g_string"":""zzz"",""g_integer"":3757,""g_has_default"":""foo""}","{""cguard1"":""1==1""}",,"{""flavor"": ""[\""cherry\"",\""lemon\""][param2]"",""other_grid"": ""\""DataGrid4\"""",""final_value"": ""other_grid_result * 3""}"

data/spec/models/rule_spec.rb

@@ -33,7 +33,8 @@ module Marty::RuleSpec
         guards = (@g_array   ? {"g_array"   =>@g_array}   : {}) +
                  (@g_single  ? {"g_single"  =>@g_single}  : {}) +
                  (@g_string  ? {"g_string"  =>@g_string}  : {}) +
-                 (@g_bool    ? {"g_bool"    =>@g_bool}    : {}) +
+                 (@g_bool.nil?     ? {} : {"g_bool"     => @g_bool})     +
+                 (@g_nullbool.nil? ? {} : {"g_nullbool" => @g_nullbool}) +
                  (@g_range   ? {"g_range"   =>@g_range}   : {}) +
                  (@g_integer ? {"g_integer" =>@g_integer} : {})
         Gemini::MyRule.create!(name: "testrule",
@@ -116,6 +117,7 @@ module Marty::RuleSpec
                             ["Rule2", "string default"],
                             ["Rule2a", "string default"],
                             ["Rule2b", "string default"],
+                            ["Rule2c", "string default"],
                             ["Rule3", "string default"],
                             ["Rule4", "string default"],
                             ["Rule5", "foo"]].sort)
@@ -177,14 +179,22 @@ module Marty::RuleSpec
                                             {'rule_type'=>'SimpleRule',
                                             'other_flag'=>true},
                                             {})
-        expect(lookup.to_a.count).to eq(3)
-        expect(lookup.map{|l|l.name}.to_set).to eq(Set["Rule2","Rule2a","Rule2b"])
+        expect(lookup.to_a.count).to eq(4)
+        expect(lookup.map{|l|l.name}.to_set).to eq(Set["Rule2","Rule2a",
+                                                       "Rule2b", "Rule2c"])
         lookup = Gemini::MyRule.get_matches('infinity',
                                             {'rule_type'=>'ComplexRule',
                                             'other_flag'=>false},
                                             {})
         expect(lookup.to_a.count).to eq(1)
         expect(lookup.first.name).to eq("Rule3")
+        # bool false matches bool nil
+        lookup = Gemini::MyRule.get_matches('infinity',
+                                            {'rule_type'=>'ComplexRule',
+                                            'other_flag'=>false},
+                                            {'g_bool'=>false})
+        expect(lookup.to_a.count).to eq(1)
+        expect(lookup.first.name).to eq("Rule3")
         lookup = Gemini::MyRule.get_matches('infinity',
                                             {'rule_type'=>'ComplexRule'},
                                             {'g_string'=>'def'})
@@ -218,18 +228,19 @@ module Marty::RuleSpec
         expect(lookup.first.name).to eq("Rule1")
         lookup = Gemini::MyRule.get_matches('infinity',
                                             {'rule_type'=>'SimpleRule'},
-                                            {'g_bool'=>false, "g_range"=>75,
+                                            {'g_bool'=>false, "g_range"=>25,
                                              'g_integer'=>10})
-        expect(lookup).to eq([])
+        expect(lookup.to_a.count).to eq(1)
+        expect(lookup.first.name).to eq("Rule2c")
         lookup = Gemini::MyRule.get_matches('infinity',
                                             {'rule_type'=>'SimpleRule'}, {})
-        expect(lookup.to_a.count).to eq(4)
+        expect(lookup.to_a.count).to eq(5)
         lookup = Gemini::MyRule.get_matches('infinity',
                                             {'rule_dt'=>"2017-3-1 02:00:00"},
                                             {})
-        expect(lookup.to_a.count).to eq(5)
+        expect(lookup.to_a.count).to eq(6)
         expect(lookup.pluck(:name).to_set).to eq(Set["Rule1", "Rule2", "Rule2a",
-                                                     "Rule2b", "Rule3"])
+                                                   "Rule2b", "Rule2c", "Rule3"])
         lookup = Gemini::MyRule.get_matches('infinity',
                                             {'rule_dt'=>"2017-4-1 16:00:00"},
                                             {})
@@ -241,6 +252,11 @@ module Marty::RuleSpec
         lookup = Gemini::MyRule.get_matches('infinity',
                                             {'rule_dt'=>"2017-5-1 00:00:01"}, {})
         expect(lookup.to_a).to eq([])
+        lookup = Gemini::MyRule.get_matches('infinity', {},
+                                            {"g_bool_def"=>false,
+                                             "g_nbool_def"=>true})
+        expect(lookup.to_a.count).to eq(1)
+        expect(lookup.pluck(:name).first).to eq("Rule1")
       end
     end
     context "rule compute" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg