marty 9.3.0 → 9.3.2

data/lib/marty/data_conversion.rb

@@ -203,7 +203,7 @@ class Marty::DataConversion
           # got an id for an association -- FIXME: perhaps this should
           # not be allowed at all?
           raise "#{type[:assoc_class].name} with id #{v} not found" unless
-            type[:assoc_class].find_by_id(v)
+            type[:assoc_class].find_by(id: v)
 
           h[ga] = v
         else

data/lib/marty/migrations.rb

@@ -201,7 +201,7 @@ EOSQL
     end.group_by { |a| a[:name] }.each do |_k, v|
       v.sort! { |a, b| b[:version] <=> a[:version] }
     end
-    time_now = Time.now.utc
+    time_now = Time.zone.now.utc
     gen_count = 0
 
     sql_files.each do |sql|
@@ -224,7 +224,7 @@ EOSQL
       File.open(sql_snap_literal, 'w') do |f|
         f.print sql_lines.join
       end
-      puts "creating #{newbase}.rb"
+      Rails.logger.info "creating #{newbase}.rb"
 
       # only split on "GO" at the start of a line with optional whitespace
       # before EOL.  GO in comments could trigger this and will cause an error

data/lib/marty/rpc_call.rb

@@ -25,7 +25,7 @@ class Marty::RpcCall
     end
 
     res = JSON.parse(response.body)
-    raise res['error'] if res.is_a?(Hash) && !res['error'].blank?
+    raise res['error'] if res.is_a?(Hash) && res['error'].present?
 
     res
   end
@@ -55,6 +55,7 @@ class Marty::RpcCall
     http = Net::HTTP.new(host, port)
     request = Net::HTTP::Post.new(path)
     http.use_ssl = use_ssl
+    http.ciphers = options[:ciphers] if options[:ciphers]
     http.read_timeout = options[:read_timeout] if options[:read_timeout]
     http.open_timeout = options[:open_timeout] if options[:open_timeout]
     request.add_field('Content-Type', 'xml')

data/lib/marty/rule_script_set.rb

@@ -28,9 +28,7 @@ class Marty::RuleScriptSet < Delorean::AbstractContainer
     super()
   end
 
-  def parse_check(sname, body)
-    sset.parse_check(sname, body)
-  end
+  delegate :parse_check, to: :sset
 
   def write_attr(k, v)
     equals, rhs = v == :parameter ? [' =?', ''] :

data/lib/marty/util.rb

@@ -1,6 +1,6 @@
 module Marty::Util
   def self.set_posting_id(sid)
-    snap = Marty::Posting.find_by_id(sid)
+    snap = Marty::Posting.find_by(id: sid)
     sid = nil if snap && (snap.created_dt == Float::INFINITY)
     Netzke::Base.session[:posting] = sid
   end
@@ -9,7 +9,7 @@ module Marty::Util
     sid = Netzke::Base.session && Netzke::Base.session[:posting]
     return unless sid.is_a? Integer
 
-    sid && Marty::Posting.find_by_id(sid)
+    sid && Marty::Posting.find_by(id: sid)
   end
 
   def self.get_posting_time

data/lib/marty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Marty
-  VERSION = '9.3.0'
+  VERSION = '9.3.2'
 end

data/lib/tasks/scripts_tasks.rake

@@ -6,8 +6,8 @@ namespace :marty do
 
   desc 'load scripts from the LOAD_DIR directory'
   task load_scripts: :environment do
