marty 2.5.2 → 2.5.4

data/spec/controllers/rpc_import_spec.rb

@@ -3,43 +3,42 @@ require 'spec_helper'
 describe Marty::RpcController do
   before(:each) { @routes = Marty::Engine.routes }
 
-  before(:each) {
+  before(:each) do
     @tags = []
     @tags << Marty::Script.load_script_bodies({
-                         "A" => "A:\n    a = 1\n",
-                         "B" => "B:\n    b = 0\n",
+                         'A' => "A:\n    a = 1\n",
+                         'B' => "B:\n    b = 0\n",
                        }, Date.today)
 
     @tags << Marty::Script.load_script_bodies({
-                         "B" => "import A\nB:\n    b = A::A().a\n",
+                         'B' => "import A\nB:\n    b = A::A().a\n",
                        }, Date.today + 1.minute)
 
     @tags << Marty::Script.load_script_bodies({
-                         "A" => "A:\n    a = 2\n",
+                         'A' => "A:\n    a = 2\n",
                        }, Date.today + 2.minute)
 
-
     # create an untagged version for DEV
-    s = Marty::Script.find_by(obsoleted_dt: 'infinity', name: "A")
+    s = Marty::Script.find_by(obsoleted_dt: 'infinity', name: 'A')
     s.body = "A:\n    a = 3\n"
     s.save!
-  }
+  end
 
   let(:tags) { @tags }
 
-  it "should properly import different versions of a script" do
+  it 'should properly import different versions of a script' do
     # try the test 3 times for fun
-    (0..2).each {
-      tags.each_with_index { |t, i|
+    (0..2).each do
+      tags.each_with_index do |t, i|
         get 'evaluate', params: {
               format: :json,
-              script: "B",
-              node: "B",
-              attrs: "b",
+              script: 'B',
+              node: 'B',
+              attrs: 'b',
               tag: t.name,
             }
         response.body.should == i.to_json
-      }
-    }
+      end
+    end
   end
 end

data/spec/dummy/delorean/blame_report.dl

@@ -1,10 +1,10 @@
-import Fields
+import MartyFields
 import Styles
 
-PostingField2: Fields::PostingField2
-    store = ["NOW"] + Marty::Posting.
-                   where("created_dt <> 'infinity'").
-                   order("created_dt DESC").limit(10).pluck("name")
+PostingField2: MartyFields::PostingField2
+    store = [ ["NOW", "NOW"] ] + [ [ lp.name, lp.name + ' (' + lp.comment + ')']
+                       for lp in Marty::Posting.get_latest_by_type(
+                         20, ['BASE', 'INTRA', 'CLOSE'])]
 
 StyleRow:
     profile     =?
@@ -59,8 +59,9 @@ ModelRows:
     klass       =?
     t1          =?
     t2          =?
+    ids         =?
 
-    groups = Marty::DataChange.changes(t1, t2, klass)
+    groups = Marty::DataChange.changes(t1, t2, klass, ids)
 
     headers = ["Group ID", "Created", "By", "Deleted", "By"] +
         Marty::DataChange.class_headers(klass)
@@ -83,6 +84,10 @@ ModelRows:
     count       = row_groups.length
     ws          = if count > 0 then [klass, rows] else nil
 
+OptionalIDsField: MartyFields::TextField
+    field_label = "Group IDs (optional)"
+    name = "restrict_to_ids"
+
 DataBlameReport:
     title = "Data Blame Report"
 
@@ -95,16 +100,18 @@ DataBlameReport:
     t2          = posting2.created_dt
 
     class_list  =? false
+    restrict_to_ids =? nil
 
     form = [
-        Fields::PostingField1,
+        MartyFields::PostingField1,
         PostingField2,
-        Fields::ClassListField,
+        MartyFields::ClassListField,
+        OptionalIDsField
         ]
 
