marty 2.1.5 → 2.3.0

data/spec/lib/delorean_query_spec.rb

@@ -35,14 +35,16 @@ A:
     o = Gemini::FannieBup.
       order("note_rate DESC", "buy_down ASC").
       select("note_rate").
-      first.note_rate
+      first.attributes.note_rate
 
     oo = Gemini::FannieBup.
       order("note_rate", "buy_down ASC").
       select("note_rate").
-      find_by("obsoleted_dt = 'infinity'").
+      find_by("obsoleted_dt = 'infinity'").attributes.
       note_rate
 
+    ooo = Gemini::FannieBup.find_by({'id' : -1})
+
     g = Gemini::FannieBup.
       select("settlement_yy*settlement_mm AS x, count(*) AS c").
       group("settlement_mm", "settlement_yy").
@@ -78,6 +80,7 @@ EOF
       @clean_file = "/tmp/clean_#{Process.pid}.psql"
       save_clean_db(@clean_file)
     end
+
     before(:each) do
       marty_whodunnit
       Marty::DataImporter.do_import_summary(Gemini::BudCategory, bud_cats)
@@ -90,10 +93,12 @@ EOF
 
       @engine = Marty::ScriptSet.new.get_engine("A")
     end
+
     after(:all) do
       restore_clean_db(@clean_file)
       Marty::ScriptSet.clear_cache
     end
+
     it "perfroms join+count" do
       res = @engine.evaluate("A", "c", {})
 
@@ -147,6 +152,12 @@ EOF
                           note_rate
     end
 
+    it "perfroms find_by on class" do
+      res = @engine.evaluate("A", "ooo", {})
+
+      expect(res).to eq Gemini::FannieBup.find_by(id: -1)
+    end
+
     it "perfroms group+count" do
       res = @engine.evaluate("A", "gg", {})
 

data/spec/lib/logger_spec.rb

@@ -73,6 +73,7 @@ module Marty
       Marty::Script.load_script_bodies(promise_bodies, Date.today)
       start_delayed_job
     end
+
     after(:all) do
       restore_clean_db(@clean_file)
       stop_delayed_job
@@ -85,30 +86,31 @@ module Marty
       File.open(Rails.root.join("log/test.log")) do |f|
         f.seek(0, IO::SEEK_END)
         engine = Marty::ScriptSet.new.get_engine(NAME_K)
-        (1..1000).each do |i|
+
+        res = (1..1000).map do |i|
           engine.background_eval("LOGGER", {"msgid" => i}, ["result"])
         end
 
-        60.times do
-          running = Marty::Promise.uncached {
-            Marty::Promise.unscoped.where(result: nil)
-          }.count
-          break if running == 0
-          sleep 1
-        end
+        # wait for all the jobs to finish; collect/check their result
+        expect(res.map {|x| x["result"]}.sort).to eq (1..1000).to_a
 
-        # each background_eval writes one line to /tmp/logaction.txt
-        # these must happen no matter what happens in Marty::Logger
-        expect(File.readlines("/tmp/logaction.txt").count).to eq(1000)
+        line_count = File.readlines("/tmp/logaction.txt").count
 
-        # each background_eval does 10 calls to Marty::Logger.
-        # failures (after 3 retries at 0.1 sec each) are logged to rails log
-        # the total count should be 10000
         log_count = Marty::Log.all.count
         failed_count = f.readlines.select do
           |l|
           l == "Marty::Logger failure: database is locked\n"
         end.count
+
+        expect(Marty::Promise.where.not(result: {}).count).to eq 1000
+
+        # each background_eval writes one line to /tmp/logaction.txt
+        # these must happen no matter what happens in Marty::Logger
+        expect(line_count).to eq(1000)
+
+        # each background_eval does 10 calls to Marty::Logger.
+        # failures (after 3 retries at 0.1 sec each) are logged to rails log
+        # the total count should be 10000
         expect(log_count + failed_count).to eq(10000)
       end
     end

data/spec/models/data_grid_spec.rb

@@ -495,21 +495,15 @@ EOS
 
         expect{lookup_grid_helper('infinity',
                                "G9",
-                               {"ltv" => 81},
+                               {"state" => nil, "ltv" => 81},
                                )}.to raise_error(/matches > 1/)
 