-    Mcfly.whodunnit = Marty::User.find_by_login(
-      Rails.configuration.marty.system_account
+    Mcfly.whodunnit = Marty::User.find_by(
+      login: Rails.configuration.marty.system_account
     )
 
     raise 'must have system user account seeded' unless Mcfly.whodunnit

data/marty.gemspec

@@ -7,6 +7,10 @@ require 'zlib'
 require 'csv'
 require 'pathname'
 
+git_tracked_files = `git ls-files`.split($\)
+gem_ignored_files = `git ls-files -i -X .gemignore`.split($\)
+files = git_tracked_files - gem_ignored_files
+
 Gem::Specification.new do |s|
   s.name        = 'marty'
   s.version     = Marty::VERSION
@@ -24,7 +28,7 @@ Gem::Specification.new do |s|
   s.summary     = 'A framework for working with versioned data'
   s.description =
     'Marty is a framework for viewing and reporting on versioned data.'
-  s.files       = `git ls-files`.split($\)
+  s.files       = files
   s.licenses    = ['MIT']
   # used for signing aws ec2 requests
   s.add_dependency 'actioncable'

data/spec/controllers/job_controller_spec.rb

@@ -17,7 +17,7 @@ describe Marty::JobController, slow: true do
     # means we lose the globally set uesr
     Mcfly.whodunnit = system_user
 
-    Marty::Script.load_script_bodies(promise_bodies, Date.today)
+    Marty::Script.load_script_bodies(promise_bodies, Time.zone.today)
 
     start_delayed_job
   end
@@ -111,7 +111,7 @@ describe Marty::JobController, slow: true do
     res = engine.background_eval('Z', { 'p_title' => NAME_C }, ['result'])
     wait_for_jobs
 
-    promise = Marty::Promise.find_by_title(NAME_C)
+    promise = Marty::Promise.find_by(title: NAME_C)
 
     get 'download', params: {
       job_id: promise.id,
@@ -126,7 +126,7 @@ describe Marty::JobController, slow: true do
     engine.background_eval('Z', { 'p_title' => NAME_E }, ['result'])
     wait_for_jobs
 
-    promise = Marty::Promise.find_by_title(NAME_E)
+    promise = Marty::Promise.find_by(title: NAME_E)
 
     res = promise.result['result']
 
@@ -167,7 +167,7 @@ describe Marty::JobController, slow: true do
     engine.background_eval('Y', { 'p_title' => title }, ['d'])
     sleep 5
 
-    promise = Marty::Promise.find_by_title(title)
+    promise = Marty::Promise.find_by(title: title)
 
     res = { 'd' => [
       { 'z' => 0.875, 'a' => { 'b' => { 'e' => 0.125 } } },
@@ -194,7 +194,7 @@ describe Marty::JobController, slow: true do
                           )
     sleep 5
 
-    promise = Marty::Promise.find_by_title(NAME_B)
+    promise = Marty::Promise.find_by(title: NAME_B)
 
     expect(promise.result).to eq(
       'result' => [{ 'a' => 1, 'b' => 1 }, { 'a' => 2, 'b' => 4 }, { 'a' => 3, 'b' => 9 }],
@@ -237,8 +237,8 @@ describe Marty::JobController, slow: true do
     engine = Marty::ScriptSet.new.get_engine(NAME_G)
     res = engine.evaluate('V', 'result', {})
     expect(res).to eq [123]
-    p1 = Marty::Promise.find_by_title(NAME_G.to_s)
-    p2 = Marty::Promise.find_by_title("#{NAME_G}2")
+    p1 = Marty::Promise.find_by(title: NAME_G.to_s)
+    p2 = Marty::Promise.find_by(title: "#{NAME_G}2")
     expect(p2.parent_id).to eq p1.id
   end
 end

data/spec/controllers/rpc_controller_spec.rb

@@ -438,7 +438,7 @@ describe Marty::RpcController do
   end
 
   before(:each) do
-    @p0 = Marty::Posting.do_create('BASE', Date.today, 'a comment')
+    @p0 = Marty::Posting.do_create('BASE', Time.zone.today, 'a comment')
 
     @t1 = Marty::Script.load_script_bodies({
                          'M1' => sample_script,
@@ -463,16 +463,16 @@ describe Marty::RpcController do
                          'M9Schemas' => script9_schema,
                          'M10Schemas' => script10_schema,
                          'M11Schemas' => script11_schema,
-                       }, Date.today + 1.minute)
+                        }, Time.zone.today + 1.minute)
 
-    @p1 = Marty::Posting.do_create('BASE', Date.today + 2.minute, 'a comment')
+    @p1 = Marty::Posting.do_create('BASE', Time.zone.today + 2.minutes, 'a comment')
 
     @t2 = Marty::Script.load_script_bodies({
                          'M1' =>
                          sample_script.gsub(/A/, 'AA') + '    e =? "hello"',
-                       }, Date.today + 3.minute)
+                        }, Time.zone.today + 3.minutes)
 