-    ts = if Gemini::Helper.infinity_dt(t1)
+    ts = if Marty::Helper.infinity_dt(t1)
          then [t2, t1]
-         else if Gemini::Helper.infinity_dt(t2)
+         else if Marty::Helper.infinity_dt(t2)
               then [t1, t2]
               else [t1, t2].sort
 
@@ -112,8 +119,17 @@ DataBlameReport:
         then Marty::DataChange.sanitize_classes(class_list)
         else Marty::DataChange.class_list
 
-    result = [
-        ModelRows(t1 = ts[0], t2 = ts[1], klass = klass).ws
+    ids = if restrict_to_ids
+        then [ idstr.to_i for idstr in restrict_to_ids.split(',') ]
+        else nil
+
+    ids_check = if ids && ids.length > 0 && sanitized.length > 1
+        then ERR("Can't specify Group IDs if more than one class selected")
+        else true
+
+    result = ids_check && [
+        ModelRows(t1 = ts[0], t2 = ts[1], klass = klass,
+                  ids = ids).ws
         for klass in sanitized
         ].compact
 
@@ -143,7 +159,7 @@ DataBlameReportSummary:
     t2          = posting2.created_dt
 
     form = [
-        Fields::PostingField1,
+        MartyFields::PostingField1,
         PostingField2,
         ]
 
@@ -157,9 +173,9 @@ DataBlameReportSummary:
         Styles::Style.m_hdr_style0,
         ]
 
-    ts = if Gemini::Helper.infinity_dt(t1)
+    ts = if Marty::Helper.infinity_dt(t1)
          then [t2, t1]
-         else if Gemini::Helper.infinity_dt(t2)
+         else if Marty::Helper.infinity_dt(t2)
               then [t1, t2]
               else [t1, t2].sort
 
@@ -171,3 +187,82 @@ DataBlameReportSummary:
     header = [["row", r, {"style" : [Styles::Style.s_hdr]}] for r in postings]
     result = [[title,[hrow] + rows, {"widths" : [30]}], ["Parameters", header]]
     format = "xlsx"
+
+DeadReferenceReport:
+    title = "Dead Reference Report"
+
+    class_list =? false
+    pt_name    =?
+    posting    =? Marty::Posting.lookup(pt_name)
+
+    sanitized = if class_list
+        then Marty::DataChange.sanitize_classes(class_list)
+        else Marty::DataChange.class_list
+
+    form = [
+        MartyFields::PostingField,
+        MartyFields::ClassListField,
+        ]
+
+    result = [
+        [[[klass, attr, obj].flatten for obj in list]
+         for attr, list in Marty::DataChange.dead_refs(posting.created_dt,
+                                                       klass)].flatten(1)
+        for klass in sanitized
+        ].flatten(1)
+
+    format = "csv"
+
+######################################################################
+
+DataImportParam:
+    field_label = "Input Rows"
+    name        = "data_import_field"
+    xtype       = ":textareafield"
+    scrollable = true
+    field_style = {
+        "font_family": 'courier new',
+        "font_size":   '12px',
+        }
+    height      =  600
+
+CommaSepField: MartyFields::CheckboxField
+    name        = "comma_sep"
+    field_label = "Comma Separated"
+
+DiffReport:
+    title = "Diff Report"
+
+    class_name        =? false
+    data_import_field =?
+    comma_sep         =? false
+
+    klass = Marty::Helper.constantize(class_name)
+
+    col_types = Marty::Helper.get_column_types(klass)
+    data      = Marty::Helper.parse_csv_to_hash(
+        data_import_field, comma_sep, col_types)
+
+    diff = Marty::DataChange.diff(klass, data)
+
+    result = [{"title"  : "different",
+               "format" : "csv",
+               "result" : diff["different"].flatten},
+              {"title"  : "same",
+               "format" : "csv",
+               "result" : diff["same"]},
+              {"title"  : "only_input",
+               "format" : "csv",
+               "result" : diff["only_input"]},
+              {"title"  : "only_source",
+               "format" : "csv",
+               "result" : diff["only_source"]},
+              ]
+
+    form = [
+        MartyFields::ClassField,
+        DataImportParam,
+        CommaSepField,
+        ]
+
+    format = "zip"

