marty 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb3ca7ab90c87f02efe558edd6cc4645ab3e9fa519ca047961b959d72c58d2b9
-  data.tar.gz: 13ef9b0ebbe0f2e6de2de7e2b8684cadbef122ecc8fec8f1c5dee8240014191c
+  metadata.gz: d09559e9d5549c8ab9720fb91659a23af5eb2776cd4992d976a294573c2e7374
+  data.tar.gz: d8a8cfbd3ddb0a74733f5e68046548dd33aab183e6bea5963e6f8774442ca3a6
 SHA512:
-  metadata.gz: 175f379edebcf299c9b6b0c9d3432bbabb16029f64d4d918b292f4812198efa47716ba88fd4e405230d52ffae5d44afb93fe614541d431f7ad20c47c82d3d5f6
-  data.tar.gz: d4f24991b4876a9f4e97e9facb97d4c68025b3d89fe29fd2e731f3ebd265ff77b7377f3a494b47879119202515cc26f18f040ab0da97bc9717e15c55fb76d6c5
+  metadata.gz: c314f71f548391bfab763ab236d4f99dffe477c8dc90af831502caf36cd16439315df0906c454c3b7fb05d2967cac4481b46193c0f7aa461727c47186d4d1ff8
+  data.tar.gz: 2e0c6f94fa4989ec13c37cce0b836c72d7f1e9153dea3b53d6e4037c3caf66a5883fae6411aeb2eaa89f4658dc2e7fd73111b3b539dc680bbb3063340cc5e0a1

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    marty (2.6.0)
+    marty (2.6.2)
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay
       daemons (~> 1.3.1)
       delayed_job_active_record
-      delorean_lang (~> 0.5.0)
+      delorean_lang (~> 0.5.2)
       json-schema
       mcfly (~> 0.0.20)
       net-ldap (~> 0.16.1)
@@ -62,9 +62,7 @@ GEM
       io-like (~> 0.3.0)
     arel (8.0.0)
     ast (2.4.0)
-    aws-eventstream (1.0.2)
-    aws-sigv4 (1.1.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-sigv4 (1.0.3)
     axlsx (3.0.0.pre)
       htmlentities (~> 4.3, >= 4.3.4)
       mimemagic (~> 0.3)
@@ -99,7 +97,7 @@ GEM
     delayed_job_active_record (4.1.3)
       activerecord (>= 3.0, < 5.3)
       delayed_job (>= 3.0, < 5)
-    delorean_lang (0.5.1)
+    delorean_lang (0.5.2)
       activerecord (>= 3.2)
       treetop (~> 1.5)
     diff-lcs (1.3)

data/app/models/marty/data_grid.rb

@@ -238,7 +238,8 @@ class Marty::DataGrid < Marty::Base
 
   def self.lookup_grid_distinct_entry_h(
         pt, h, dgh, visited = nil, follow = true,
-        return_grid_data = false, distinct = true)
+        return_grid_data = false, distinct = true
+      )
 
     # Perform grid lookup, if result is another data_grid, and follow is true,
     # then perform lookup on the resulting grid.  Allows grids to be nested

data/app/models/marty/script.rb

@@ -4,7 +4,7 @@ class Marty::Script < Marty::Base
   validates_presence_of :name, :body
   mcfly_validates_uniqueness_of :name
   validates_format_of :name,
-                      with: /\A[A-Z][a-zA-Z0-9]*\z/,
+                      with: /\A[A-Z][a-zA-Z0-9]*(::[A-Z][a-zA-Z0-9]*)*\z/,
                       message: I18n.t('script.save_error')
 
   belongs_to :user, class_name: 'Marty::User'
@@ -12,112 +12,12 @@ class Marty::Script < Marty::Base
   gen_mcfly_lookup :lookup, [:name], cache: true
 
   # find script by name/tag (not cached)
-  def self.find_script(sname, tag = nil)
-    tag = Marty::Tag.map_to_tag(tag)
-    Marty::Script.mcfly_pt(tag.created_dt).find_by(name: sname)
-  end
 
   def find_tag
     # find the first tag created after this script.
     Marty::Tag.where('created_dt >= ?', created_dt).order(:created_dt).first
   end
 