-    @p2 = Marty::Posting.do_create('BASE', Date.today + 4.minute, 'a comment')
+    @p2 = Marty::Posting.do_create('BASE', Time.zone.today + 4.minutes, 'a comment')
     @data = [['some data', 7, [1, 2, 3], { foo: 'bar', baz: 'quz' }, 5, 'string'],
              ['some more data', [1, 2, 3], 5, { foo: 'bar', baz: 'quz' }, 5, 'string']]
     @data_json = @data.to_json
@@ -517,7 +517,7 @@ describe Marty::RpcController do
     expect(res).to include('job_id')
     job_id = res['job_id']
 
-    promise = Marty::Promise.find_by_id(job_id)
+    promise = Marty::Promise.find_by(id: job_id)
 
     expect(promise.result).to eq('e' => 4)
 
@@ -542,7 +542,7 @@ describe Marty::RpcController do
     job_id = res['job_id']
 
     marty_whodunnit
-    Marty::Script.load_scripts(File.join(Rails.root, '../../delorean'), Date.today)
+    Marty::Script.load_scripts(Rails.root.join('../../delorean'), Time.zone.today)
 
     post 'evaluate', params: {
            format: :json,
@@ -574,7 +574,7 @@ describe Marty::RpcController do
     expect(res).to include('job_id')
     job_id = res['job_id']
 
-    promise = Marty::Promise.find_by_id(job_id)
+    promise = Marty::Promise.find_by(id: job_id)
 
     expect(promise.result).to eq('e' => 4)
 

data/spec/controllers/rpc_import_spec.rb

@@ -8,15 +8,15 @@ describe Marty::RpcController do
     @tags << Marty::Script.load_script_bodies({
                          'A' => "A:\n    a = 1\n",
                          'B' => "B:\n    b = 0\n",
-                       }, Date.today)
+                        }, Time.zone.today)
 
     @tags << Marty::Script.load_script_bodies({
                          'B' => "import A\nB:\n    b = A::A().a\n",
-                       }, Date.today + 1.minute)
+                        }, Time.zone.today + 1.minute)
 
     @tags << Marty::Script.load_script_bodies({
                          'A' => "A:\n    a = 2\n",
-                       }, Date.today + 2.minute)
+                        }, Time.zone.today + 2.minutes)
 
     # create an untagged version for DEV
     s = Marty::Script.find_by(obsoleted_dt: 'infinity', name: 'A')

data/spec/features/data_blame_report_spec.rb

@@ -12,7 +12,7 @@ feature 'Data Blame report', js: true do
   end
 
   def with_user(uname)
-    u = Marty::User.find_by_login(uname)
+    u = Marty::User.find_by(login: uname)
     begin
       old_u, Mcfly.whodunnit = Mcfly.whodunnit, u
       yield(u)

data/spec/features/data_grid_spec.rb

@@ -10,10 +10,15 @@ feature 'data grid view', js: true, speed: :super_slow do
     Marty::Script.load_scripts
     dt = DateTime.parse('2017-1-1')
     p = File.expand_path('../../fixtures/misc', __FILE__)
