marty 5.1.3 → 5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 721393c215b2dbf1013c0ed60c8bee3fbc801f3a
-  data.tar.gz: 71bedcb01d1fb87f391df4699662e27d7589b5ce
+  metadata.gz: 76a0d4a1329fc8a257a905e327c3245dde1e638a
+  data.tar.gz: e918f2b2349a35da28cfdd7e01c0c6710cc5190c
 SHA512:
-  metadata.gz: 4aa0408d877bc3f5d5f7a196880030abcf89b4c32d002c913e053368e455542e38ca8db6f1c6c7d2e1b317cac7113606cc2c1b7a375b1594b5e4ede492375173
-  data.tar.gz: e454bc45988cc864988c81a293fef71fa3158076ef7c714aca66be7519dc37f116b6cd1de194fab75f55fe9fe33bf202f2fd69cb81ab50d3fd1ca1dc0b3f3b30
+  metadata.gz: ca56ed8fdeb18d1951a6ceeefb7ae3d7b63b7292ac7a577d628153384c333693888feb2669c9ec6ad1074a680ab89a6db9a8212e3540462ee79d6410f937deae
+  data.tar.gz: 36157384d4e25c764cbe1277380603da2e3ef359a07220f2e1572ad7b3a3f2a29810e0917d8a3a9af4e9795e6b3dc45280a523fd0a436f0278b6cd744f44ca03

data/.rubocop_todo.yml

@@ -1,29 +1,21 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-01-22 15:18:37 +0300 using RuboCop version 0.63.1.
+# on 2019-08-13 13:20:18 -0700 using RuboCop version 0.73.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 526
+# Offense count: 418
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
 # SupportedColonStyles: key, separator, table
 # SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
 Layout/AlignHash:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth.
-# SupportedStyles: case, end
-Layout/CaseIndentation:
-  Exclude:
-    - 'app/models/marty/data_grid.rb'
-
-# Offense count: 35
+# Offense count: 38
 # Cop supports --auto-correct.
 Layout/ClosingHeredocIndentation:
   Exclude:
@@ -38,59 +30,76 @@ Layout/ClosingHeredocIndentation:
 Layout/EndAlignment:
   Enabled: false
 
-# Offense count: 81
+# Offense count: 33
 # Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
 Layout/ExtraSpacing:
-  Enabled: false
+  Exclude:
+    - 'app/components/marty/data_grid_view.rb'
+    - 'app/components/marty/posting_window.rb'
+    - 'app/models/marty/data_grid.rb'
+    - 'lib/marty/logger.rb'
+    - 'lib/marty/migrations.rb'
+    - 'lib/marty/monkey.rb'
+    - 'spec/controllers/rpc_controller_spec.rb'
+    - 'spec/features/rule_spec.rb'
+    - 'spec/lib/json_schema_spec.rb'
+    - 'spec/models/data_grid_spec.rb'
+    - 'spec/models/event_spec.rb'
+    - 'spec/models/rule_spec.rb'
+    - 'spec/models/script_spec.rb'
 
-# Offense count: 136
+# Offense count: 112
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
 Layout/IndentFirstHashElement:
   Exclude:
     - 'app/components/marty/extras/layout.rb'
-    - 'lib/marty/data_change.rb'
-    - 'lib/marty/rpc_call.rb'
     - 'spec/controllers/diagnostic/controller_spec.rb'
-    - 'spec/controllers/job_controller_spec.rb'
     - 'spec/controllers/rpc_controller_spec.rb'
     - 'spec/controllers/rpc_import_spec.rb'
-    - 'spec/dummy/app/models/gemini/fannie_bup.rb'
-    - 'spec/features/user_view_spec.rb'
-    - 'spec/lib/data_importer_spec.rb'
     - 'spec/lib/json_schema_spec.rb'
     - 'spec/models/api_auth_spec.rb'
 
-# Offense count: 92
+# Offense count: 93
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
+# SupportedStyles: squiggly, active_support, powerpack, unindent
 Layout/IndentHeredoc:
   Enabled: false
 
-# Offense count: 230
+# Offense count: 288
 # Cop supports --auto-correct.
 # Configuration parameters: Width, IgnoredPatterns.
 Layout/IndentationWidth:
   Enabled: false
 
