marty 2.5.2 → 2.5.4

data/Gemfile

@@ -1,28 +1,28 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Declare your gem's dependencies in marty.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
 gemspec
 
-gem 'delayed_job_active_record'
 gem 'daemons'
-gem 'rails', '~> 5.1.4'
+gem 'delayed_job_active_record'
 gem 'pg'
+gem 'rails', '~> 5.1.4'
 gem 'sqlite3'
 
 group :development, :test do
+  gem 'capybara'
+  gem 'chromedriver-helper'
+  gem 'connection_pool'
+  gem 'database_cleaner'
   gem 'pry-rails'
-  gem 'rspec-rails'
+  gem 'rails-controller-testing'
   gem 'rspec-instafail', require: false
+  gem 'rspec-rails'
   gem 'rubocop', require: false
-  gem 'capybara'
   gem 'selenium-webdriver'
-  gem 'chromedriver-helper'
   gem 'timecop'
-  gem 'database_cleaner'
-  gem 'rails-controller-testing'
-  gem 'connection_pool'
 
   # gem 'mcfly', path: File.expand_path('../../mcfly', __FILE__)
   gem 'mcfly'

data/Gemfile.lock

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

data/Rakefile

@@ -20,11 +20,9 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
 task default: 'app:spec'

data/app/components/marty/api_auth_view.rb

@@ -7,10 +7,10 @@ class Marty::ApiAuthView < Marty::McflyGridPanel
   def configure(c)
     super
 
-    c.title   = I18n.t('api_auth', default: "API Authorization")
-    c.model   = "Marty::ApiAuth"
+    c.title   = I18n.t('api_auth', default: 'API Authorization')
+    c.model   = 'Marty::ApiAuth'
     c.attributes = [:app_name, :api_key, :script_name]
-    c.store_config.merge!({sorters: [{property: :app_name, direction: 'ASC'}]})
+    c.store_config.merge!(sorters: [{ property: :app_name, direction: 'ASC' }])
   end
 
   attribute :app_name do |c|

data/app/components/marty/api_config_view.rb

@@ -23,11 +23,12 @@ class Marty::ApiConfigView < Marty::Grid
     c.paging = :pagination
     c.editing = :in_form
     c.store_config.merge!(
-      sorters: [{ property: :script, direction: :ASC},
-                { property: :node,      direction: :ASC},
-                { property: :attr,      direction: :ASC},
-                { property: :api_class, direction: :ASC},
-               ])
+      sorters: [
+        { property: :script,    direction: :ASC },
+        { property: :node,      direction: :ASC },
+        { property: :attr,      direction: :ASC },
+        { property: :api_class, direction: :ASC },
+      ])
     @model = c.model
   end
 
@@ -44,7 +45,7 @@ class Marty::ApiConfigView < Marty::Grid
       type:          :string,
     )
     c.width = 200
-    c.label = "API Class"
+    c.label = 'API Class'
   end
 
   attribute :script do |c|
@@ -70,8 +71,7 @@ class Marty::ApiConfigView < Marty::Grid
     end
   end
 
-  [:logged, :input_validated, :output_validated, :strict_validate].each do
-    |a|
+  [:logged, :input_validated, :output_validated, :strict_validate].each do |a|
     attribute a do |c|
       c.width = 110
     end

data/app/components/marty/api_log_view.rb

@@ -30,8 +30,8 @@ class Marty::ApiLogView < Marty::Grid
     c.title      = 'Api Log View'
     c.model      = Marty::Log
     c.attributes = @@attrs
-    c.scope      = {message_type: 'api'}
-    c.store_config.merge!(sorters: [{property: :timestamp, direction: 'DESC'}])
+    c.scope      = { message_type: 'api' }
+    c.store_config.merge!(sorters: [{ property: :timestamp, direction: 'DESC' }])
   end
 
   component :edit_window do |c|
@@ -46,8 +46,8 @@ class Marty::ApiLogView < Marty::Grid
       :attrs,
       :start_time,
       :end_time,
-      textarea_field(:input).merge!({height: 300}),
-      textarea_field(:output).merge!({height: 300}),
+      textarea_field(:input).merge!(height: 300),
+      textarea_field(:output).merge!(height: 300),
       :error,
       :remote_ip,
       :auth_name,
