marty 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dd02192b3d004677a70a48f2f83599ad2d211715002d24a4b48d62e9bef7281
-  data.tar.gz: e16b0db7764849a5adcba362609f8a8569de0dacd0f606764b5ad2e2ce04c4d3
+  metadata.gz: 803d233d1eca573e9cf368dc8592895e9a4f237117842472e59d35dff646f8d5
+  data.tar.gz: 31aa8139cf13387596b37e4e934a59837b9e6dff7ca8eff801ff2b5bdc0dfde2
 SHA512:
-  metadata.gz: 5684b1cb2f2d3aa73c0360c2b9fe535956e62705c2d652f31dc4f44fc27dbcd67ca5824db025438410ee32094de6f4bd2dc3c2023d51ded3063c0cf498886120
-  data.tar.gz: 69ec8e2b57199e0198848ffd9563ba40a1489e76e1335e9414334be10ec28ef05f497381e684ec7841035911a2c4460c6b48065633ad85be7221429e557da4e1
+  metadata.gz: 82fa093b9db78af2ebe9b47a27673a023b4eafdeb46d2eb5f835113dc142ce12e16486a51098b1cbadf5e93022c28d636457ac01ccbce619fc362ee94832a568
+  data.tar.gz: 0db7610f06f94b2e6c48fcdee37b5c024361a8501659d01983892471677738f1c937c47c65c3eb529aa3399c1dc265072e6b9cc279544782dab58e9cf35a7e9e

data/.rubocop.yml

@@ -33,3 +33,10 @@ Style/CaseEquality:
     - 'lib/marty/monkey.rb'
     - 'other/marty/api/base.rb'
     - 'spec/lib/mcfly_model_spec.rb'
+
+Lint/UnusedMethodArgument:
+  AllowUnusedKeywordArguments: true
+  IgnoreEmptyMethods: true
+
+Style/SymbolArray:
+  EnforcedStyle: brackets

data/.rubocop_todo.yml

@@ -272,33 +272,6 @@ Lint/UnderscorePrefixedVariableName:
     - 'lib/marty/monkey.rb'
     - 'lib/marty/promise_job.rb'
 
-# Offense count: 36
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
-Lint/UnusedBlockArgument:
-  Enabled: false
-
-# Offense count: 21
-# Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
-Lint/UnusedMethodArgument:
-  Exclude:
-    - 'app/models/marty/base_rule.rb'
-    - 'app/models/marty/pg_enum.rb'
-    - 'app/models/marty/posting.rb'
-    - 'db/migrate/091_create_marty_promises.rb'
-    - 'db/migrate/201_create_marty_events.rb'
-    - 'lib/marty/cache_adapters/mcfly_ruby_cache.rb'
-    - 'lib/marty/json_schema.rb'
-    - 'lib/marty/monkey.rb'
-    - 'lib/marty/promise_proxy.rb'
-    - 'lib/marty/rule_script_set.rb'
-    - 'other/marty/api/base.rb'
-    - 'spec/lib/json_schema_spec.rb'
-    - 'spec/lib/xl_spec.rb'
-    - 'spec/support/components/netzke_grid.rb'
-    - 'spec/support/netzke.rb'
-
 # Offense count: 4
 Lint/UriEscapeUnescape:
   Exclude:
@@ -657,14 +630,6 @@ Style/ConditionalAssignment:
     - 'spec/support/components/netzke_combobox.rb'
     - 'spec/support/components/netzke_grid.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/DefWithParentheses:
-  Exclude:
-    - 'spec/dummy/db/migrate/20171221095312_create_gemini_my_rules.rb'
-    - 'spec/dummy/db/migrate/20171221095359_create_gemini_xyz_rules.rb'
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/utils.rb'
-
 # Offense count: 181
 Style/Documentation:
   Enabled: false
@@ -683,26 +648,6 @@ Style/EachForSimpleLoop:
   Exclude:
     - 'spec/controllers/rpc_import_spec.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/EachWithObject:
