marty 4.0.0.rc2 → 5.1.0

data/spec/features/reporting_spec.rb

@@ -206,8 +206,8 @@ DELOREAN
     end
 
     wait_for_element do
-      expect(page).to have_content('XYZ1,XYZ2,XYZ3,XYZ4 1,2,3,4 2,4,6,8 ' +
-                                   '3,6,9,12 4,8,12,16')
+      expect(page).to have_content("XYZ1,XYZ2,XYZ3,XYZ4\n1,2,3,4\n2,4,6,8\n" +
+                                   "3,6,9,12\n4,8,12,16")
     end
   end
 
@@ -263,8 +263,8 @@ DELOREAN
     url = generate_rep_url(format: 'txt') + URI.encode('&disposition=inline')
     visit url
     wait_for_element do
-      expect(page).to have_content('XYZ1,XYZ2,XYZ3,XYZ4 1,2,3,4 2,4,6,8 ' +
-                                   '3,6,9,12 4,8,12,16')
+      expect(page).to have_content("XYZ1,XYZ2,XYZ3,XYZ4\n1,2,3,4\n2,4,6,8\n" +
+                                   "3,6,9,12\n4,8,12,16")
     end
   end
 

data/spec/features/rule_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'marty_rspec'
 
 feature 'rule view', js: true do
   before(:all) do
@@ -39,7 +38,6 @@ feature 'rule view', js: true do
      JS
   end
 
-  # click_checkbox in marty_rspec not working here for some reason
   def click_checkbox(name)
     q = %Q(checkbox[fieldLabel="#{name}"])
     page.execute_script <<-JS
@@ -48,7 +46,6 @@ feature 'rule view', js: true do
     JS
   end
 
-  # click_col in marty_rspec is not reliable
   def click_column(rv, name)
     cid = col_id(rv, name)
     c = find('#' + cid)
@@ -115,7 +112,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(9)
+    expect(mrv.row_count()).to eq(12)
     expect(mrv.get_row_vals(1)).to include('name' => 'abc',
                                             'rule_type' => 'SimpleRule',
                                             'start_dt' => '2013-01-01T11:03:01',
@@ -339,7 +336,7 @@ computed_value = if paramb
      else (grid2_grid_result||1) / param1
 EOL
 
-    names = mrv.get_col_vals(:name, 9, 0)
+    names = mrv.get_col_vals(:name, 12, 0)
     idx = names.index { |n| n == 'Rule3' } + 1
     mrv.select_row(idx)
     press('Edit')
@@ -362,35 +359,68 @@ EOL
                                                  'ZRule3', 'ZRule4',
                                                  'ZRule5'])
     xrv.select_row(1)
+
+    expect(page).to_not have_content('NOT (G2V1)')
+
     press('Edit')
-    fill_in('Range Guard 1', with: '[100,200)')
-    fill_in('Range Guard 2', with: '[30,40)')
+
+    fill_in('Guard two', with: 'G2V1')
+    click_checkbox('Not')
+
+    fill_in('Range Guard 1', with: '[100,200)', fill_options: { clear: :backspace })
+    fill_in('Range Guard 2', with: '[30,40)', fill_options: { clear: :backspace })
     press('OK')
+
     wait_for_ajax
-    r = Gemini::XyzRule.get_matches('infinity', {},  'g_range1' => 150,
-                                                     'g_range2' => 35)
+
+    r = Gemini::XyzRule.get_matches(
+      'infinity',
+      {},
+      'g_range1' => 150,
+      'g_range2' => 35,
+      'guard_two' => 'G2V2'
+    )
 
     expect(r.to_a.count).to eq(1)