-# Offense count: 44
+# Offense count: 22
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: symmetrical, new_line, same_line
 Layout/MultilineHashBraceLayout:
-  Enabled: false
+  Exclude:
+    - 'app/components/marty/event_view.rb'
+    - 'app/components/marty/user_view.rb'
+    - 'app/models/marty/delorean_rule.rb'
+    - 'lib/marty/migrations.rb'
+    - 'lib/marty/schema_helper.rb'
+    - 'other/marty/api/base.rb'
+    - 'other/marty/diagnostic/nodes.rb'
+    - 'spec/features/rule_spec.rb'
+    - 'spec/lib/json_schema_spec.rb'
+    - 'spec/other/diagnostic/base_spec.rb'
 
-# Offense count: 124
+# Offense count: 123
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: symmetrical, new_line, same_line
 Layout/MultilineMethodCallBraceLayout:
   Enabled: false
 
-# Offense count: 81
+# Offense count: 88
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented, indented_relative_to_receiver
@@ -105,7 +114,7 @@ Layout/MultilineMethodDefinitionBraceLayout:
   Exclude:
     - 'lib/marty/data_importer.rb'
 
-# Offense count: 20
+# Offense count: 18
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented
@@ -119,12 +128,10 @@ Layout/MultilineOperationIndentation:
     - 'lib/marty/data_change.rb'
     - 'other/marty/api/base.rb'
     - 'spec/controllers/application_controller_spec.rb'
-    - 'spec/dummy/app/models/gemini/extras/settlement_import.rb'
     - 'spec/models/api_auth_spec.rb'
     - 'spec/models/script_spec.rb'
     - 'spec/support/shared_connection.rb'
 
-
 # Offense count: 11
 # Cop supports --auto-correct.
 # Configuration parameters: IndentationWidth.
@@ -132,31 +139,6 @@ Layout/Tab:
   Exclude:
     - 'app/components/marty/posting_window.rb'
 
-# Offense count: 9
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingBlankLines:
-  Exclude:
-    - 'spec/dummy/app/controllers/components_controller.rb'
-    - 'spec/dummy/config/boot.rb'
-    - 'spec/dummy/public/extjs/build/examples/classic/app/nested-loading/resources/sass/config.rb'
-    - 'spec/dummy/public/extjs/build/examples/classic/panel/bubble-panel/resources/sass/config.rb'
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/overrides.rb'
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/utils.rb'
-    - 'spec/dummy/public/extjs/examples/classic/app/nested-loading/resources/sass/config.rb'
-    - 'spec/dummy/public/extjs/examples/classic/panel/bubble-panel/resources/sass/config.rb'
-    - 'spec/dummy/public/extjs/modern/theme-base/sass/utils.rb'
-
-# Offense count: 28
-# Cop supports --auto-correct.
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/overrides.rb'
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/utils.rb'
-    - 'spec/lib/xl_spec.rb'
-
 # Offense count: 1
 Lint/AmbiguousBlockAssociation:
   Exclude:
@@ -168,19 +150,17 @@ Lint/AmbiguousOperator:
     - 'app/components/marty/script_form.rb'
     - 'other/marty/diagnostic/aws/ec2_instance.rb'
 
-# Offense count: 6
+# Offense count: 3
 Lint/AmbiguousRegexpLiteral:
   Exclude:
     - 'spec/controllers/job_controller_spec.rb'
-    - 'spec/dummy/app/models/gemini/fannie_bup.rb'
     - 'spec/models/posting_spec.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
     - 'app/components/marty/event_view.rb'
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/overrides.rb'
 
 # Offense count: 2
 Lint/Debugger:
@@ -195,11 +175,12 @@ Lint/DuplicateMethods:
     - 'spec/support/shared_connection_db_helpers.rb'
 
 # Offense count: 2
+# Configuration parameters: AllowComments.
 Lint/HandleExceptions:
   Exclude:
     - 'spec/support/netzke.rb'
 
-# Offense count: 23
+# Offense count: 25
 Lint/IneffectiveAccessModifier:
   Exclude:
     - 'app/components/marty/mcfly_grid_panel.rb'
@@ -219,12 +200,10 @@ Lint/LiteralAsCondition:
   Exclude:
     - 'app/models/marty/promise.rb'
 