-  def self.create_script(name, body)
-    script      = new
-    script.name = name
-    script.body = body
-    script.save
-    script
-  end
-
-  def self.load_a_script(sname, body, dt = nil)
-    s = Marty::Script.find_by(obsoleted_dt: 'infinity', name: sname)
-
-    if !s
-      s = Marty::Script.new
-      s.body = body
-      s.name = sname
-      s.created_dt = dt if dt
-      s.save!
-    elsif s.body != body
-      s.body = body
-      s.created_dt = dt if dt
-      s.save!
-    end
-  end
-
-  def self.load_script_bodies(bodies, dt = nil)
-    bodies.each do |sname, body|
-      load_a_script(sname, body, dt)
-    end
-
-    # Create a new tag if scripts were modified after the last tag
-    tag = Marty::Tag.get_latest1
-    latest = Marty::Script.order('created_dt DESC').first
-
-    tag_time = (dt || [latest.try(:created_dt), Time.now].compact.max) +
-      1.second
-
-    # If no tag_time is provided, the tag created_dt will be the same
-    # as the scripts.
-    tag = Marty::Tag.do_create(tag_time, 'tagged from load scripts') if
-      !(tag && latest) || tag.created_dt <= latest.created_dt
-
-    tag
-  end
-
-  def self.load_scripts(path = nil, dt = nil)
-    files = get_script_filenames(path)
-
-    bodies = read_script_files(files)
-
-    load_script_bodies(bodies, dt)
-  end
-
-  def self.read_script_files(files)
-    files.collect do |fpath|
-      fname = File.basename(fpath)[0..-4].camelize
-      [fname, File.read(fpath)]
-    end
-  end
-
-  def self.get_script_filenames(paths = nil)
-    paths = get_script_paths(paths)
-
-    filenames = {}
-    paths.each do |path|
-      Dir.glob("#{path}/*.dl").each do |filename|
-        basename = File.basename(filename)
-        filenames[basename] = filename unless filenames.key?(basename)
-      end
-    end
-
-    filenames.values
-  end
-
-  def self.get_script_paths(paths)
-    if paths
-      paths = Array(paths)
-    elsif Rails.configuration.marty.delorean_scripts_path
-      paths = Rails.configuration.marty.delorean_scripts_path
-    else
-      paths = [
-        "#{Rails.root}/delorean",
-        # FIXME: HACKY, wouldn't it be better to use
-        # Gem::Specification.find_by_name("marty").gem_dir??
-        File.expand_path('../../../../delorean', __FILE__),
-      ]
-    end
-  end
-
-  def self.delete_scripts
-    ActiveRecord::Base.connection.
-      execute('ALTER TABLE marty_scripts DISABLE TRIGGER USER;')
-    Marty::Script.delete_all
-    ActiveRecord::Base.connection.
-      execute('ALTER TABLE marty_scripts ENABLE TRIGGER USER;')
-  end
-
   delorean_fn :eval_to_hash, sig: 5 do |dt, script, node, attrs, params|
     tag = Marty::Tag.find_match(dt) if dt.present?
     raise("no tag for #{dt}") if tag.nil? && dt.present?
@@ -156,4 +56,112 @@ class Marty::Script < Marty::Base
 
     CodeRay.scan(script.body, :ruby).div(line_numbers: :table)
   end