-    Dir.glob(p + '/data_grid_*.txt').each do |path|
+    Dir.glob(p + '/data_grid_*.txt').sort.each do |path|
+      next if path.include?('data_grid_7')
+
       n = File.basename(path, '.txt').camelize
       Marty::DataGrid.create_from_import(n, File.read(path), dt)
     end
+    path = p + '/data_grid_7.txt'
+    Marty::DataGrid.create_from_import('DataGrid7', File.read(path),
+                                       dt + 1.second)
     u = Marty::User.create!(login: 'grid_user',
                             firstname: 'grid',
                             lastname: 'user',
@@ -295,7 +300,7 @@ feature 'data grid view', js: true, speed: :super_slow do
     log_in_as('marty')
     go_to_data_grids
     dgv = netzke_find('data_grid_view')
-    grids = dgv.get_col_vals('name', 5)
+    grids = dgv.get_col_vals('name', 6)
     set_one = lambda do |grid, perms|
       pos = grids.index(grid) + 1
       dgv.select_row(pos)
@@ -398,7 +403,7 @@ feature 'data grid view', js: true, speed: :super_slow do
     log_in_as('grid_user')
     go_to_data_grids(admin: false)
     dgv = netzke_find('data_grid_user_view')
-    grids = dgv.get_col_vals('name', 5)
+    grids = dgv.get_col_vals('name', 9)
 
     # now test some editing, saving, and cancel logic
     get_latest = lambda do
@@ -407,6 +412,99 @@ feature 'data grid view', js: true, speed: :super_slow do
     grid = get_latest.call
     grid.constraint = '>=0<200'
     grid.save!
+
+    # check boolean validation
+    pos = grids.index('DataGrid6') + 1
+    dgv.select_row(pos)
+    press('Edit Grid')
+    wait_for_ajax
+    grid_setup
+    cell_edit(3, 0, 'bad')
+    press('Save')
+    expect(page).to have_content('error: some entries failed constraint or '\
+                                 'data type check')
+    press('OK')
+    wait_for_ajax
+    press('Cancel')
+    press('Yes')
+    wait_for_ajax
+    press('Edit Grid')
+    wait_for_ajax
+    # test saving and validation etc
+    grid_setup
+    cell_edit(3, 0, 'true')
+    cell_edit(3, 2, 'true')
+    press('Save')
+    wait_for_ajax
+    dg_data = Marty::DataGrid.mcfly_pt('infinity').find_by(name: 'DataGrid6').
+                data.flatten
+    expect(dg_data).to eq([true, false, true, false])
+
+    # class validation
+    pos = grids.index('DataGrid7') + 1
+    dgv.select_row(pos)
+    press('Edit Grid')
+    wait_for_ajax
+    grid_setup
+    cell_edit(1, 0, 'bad')
+    press('Save')
+    expect(page).to have_content('error: some entries failed constraint or '\
+                                 'data type check')
+    press('OK')
+    wait_for_ajax
+    press('Cancel')
+    press('Yes')
+    wait_for_ajax
+    press('Edit Grid')
+    wait_for_ajax
+    # test saving and validation etc
+    grid_setup
+    cell_edit(1, 0, 'DataGrid8')
+    press('Save')
+    wait_for_ajax
+    dg_data = Marty::DataGrid.mcfly_pt('infinity').find_by(name: 'DataGrid7').
+                data.flatten
+    expect(dg_data).to eq(['DataGrid8', 'DataGrid3', 'DataGrid4', 'DataGrid5'])
+
+    # int validation
+    pos = grids.index('DataGrid8') + 1
+    dgv.select_row(pos)
+    press('Edit Grid')
+    wait_for_ajax
+    grid_setup
+    cell_edit(2, 0, 'bad')
+    press('Save')
+    expect(page).to have_content('error: some entries failed constraint or '\
+                                 'data type check')
+    press('OK')
+    wait_for_ajax
+    press('Cancel')
+    press('Yes')
+    wait_for_ajax
+    press('Edit Grid')
+    wait_for_ajax
+    # test saving and validation etc
+    grid_setup
+    cell_edit(2, 0, 123)
+    press('Save')
+    wait_for_ajax
+    dg_data = Marty::DataGrid.mcfly_pt('infinity').find_by(name: 'DataGrid8').
+                data.flatten
+    expect(dg_data).to eq([123, 360, 120, 180, 240, 360])
+
+    # string grid
+    pos = grids.index('DataGrid9') + 1
+    dgv.select_row(pos)
+    press('Edit Grid')
+    wait_for_ajax
+    grid_setup
+    cell_edit(2, 0, 'bad')
+    press('Save')
+    wait_for_ajax
+    dg_data = Marty::DataGrid.mcfly_pt('infinity').find_by(name: 'DataGrid9').
+                data.flatten
+    expect(dg_data).to eq(['bad', '360', '120', '180', '240', '360'])
+
     pos = grids.index('DataGrid5') + 1
     dgv.select_row(pos)
     press('Edit Grid')

data/spec/features/enum_values_report_spec.rb

@@ -12,7 +12,7 @@ feature 'Enum Values List report', js: true do
   end
 
   def with_user(uname)
-    u = Marty::User.find_by_login(uname)
+    u = Marty::User.find_by(login: uname)
     begin
       old_u, Mcfly.whodunnit = Mcfly.whodunnit, u
       yield(u)

data/spec/features/extjs_spec.rb

@@ -16,7 +16,7 @@ feature 'on grid cells', js: true do
   let(:uv) { netzke_find('user_view') }
 
   before do
-    Mcfly.whodunnit = Marty::User.find_by_login('marty')
+    Mcfly.whodunnit = Marty::User.find_by(login: 'marty')
   end
 
   it 'grid cells should encode html' do

data/spec/features/jobs_dashboard_spec.rb

@@ -10,14 +10,14 @@ describe 'Jobs Dashboard', type: :feature, js: true, capybara: true do
       title: 'Test Job 1',
       user: Marty::User.find_by(login: 'marty'),
       cformat: 'csv',
-      start_dt: Time.now,
+      start_dt: Time.zone.now,
       promise_type: 'delorean'
     )
     Marty::Promise.create!(
       title: 'Test Job 2',
       user: other_user,
       cformat: 'csv',
-      start_dt: Time.now,
+      start_dt: Time.zone.now,
       promise_type: 'delorean'
     )
 