-    exp = { 'user_id' => 1,
-           'o_user_id' => nil,
-           'name' => 'ZRule1',
-           'engine' => 'Gemini::XyzRuleScriptSet',
-           'rule_type' => 'ZRule',
-           'start_dt' => DateTime.parse('2017-1-1 08:01:00'),
-           'simple_guards' => { 'g_bool' => false,
-                             'g_date' => '2017-1-1',
-                             'g_range1' => '[100,200)',
-                             'g_range2' => '[30,40)',
-                             'g_string' => 'aaa',
-                             'g_integer' => '5',
-                             'g_datetime' => '2017-1-1 12:00:01' },
-           'computed_guards' => {},
-           'grids' => { 'grid1' => 'DataGrid1' },
-           'results' =>
-           { 'bvlen' => 'base_value.length',
-            'bv' => 'base_value' } }
+    exp = {
+      'user_id' => 1,
+      'o_user_id' => nil,
+      'name' => 'ZRule1',
+      'engine' => 'Gemini::XyzRuleScriptSet',
+      'rule_type' => 'ZRule',
+      'start_dt' => DateTime.parse('2017-1-1 08:01:00'),
+      'simple_guards' => {
+        'g_bool' => false,
+        'g_date' => '2017-1-1',
+        'guard_two' => 'G2V1',
+        'g_range1' => '[100,200)',
+        'g_range2' => '[30,40)',
+        'g_string' => 'aaa',
+        'g_integer' => '5',
+        'g_datetime' => '2017-1-1 12:00:01'
+      },
+      'simple_guards_options' => {
+        'g_bool' => { 'not' => false },
+        'g_date' => { 'not' => false },
+        'g_datetime' => { 'not' => false },
+        'g_integer' => { 'not' => false },
+        'g_range1' => { 'not' => false },
+        'g_range2' => { 'not' => false },
+        'g_string' => { 'not' => false },
+        'guard_two' => { 'not' => true }
+      },
+      'computed_guards' => {},
+      'grids' => { 'grid1' => 'DataGrid1' },
+      'results' => {
+        'bvlen' => 'base_value.length',
+        'bv' => 'base_value'
+      }
+    }
 
     expect(r.first.as_json).to include(exp)
+
+    expect(page).to have_content('NOT (G2V1)')
+
     expect(xrv.get_col_vals(:g_string, 8, 0)).to eq(['aaa', 'bbb', 'ccc', 'ddd',
                                                      'eee', 'eee', 'eee', 'eee'])
     click_column(xrv, 'String list Guard')
@@ -418,8 +448,9 @@ EOL
                                                    %Q({"grid1":"DataGrid2"}),
                                                    %Q({"grid1":"DataGrid1"}),
                                                    %Q({"grid1":"DataGrid1"})])
+
     press('Applications')
-    press('Data Grids')
+    press('Data Grids Admin')
     dgv = netzke_find('data_grid_view')
     cvs = dgv.get_col_vals(:name, 4, 0)
     ind1 = cvs.index('DataGrid1') + 1
@@ -447,9 +478,9 @@ EOL
     go_to_my_rules
     wait_for_ajax
 