+
+  class << self
+    def find_script(sname, tag = nil)
+      tag = Marty::Tag.map_to_tag(tag)
+      Marty::Script.mcfly_pt(tag.created_dt).find_by(name: sname)
+    end
+
+    def create_script(name, body)
+      script      = new
+      script.name = name
+      script.body = body
+      script.save
+      script
+    end
+
+    def load_a_script(sname, body, dt = nil)
+      s = Marty::Script.find_by(obsoleted_dt: 'infinity', name: sname)
+
+      if !s
+        s = Marty::Script.new
+        s.body = body
+        s.name = sname
+        s.created_dt = dt if dt
+        s.save!
+      elsif s.body != body
+        s.body = body
+        s.created_dt = dt if dt
+        s.save!
+      end
+    end
+
+    def load_script_bodies(bodies, dt = nil)
+      bodies.each do |sname, body|
+        load_a_script(sname, body, dt)
+      end
+
+      # Create a new tag if scripts were modified after the last tag
+      tag = Marty::Tag.get_latest1
+      latest = Marty::Script.order('created_dt DESC').first
+
+      tag_time = (dt || [latest.try(:created_dt), Time.now].compact.max) +
+        1.second
+
+      # If no tag_time is provided, the tag created_dt will be the same
+      # as the scripts.
+      tag = Marty::Tag.do_create(tag_time, 'tagged from load scripts') if
+        !(tag && latest) || tag.created_dt <= latest.created_dt
+
+      tag
+    end
+
+    def load_scripts(path = nil, dt = nil)
+      files = get_script_file_paths(path)
+
+      bodies = read_script_files(files)
+
+      load_script_bodies(bodies, dt)
+    end
+
+    def read_script_files(files)
+      files.map do |fname, fpath|
+        script_name = fname.camelize
+        [script_name, File.read(fpath)]
+      end
+    end
+
+    def get_script_filenames(paths = nil)
+      get_script_file_paths(paths).values
+    end
+
+    def get_script_file_paths(paths = nil)
+      paths = get_script_paths(paths)
+
+      paths.each_with_object({}) do |path, filenames|
+        Dir.glob("#{path}/**/*.dl").each do |filename|
+          base_pathname = Pathname.new(path)
+          pathname = Pathname.new(filename).relative_path_from(base_pathname)
+          relative_file_name = pathname.sub_ext('').to_s
+
+          next if filenames.key?(relative_file_name)
+
+          filenames[relative_file_name] = filename
+        end
+      end
+    end
+
+    def get_script_paths(paths)
+      paths_from_config = Rails.configuration.marty.delorean_scripts_path
+
+      return Array(paths) if paths
+      return paths_from_config if paths_from_config.present?
+
+      [
+        "#{Rails.root}/delorean",
+        # FIXME: HACKY, wouldn't it be better to use
+        # Gem::Specification.find_by_name("marty").gem_dir??
+        File.expand_path('../../../../delorean', __FILE__),
+      ]
+    end
+
+    def delete_scripts
+      ActiveRecord::Base.connection.
+        execute('ALTER TABLE marty_scripts DISABLE TRIGGER USER;')
+      Marty::Script.delete_all
+      ActiveRecord::Base.connection.
+        execute('ALTER TABLE marty_scripts ENABLE TRIGGER USER;')
+    end
+  end
 end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '2.6.1'
+  VERSION = '2.6.2'
 end

data/lib/tasks/marty_tasks.rake

@@ -9,20 +9,6 @@ namespace :marty do
     end
   end
 
-  desc 'remove all loaded scripts from the database'
-  task delete_scripts: :environment do
-    Marty::Script.delete_scripts
-  end
-
-  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)
-    raise 'must have system user account seeded' unless Mcfly.whodunnit
-    load_dir = ENV['LOAD_DIR']
-    Marty::Script.load_scripts(load_dir)
-  end
-
   # currently this is for delorean style rules only.  if other types were ever
   # added (eg some sort of SQL rule like apollo has), that would probably be
   # a new rake task

data/lib/tasks/scripts_tasks.rake

@@ -0,0 +1,18 @@
+namespace :marty do
+  desc 'remove all loaded scripts from the database'
+  task delete_scripts: :environment do
+    Marty::Script.delete_scripts
+  end
+
+  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
+    )
+
+    raise 'must have system user account seeded' unless Mcfly.whodunnit
+
+    load_dir = ENV['LOAD_DIR']
+    Marty::Script.load_scripts(load_dir)
+  end
+end

data/marty.gemspec

@@ -5,6 +5,7 @@ require 'digest/md5'
 require 'base64'
 require 'zlib'
 require 'csv'
+require 'pathname'
 
 Gem::Specification.new do |s|
   s.name        = 'marty'
@@ -32,7 +33,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'axlsx', '3.0.0pre'
 
-  s.add_dependency 'delorean_lang', '~> 0.5.0'
+  s.add_dependency 'delorean_lang', '~> 0.5.2'
   s.add_dependency 'mcfly', '~> 0.0.20'
 
   s.add_dependency 'coderay'