-# Offense count: 10
+# Offense count: 3
 Lint/ParenthesesAsGroupedExpression:
   Exclude:
-    - 'lib/marty/permissions.rb'
     - 'spec/lib/logger_spec.rb'
-    - 'spec/models/data_grid_spec.rb'
     - 'spec/models/user_spec.rb'
     - 'spec/support/suite.rb'
 
@@ -233,18 +212,11 @@ Lint/RescueException:
   Exclude:
     - 'lib/marty/promise_proxy.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 Lint/ScriptPermission:
   Exclude:
     - 'Rakefile'
-    - 'spec/dummy/Rakefile'
-
-# Offense count: 1
-# Configuration parameters: IgnoreImplicitReferences.
-Lint/ShadowedArgument:
-  Exclude:
-    - 'app/components/marty/main_auth_app.rb'
 
 # Offense count: 7
 Lint/ShadowingOuterLocalVariable:
@@ -257,20 +229,19 @@ Lint/ShadowingOuterLocalVariable:
     - 'other/marty/diagnostic/base.rb'
     - 'other/marty/diagnostic/database.rb'
 
-# Offense count: 8
+# Offense count: 7
 # Cop supports --auto-correct.
 Lint/StringConversionInInterpolation:
   Exclude:
     - 'app/components/marty/api_log_view.rb'
-    - 'app/components/marty/extras/layout.rb'
     - 'app/components/marty/import_view.rb'
     - 'spec/support/netzke.rb'
 
 # Offense count: 2
+# Configuration parameters: AllowKeywordBlockArguments.
 Lint/UnderscorePrefixedVariableName:
   Exclude:
     - 'lib/marty/monkey.rb'
-    - 'lib/marty/promise_job.rb'
 
 # Offense count: 4
 Lint/UriEscapeUnescape:
@@ -289,7 +260,7 @@ Lint/UselessAccessModifier:
     - 'lib/marty/json_schema.rb'
     - 'other/marty/diagnostic/reporter.rb'
 
-# Offense count: 159
+# Offense count: 90
 Lint/UselessAssignment:
   Enabled: false
 
@@ -303,20 +274,14 @@ Lint/Void:
     - 'spec/lib/xl_styles_spec.rb'
     - 'spec/models/posting_spec.rb'
 
-# Offense count: 101
+# Offense count: 109
 Metrics/AbcSize:
-  Max: 134
-
-# Offense count: 138
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
-Metrics/BlockLength:
-  Max: 842
+  Max: 129
 
-# Offense count: 21
+# Offense count: 22
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 600
+  Max: 578
 
 # Offense count: 68
 Metrics/CyclomaticComplexity:
@@ -327,21 +292,21 @@ Metrics/CyclomaticComplexity:
 Metrics/MethodLength:
   Max: 98
 
-# Offense count: 12
+# Offense count: 11
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 690
+  Max: 598
 
-# Offense count: 13
+# Offense count: 17
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
-  Max: 9
+  Max: 10
 
-# Offense count: 47
+# Offense count: 50
 Metrics/PerceivedComplexity:
   Max: 35
 
-# Offense count: 27
+# Offense count: 30
 Naming/AccessorMethodName:
   Enabled: false
 
@@ -349,9 +314,8 @@ Naming/AccessorMethodName:
 Naming/BinaryOperatorParameterName:
   Exclude:
     - 'lib/marty/monkey.rb'
-    - 'lib/marty/promise_job.rb'
 
-# Offense count: 11
+# Offense count: 12
 Naming/ConstantName:
   Exclude:
     - 'spec/models/data_grid_spec.rb'
@@ -364,7 +328,7 @@ Naming/HeredocDelimiterCase:
     - 'spec/controllers/rpc_controller_spec.rb'
     - 'spec/models/script_spec.rb'
 
-# Offense count: 62
+# Offense count: 64
 # Configuration parameters: Blacklist.
 # Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
@@ -380,13 +344,7 @@ Naming/HeredocDelimiterNaming:
     - 'spec/lib/xl_styles_spec.rb'
     - 'spec/models/data_grid_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: .
-# SupportedStyles: snake_case, camelCase
-Naming/MethodName:
-  EnforcedStyle: snake_case
-
-# Offense count: 9
+# Offense count: 10
 # Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
 # NamePrefixBlacklist: is_, has_, have_