-        err = /Data Grid lookup failed/
-        expect{lookup_grid_helper('infinity',
-                                 "G9",
-                                 {"state" => "CA", "ltv" => nil},
-                                 false, false)}.to raise_error(err)
-
         res = lookup_grid_helper('infinity',
                                  "G9",
-                                 {"state" => nil, "ltv" => 81},
+                                 {"state" => "CA", "ltv" => nil},
                                  false, false)
+        expect(res).to eq [123,"G9"]
 
-        expect(res).to eq [456,"G9"]
       end
 
       it "should handle boolean keys" do
@@ -776,7 +770,7 @@ EOS
       it "should not create a new version if no change has been made" do
         dg = dg_from_import("G4", G1)
         dg.update_from_import("G4", G1)
-        expect(Marty::DataGrid.unscoped.where(group_id: dg.group_id).count).to eq 1
+        expect(Marty::DataGrid.where(group_id: dg.group_id).count).to eq 1
       end
 
       it "should be able to export and import back grids" do

data/spec/models/promise_spec.rb

@@ -19,12 +19,12 @@ describe Marty::Promise, slow: true do
 
   before(:each) do
     @time = DateTime.now
-    expect(Marty::Promise.unscoped.count).to eq(0)
+    expect(Marty::Promise.count).to eq(0)
     engine = Marty::ScriptSet.new.get_engine(NAME_A)
     engine.background_eval("Y", {"p_title" => NAME_A}, ["d"])
     sleep 5
     Marty::Promise.cleanup
-    expect(Marty::Promise.unscoped.count).to eq(10)
+    expect(Marty::Promise.count).to eq(10)
   end
 
   after(:each) do
@@ -40,24 +40,24 @@ describe Marty::Promise, slow: true do
   it "should retain jobs that were run less than 4 hours ago" do
     Timecop.freeze(@time + 4.hours)
     Marty::Promise.cleanup
-    expect(Marty::Promise.unscoped.count).to eq(10)
+    expect(Marty::Promise.count).to eq(10)
   end
 
   it "should cleanup jobs that are older than 4 hours" do
     Timecop.freeze(@time + 4.hours + 1.minute)
     Marty::Promise.cleanup
-    expect(Marty::Promise.unscoped.count).to eq(0)
+    expect(Marty::Promise.count).to eq(0)
   end
 
   it "should allow cleanup of all jobs when forced by admin" do
     Timecop.freeze(@time + 4.hours)
     Marty::Promise.cleanup(true)
-    expect(Marty::Promise.unscoped.count).to eq(0)
+    expect(Marty::Promise.count).to eq(0)
   end
 
   it "should provide a live search scope for filtering by user or role" do
-    expect(Marty::Promise.live_search('XXX').size).to eq(0)
-    expect(Marty::Promise.live_search('marty').size).to eq(10)
-    expect(Marty::Promise.live_search('Admin').size).to eq(10)
+    expect(Marty::VwPromise.live_search('XXX').size).to eq(0)
+    expect(Marty::VwPromise.live_search('marty').size).to eq(10)
+    expect(Marty::VwPromise.live_search('Admin').size).to eq(10)
   end
 end

data/spec/models/rule_spec.rb

@@ -80,28 +80,28 @@ module Marty::RuleSpec
       it "detects errors in computed guards" do
         @rule_type = "SimpleRule"
         @computed_guards = {"guard1"=> "zvjsdf12.z8*"}
-        exp = /Computed - Error in rule 'testrule' field 'computed_guards': syntax error/
+        exp = /Computed - Error in rule 'testrule' field 'computed_guards': Syntax error/
         expect{subject}.to raise_error(exp)
       end
       it "detects errors in computed results" do
         @rule_type = "SimpleRule"
         @results = {"does_not_compute"=> "zvjsdf12.z8*"}
         @grids = {"grid1"=>"DataGrid1","grid2"=>"DataGrid2"}
-        exp = /Computed - Error in rule 'testrule' field 'results': syntax error/
+        exp = /Computed - Error in rule 'testrule' field 'results': Syntax error/
         expect{subject}.to raise_error(exp)
       end
       it "detects errors in computed results 2" do
         @rule_type = "SimpleRule"
         @results = {"does_not_compute"=> "zvjsdf12.z8*"}
         @grids = {"grid1"=>"DataGrid1","grid2"=>"DataGrid1","grid3"=>"DataGrid3"}