-  Exclude:
-    - 'lib/marty/util.rb'
-    - 'lib/marty/xl.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/EmptyCaseCondition:
-  Exclude:
-    - 'app/components/marty/base_rule_view.rb'
-    - 'app/models/marty/data_grid.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/EmptyLiteral:
-  Exclude:
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/utils.rb'
-
 # Offense count: 8
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -775,25 +720,6 @@ Style/GuardClause:
     - 'spec/lib/json_schema_spec.rb'
     - 'spec/support/post_run_logger.rb'
 
-# Offense count: 43
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
-# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
-Style/HashSyntax:
-  Exclude:
-    - 'app/components/marty/simple_app.rb'
-    - 'app/models/marty/user.rb'
-    - 'app/models/marty/vw_promise.rb'
-    - 'db/migrate/090_create_delayed_jobs.rb'
-    - 'lib/marty/engine.rb'
-    - 'lib/marty/migrations.rb'
-    - 'spec/features/scripting_spec.rb'
-    - 'spec/features/user_view_spec.rb'
-    - 'spec/lib/json_schema_spec.rb'
-    - 'spec/spec_helper.rb'
-    - 'spec/support/netzke.rb'
-    - 'spec/support/shared_connection.rb'
-
 # Offense count: 2
 Style/IdenticalConditionalBranches:
   Exclude:
@@ -1124,13 +1050,6 @@ Style/StructInheritance:
     - 'lib/marty/promise_job.rb'
     - 'lib/marty/promise_ruby_job.rb'
 
-# Offense count: 75
-# Cop supports --auto-correct.
-# Configuration parameters: MinSize.
-# SupportedStyles: percent, brackets
-Style/SymbolArray:
-  EnforcedStyle: brackets
-
 # Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, AllowSafeAssignment.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (2.7.1)
+    marty (2.7.2)
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay

data/app/components/marty/base_rule_view.rb

@@ -278,12 +278,11 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
     nullbool = h[:type] == :boolean && (h[:null] == true || !h.include?(:null))
     attribute name do |c|
       c.width = h[:width] || 150
-      case
-      when h[:type] == :datetime
+      if h[:type] == :datetime
         c.format = 'Y-m-d H:i'
-      when h[:type] == :date
+      elsif h[:type] == :date
         c.format = 'Y-m-d'
-      when nullbool
+      elsif nullbool
           c.type = :string
           enum_column(c, ['True', 'False'])
       else
@@ -304,7 +303,7 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
         c.getter = Marty::BaseRuleView.jsonb_field_getter(meth, namestr, nullbool)
         c.setter = Marty::BaseRuleView.jsonb_field_setter(meth, namestr,
                                                           h[:type] == :boolean)
-        c.filter_with = lambda do |rel, value, op|
+        c.filter_with = lambda do |rel, value, _op|
           v = ActiveRecord::Base.connection.quote(value)[1..-2]
           rel.where("#{meth}->>'#{namestr}' like '%#{v}%'")
         end
@@ -342,7 +341,7 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
       c.flex   = 1
       c.getter = jsonb_getter(a.to_s)
       c.sorting_scope = json_sort_scope(a)
-      c.filter_with = lambda do |rel, value, op|
+      c.filter_with = lambda do |rel, value, _op|
         v = ActiveRecord::Base.connection.quote(value)[1..-2]
         rel.where("#{a}::text like '%#{v}%'")
       end

data/app/components/marty/main_auth_app.rb

@@ -390,12 +390,12 @@ class Marty::MainAuthApp < Marty::AuthApp
     c.klass = Marty::LogView
   end
 
-  endpoint :reload_scripts do |params|
+  endpoint :reload_scripts do |_params|
     Marty::Script.load_scripts
     client.netzke_notify 'Scripts have been reloaded'
   end
 
-  endpoint :load_seed do |params|
+  endpoint :load_seed do |_params|
     Rails.application.load_seed
     client.netzke_notify 'Seeds have been loaded'
   end