@@ -403,20 +361,19 @@ Naming/PredicateName:
     - 'other/marty/api/base.rb'
     - 'other/marty/diagnostic/packer.rb'
 
-# Offense count: 146
+# Offense count: 148
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: io, id, to, by, on, in, at, ip, db
 Naming/UncommunicativeMethodParamName:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 3
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: snake_case, camelCase
 Naming/VariableName:
   Exclude:
     - 'app/models/marty/enum.rb'
     - 'app/models/marty/tag.rb'
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/utils.rb'
     - 'spec/features/enum_spec.rb'
 
 # Offense count: 1
@@ -447,11 +404,10 @@ Performance/FlatMap:
     - 'lib/marty/aws/request.rb'
     - 'other/marty/diagnostic/aws/ec2_instance.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 Performance/InefficientHashSearch:
   Exclude:
-    - 'app/components/marty/base_rule_view.rb'
     - 'other/marty/diagnostic/reporter.rb'
 
 # Offense count: 5
@@ -464,11 +420,10 @@ Performance/RedundantBlockCall:
     - 'spec/features/scripting_test_spec.rb'
     - 'spec/support/setup.rb'
 
-# Offense count: 5
+# Offense count: 4
 # Cop supports --auto-correct.
 Performance/RedundantMatch:
   Exclude:
-    - 'app/components/marty/base_rule_view.rb'
     - 'lib/marty/migrations.rb'
     - 'spec/support/components/netzke_combobox.rb'
     - 'spec/support/components/netzke_grid.rb'
@@ -484,7 +439,7 @@ Performance/RedundantMerge:
     - 'app/components/marty/event_view.rb'
     - 'app/components/marty/user_view.rb'
 
-# Offense count: 16
+# Offense count: 21
 # Cop supports --auto-correct.
 Performance/Size:
   Exclude:
@@ -492,11 +447,10 @@ Performance/Size:
     - 'spec/lib/mcfly_model_spec.rb'
     - 'spec/models/rule_spec.rb'
 
-# Offense count: 4
+# Offense count: 1
 # Cop supports --auto-correct.
 Performance/StringReplacement:
   Exclude:
-    - 'spec/dummy/app/models/gemini/fannie_bup.rb'
     - 'spec/lib/data_importer_spec.rb'
 
 # Offense count: 2
@@ -506,19 +460,12 @@ Performance/TimesMap:
   Exclude:
     - 'spec/models/data_grid_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/UnneededSort:
-  Exclude:
-    - 'app/models/marty/event.rb'
-
-# Offense count: 9
+# Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: prefer_alias, prefer_alias_method
 Style/Alias:
   Exclude:
-    - 'app/models/marty/pg_enum.rb'
     - 'app/models/marty/vw_promise.rb'
     - 'lib/marty/monkey.rb'
     - 'lib/marty/promise_proxy.rb'
@@ -548,19 +495,7 @@ Style/BarePercentLiterals:
     - 'spec/models/config_spec.rb'
     - 'spec/support/netzke.rb'
 
-# Offense count: 21
-Style/CaseEquality:
-  Exclude:
-    - 'app/components/marty/report_form.rb'
-    - 'app/models/marty/data_grid.rb'
-    - 'lib/marty/data_change.rb'
-    - 'lib/marty/data_conversion.rb'
-    - 'lib/marty/mcfly_model.rb'
-    - 'lib/marty/monkey.rb'
-    - 'other/marty/api/base.rb'
-    - 'spec/lib/mcfly_model_spec.rb'
-
-# Offense count: 157
+# Offense count: 130
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
@@ -617,7 +552,7 @@ Style/CommentedKeyword:
   Exclude:
     - 'app/models/marty/data_grid.rb'
 
-# Offense count: 6
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
 # SupportedStyles: assign_to_condition, assign_inside_condition
@@ -625,12 +560,11 @@ Style/ConditionalAssignment:
   Exclude:
     - 'app/components/marty/auth_app.rb'
     - 'app/controllers/marty/application_controller.rb'
-    - 'app/models/marty/script.rb'
     - 'spec/other/diagnostic/reporter_spec.rb'
     - 'spec/support/components/netzke_combobox.rb'
     - 'spec/support/components/netzke_grid.rb'
 
-# Offense count: 181
+# Offense count: 159
 Style/Documentation:
   Enabled: false
 
@@ -661,22 +595,32 @@ Style/EmptyMethod:
     - 'spec/models/import_type_spec.rb'
     - 'spec/support/empty_job.rb'
 
-# Offense count: 22
+# Offense count: 15
 # Cop supports --auto-correct.
 Style/ExpandPathArguments:
-  Enabled: false
+  Exclude:
+    - 'Rakefile'
+    - 'app/models/marty/script.rb'
+    - 'marty.gemspec'
+    - 'script/rails'
+    - 'spec/controllers/rpc_controller_spec.rb'
+    - 'spec/features/data_grid_spec.rb'
+    - 'spec/features/rule_spec.rb'
+    - 'spec/lib/struct_compare_spec.rb'
+    - 'spec/models/data_grid_spec.rb'
+    - 'spec/models/rule_spec.rb'
+    - 'spec/models/script_spec.rb'
+    - 'spec/spec_helper.rb'
 
-# Offense count: 9
+# Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: format, sprintf, percent
 Style/FormatString:
   Exclude:
-    - 'app/components/marty/base_rule_view.rb'
     - 'app/components/marty/extras/misc.rb'
     - 'app/models/marty/base_rule.rb'
     - 'spec/controllers/rpc_controller_spec.rb'
-    - 'spec/dummy/app/models/gemini/helper.rb'
     - 'spec/features/rule_spec.rb'
     - 'spec/lib/struct_compare_spec.rb'
     - 'spec/models/rule_spec.rb'
@@ -693,16 +637,14 @@ Style/FormatStringToken:
     - 'spec/lib/struct_compare_spec.rb'
     - 'spec/models/rule_spec.rb'
 
-# Offense count: 8
-# Configuration parameters: AllowedVariables.
-Style/GlobalVars:
-  Exclude:
-    - 'spec/dummy/public/extjs/build/examples/classic/app/nested-loading/resources/sass/config.rb'
-    - 'spec/dummy/public/extjs/build/examples/classic/panel/bubble-panel/resources/sass/config.rb'
-    - 'spec/dummy/public/extjs/examples/classic/app/nested-loading/resources/sass/config.rb'
-    - 'spec/dummy/public/extjs/examples/classic/panel/bubble-panel/resources/sass/config.rb'
+# Offense count: 211
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
 
-# Offense count: 16
+# Offense count: 15
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
@@ -716,7 +658,6 @@ Style/GuardClause:
     - 'app/models/marty/user.rb'
     - 'lib/marty/json_schema.rb'
     - 'lib/marty/util.rb'
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/utils.rb'
     - 'spec/lib/json_schema_spec.rb'
     - 'spec/support/post_run_logger.rb'
 
@@ -726,19 +667,18 @@ Style/IdenticalConditionalBranches:
     - 'app/components/marty/mcfly_grid_panel.rb'
 
 # Offense count: 1
+# Configuration parameters: AllowIfModifier.
 Style/IfInsideElse:
   Exclude:
     - 'lib/marty/data_change.rb'
 
-# Offense count: 7
+# Offense count: 5
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:
     - 'app/components/marty/promise_view.rb'
     - 'app/models/marty/promise.rb'
     - 'app/models/marty/token.rb'
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/utils.rb'
-    - 'spec/dummy/public/extjs/modern/theme-base/sass/utils.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -779,7 +719,7 @@ Style/Lambda:
     - 'spec/lib/xl_styles_spec.rb'
     - 'spec/support/shared_connection.rb'
 
-# Offense count: 29
+# Offense count: 24
 # Cop supports --auto-correct.
 Style/LineEndConcatenation:
   Exclude:
@@ -791,25 +731,22 @@ Style/LineEndConcatenation:
     - 'lib/marty/migrations.rb'
     - 'other/marty/api/base.rb'
     - 'spec/controllers/application_controller_spec.rb'
-    - 'spec/dummy/app/models/gemini/extras/settlement_import.rb'
     - 'spec/features/reporting_spec.rb'
     - 'spec/features/user_view_spec.rb'
     - 'spec/models/api_auth_spec.rb'
     - 'spec/models/script_spec.rb'
 
-# Offense count: 14
+# Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
 Style/MethodCallWithoutArgsParentheses:
   Exclude:
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/utils.rb'
     - 'spec/features/log_view_spec.rb'
     - 'spec/features/rule_spec.rb'
     - 'spec/lib/xl_spec.rb'
     - 'spec/lib/xl_styles_spec.rb'
-    - 'spec/support/netzke.rb'
 
-# Offense count: 99
+# Offense count: 100
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
@@ -829,7 +766,7 @@ Style/MissingRespondToMissing:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, Autocorrect.
 # SupportedStyles: module_function, extend_self
 Style/ModuleFunction:
   Exclude:
@@ -845,7 +782,7 @@ Style/MultilineBlockChain:
     - 'other/marty/diagnostic/delayed_job_version.rb'
     - 'other/marty/diagnostic/node.rb'
 
-# Offense count: 23
+# Offense count: 22
 # Cop supports --auto-correct.
 Style/MultilineIfModifier:
   Exclude:
@@ -859,7 +796,6 @@ Style/MultilineIfModifier:
     - 'lib/marty/data_importer.rb'
     - 'lib/marty/json_schema.rb'
     - 'lib/marty/migrations.rb'
-    - 'lib/marty/promise_job.rb'
     - 'lib/marty/xl.rb'
     - 'spec/support/structure_compare.rb'
 
@@ -874,12 +810,14 @@ Style/MultipleComparison:
     - 'app/models/marty/data_grid.rb'
     - 'lib/marty/xl.rb'
 
-# Offense count: 83
+# Offense count: 74
 # Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
 Style/MutableConstant:
   Enabled: false
 
-# Offense count: 16
+# Offense count: 15
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: both, prefix, postfix
@@ -896,7 +834,6 @@ Style/NegatedIf:
     - 'app/models/marty/tag.rb'
     - 'lib/marty/data_change.rb'
     - 'lib/marty/data_exporter.rb'
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/utils.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -932,19 +869,31 @@ Style/Next:
 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:
-  MinDigits: 15
+  MinDigits: 7
 
-# Offense count: 42
+# Offense count: 18
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/models/marty/event.rb'
+    - 'lib/marty/content_handler.rb'
+    - 'lib/marty/data_change.rb'
+    - 'lib/marty/data_importer.rb'
+    - 'lib/marty/xl.rb'
+
+# Offense count: 40
 # Cop supports --auto-correct.
 Style/ParallelAssignment:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: AllowSafeAssignment, AllowInMultilineConditions.
 Style/ParenthesesAroundCondition:
   Exclude:
-    - 'app/models/marty/data_grid.rb'
     - 'lib/marty/aws/request.rb'
     - 'lib/marty/data_change.rb'
     - 'lib/marty/xl.rb'
@@ -977,15 +926,13 @@ Style/PerlBackrefs:
   Exclude:
     - 'lib/marty/migrations.rb'
 
-# Offense count: 6
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
   Exclude:
     - 'other/marty/diagnostic/reporter.rb'
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/overrides.rb'
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/utils.rb'
 
 # Offense count: 6
 # Cop supports --auto-correct.
@@ -1000,12 +947,34 @@ Style/RegexpLiteral:
     - 'lib/marty/xl.rb'
     - 'spec/models/event_spec.rb'
 
-# Offense count: 33
+# Offense count: 36
 # Cop supports --auto-correct.
 Style/RescueModifier:
   Enabled: false
 
-# Offense count: 6
+# Offense count: 20
+# Cop supports --auto-correct.
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
+# Whitelist: present?, blank?, presence, try, try!
+Style/SafeNavigation:
+  Exclude:
+    - 'app/components/marty/extras/layout.rb'
+    - 'app/components/marty/script_grid.rb'
+    - 'app/controllers/marty/application_controller.rb'
+    - 'app/controllers/marty/diagnostic/controller.rb'
+    - 'app/models/marty/config.rb'
+    - 'app/models/marty/data_grid.rb'
+    - 'app/models/marty/delorean_rule.rb'
+    - 'app/models/marty/enum.rb'
+    - 'app/models/marty/import_type.rb'
+    - 'app/models/marty/tag.rb'
+    - 'lib/marty/cache_adapters/mcfly_ruby_cache.rb'
+    - 'lib/marty/data_importer.rb'
+    - 'lib/marty/mcfly_model.rb'
+    - 'lib/marty/xl.rb'
+    - 'spec/support/chromedriver.rb'
+
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: AllowAsExpressionSeparator.
 Style/Semicolon:
@@ -1013,10 +982,9 @@ Style/Semicolon:
     - 'app/components/marty/base_rule_view.rb'
     - 'app/components/marty/config_view.rb'
     - 'spec/controllers/rpc_controller_spec.rb'
-    - 'spec/dummy/public/extjs/classic/theme-base/sass/utils.rb'
     - 'spec/support/helper.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: .
 # SupportedStyles: use_perl_names, use_english_names
@@ -1031,43 +999,42 @@ Style/StringLiteralsInInterpolation:
   Exclude:
     - 'spec/spec_helper.rb'
 
-# Offense count: 1
+# Offense count: 2
 Style/StructInheritance:
   Exclude:
     - 'lib/marty/promise_job.rb'
     - 'lib/marty/promise_ruby_job.rb'
 
-# Offense count: 7
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, AllowSafeAssignment.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
 Style/TernaryParentheses:
   Exclude:
     - 'app/models/marty/data_grid.rb'
-    - 'lib/marty/data_change.rb'
     - 'lib/marty/xl.rb'
     - 'other/marty/api/base.rb'
 
-# Offense count: 40
+# Offense count: 39
 # Cop supports --auto-correct.
 Style/TrailingBodyOnModule:
   Enabled: false
 
-# Offense count: 67
+# Offense count: 71
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
 Style/TrailingCommaInArguments:
   Enabled: false
 
-# Offense count: 61
+# Offense count: 53
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
 Style/TrailingCommaInArrayLiteral:
   Enabled: false
 
-# Offense count: 169
+# Offense count: 147
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
@@ -1082,25 +1049,22 @@ Style/UnneededPercentQ:
     - 'spec/features/rule_spec.rb'
     - 'spec/models/config_spec.rb'
 
-# Offense count: 133
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/UnneededSort:
+  Exclude:
+    - 'app/models/marty/event.rb'
+
+# Offense count: 96
 # Cop supports --auto-correct.
-# Configuration parameters: WordRegex.
+# Configuration parameters: EnforcedStyle, MinSize, WordRegex.
 # SupportedStyles: percent, brackets
 Style/WordArray:
-  EnforcedStyle: percent
-  MinSize: 18
+  Enabled: false
 
-# Offense count: 247
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 136
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 100
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Style/SafeNavigation:
-  Enabled: false
-
-Style/NumericPredicate:
-  Enabled: false

data/lib/marty/rpc_call.rb

@@ -1,20 +1,22 @@
 class Marty::RpcCall
   # POST to a remote marty
   def self.marty_post(host, port, path, script, node, attrs, params,
-                      options = {}, ssl = false)
+                      rpc_opts = {}, ssl = false, http_opts = {})
     http = Net::HTTP.new(host, port)
 
-    # FIXME: in 5.2.0 put ssl in options hash
+    # FIXME: in 5.2.0 put ssl in https_opts hash and change interface
     http.use_ssl = ssl
-    http.read_timeout = options[:read_timeout] if options[:read_timeout]
+    http.read_timeout = http_opts[:read_timeout] if http_opts[:read_timeout]
+    http.open_timeout = http_opts[:open_timeout] if http_opts[:open_timeout]
 
     request = Net::HTTP::Post.new(path)
     request.add_field('Content-Type', 'application/json')
-    request.body = { 'script' => script,
-                     'node'   => node,
-                     'attrs'  => attrs.to_json,
-                     'params' => params.to_json,
-                    }.to_json
+    request.body = rpc_opts.merge(
+      'script' => script,
+      'node'   => node,
+      'attrs'  => attrs.to_json,
+      'params' => params.to_json,
+    ).to_json
 
     begin
       response = http.request(request)
@@ -54,6 +56,7 @@ class Marty::RpcCall
     request = Net::HTTP::Post.new(path)
     http.use_ssl = use_ssl
     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')
     request.add_field('Accept', 'xml')
     request.body = body

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '5.1.3'
+  VERSION = '5.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 5.1.4
 platform: ruby
 authors:
 - Arman Bostani