data/spec/dummy/delorean/test_namespace/nested_namespace/test.dl

@@ -0,0 +1 @@
+# Empty script

data/spec/dummy/delorean/test_namespace/test.dl

@@ -0,0 +1 @@
+# Empty script

data/spec/fixtures/scripts/load_tests/namespace/nested_namespace/script3.dl

@@ -0,0 +1,2 @@
+NodeE:
+  attr = 789

data/spec/models/script_spec.rb

@@ -113,7 +113,7 @@ describe Marty::Script do
 
   describe '.load_scripts' do
     before(:each) do
-      allow(Marty::Script).to receive(:load_script_bodies)
+      allow(Marty::Script).to receive(:load_script_bodies).and_call_original
     end
 
     let(:scripts_path) do
@@ -122,11 +122,25 @@ describe Marty::Script do
     let(:now) { Time.zone.now - 1.minute }
     let(:ls1) { File.read("#{scripts_path}/script1.dl") }
     let(:ls2) { File.read("#{scripts_path}/script2.dl") }
+    let(:ls3) { File.read("#{scripts_path}/namespace/nested_namespace/script3.dl") }
 
     it 'reads in the files and loads the script bodies' do
       Marty::Script.load_scripts(scripts_path, now)
+      expected_args = match_array([
+                                    ['Script1', ls1],
+                                    ['Script2', ls2],
+                                    ['Namespace::NestedNamespace::Script3', ls3]
+                                  ])
+
       expect(Marty::Script).to have_received(:load_script_bodies).
-        with(match_array([['Script1', ls1], ['Script2', ls2]]), now)
+        with(expected_args, now)
+
+      loaded_script_names = Marty::Script.pluck(:name).sort
+      expect(loaded_script_names).to eq [
+        'Namespace::NestedNamespace::Script3',
+        'Script1',
+        'Script2'
+      ]
     end
   end
 
@@ -140,7 +154,7 @@ describe Marty::Script do
 
       it 'gets the files from the specified directory' do
         Marty::Script.get_script_filenames('/test')
-        expect(Dir).to have_received(:glob).with('/test/*.dl')
+        expect(Dir).to have_received(:glob).with('/test/**/*.dl')
       end
 
       it 'returns the files in the given directory' do
@@ -151,9 +165,9 @@ describe Marty::Script do
 
     context 'with duplicate script file names' do
       it 'returns only the unique file names' do
-        allow(Dir).to receive(:glob).with('/test1/*.dl').
+        allow(Dir).to receive(:glob).with('/test1/**/*.dl').
           and_return(['/test1/sc1.dl', '/test1/sc2.dl'])
-        allow(Dir).to receive(:glob).with('/test2/*.dl').
+        allow(Dir).to receive(:glob).with('/test2/**/*.dl').
           and_return(['/test2/sc2.dl', '/test2/sc3.dl'])
         expect(Marty::Script.get_script_filenames(['/test1', '/test2'])).
           to match_array(['/test1/sc1.dl', '/test1/sc2.dl', '/test2/sc3.dl'])
@@ -164,9 +178,9 @@ describe Marty::Script do
       it 'gets the files from the default paths' do
         allow(Dir).to receive(:glob).and_return([])
         Marty::Script.get_script_filenames
-        expect(Dir).to have_received(:glob).with("#{Rails.root}/delorean/*.dl")
+        expect(Dir).to have_received(:glob).with("#{Rails.root}/delorean/**/*.dl")
         expect(Dir).to have_received(:glob).
-          with(File.expand_path('../../../delorean/*.dl', __FILE__))
+          with(File.expand_path('../../../delorean/**/*.dl', __FILE__))
         expect(Dir).to have_received(:glob).twice
       end
     end
@@ -180,7 +194,7 @@ describe Marty::Script do
       it 'gets the files from the specified path' do
         allow(Dir).to receive(:glob).and_return([])
         Marty::Script.get_script_filenames
-        expect(Dir).to have_received(:glob).with('/conf_test/*.dl')
+        expect(Dir).to have_received(:glob).with('/conf_test/**/*.dl')
       end
     end
   end