@@ -58,13 +58,11 @@ class Marty::ApiLogView < Marty::Grid
     attribute a do |c|
       c.filterable    = true
       c.read_only     = true
-      c.getter        = lambda {|r| r.details[a.to_s] }
-      c.sorting_scope = lambda {
-        |r, dir|
+      c.getter        = lambda { |r| r.details[a.to_s] }
+      c.sorting_scope = lambda { |r, dir|
         r.order("details->>'#{a.to_s}'" + dir.to_s)
       }
-      c.filter_with = lambda {
-        |r, v, op|
+      c.filter_with = lambda { |r, v, op|
         r.where("details->>'#{a.to_s}' #{op} '#{v}%'")
       } unless [:start_time, :endtime].include?(a)
 
@@ -72,17 +70,15 @@ class Marty::ApiLogView < Marty::Grid
       when :start_time, :end_time
         c.type        = :datetime
         c.format      = 'Y-m-d h:i:s'
-        c.getter      = lambda {|r| Time.zone.parse(r.details[a.to_s])}
-        c.filter_with = lambda {
-          |r, v, op|
+        c.getter      = lambda { |r| Time.zone.parse(r.details[a.to_s]) }
+        c.filter_with = lambda { |r, v, op|
           r.where("(details->>'#{a.to_s}')::date #{DATE_OP_MAP[op]} '#{v}%'")
         }
       when :input, :output
         c.getter    = lambda { |r| r.details[a.to_s].pretty_inspect }
         c.width     = 900
         c.read_only = true
-        c.filter_with = lambda {
-          |r, v, op|
+        c.filter_with = lambda { |r, v, op|
           r.where("(details->>'#{a.to_s}')::text #{op} '%#{v}%'")
         }
       end
@@ -96,9 +92,9 @@ class Marty::ApiLogView < Marty::Grid
     end
   end
 
-  #copied from log_view.rb
+  # copied from log_view.rb
   attribute :timestamp_custom do |c|
-    c.text         = I18n.t("log_grid.timestamp")
+    c.text         = I18n.t('log_grid.timestamp')
     c.width        = 200
     c.read_only    = true
     c.filterable = true
@@ -108,14 +104,14 @@ class Marty::ApiLogView < Marty::Grid
       xtype: :displayfield,
     }
     c.getter = lambda { |r| Time.at(r.timestamp) }
-    c.sorting_scope = lambda {|r, dir| r.order("timestamp " + dir.to_s)}
+    c.sorting_scope = lambda { |r, dir| r.order('timestamp ' + dir.to_s) }
 
     # FIXME?: The UI AR/PG DateTime workaround requires the timestamp to be cast
     # to text in order to compare filter input using the LIKE operator.
     # Otherwise it will fail. '<' and '>' functionality is missing.
-    c.filter_with = lambda {|r, v, op|
-      r.where("timestamp::text  #{op} '#{v}%'")}
+    c.filter_with = lambda { |r, v, op|
+      r.where("timestamp::text  #{op} '#{v}%'")
+    }
   end
-
 end
 ApiLogView = Marty::ApiLogView

data/app/components/marty/auth_app.rb

@@ -12,14 +12,14 @@ class Marty::AuthApp < Marty::SimpleApp
     [].tap do |menu|
       user = Mcfly.whodunnit
       if !user.nil?
-        menu << "->" << {
+        menu << '->' << {
           text: user.name,
           tooltip: 'Current user',
           menu: user_menu,
-          name: "sign_out",
+          name: 'sign_out',
         }
       else
-        menu << "->" << :sign_in
+        menu << '->' << :sign_in
       end
     end
   end
@@ -29,18 +29,18 @@ class Marty::AuthApp < Marty::SimpleApp
   end
 
   action :sign_in do |c|
-    c.icon_cls = "fa fa-sign-in-alt gylph"
+    c.icon_cls = 'fa fa-sign-in-alt gylph'
   end
 
   action :sign_out do |c|
-    c.icon_cls = "fa fa-sign-out-alt gylph"
+    c.icon_cls = 'fa fa-sign-out-alt gylph'
     c.text     = "Sign out #{Mcfly.whodunnit.name}" if Mcfly.whodunnit
   end
 
   endpoint :sign_in do |params|
     user = Marty::User.try_to_login(params[:login], params[:password])
     user ? Netzke::Base.controller.set_user(user) :
-      client.netzke_notify("Wrong credentials")
+      client.netzke_notify('Wrong credentials')
 
     !!user
   end

data/app/components/marty/base_rule_view.rb

@@ -4,6 +4,7 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
   def self.klass
     Marty::BaseRule
   end
+
   def klass
     self.class.klass
   end
@@ -11,19 +12,21 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
   def self.base_fields
     [:name]
   end
+
   def self.computed_fields
     [:computed_guards, :grids, :results]
   end
+
   def configure(c)
     super
     c.model = self.class.klass
     c.title = I18n.t('rule')
     c.attributes = self.class.base_fields +
                    klass.guard_info.
-                     sort_by{|_, h| h[:order] || 0}.
-                     reject{|_, h| h[:hidden]}.
+                     sort_by { |_, h| h[:order] || 0 }.
+                     reject { |_, h| h[:hidden] }.
                      map { |name, _| name.to_sym } + self.class.computed_fields
-    c.store_config.merge!(sorters: [{property: :name, direction: 'ASC'}])
+    c.store_config.merge!(sorters: [{ property: :name, direction: 'ASC' }])
     c.editing      = :in_form
     c.paging       = :pagination
     c.multi_select = false
@@ -42,6 +45,7 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
       @key    = key
       @lineno = lineno
     end
+
     def message
       "keyword '#{@key}' specified more than once (line #{@lineno})"
     end
@@ -53,22 +57,25 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
     last_key = nil
     s.lines.each.with_index(1) do |line, idx|
       next if /\A\s*\z/.match(line)
+
       line.chomp!
       begin
         m = /\A\s*([a-z][a-z0-9_]*)\s*=\s*(.*)\s*\z/.match(line)
         if m
           k, v = m[1], m[2]
           raise DupKeyError.new(k, idx) if result.keys.include?(k)
+
           save_linenos[k] = idx
           result[k] = v
           last_key = k
         else
           raise unless last_key
+
           result[last_key] += "\n" + line.strip
         end
       rescue DupKeyError => e
         raise
-      rescue => e
+      rescue StandardError => e
         raise "syntax error on line #{idx}"
       end
     end
@@ -77,6 +84,7 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
 
   def self.hash_to_simple(h)
     return unless h && h.present?
+
     lhs_wid = h.keys.map(&:length).max
     fmt = "%-#{lhs_wid}s = %s"
     result = []
@@ -84,7 +92,7 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
       vlines = vstr.lines.map(&:chomp)
       fst = vlines.shift
       result << fmt % [k, fst]
-      vlines.each {|l| result << " "*(lhs_wid+3) + l}
+      vlines.each { |l| result << ' ' * (lhs_wid + 3) + l }
     end
     result.join("\n")
   end
@@ -94,7 +102,7 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
   end
 
   def jsonb_simple_getter(c)
-    lambda {|r| Marty::BaseRuleView.hash_to_simple(r.send(c)) }
+    lambda { |r| Marty::BaseRuleView.hash_to_simple(r.send(c)) }
   end
 
   def jsonb_simple_setter(c)
@@ -104,7 +112,7 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
 
       begin
         final = Marty::BaseRuleView.simple_to_hash(v)
-      rescue => e
+      rescue StandardError => e
         final = { "~~ERROR~~": e.message }
       end
 
@@ -115,16 +123,16 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
     }
   end
 
-  def self.jsonb_field_getter(j, c, nullbool=nil)
+  def self.jsonb_field_getter(j, c, nullbool = nil)
     lambda do |r|
       rv = r.send(j)[c]
       v = nullbool ? (rv == true ? 'True' :
                         rv == false ? 'False' : rv) : rv
-      v || ""
+      v || ''
     end
   end
 
-  def self.jsonb_field_setter(j, c, bool=nil)
+  def self.jsonb_field_setter(j, c, bool = nil)
     lambda do |r, rv|
       v = bool ? rv.to_s.downcase == 'true' : rv
       rv == '' || rv == '---' ? r.send(j).delete(c) : r.send(j)[c] = v
@@ -157,7 +165,7 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
     c.width = 150
   end
 
-  def self.grid_column(c, label=nil)
+  def self.grid_column(c, label = nil)
     editor_config = {
       trigger_action: :all,
       xtype:          :combo,
@@ -173,8 +181,8 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
       type:          :string,
       getter: jsonb_field_getter(:grids, c.to_s),
       setter: jsonb_field_setter(:grids, c.to_s),
-#      getter: lambda { |r| r.grids[c.to_s] },
-#      setter: lambda { |r, v| r.grids[c.to_s] = v },
+      #      getter: lambda { |r| r.grids[c.to_s] },
+      #      setter: lambda { |r, v| r.grids[c.to_s] = v },
     }
   end
 
@@ -183,7 +191,7 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
   end
 
   def form_items_guards
-    klass.guard_info.reject{|_, h| h[:hidden]}.keys.map{|x|x.to_sym}
+    klass.guard_info.reject { |_, h| h[:hidden] }.keys.map(&:to_sym)
   end
 
   def form_items_grids
@@ -213,11 +221,11 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
         vbox(*form_items_attrs +
              form_items_guards,
              border: false,
-             width: "40%",
-        ),
+             width: '40%',
+            ),
         vbox(width: '2%', border: false),
         vbox(
-             width: '55%', border: false),
+          width: '55%', border: false),
         height: '40%',
         border: false,
       ),