data/spec/features/log_view_spec.rb

@@ -23,7 +23,7 @@ feature 'logger view', js: true, capybara: true do
                        timestamp: Time.zone.now - 10.days)
 
     @ts = Marty::Log.select(:timestamp).order(timestamp: :desc).map do |(ts)|
-      Time.zone.at(ts[:timestamp]).strftime('%Y-%m-%dT%H:%M:%S.%L%:z')
+      Time.zone.at(ts[:timestamp]).strftime('%Y-%m-%d %H:%M:%S')
     end
 
     @clean_file = "/tmp/clean_#{Process.pid}.psql"

data/spec/features/reporting_spec.rb

@@ -22,7 +22,7 @@ feature 'under Applications menu, Reports workflows', js: true do
   end
 
   def with_user(uname, &block)
-    u = Marty::User.find_by_login(uname)
+    u = Marty::User.find_by(login: uname)
     begin
       old_u, Mcfly.whodunnit = Mcfly.whodunnit, u
       block.call(u)
@@ -81,13 +81,13 @@ DELOREAN
 
       Marty::Script.
         load_script_bodies({ 'SomeReport' => a_report, },
-                           Date.today)
+                           Time.zone.today)
 
       Marty::Script.
         load_script_bodies({ 'SomeReport' =>
                              a_report +
                              "CC: BB\n    title=\"CC\"\n    result = 123" },
-                           Date.today + 1.minute)
+                           Time.zone.today + 1.minute)
     end
   end