data/spec/other/diagnostic/delayed_job_workers_spec.rb

@@ -8,7 +8,7 @@ describe Marty::Diagnostic::DelayedJobWorkers do
       ip || Marty::Helper.my_ip => {
         'Delayed Workers / Node' => {
           'description' => error ? '3' : '4',
-          'status'      => status || true,
+          'status'      => status.nil? ? true : status,
           'consistent'  => nil
         },
       }

data/spec/support/components/netzke_grid.rb

@@ -68,15 +68,49 @@ module Marty; module RSpec; module Components
       find('#' + el).click
     end
 
-    def get_col_vals(col, cnt = row_count, init = 0)
+    # filter_col and filter_col_toggle expect sortable column
+    #   might need to allow to specify the number of :down to send.
+    #   for now, four :downs to get to the filter, :right opens it
+    #    then enter value and press return
+    def filter_col(col, value)
+      el = run_js <<-JS
+          #{ext_var(grid, 'grid')}
+          return #{ext_find(ext_arg('gridcolumn', text: col), 'grid')}.id
+        JS
+
+      c = find('#' + el)
+      c.send_keys([:down, :down, :down, :down, :right, value, :return])
+      sleep 1.0
+      c.click
+    end
+
+    def filter_col_toggle(col)
+      el = run_js <<-JS
+          #{ext_var(grid, 'grid')}
+          return #{ext_find(ext_arg('gridcolumn', text: col), 'grid')}.id
+        JS
+
+      c = find('#' + el)
+      c.send_keys([:down, :down, :down, :down, ' ', :escape])
+      sleep 1.0
+    end
+
+    def get_col_vals(col, cnt = row_count, init = 0, date_only = true)
       # NOTE: does not validate the # of rows
       run_js <<-JS
           var result = [];
           for (var i = #{init}; i < #{init.to_i + cnt.to_i}; i++) {
             #{ext_cell_val('i', col, grid)}
-            if(value instanceof Date){
-              result.push(value.toISOString().substring(0,value.toISOString().indexOf('T')));
-            } else {
+            if(value instanceof Date) {
+                if (#{date_only}){
+                  result.push(value.toISOString().split('T')[0]);
+                }
+                else
+                {
+                  result.push(value.toISOString());
+                }
+            }
+            else {
               result.push(value);
             };
           };
@@ -113,6 +147,14 @@ module Marty; module RSpec; module Components
       el
     end
 
+    def select_row_range(st, en)
+      resid = run_js(<<-JS, 10.0)
+          #{ext_var(grid, 'grid')}
+          grid.getSelectionModel().selectRange(#{st-1}, #{en-1});
+        JS
+      wait_for_ajax
+    end
+
     def set_row_vals row, fields
       js_set_fields = fields.each_pair.map do |k, v|
         "r.set('#{k}', '#{v}');"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-29 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: mcfly
   requirement: !ruby/object:Gem::Requirement
@@ -424,6 +424,7 @@ files:
 - lib/pyxll/pyxll.cfg
 - lib/pyxll/sample.xlsx
 - lib/tasks/marty_tasks.rake
+- lib/tasks/scripts_tasks.rake
 - make-dummy.mk
 - marty.gemspec
 - other/marty/api/base.rb
@@ -531,6 +532,8 @@ files:
 - spec/dummy/delorean/marty_fields.dl
 - spec/dummy/delorean/styles.dl
 - spec/dummy/delorean/table_report.dl
+- spec/dummy/delorean/test_namespace/nested_namespace/test.dl
+- spec/dummy/delorean/test_namespace/test.dl
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/lib/class_list.rb
 - spec/dummy/lib/gemini/my_rule_script_set.rb
@@ -1563,6 +1566,7 @@ files:
 - spec/fixtures/csv/rule/XyzRule.csv
 - spec/fixtures/json/rpc_controller.json
 - spec/fixtures/misc/struct_compare_tests.txt
+- spec/fixtures/scripts/load_tests/namespace/nested_namespace/script3.dl
 - spec/fixtures/scripts/load_tests/script1.dl
 - spec/fixtures/scripts/load_tests/script2.dl
 - spec/job_helper.rb