data/app/components/marty/promise_view.rb

@@ -74,7 +74,7 @@ class Marty::PromiseView < Netzke::Tree::Base
     a.icon_cls = 'fa fa-sync-alt glyph'
   end
 
-  endpoint :clear do |params|
+  endpoint :clear do |_params|
     Marty::Promise.cleanup(true)
     client.netzke_on_refresh
   end

data/app/components/marty/simple_app.rb

@@ -69,33 +69,33 @@ class Marty::SimpleApp < Netzke::Base
   # Config for the main panel, which will contain dynamically loaded components.
   def main_panel_config(overrides = {})
     {
-      :itemId => 'main_panel',
-      :region => 'center',
-      :layout => 'fit'
+      itemId: 'main_panel',
+      region: 'center',
+      layout: 'fit'
     }.merge(overrides)
   end
 
   # Config for the status bar
   def status_bar_config(overrides = {})
     {
-      :itemId => 'status_bar',
-      :xtype => 'statusbar',
-      :region => 'south',
-      :statusAlign => 'right',
-      :busyText => 'Busy...',
-      :default_text => 'Ready',
-      :default_icon_cls => ''
+      itemId: 'status_bar',
+      xtype: 'statusbar',
+      region: 'south',
+      statusAlign: 'right',
+      busyText: 'Busy...',
+      default_text: 'Ready',
+      default_icon_cls: ''
     }.merge(overrides)
   end
 
   # Config for the menu bar
   def menu_bar_config(overrides = {})
     {
-      :itemId => 'menu_bar',
-      :layout => { overflow_handler: 'Menu' },
-      :xtype => 'toolbar',
-      :region => 'north',
-      :items => menu
+      itemId: 'menu_bar',
+      layout: { overflow_handler: 'Menu' },
+      xtype: 'toolbar',
+      region: 'north',
+      items: menu
     }.merge(overrides)
   end
 

data/app/models/marty/base_rule.rb

@@ -96,7 +96,7 @@ class Marty::BaseRule < Marty::Base
     "(#{field}#{arrow}'#{subfield}')#{fieldcast} #{op} #{value}"
   end
 
-  def self.get_matches_(pt, attrs, params)
+  def self.get_matches_(_pt, attrs, params)
     q = select('DISTINCT ON (name) *').where(attrs)
 
     params.each do |k, vraw|

data/app/models/marty/data_grid.rb

@@ -216,13 +216,25 @@ class Marty::DataGrid < Marty::Base
     res
   end
 
-  cached_delorean_fn :lookup_grid_h, sig: 4 do |pt, dgn, h, distinct|
+  # this function is cached through lookup_grid_h_priv
+  delorean_fn :lookup_grid_h, sig: 4 do |pt, dgn, h, distinct|
     dgh = lookup_h(pt, dgn)
     raise "#{dgn} grid not found" unless dgh
     raise "non-hash arg #{h}" unless Hash === h
 
-    res = lookup_grid_distinct_entry_h(pt, h, dgh, nil, true, false, distinct)
-    res['result']
+    attrs = dgh['metadata'].map { |a| a['attr'] }
+
+    # Narrow hash to needed attrs -- makes the cache work a lot better
+    # in case the hash includes items not in grid attrs.
+    lookup_grid_h_priv(pt, dgh, h.slice(*attrs), distinct)
+  end
+
+  # private method used to cache lookup_grid_distinct_entry_h result
+  cached_delorean_fn :lookup_grid_h_priv,
+                     private: true, sig: 4 do |pt, dgh, h, distinct|
+
+    lookup_grid_distinct_entry_h(
+      pt, h, dgh, nil, true, false, distinct)['result']
   end
 
   # FIXME: using cached_delorean_fn just for the caching -- this is
@@ -261,10 +273,9 @@ class Marty::DataGrid < Marty::Base
 
     res = vhash['result']
 