@@ -227,7 +235,7 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
              form_items_results,
              width: '99%',
              border: false
-        ),
+            ),
         height: '40%',
        border: false
       )
@@ -264,7 +272,7 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
       if h[:type] != :range
         c.getter = Marty::BaseRuleView.jsonb_field_getter(meth, namestr, nullbool)
         c.setter = Marty::BaseRuleView.jsonb_field_setter(meth, namestr,
-                                                          h[:type]==:boolean)
+                                                          h[:type] == :boolean)
         c.filter_with = lambda do |rel, value, op|
           v = ActiveRecord::Base.connection.quote(value)[1..-2]
           rel.where("#{meth}->>'#{namestr}' like '%#{v}%'")

data/app/components/marty/config_view.rb

@@ -9,11 +9,11 @@ class Marty::ConfigView < Marty::Grid
   def configure(c)
     super
 
-    c.title      = I18n.t('config', default: "Config")
-    c.model      = "Marty::Config"
+    c.title      = I18n.t('config', default: 'Config')
+    c.model      = 'Marty::Config'
     c.attributes = [:key, :value, :description]
     c.editing    = :both
-    c.store_config.merge!(sorters: [{property: :key, direction: 'ASC'}])
+    c.store_config.merge!(sorters: [{ property: :key, direction: 'ASC' }])
   end
 
   def my_jsonb_getter
@@ -21,13 +21,16 @@ class Marty::ConfigView < Marty::Grid
   end
 
   def my_jsonb_pretty_getter
-    lambda { |r| v = Marty::Config[r.key]
-      !v.nil? && (JSON.pretty_generate(v) rescue v.to_json) || '' }
+    lambda { |r|
+      v = Marty::Config[r.key]
+      !v.nil? && (JSON.pretty_generate(v) rescue v.to_json) || ''
+    }
   end
 
   def my_jsonb_setter
     lambda { |r, v|
       return r.set_value(nil) if v.blank?
+
       decoded = ActiveSupport::JSON.decode(v) rescue nil
       r.set_value(decoded)
     }
@@ -36,10 +39,10 @@ class Marty::ConfigView < Marty::Grid
   def default_form_items
     [
       :key,
-      jsonb_field(:value, {
-                    getter: my_jsonb_pretty_getter,
-                    setter: my_jsonb_setter,
-                  }),
+      jsonb_field(:value,
+                  getter: my_jsonb_pretty_getter,
+                  setter: my_jsonb_setter,
+                 ),
       textarea_field(:description),
     ]
   end