-        exp = /Computed - Error in rule 'testrule' field 'results': syntax error/
+        exp = /Computed - Error in rule 'testrule' field 'results': Syntax error/
         expect{subject}.to raise_error(exp)
       end
       it "detects errors in computed results 3" do
         @rule_type = "SimpleRule"
         @results = {"does_not_compute"=> "zvjsdf12.z8*"}
         @grids = {"grid1"=>"DataGrid1","grid2"=>"DataGrid1","grid3"=>"DataGrid1"}
-        exp = /Computed - Error in rule 'testrule' field 'results': syntax error/
+        exp = /Computed - Error in rule 'testrule' field 'results': Syntax error/
         expect{subject}.to raise_error(exp)
       end
       it "reports bad grid names" do
@@ -141,19 +141,19 @@ module Marty::RuleSpec
       it "detects script errors" do
         @rule_type = 'XRule'
         @results = {"x"=>"zx sdf wer"}
-        exp = /Computed - Error in rule 'testrule' field 'results': syntax error/
+        exp = /Computed - Error in rule 'testrule' field 'results': Syntax error/
         expect{subject}.to raise_error(exp)
       end
       it "rule script stuff overrides 1" do
         @rule_type = 'XRule'
         @computed_guards = {"abc"=>"true", "xyz_guard"=> "err err err"}
-        exp = /Computed - Error in rule 'testrule' field 'xyz': syntax error/
+        exp = /Computed - Error in rule 'testrule' field 'xyz': Syntax error/
         expect{subject}.to raise_error(exp)
       end
       it "rule script stuff overrides 2" do
         @rule_type = 'XRule'
         @computed_guards = {"abc"=>"err err err", "xyz_guard"=> "xyz_param"}
-        exp = /Computed - Error in rule 'testrule' field 'computed_guards': syntax error/
+        exp = /Computed - Error in rule 'testrule' field 'computed_guards': Syntax error/
         expect{subject}.to raise_error(exp)
       end
       it "rule script stuff overrides 3" do

data/spec/spec_helper.rb

@@ -47,7 +47,7 @@ class ActiveRecord::Base
   end
 end
 
-register_chrome_driver
+register_chrome_driver(:chrome, chromeOptions: { args: %w[start-maximized]})
 register_chrome_driver(:headless,
                        chromeOptions: {
                          args: %w[headless disable-gpu window-size=3840,2160]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.3.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.37
+        version: 0.4.00
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.37
+        version: 0.4.00
 - !ruby/object:Gem::Dependency
   name: mcfly
   requirement: !ruby/object:Gem::Requirement
@@ -207,9 +207,11 @@ files:
 - app/components/marty/extras/layout.rb
 - app/components/marty/extras/misc.rb
 - app/components/marty/form.rb
+- app/components/marty/form/client/form.css
 - app/components/marty/grid.rb
 - app/components/marty/grid_append_only.rb
 - app/components/marty/import_type_view.rb
+- app/components/marty/import_view.rb
 - app/components/marty/live_search_grid_panel.rb
 - app/components/marty/log_view.rb
 - app/components/marty/main_auth_app.rb
@@ -435,6 +437,7 @@ files:
 - app/models/marty/token.rb
 - app/models/marty/user.rb
 - app/models/marty/user_role.rb
+- app/models/marty/vw_promise.rb
 - app/views/layouts/marty/application.html.erb
 - app/views/marty/diagnostic/diag.html.erb
 - app/views/marty/diagnostic/op.html.erb
@@ -480,6 +483,8 @@ files:
 - db/migrate/303_create_marty_logs.rb
 - db/migrate/304_drop_marty_api_logs.rb
 - db/migrate/400_create_dg_plv8_v1_fns.rb
+- db/migrate/410_jsonb_promise_result.rb
+- db/migrate/411_create_vw_promises.rb
 - db/seeds.rb
 - delorean/diagnostics.dl
 - delorean/script_report.dl
@@ -491,7 +496,7 @@ files:
 - lib/marty/data_exporter.rb
 - lib/marty/data_importer.rb
 - lib/marty/engine.rb
-- lib/marty/javascript/overrides.js
+- lib/marty/javascript/grid_view_in_form.js
 - lib/marty/json_schema.rb
 - lib/marty/logger.rb
 - lib/marty/mcfly_model.rb