-    v = case
-        when ::Marty::EnumHelper.pg_enum?(klass: res)
+    v = if ::Marty::EnumHelper.pg_enum?(klass: res)
           c_data_type.find_by_name(res)
-        when Marty::DataGrid == c_data_type
+        elsif Marty::DataGrid == c_data_type
           follow ?
             Marty::DataGrid.lookup_h(pt, res) :
             Marty::DataGrid.lookup(pt, res)
@@ -612,9 +623,9 @@ class Marty::DataGrid < Marty::Base
       end
     end
 
-    removes.reject! { |dir, set| set.empty? }
+    removes.reject! { |_dir, set| set.empty? }
 
-    removes.each do |dir, set|
+    removes.each do |dir, _set|
       metadata_copy.select { |m| m['dir'] == dir }.each do |meta|
         meta['keys'] = remove_indices(meta['keys'], removes[dir])
       end

data/app/models/marty/delorean_rule.rb

@@ -100,7 +100,7 @@ class Marty::DeloreanRule < Marty::BaseRule
             result.err_section)
         end
         result.cg_hash = Hash[result.cg_keys.zip(result.cg_vals)]
-        fails = result.cg_hash.select { |k, v| ![v].flatten.first }
+        fails = result.cg_hash.select { |_k, v| ![v].flatten.first }
         return fails if fails.present?
       end
 
@@ -202,7 +202,7 @@ class Marty::DeloreanRule < Marty::BaseRule
     proc do |old, new|
       klass.where(obsoleted_dt: 'infinity').each do |r|
         r.grids.each { |k, v| r.grids[k] = new if v == old }
-        r.results.each do |k, v|
+        r.results.each do |k, _v|
           r.results[k] = %Q("#{new}") if
                          k.ends_with?('_grid') && r.fixed_results[k] == old
         end

data/app/models/marty/pg_enum.rb

@@ -13,7 +13,7 @@ module Marty::PgEnum
     base.class_eval do
       extend ::Delorean::Functions unless respond_to?(:delorean_fn)
 
-      delorean_fn :get_all do |pt = nil|
+      delorean_fn :get_all do |_pt = nil|
         self::VALUES.map(&:to_s)
       end
 

data/app/models/marty/posting.rb

@@ -67,7 +67,7 @@ class Marty::Posting < Marty::Base
     q.order('created_dt DESC').first.attributes
   end
 
-  def self.get_latest(limit, is_test = nil)
+  def self.get_latest(limit, _is_test = nil)
     # IMPORTANT: is_test arg is ignored (KEEP for backward compat.)
 
     q = where("created_dt <> 'infinity'").

data/app/models/marty/user.rb

@@ -2,7 +2,7 @@ class Marty::User < Marty::Base
   validates_presence_of :login, :firstname, :lastname
   validates_uniqueness_of :login
 
-  validates_format_of :login, :with => /\A[a-z0-9_\-@\.]*\z/i
+  validates_format_of :login, with: /\A[a-z0-9_\-@\.]*\z/i
   validates_length_of :login, :firstname, :lastname, maximum: 100
 
   MARTY_IMPORT_UNIQUENESS = [:login]

data/app/models/marty/vw_promise.rb

@@ -66,6 +66,6 @@ class Marty::VwPromise < Marty::Base
     st = "%#{search_text}%"
     # Convert "Role Name" or "Role name" to "role_name" (underscore is key)
     st2 = "%#{search_text.titleize.gsub(/\s/, '').underscore}%"
-    joins(:user => :roles).where(query, st, st, st, st2).distinct
+    joins(user: :roles).where(query, st, st, st, st2).distinct
   }
 end

data/lib/marty/data_change.rb

@@ -224,7 +224,7 @@ class Marty::DataChange
         next
       end
 
-      key_hash = conv.reject { |k, v| !keys.member?(k) }
+      key_hash = conv.reject { |k, _v| !keys.member?(k) }
 
       source = Marty::DataConversion.find_row(klass, key_hash, ts)
 
@@ -236,7 +236,7 @@ class Marty::DataChange
 
       found_sources << source
 