data/spec/dummy/delorean/data_report.dl

@@ -1,4 +1,4 @@
-import Fields
+import MartyFields
 import Styles
 
 ######################################################################
@@ -23,8 +23,8 @@ TableReport:
     row_count   = result_raw.length
     result      = Gemini::Helper.to_csv(result_raw)
     form        = [
-        Fields::PostingField,
-        Fields::ClassField,
+        MartyFields::PostingField,
+        MartyFields::ClassField,
         ]
     format      = "csv"
 
@@ -61,7 +61,7 @@ EnumReport:
 
 #####################################################################
 
-DataImportParam: Fields::CsvField
+DataImportParam: MartyFields::CsvField
     field_label = "Import Text"
     name        = "data_import_field"
     height      =  600

data/spec/dummy/delorean/marty_fields.dl

@@ -0,0 +1,63 @@
+PostingField:
+    field_label = "Posting"
+    xtype       = ":combo"
+    name        = "pt_name"
+    store       =  Marty::Posting.
+                   where("created_dt <> 'infinity'").
+                   order("created_dt DESC").limit(10).pluck("name")
+    value       = store[0]
+
+######################################################################
+
+PostingField1: PostingField
+    field_label = "Posting 1"
+    name        = "pt_name1"
+
+PostingField2: PostingField
+    field_label = "Posting 2"
+    name        = "pt_name2"
+
+######################################################################
+
+ClassListField:
+    field_label = "Tables"
+    xtype       = ":multiselectcombo"
+    name        = "class_list"
+    store       = Marty::DataChange.class_list
+
+ClassField: ClassListField
+    xtype       = ":combo"
+    name        = "class_name"
+    store       = Marty::DataChange.class_list
+
+######################################################################
+
+
+CheckboxField:
+    xtype           = ":checkboxfield"
+    checked         = false
+    input_value     = true
+    unchecked_value = false
+
+######################################################################
+
+JsonField:
+    xtype       = ":textareafield"
+    name        = "json_field"
+    field_label = "JSON"
+    auto_scroll = true
+    spellcheck  = false
+    field_style = {
+        "font_family": 'courier new',
+        "font_size": '12px'
+        }
+    height      = 400
+
+CsvField: JsonField
+    field_label = "CSV"
+    name        = "csv_field"
+
+TextField:
+    xtype        = ":textfield"
+    field_label  = "Text"
+    name         = "text_field"

data/spec/dummy/delorean/table_report.dl

@@ -0,0 +1,34 @@
+import MartyFields
+import Styles
+
+ReadableField: MartyFields::CheckboxField
+    name        = "readable"
+    field_label = "Disable Encoding"
+
+TableReport:
+    readable    =? nil
+    pt_name     =? nil
+    posting     = Marty::Posting.lookup(pt_name)
+    pt          = posting.created_dt
+    module_name =? nil
+    class_name  =? nil
+    title       =? (class_name || "Table Report") + (
+        if pt_name then "_" + pt_name else "")
+    sort_field  =? nil
+    exclude_attrs =? nil
+
+    result_raw  = Marty::DataChange.do_export(
+        pt,
+        if module_name then module_name + '::' + class_name else class_name,
+        sort_field,
+        exclude_attrs || [],
+        )
+    row_count   = result_raw.length
+    result      = Marty::Helper.to_csv(result_raw, {'readable' : readable})
+    form        = [
+        MartyFields::PostingField,
+        MartyFields::ClassField,
+        ReadableField,
+        ]
+    format      = "csv"
+

data/spec/features/auth_app_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature 'Posting workflows', js: true do
-
   before(:all) do
     @clean_file = "/tmp/clean_#{Process.pid}.psql"
     save_clean_db(@clean_file)
@@ -56,7 +55,7 @@ feature 'Posting workflows', js: true do
     end
 
     and_by 'can see that we are time warped' do
-      expect(page).to have_content "TIME WARPED"
+      expect(page).to have_content 'TIME WARPED'
     end
   end
 

data/spec/features/data_import_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature 'under Applications menu, Reports using  Data Import', js: true do
-
   before(:all) do
     marty_whodunnit
     @clean_file = "/tmp/clean_#{Process.pid}.psql"
@@ -67,7 +66,7 @@ feature 'under Applications menu, Reports using  Data Import', js: true do
       and_by 'select Data Import node' do
         wait_for_ajax
 
-        #hacky: assumes only 1 combobox without label
+        # hacky: assumes only 1 combobox without label
         within(:gridpanel, 'report_select', match: :first, wait: 5) do
           # hacky, hardcoding netzkecombobox dropdown arrow name
           arrow = find(:input, 'nodename')['data-componentid'] + '-trigger-picker'
@@ -136,7 +135,7 @@ feature 'under Applications menu, Reports using  Data Import', js: true do
       and_by 'select Data Import node' do
         wait_for_ajax
 
-        #hacky: assumes only 1 combobox without label
+        # hacky: assumes only 1 combobox without label
         within(:gridpanel, 'report_select', match: :first) do
           # hacky, hardcoding netzkecombobox dropdown arrow name
           arrow = find(:input, 'nodename')['data-componentid'] + '-trigger-picker'

data/spec/features/enum_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature 'test netzke + pg_enum compatibility', js: true do
-
   before(:all) do
     @clean_file = "/tmp/clean_#{Process.pid}.psql"
     save_clean_db(@clean_file)
@@ -14,7 +13,6 @@ feature 'test netzke + pg_enum compatibility', js: true do
   end
 
   it 'shows netzke grid combobox works w pg_enums' do
-
     lp_grid = netzke_find('loan_program_view')
     @amort_combo = netzke_find('amortization_type__name', 'combobox')
     @mortgage_combo = netzke_find('mortgage_type__name', 'combobox')
@@ -42,14 +40,13 @@ feature 'test netzke + pg_enum compatibility', js: true do
       press('Loan Programs')
     end
 
-
     and_by 'bring up new window' do
       press('Add')
     end
 
     and_by 'fill form minus enum value' do
       within(:gridpanel, 'add_window', match: :first) do
-        fill_in("Name", with: 'a_l_p')
+        fill_in('Name', with: 'a_l_p')
 
         @amort_combo.click
         @amort_combo.select_values('Fixed')
@@ -73,20 +70,20 @@ feature 'test netzke + pg_enum compatibility', js: true do
 
     and_by 'fill form w enum value & duplicated name (error), then fix' do
       within(:gridpanel, 'add_window', match: :first) do
-        fill_in("Name", with: 'a_l_p')
-        setup_enum_form("CA")
+        fill_in('Name', with: 'a_l_p')
+        setup_enum_form('CA')
         press('OK')
 
         expect(find(:msg)).to have_content 'Name - record must be unique'
 
-        fill_in("Name", with: 'a_l_p_2')
+        fill_in('Name', with: 'a_l_p_2')
         press('OK')
       end
 
       wait_for_ajax
       aggregate_failures do
         expect(lp_grid.row_count).to eq(2)
-        expect(lp_grid.get_row_vals(2)).to netzke_include({enum_state: 'CA'})
+        expect(lp_grid.get_row_vals(2)).to netzke_include(enum_state: 'CA')
       end
     end
 
@@ -104,15 +101,15 @@ feature 'test netzke + pg_enum compatibility', js: true do
 
     and_by 'fill form w --- for enum value' do
       within(:gridpanel, 'add_window', match: :first) do
-        fill_in("Name", with: 'a_l_p')
-        setup_enum_form("---")
+        fill_in('Name', with: 'a_l_p')
+        setup_enum_form('---')
         press('OK')
       end
 
       wait_for_ajax
       aggregate_failures do
         expect(lp_grid.row_count).to eq(2)
-        expect(lp_grid.get_row_vals(1)).to netzke_include({enum_state: nil})
+        expect(lp_grid.get_row_vals(1)).to netzke_include(enum_state: nil)
       end
     end
 
@@ -128,63 +125,62 @@ feature 'test netzke + pg_enum compatibility', js: true do
       expect(lp_grid.row_count).to eq(0)
     end
 
-    and_by "bring up new window" do
-      press("Add")
+    and_by 'bring up new window' do
+      press('Add')
     end
 
-    and_by "fill form with state_enum DC" do
-      within(:gridpanel, "add_window", match: :first) do
-        fill_in("Name", with: "DC Row")
-        setup_enum_form("DC")
-        press("OK")
+    and_by 'fill form with state_enum DC' do
+      within(:gridpanel, 'add_window', match: :first) do
+        fill_in('Name', with: 'DC Row')
+        setup_enum_form('DC')
+        press('OK')
       end
     end
 
-    and_by "bring up new window" do
-      press("Add")
+    and_by 'bring up new window' do
+      press('Add')
     end
 
-    and_by "fill form with state_enum AS" do
-      within(:gridpanel, "add_window", match: :first) do
-        fill_in("Name", with: "AS Row")
-        setup_enum_form("AS")
-        press("OK")
+    and_by 'fill form with state_enum AS' do
+      within(:gridpanel, 'add_window', match: :first) do
+        fill_in('Name', with: 'AS Row')
+        setup_enum_form('AS')
+        press('OK')
       end
     end
 
-    and_by "bring up new window" do
-      press("Add")
+    and_by 'bring up new window' do
+      press('Add')
     end
 
-    and_by "fill form with state_enum WA" do
-      within(:gridpanel, "add_window", match: :first) do
-        fill_in("Name", with: "WA Row")
-        setup_enum_form("WA")
-        press("OK")
+    and_by 'fill form with state_enum WA' do
+      within(:gridpanel, 'add_window', match: :first) do
+        fill_in('Name', with: 'WA Row')
+        setup_enum_form('WA')
+        press('OK')
       end
     end
 
-    and_by "bring up new window" do
-      press("Add")
+    and_by 'bring up new window' do
+      press('Add')
     end
 
-    and_by "fill form with state_enum AZ" do
-      within(:gridpanel, "add_window", match: :first) do
-        fill_in("Name", with: "AZ Row")
-        setup_enum_form("AZ")
-        press("OK")
+    and_by 'fill form with state_enum AZ' do
+      within(:gridpanel, 'add_window', match: :first) do
+        fill_in('Name', with: 'AZ Row')
+        setup_enum_form('AZ')
+        press('OK')
       end
     end
 
-    and_by "filter form by state_enum ASCENDING" do
-      press("Enum state")
-      expect(lp_grid.get_col_vals(:enum_state)).to eq(["AS","AZ","DC","WA"])
+    and_by 'filter form by state_enum ASCENDING' do
+      press('Enum state')
+      expect(lp_grid.get_col_vals(:enum_state)).to eq(['AS', 'AZ', 'DC', 'WA'])
     end
 
-    and_by "filter form by state_enum DESCENDING" do
-      press("Enum state")
-      expect(lp_grid.get_col_vals(:enum_state)).to eq(["WA","DC","AZ","AS"])
+    and_by 'filter form by state_enum DESCENDING' do
+      press('Enum state')
+      expect(lp_grid.get_col_vals(:enum_state)).to eq(['WA', 'DC', 'AZ', 'AS'])
     end
-
   end
 end