-    names = mrv.get_col_vals(:name, 9, 0)
-    gvs = mrv.get_col_vals(:grids, 9, 0)
-    rvs = mrv.get_col_vals(:results, 9, 0)
+    names = mrv.get_col_vals(:name, 12, 0)
+    gvs = mrv.get_col_vals(:grids, 12, 0)
+    rvs = mrv.get_col_vals(:results, 12, 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/features/scripting_spec.rb

@@ -221,7 +221,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
 
     and_by 'form displays correct body' do
       wait_for_ajax
-      expect(page).to have_content '1 #5 2 #1 3 #2 4 #3'
+      expect(page).to have_content "1\n#5\n2\n#1\n3\n#2\n4\n#3"
     end
 
     and_by 'select different tag' do
@@ -235,7 +235,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
 
     and_by 'form displays updated body' do
       wait_for_ajax
-      expect(page).to have_content '1 #5 2 #1'
+      expect(page).to have_content "1\n#5\n2\n#1"
     end
   end
 
@@ -288,7 +288,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
       tag_grid.select_row(2)
       wait_for_ajax
       script_grid.select_row(5)
-      expect(page).to have_content '1 #123 2 #456'
+      expect(page).to have_content "1\n#123\n2\n#456"
       expect(tag_grid.get_row_vals(2)).to netzke_include(comment: 'ABCD')
     end
   end

data/spec/features/user_view_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'under Sytem menu, User Management worflows', js: true do
+feature 'under System menu, User Management worflows', js: true do
   def go_to_user_view
     press('System')
     press('User Management')
@@ -8,7 +8,7 @@ feature 'under Sytem menu, User Management worflows', js: true do
   end
 
   def go_to_user_view_backdoor
-    sys_btn = first(:btn, 'System')
+    sys_btn = first(:btn, 'System') rescue nil
     if sys_btn
       sys_btn.click
       expect(page).not_to have_content 'User Management'
@@ -77,6 +77,7 @@ feature 'under Sytem menu, User Management worflows', js: true do
 
     and_by 'check row got edited' do
       wait_for_ajax
+      r2 = user_view.get_row_vals(2)
       expect(user_view.get_row_vals(2)).to netzke_include(
         login: 'new_login',
         firstname: 'new_fname',
@@ -114,6 +115,9 @@ feature 'under Sytem menu, User Management worflows', js: true do
       by 'check buttons' do
         find(:btn, 'New User', match: :first)
         user_view.select_row(1)
+        expect { find(:btn, 'New User') }.not_to raise_error
+        expect { find(:btn, 'Edit') }.not_to raise_error
+        expect { find(:btn, 'Delete') }.not_to raise_error
         expect(btn_disabled?('New User')).to be_falsy
         expect(btn_disabled?('Edit')).to be_falsy
         expect(btn_disabled?('Delete')).to be_falsy
@@ -127,6 +131,9 @@ feature 'under Sytem menu, User Management worflows', js: true do
       by 'check buttons' do
         find(:btn, 'New User', match: :first)
         user_view.select_row(1)
+        expect { find(:btn, 'New User') }.not_to raise_error
+        expect { find(:btn, 'Edit') }.not_to raise_error
+        expect { find(:btn, 'Delete') }.not_to raise_error
         expect(btn_disabled?('New User')).to be_falsy
         expect(btn_disabled?('Edit')).to be_falsy
         expect(btn_disabled?('Delete')).to be_falsy
@@ -140,9 +147,10 @@ feature 'under Sytem menu, User Management worflows', js: true do
       user_view = netzke_find('user_view')
       by 'check buttons' do
         user_view.select_row(1)
-        expect(page).not_to have_content('New User')
-        expect(page).not_to have_content('Edit')
-        expect(page).not_to have_content('Delete')
+        err = /Unable to find btn/
+        ['New User', 'Edit', 'Delete'].each do |btn_name|
+          expect { find(:btn, btn_name) }.to raise_error(err)
+        end
       end
     end
 
@@ -153,9 +161,10 @@ feature 'under Sytem menu, User Management worflows', js: true do
       user_view = netzke_find('user_view')
       by 'check buttons' do
         user_view.select_row(1)
-        expect(page).not_to have_content('New User')
-        expect(page).not_to have_content('Edit')
-        expect(page).not_to have_content('Delete')
+        err = /Unable to find btn/
+        ['New User', 'Edit', 'Delete'].each do |btn_name|
+          expect { find(:btn, btn_name) }.to raise_error(err)
+        end
       end
     end
   end

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

@@ -1,4 +1,4 @@
-name,rule_type,start_dt,end_dt,other_flag,simple_guards,computed_guards,grids,results
+name,rule_type,start_dt,end_dt,other_flag,simple_guards,computed_guards,grids,results,simple_guards_options
 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 "", 
@@ -13,3 +13,6 @@ Rule2c,SimpleRule,2017-2-1 14:00:00,2017-4-1,true,"{""g_array"":[""G1V2""],""g_s
 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', \""a string\""]""}","{""grid1"":""DataGrid1"",""grid2"":""DataGrid2""}","{""simple_result"":""\""c value\"""",""computed_value"":""if paramb\n    then param1 / (grid1_grid_result||1)\n     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, \""a string\""]""}",,"{""flavor"": ""[\""cherry\"",\""lemon\""][param2]"",""other_grid"": ""\""DataGrid4\"""",""final_value"": ""other_grid_result * 3""}"
+NotRule1,SimpleRule,2017-4-2 15:00:01,2017-5-1,,"{""g_string"":""zzz"",""g_range"":""(,20]"",""g_integer"":3757,""g_has_default"":""foo"",""g_bool"":false,""g_array"":[""G1V1""]}","{""cguard1"":""[1==1, \""a string\""]""}",,"{""flavor"": ""[\""cherry\"",\""lemon\""][param2]"",""other_grid"": ""\""DataGrid4\"""",""final_value"": ""other_grid_result * 3""}","{""g_string"":{""not"":true},""g_integer"":{""not"":false}}"
+NotRule2,SimpleRule,2017-4-2 15:00:01,2017-5-1,,"{""g_string"":""zzz"",""g_range"":""(,20]"",""g_integer"":3757,""g_has_default"":""foo"",""g_bool"":false,""g_array"":[""G1V1""]}","{""cguard1"":""[1==1, \""a string\""]""}",,"{""flavor"": ""[\""cherry\"",\""lemon\""][param2]"",""other_grid"": ""\""DataGrid4\"""",""final_value"": ""other_grid_result * 3""}","{""g_string"":{""not"":true},""g_integer"":{""not"":true}}"
+NotRule3,SimpleRule,2017-4-2 15:00:01,2017-5-1,,"{""g_string"":""zzz"",""g_range"":""(,200]"",""g_integer"":3757,""g_has_default"":""foo"",""g_bool"":false,""g_array"":[""G1V1""]}","{""cguard1"":""[1==1, \""a string\""]""}",,"{""flavor"": ""[\""cherry\"",\""lemon\""][param2]"",""other_grid"": ""\""DataGrid4\"""",""final_value"": ""other_grid_result * 3""}","{""g_string"":{""not"":true},""g_integer"":{""not"":true}, ""g_range"":{""not"":true}}"

data/spec/lib/data_importer_spec.rb

@@ -349,8 +349,8 @@ describe DataImporter do
 
     begin
       Marty::DataImporter.do_import_summary(Gemini::FannieBup, fannie_bup4)
-    rescue Marty::DataImporter::Error => exc
-      exc.lines.should == [0]
+    rescue Marty::DataImporter::Error => e
+      e.lines.should == [0]
     else
       raise 'should have had an exception'
     end
@@ -390,9 +390,9 @@ describe DataImporter do
 
     begin
       Marty::DataImporter.do_import_summary(Gemini::FannieBup, fannie_bup5)
-    rescue Marty::DataImporter::Error => exc
-      exc.lines.should == [1]
-      exc.message.should =~ /Conv Fixed XX/
+    rescue Marty::DataImporter::Error => e
+      e.lines.should == [1]
+      e.message.should =~ /Conv Fixed XX/
     else
       raise 'should have had an exception'
     end
@@ -409,9 +409,9 @@ describe DataImporter do
     begin
       res = Marty::DataImporter.
         do_import_summary(Gemini::FannieBup, fannie_bup6)
-    rescue Marty::DataImporter::Error => exc
-      exc.lines.should == [1]
-      exc.message.should =~ /bad float/
+    rescue Marty::DataImporter::Error => e
+      e.lines.should == [1]
+      e.message.should =~ /bad float/
     else
       raise 'should have had an exception'
     end

data/spec/lib/mcfly_model_spec.rb

@@ -113,16 +113,16 @@ describe 'McflyModel' do
     a1 = @engine.evaluate('A', 'lookup', params)
     a2 = @engine.evaluate('A', 'clookup', params)
     expect(a1).to eq(a2)                            # cache/non return same
-    expect(a1.class).to eq(Hash)              # mode default so return hash
-    expect(a2.class).to eq(Hash)
+    expect(a1.class).to eq(OpenStruct)              # mode default so return OS
+    expect(a2.class).to eq(OpenStruct)
 
     # check that keys are non mcfly non uniqueness
-    expect(a1.to_h.keys.to_set).to eq(Set['buy_up', 'buy_down'])
+    expect(a1.to_h.keys.to_set).to eq(Set[:buy_up, :buy_down])
   end
 
   it 'lookup non generated' do
     # a1 will be AR Relations
-    # b1 will be hash because the b fns return #first
+    # b1 will be OpenStructs because the b fns return #first
     e_id = Gemini::Entity.where(name: 'PLS').first.id
     bc_id = Gemini::BudCategory.where(name: 'Conv Fixed 20').first.id
     p = { 'e_id' => e_id, 'bc_id' => bc_id }
@@ -141,10 +141,10 @@ describe 'McflyModel' do
     # a1 is AR but still missing the FK entity_id so will raise
     expect { a1.first.entity }.to raise_error(/missing attribute: entity_id/)
 
-    expect(b1.class).to eq(Hash)
+    expect(b1.class).to eq(OpenStruct)
 
     # make sure b1 has correct keys
-    expect(b1.to_h.keys.to_set).to eq(Set['buy_up', 'buy_down'])
+    expect(b1.to_h.keys.to_set).to eq(Set[:buy_up, :buy_down])
   end
 
   it 'lookup mode nil' do

data/spec/models/data_grid_spec.rb

@@ -177,6 +177,16 @@ Investor Services\t-0.625
 Admin Services\t-1.0
 Admin Services Plus\t-1.625
 Investor Services Acadamy\t-0.5
+EOS
+
+    Gl = <<EOS
+lenient
+fha_203k_option2\tstring\tv\tfha_203k_option2
+
+Investor Services\t-0.625
+NOT (Admin Premium Services|Admin Services|Admin Services Plus)\t-1.0
+Admin Services Plus\t-1.625
+Investor Services Acadamy\t-0.5
 EOS
 
     before(:each) do
@@ -295,8 +305,8 @@ EOS
       let(:pt) { 'infinity' }
 
       before(:each) do
-        ['G1', 'G2', 'G3', 'G4', 'G5', 'G6', 'G7', 'G8', 'Ga', 'Gb',
-         'Gc', 'Gd', 'Ge', 'Gf', 'Gg', 'Gh', 'Gj'].each do |g|
+        %w[G1 G2 G3 G4 G5 G6 G7 G8 Ga Gb
+           Gc Gd Ge Gf Gg Gh Gj Gl].each do |g|
           dg_from_import(g, "Marty::DataGridSpec::#{g}".constantize)
         end
       end
@@ -624,18 +634,22 @@ EOS
         expected_metadata = [{ 'dir' => 'v',
                                'attr' => 'units',
                                'keys' => [[1, 2], [1, 2], [3, 4], [3, 4]],
+                               'nots' => [false, false, false, false],
                                'type' => 'integer' },
                              { 'dir' => 'v',
                                'attr' => 'ltv',
                                'keys' => ['[,80]', '(80,105]', '[,80]', '(80,105]'],
+                               'nots' => [false, false, false, false],
                                'type' => 'numrange' },
                              { 'dir' => 'h',
                                'attr' => 'cltv',
                                'keys' => ['[100,110)', '[110,120)', '[120,]'],
+                               'nots' => [false, false, false],
                                'type' => 'numrange' },
                              { 'dir' => 'h',
                                'attr' => 'fico',
                                'keys' => ['[600,700)', '[700,750)', '[750,]'],
+                               'nots' => [false, false, false],
                                'type' => 'numrange' }]
 
         dgh = Marty::DataGrid.lookup_h(pt, 'G2')
@@ -651,15 +665,18 @@ EOS
         expected_metadata = [{ 'dir' => 'v',
                                'attr' => 'state',
                                'keys' => [['CA'], ['HI', 'TX'], ['NM'], ['MA'], nil],
+                               'nots' => [false, false, false, false, false],
                                'type' => 'string' },
                              { 'dir' => 'v',
                                'attr' => 'ltv',
                                'keys' => ['[,80]', '(80,105]', '[,80]', '(80,105]',
                                           '[,80]'],
+                                'nots' => [false, false, false, false, false],
                                'type' => 'numrange' },
                              { 'dir' => 'h',
                                'attr' => 'fico',
                                'keys' => ['[600,700)', '[700,750)', '[750,]'],
+                               'nots' => [false, false, false],
                                'type' => 'numrange' }]
         dgh = Marty::DataGrid.lookup_h(pt, 'G8')
         res = Marty::DataGrid.lookup_grid_distinct_entry_h(pt,
@@ -676,6 +693,7 @@ EOS
         expected_metadata = [{ 'dir' => 'v',
                                'attr' => 'ltv',
                                'keys' => ['[,115]', '(115,135]', '(135,140]'],
+                               'nots' => [false, false, false],
                                'type' => 'numrange' }]
         dgh = Marty::DataGrid.lookup_h(pt, 'G8')
         res = Marty::DataGrid.lookup_grid_distinct_entry_h(pt,
@@ -698,6 +716,7 @@ EOS
                                                              dgh, nil, false, true)
         end
       end
+
       it 'should handle all quote chars in grid inputs' do
         dgh = Marty::DataGrid.lookup_h(pt, 'G1')
         # single, double, backslash, grave, acute, unicode quotes: left single,
@@ -710,12 +729,70 @@ EOS
             pt, { 'ltv' => 10, 'fico' => 690, 'state' => st }, dgh, nil, false, true)
         end
       end
+
       it 'should handle quote chars in object name' do
         dgh = Marty::DataGrid.lookup_h(pt, 'G1')
         st = Gemini::State.new(name: "'\\")
         res = Marty::DataGrid.lookup_grid_distinct_entry_h(
           pt, { 'ltv' => 10, 'fico' => 690, 'state' => st }, dgh, nil, false, true)
       end
+
+      it 'Should handle NOT condition in lookups' do
+        dgh = Marty::DataGrid.lookup_h(pt, 'Gl')
+
+        g1_res = lookup_grid_helper(
+          'infinity',
+          'Gl',
+          { 'fha_203k_option2' => 'Admin Services Plus' },
+          false,
+          true
+        )
+        expect(g1_res).to eq([-1.625, 'Gl'])
+
+        g1_res = lookup_grid_helper(
+          'infinity',
+          'Gl',
+          { 'fha_203k_option2' => 'Not Existing Services' },
+          false,
+          true
+        )
+        expect(g1_res).to eq([-1.0, 'Gl'])
+
+        g1_res = lookup_grid_helper(
+          'infinity',
+          'Gl',
+          { 'fha_203k_option2' => 'Admin Services' },
+          false,
+          true
+        )
+        expect(g1_res).to eq([nil, 'Gl'])
+      end
+
+      it 'Should handle NOT condition in import' do
+        dg = dg_from_import('Gl0', Gl)
+        expect(dg.id).to be_present
+
+        expect(dg.metadata.first['nots']).to eq([false, true, false, false])
+        expect(dg.metadata.first['keys']).to eq(
+          [
+            ['Investor Services'],
+            ['Admin Premium Services', 'Admin Services', 'Admin Services Plus'],
+            ['Admin Services Plus'],
+            ['Investor Services Acadamy']
+          ]
+        )
+
+        indexes = Marty::GridIndexString.where(data_grid_id: dg.id)
+
+        expect(indexes.size).to eq 4
+        expect(indexes.where(not: true).size).to eq 1
+
+        not_index = indexes.find_by(not: true)
+        expect(not_index.key).to eq(
+          ['Admin Premium Services', 'Admin Services', 'Admin Services Plus']
+        )
+        expect(not_index.index).to eq(1)
+      end
     end
 
     describe 'exports' do
@@ -725,6 +802,11 @@ EOS
 
         expect(dg.export).to eq(dg2.export)
       end
+
+      it 'Should handle NOT condition in export' do
+        dg = dg_from_import('Gl0', Gl)
+        expect(dg.export.delete("\r")).to eq(Gl)
+      end
     end
 
     describe 'updates' do
@@ -757,15 +839,50 @@ EOS
       end
 
       it 'should be able to export and import back grids' do
-        [G1, G2, G3, G4, G5, G6, G7, G8, G9, Ga, Gb].each_with_index do |grid, i|
+        [G1, G2, G3, G4, G5, G6, G7, G8, G9, Ga, Gb, Gl].each_with_index do |grid, i|
           dg = dg_from_import("G#{i}", grid)
           g1 = dg.export
+
           dg = dg_from_import("Gx#{i}", g1)
           g2 = dg.export
+
+          dg1 = Marty::DataGrid.lookup_h('infinity', "G#{i}").except(
+            'id',
+            'group_id',
+            'created_dt',
+            'name',
+          )
+
+          dg2 = Marty::DataGrid.lookup_h('infinity', "Gx#{i}").except(
+            'id',
+            'group_id',
+            'created_dt',
+            'name',
+          )
+
           expect(g1).to eq g2
+          expect(dg1).to eq dg2
         end
       end
 
+      it 'Should handle NOT condition in update' do
+        dgb = dg_from_import('Gl', Gl, '1/1/2014')
+        new_gl = Gl.sub(/-1.0/, '-3.45').sub('Investor Services', 'NOT (Investor Services)')
+        dgb.update_from_import('Gl', new_gl, '1/1/2015')
+
+        grids = Marty::DataGrid.where(name: 'Gl')
+        expect(grids.size).to eq 2
+
+        old_dg = grids.where.not(obsoleted_dt: 'infinity').first
+        new_dg = grids.where(obsoleted_dt: 'infinity').first
+
+        expect(old_dg.metadata.first['nots']).to eq [false, true, false, false]
+        expect(old_dg.data).to eq [[-0.625], [-1.0], [-1.625], [-0.5]]
+
+        expect(new_dg.metadata.first['nots']).to eq [true, true, false, false]
+        expect(new_dg.data).to eq [[-0.625], [-3.45], [-1.625], [-0.5]]
+      end
+
       it 'should be able to externally export/import grids' do
         load_scripts(nil, Date.today)
 
@@ -814,7 +931,8 @@ EOS
       # rubocop:disable Style/NestedTernaryOperator
       type_str = type == 'float' ? (explicit_float ? 'float' : nil) : type
       # rubocop:enable Style/NestedTernaryOperator
-      top = [lenient_str, type_str].compact.join(' ') + "\t" + constraint + "\n"
+      con_part = constraint.present? ? "\t" + constraint : ''
+      top = [lenient_str, type_str].compact.join(' ') + con_part + "\n"
       (top =~ /\A\s*\z/ ? '' : top) +
         <<~EOS
           b\tboolean\tv
@@ -836,8 +954,8 @@ EOS
         tests = JSON.parse(File.read('spec/fixtures/json/data_grid.json'))
         aggregate_failures do
           tests.each do |test|
-            keys = %w[id type constraint values error]
-            id, type, constraint, values, error = test.values_at(*keys)
+            keys = %w[id type constraint values error line1]
+            id, type, constraint, values, error, line1 = test.values_at(*keys)
             err_re = Regexp.new(error) if error
             # for float, do both ex- and implicit declaration
             exfls = type == 'float' ? [true, false] : [true]
@@ -848,7 +966,21 @@ EOS
                 got = nil
                 tnam = "Test #{id} lenient=#{lenient} exfl=#{exfl}"
                 begin
-                  dg_from_import(tnam, grid)
+                  dg = dg_from_import(tnam, grid)
+
+                  # make sure export of line1  works correctly
+                  # when dg is lenient and/or has constraint and/or
+                  # not float
+                  next unless lenient || constraint.present? ||
+                              type != 'float'
+
+                  # also skip grids where we included float explicitly
+                  # because export will convert back to implicit
+                  next if type == 'float' && exfl
+
+                  dga = dg.export_array
+                  line1 = dga.first.first.join("\t") + "\n"
+                  expect(line1).to eq(grid.lines.first)
                 rescue StandardError => e
                   got = e.message
                 end