-      non_key_hash = conv.reject { |k, v| keys.member?(k) }
+      non_key_hash = conv.reject { |k, _v| keys.member?(k) }
 
       # is source same as converted input?
       if non_key_hash.all? { |k, v| v == source.send(k) }
@@ -281,7 +281,7 @@ class Marty::DataChange
     ts = Mcfly.normalize_infinity(ts)
     col_types = Marty::DataConversion.col_types(klass)
 
-    mcfly_cols = col_types.map do |attr, h|
+    mcfly_cols = col_types.map do |_attr, h|
       Hash === h && Mcfly.has_mcfly?(h[:assoc_class]) && h || nil
     end.compact
 

data/lib/marty/data_conversion.rb

@@ -152,7 +152,7 @@ class Marty::DataConversion
 
     raise "no key_attrs for #{klass}" unless key_attrs
 
-    find_options = options.select { |k, v| key_attrs.member? k.to_sym }
+    find_options = options.select { |k, _v| key_attrs.member? k.to_sym }
 
     raise "no keys for #{klass} -- #{options}" if find_options.empty?
 

data/lib/marty/data_importer.rb

@@ -32,7 +32,7 @@ module Marty
                        preprocess_function,
                       )
 
-      recs.each_with_object(Hash.new(0)) do |(op, id), h|
+      recs.each_with_object(Hash.new(0)) do |(op, _id), h|
         h[op] += 1
       end
     end

data/lib/marty/engine.rb

@@ -9,7 +9,7 @@ module Marty
 
     # generators add rspec tests
     config.generators do |g|
-      g.test_framework :rspec, :view_specs => false
+      g.test_framework :rspec, view_specs: false
     end
   end
 end

data/lib/marty/json_schema.rb

@@ -4,7 +4,7 @@ module Marty
   private
 
   class PgEnumAttribute < JSON::Schema::Attribute
-    def self.validate(curr_schema, data, frag, pro, validator, opt = {})
+    def self.validate(curr_schema, data, frag, pro, _validator, opt = {})
       values = nil
       path = '#/' + frag.join('/')
       begin

data/lib/marty/mcfly_model.rb

@@ -70,7 +70,7 @@ module Mcfly::Model
       end.join(' AND ')
 
       if Hash === attrs
-        order = attrs.select { |k, v| v }.keys.reverse.map do |k|
+        order = attrs.select { |_k, v| v }.keys.reverse.map do |k|
           k = "#{k}_id" if assoc.member?(k)
 
           "#{k} NULLS LAST"
@@ -82,9 +82,9 @@ module Mcfly::Model
 
       fn = cache ? :cached_delorean_fn : :delorean_fn
       base_mcfly_lookup(fn, name, options + { sig:  attrs.length + 1,
-                                             mode: mode }) do |t, *attr_list|
+                                             mode: mode }) do |_t, *attr_list|
 
-        attr_list_ids = attr_list.each_with_index.map do |x, i|
+        attr_list_ids = attr_list.each_with_index.map do |_x, i|
           assoc.member?(attrs[i]) ?
             (attr_list[i] && attr_list[i].id) : attr_list[i]
         end

data/lib/marty/migrations.rb

@@ -141,7 +141,7 @@ module Marty::Migrations
           end
         end
       elsif !excludes.include?(c)
-        assoc = klass.reflections.find { |(n, h)| h.foreign_key == c }
+        assoc = klass.reflections.find { |(_n, h)| h.foreign_key == c }
         if assoc && assoc[1].klass.columns_hash['name']
           table_name = assoc[1].table_name
           jointabs[table_name] ||= 0
@@ -182,8 +182,8 @@ EOSQL
 
   def self.lines_to_crlf(lines)
     lines.map do |line|
-      line.encode(line.encoding, :universal_newline => true).
-        encode(line.encoding, :crlf_newline => true)
+      line.encode(line.encoding, universal_newline: true).
+        encode(line.encoding, crlf_newline: true)
     end
   end
 
@@ -198,7 +198,7 @@ EOSQL
         version: m[2].to_i,
         raw_sql: "#{md}/sql/#{m[1]}_v#{m[2]}_sql_#{m[3]}.sql"
       }
-    end.group_by { |a| a[:name] }.each do |k, v|
+    end.group_by { |a| a[:name] }.each do |_k, v|
       v.sort! { |a, b| b[:version] <=> a[:version] }
     end
     time_now = Time.now.utc

data/lib/marty/monkey.rb

@@ -210,7 +210,7 @@ module Netzke::Basepack::DataAdapters
       predicates[1..-1].inject(predicates.first) { |r, p| r.and(p)  }
     end
 
-    def update_predecate_for_enum(table, op, value)
+    def update_predecate_for_enum(table, _op, value)
       col = Arel::Nodes::NamedFunction.new('CAST', [table.as('TEXT')])
       col.matches "%#{value}%"
     end

data/lib/marty/promise_proxy.rb

@@ -31,7 +31,7 @@ class Marty::PromiseProxy < BasicObject
     @promise
   end
 
-  def is_a?(c)
+  def is_a?(_c)
     # Marty::PromiseProxy == c
     # {}.is_a? c
 

data/lib/marty/rule_script_set.rb

@@ -47,7 +47,7 @@ class Marty::RuleScriptSet < Delorean::AbstractContainer
     dgid.ends_with?('_grid') ? dgid + '_result' : dgid + '_grid_result'
   end
 
-  def expand_grid_code(h, dgid, dgname, cache, extra_params)
+  def expand_grid_code(h, dgid, dgname, cache, _extra_params)
     final_name = self.class.grid_final_name(dgid)
     if cache[dgname]
       h[final_name] = (cache[dgname]).to_s
@@ -133,7 +133,7 @@ class Marty::RuleScriptSet < Delorean::AbstractContainer
       acc + [acc.last + len]
     end
     ranges = oh.keys.zip(ranges0.each_cons(2).to_a)
-    secnm, (st, en) = ranges.detect do |sec, (st, en)|
+    secnm, (st, en) = ranges.detect do |_sec, (st, en)|
       line.between?(st, en - 1)
     end
     [secnm, line - st + 1]

data/lib/marty/util.rb

@@ -100,9 +100,8 @@ module Marty::Util
     when Array
       obj.map { |o| deep_round(o, digits) }
     when Hash
-      obj.inject({}) do |result, (key, value)|
+      obj.each_with_object({}) do |(key, value), result|
         result[key] = deep_round(value, digits)
-        result
       end
     else
       obj.is_a?(Float) ? obj.round(digits) : obj

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '2.7.1'
+  VERSION = '2.7.2'
 end

data/lib/marty/xl.rb

@@ -521,10 +521,9 @@ class Marty::Xl
     when Array
       obj.map { |x| symbolize_keys(x, sym_str) }
     when Hash
-      obj.inject({}) do |result, (key, value)|
+      obj.each_with_object({}) do |(key, value), result|
         key = key.to_sym if key.is_a?(String)
         result[key] = symbolize_keys(value, sym_str)
-        result
       end
     when String
       (sym_str && obj.starts_with?(sym_str)) ? obj[sym_str.length..-1].to_sym : obj

data/other/marty/api/base.rb

@@ -50,7 +50,7 @@ class Marty::Api::Base
     ).pluck(:app_name).first
   end
 
-  def self.evaluate params, request, config
+  def self.evaluate params, _request, config
     # prevent script evaluation from modifying passed in params
     params = params.deep_dup
 
@@ -234,7 +234,7 @@ class Marty::Api::Base
         errs.map { |err| _get_errors(err) }
       elsif errs.is_a?(Hash)
         if !errs.include?(:failed_attribute)
-          errs.map { |k, v| _get_errors(v) }
+          errs.map { |_k, v| _get_errors(v) }
         else
           fa, fragment, message, errors = errs.values_at(:failed_attribute,
                                                          :fragment,

data/other/marty/diagnostic/nodes.rb

@@ -35,7 +35,7 @@ module Marty::Diagnostic; class Nodes < Base
        'terminated'    => error_if(instances.terminated),
        'stopping'      => error_if(instances.stopping),
        'stopped'       => error_if(instances.stopped),
-      }.delete_if { |k, v| v.empty? }
+      }.delete_if { |_k, v| v.empty? }
     rescue StandardError => e
       error(e.message)
     end

data/spec/controllers/diagnostic/controller_spec.rb

@@ -35,7 +35,7 @@ module Marty::Diagnostic
 
         # generate version data and declare all values consistent
         versions = Version.generate.each_with_object({}) do |(n, v), h|
-          h[n] = v.each { |t, r| r['consistent'] = true }
+          h[n] = v.each { |_t, r| r['consistent'] = true }
         end
 
         expected = {

data/spec/features/reporting_spec.rb

@@ -76,7 +76,7 @@ DD: BB
     result = 444
 DELOREAN
 
-    with_user('dev1') do |u|
+    with_user('dev1') do |_u|
       Marty::Posting.do_create('BASE', SOME_DT, 'a comment')
 
       Marty::Script.

data/spec/features/scripting_spec.rb

@@ -85,7 +85,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
     and_by 'select the new script' do
       wait_for_ajax
       within(:gridpanel, 'script_grid', match: :first) do
-        expect(script_grid.get_row_vals(6)).to netzke_include(:name => 'Xyz', :tag => 'DEV')
+        expect(script_grid.get_row_vals(6)).to netzke_include(name: 'Xyz', tag: 'DEV')
         script_grid.select_row(6)
       end
     end
@@ -289,7 +289,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
       wait_for_ajax
       script_grid.select_row(5)
       expect(page).to have_content '1 #123 2 #456'
-      expect(tag_grid.get_row_vals(2)).to netzke_include(:comment => 'ABCD')
+      expect(tag_grid.get_row_vals(2)).to netzke_include(comment: 'ABCD')
     end
   end
 

data/spec/features/scripting_test_spec.rb

@@ -45,7 +45,7 @@ C:
     a = 456.0 + p0
 DELOREAN
 
-    with_user('dev1') do |u|
+    with_user('dev1') do |_u|
       Marty::Script.
         load_script_bodies({
                              'M1' => sample_script,
@@ -74,7 +74,7 @@ B: A
     p =? 5
 DELOREAN
 
-    with_user('dev1') do |u|
+    with_user('dev1') do |_u|
       Marty::Script.
         load_script_bodies({
                              'M3' => sample_script2,

data/spec/features/user_view_spec.rb

@@ -78,11 +78,11 @@ feature 'under Sytem menu, User Management worflows', js: true do
     and_by 'check row got edited' do
       wait_for_ajax
       expect(user_view.get_row_vals(2)).to netzke_include(
-        :login => 'new_login',
-        :firstname => 'new_fname',
-        :lastname => 'new_lname',
-        :active => true,
-        :roles => 'User Manager,Viewer',
+        login: 'new_login',
+        firstname: 'new_fname',
+        lastname: 'new_lname',
+        active: true,
+        roles: 'User Manager,Viewer',
       )
     end
 

data/spec/lib/json_schema_spec.rb

@@ -26,9 +26,9 @@ module Marty
         },
       }
     }
-    opt = { :validate_schema => true,
-                :errors_as_objects  => false,
-                :version            => Marty::JsonSchema::RAW_URI }
+    opt = { validate_schema: true,
+                errors_as_objects: false,
+                version: Marty::JsonSchema::RAW_URI }
 
     it 'returns no error on correct simple data' do
       data = { 'a' => 5 }
@@ -625,7 +625,7 @@ module Marty
   ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ###
 
   class FloorOf8 < JSON::Schema::Attribute
-    def self.validate(curr_schema, data, frag, processor, validator, opt)
+    def self.validate(curr_schema, data, frag, processor, _validator, opt)
       if data < 8
         msg = 'Error at FloorOf8: Value is below 8'
         validation_error(processor,
@@ -639,7 +639,7 @@ module Marty
   end
 
   class CeilingOf20 < JSON::Schema::Attribute
-    def self.validate(curr_schema, data, frag, processor, validator, opt)
+    def self.validate(curr_schema, data, frag, processor, _validator, opt)
       if data > 20
         msg = 'Error at CeilingOf20: Value exceeds 20'
         validation_error(processor,

data/spec/lib/xl_spec.rb

@@ -88,7 +88,7 @@ describe Marty::Xl do
     Delorean::Engine.new 'YYY'
   end
 
-  def worksheet(ind, c)
+  def worksheet(_ind, c)
     code = CODE.clone
     map = { 'C1' => c[0].to_s, 'C2' => c[1].to_s }
     map.each { |k, v| code.sub!(k, v)  }

data/spec/spec_helper.rb

@@ -42,7 +42,7 @@ RSpec.configure do |config|
     marty_whodunnit
   end
 
-  config.after(:each, :js => true) do |example|
+  config.after(:each, js: true) do |example|
     # save a screenshot on js failures for CI server testing
     if example.exception
       meta = example.metadata

data/spec/support/components/netzke_grid.rb

@@ -265,7 +265,7 @@ module Marty; module RSpec; module Components
       res
     end
 
-    def end_edit(row, field)
+    def end_edit(_row, _field)
       run_js <<-JS
           #{ext_var(grid, 'grid')}
           #{ext_var(ext_celleditor, 'editor')}
@@ -383,7 +383,7 @@ module Marty; module RSpec; module Components
         JS
     end
 
-    def end_edit(row, field)
+    def end_edit(_row, _field)
       run_js <<-JS
           #{ext_var(grid, 'grid')}
           #{ext_var(ext_celleditor, 'editor')}

data/spec/support/netzke.rb

@@ -1,7 +1,7 @@
 module Marty; module RSpec; module Netzke
   MAX_WAIT_TIME = 5.0
 
-  def by message, level = 0
+  def by message, _level = 0
     wait_for_ready(10)
     pending(message) unless block_given?
     yield
@@ -30,8 +30,8 @@ module Marty; module RSpec; module Netzke
     end
 
     find(:xpath, '//span', text: 'Sign in', match: :first, wait: 5).click
-    fill_in('login', :with => username)
-    fill_in('password', :with => password)
+    fill_in('login', with: username)
+    fill_in('password', with: password)
     press('OK')
     wait_for_ajax
   end
@@ -64,7 +64,7 @@ module Marty; module RSpec; module Netzke
     end
   end
 
-  def popup message = ''
+  def popup _message = ''
     wait_for_ready
     yield if block_given?
     close_window

data/spec/support/shared_connection.rb

@@ -20,12 +20,12 @@ module Marty; module RSpec; module SharedConnection
     def self.connection
       EXCL_LAMBDA.call.include?(model_name) ? orig_connection :
         @@shared_connection ||
-        ConnectionPool::Wrapper.new(:size => 1) { retrieve_connection }
+        ConnectionPool::Wrapper.new(size: 1) { retrieve_connection }
     end
 
     def self.reset_shared_connection
       @@shared_connection = ConnectionPool::Wrapper.
-                              new(:size => 1) { retrieve_connection }
+                              new(size: 1) { retrieve_connection }
     end
   end
 end end end

data/spec/support/users.rb

@@ -13,7 +13,7 @@ module Marty; module RSpec; module Users
 
         role = Marty::Role.find_by_name(role_name.to_s)
 
-        rails "Oops unknown role: #{role_name}. Was db seeded?" unless role
+        raise "Oops unknown role: #{role_name}. Was db seeded?" unless role
 
         user_role = Marty::UserRole.new
         user_role.user = user

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg