marty 8.2.0 → 8.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef38a20a14482c03a791b80eb8743f9764151a8e8d09c682c76ffeea62d76828
-  data.tar.gz: 480f31e3d956e235fd4941be08c209c05a7c338d3fbdeb6d2b85a4d4af7b0c28
+  metadata.gz: 6a089e78541222d60d9d84b7339c0fdefc8c87f445f0943a471732167e6946e2
+  data.tar.gz: cde4b147a1f9d753327c09665df1aa2045f887c9a6d0cafd0236227ceff3c7f9
 SHA512:
-  metadata.gz: 5263a4562cfa44272654a399ef3f5e2f52cb95e27fd027c130b0477b93dad83d1b83631d5efc8946344ed5485ef5b654980282882580fd472687fd99d6b71ddc
-  data.tar.gz: 07e53433346be6dbd718fa631aa7535179ec944139ebbcb6fd69ef9b5182a175dad233df397ca14300581da995d553a667dbb0126e6f988ea3e5339e4fc365aa
+  metadata.gz: 42d06eccfc9294f7151ab41f12e6a8970c0c086fe8d6cf492c3520d82ed2c9694bc9f231f8fb6e3d6bb4f8f9c251085145a2c7f5d2d04884bc071a68b64dc4ee
+  data.tar.gz: 32f0ce4bd5c4425ab855e4d606b50d117be8609c4cf23ba0968b2ced644fcdc29ca1f5ad7b8b345b6b6bf42a0cee374c973ec8d6ac191ab7c37623c6c729b2be

data/.gitlab-ci.yml

@@ -17,6 +17,9 @@ before_script:
     - merge_requests
 
   stage: test
+  retry:
+    max: 2
+    when: script_failure
 
   # Use only the following CI runners
   tags:
@@ -27,10 +30,45 @@ rubocop:
   script:
     - bundle exec rubocop
 
-rspec-without-features:
+rspec (controllers):
   extends: .base-test
   script:
-    - bundle exec rspec --exclude-pattern "spec/features/**/*_spec.rb"
+    - bundle exec rspec spec/controllers
+
+rspec (jobs):
+  extends: .base-test
+  script:
+    - bundle exec rspec spec/jobs
+
+rspec (lib):
+  extends: .base-test
+  script:
+    - bundle exec rspec spec/lib
+
+rspec (models):
+  extends: .base-test
+  script:
+    - bundle exec rspec spec/models
+
+rspec (other):
+  extends: .base-test
+  script:
+    - bundle exec rspec spec/other
+
+rspec (performance):
+  extends: .base-test
+  script:
+    - bundle exec rspec spec/performance
+
+rspec (requests):
+  extends: .base-test
+  script:
+    - bundle exec rspec spec/requests
+
+rspec (services):
+  extends: .base-test
+  script:
+    - bundle exec rspec spec/services
 
 rspec-features-1:
   extends: .base-test

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_from: .rubocop_todo.yml
 require: rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.3.3
+  TargetRubyVersion: 2.4.2
   Exclude:
     - 'db/**/*'
     - 'spec/dummy/**/*'

data/.rubocop_todo.yml

@@ -1,20 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-09-12 08:37:20 -0700 using RuboCop version 0.73.0.
+# on 2019-11-28 17:01:18 -0800 using RuboCop version 0.77.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: 416
-# Cop supports --auto-correct.
-# 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: 38
 # Cop supports --auto-correct.
 Layout/ClosingHeredocIndentation:
@@ -23,28 +14,26 @@ Layout/ClosingHeredocIndentation:
     - 'spec/support/components/netzke_combobox.rb'
     - 'spec/support/components/netzke_grid.rb'
 
-# Offense count: 57
+# Offense count: 56
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleAlignWith, AutoCorrect, Severity.
 # SupportedStylesAlignWith: keyword, variable, start_of_line
 Layout/EndAlignment:
   Enabled: false
 
-# Offense count: 32
+# Offense count: 29
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
 Layout/ExtraSpacing:
   Exclude:
     - 'app/components/marty/data_grid_view.rb'
     - 'app/components/marty/posting_window.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'
 
@@ -52,7 +41,7 @@ Layout/ExtraSpacing:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   Exclude:
     - 'app/components/marty/extras/layout.rb'
     - 'spec/controllers/diagnostic/controller_spec.rb'
@@ -61,26 +50,49 @@ Layout/IndentFirstHashElement:
     - 'spec/lib/json_schema_spec.rb'
     - 'spec/models/api_auth_spec.rb'
 
-# Offense count: 93
+# Offense count: 394
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Enabled: false
+
+# Offense count: 95
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: squiggly, active_support, powerpack, unindent
-Layout/IndentHeredoc:
-  Enabled: false
+Layout/HeredocIndentation:
+  Exclude:
+    - 'app/components/marty/data_grid_user_view.rb'
+    - 'lib/marty/migrations.rb'
+    - 'spec/controllers/rpc_controller_spec.rb'
+    - 'spec/features/reporting_spec.rb'
+    - 'spec/features/rule_spec.rb'
+    - 'spec/features/scripting_test_spec.rb'
+    - 'spec/job_helper.rb'
+    - 'spec/lib/data_exporter_spec.rb'
+    - 'spec/lib/data_importer_spec.rb'
+    - 'spec/lib/delorean_query_spec.rb'
+    - 'spec/lib/mcfly_model_spec.rb'
+    - 'spec/lib/xl_spec.rb'
+    - 'spec/lib/xl_styles_spec.rb'
+    - 'spec/models/data_grid_spec.rb'
+    - 'spec/models/script_spec.rb'
 
-# Offense count: 290
+# Offense count: 283
 # Cop supports --auto-correct.
 # Configuration parameters: Width, IgnoredPatterns.
 Layout/IndentationWidth:
   Enabled: false
 
-# Offense count: 20
+# Offense count: 19
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: symmetrical, new_line, same_line
 Layout/MultilineHashBraceLayout:
   Exclude:
-    - 'app/components/marty/event_view.rb'
     - 'app/components/marty/user_view.rb'
     - 'app/models/marty/delorean_rule.rb'
     - 'lib/marty/migrations.rb'
@@ -89,14 +101,14 @@ Layout/MultilineHashBraceLayout:
     - 'spec/lib/json_schema_spec.rb'
     - 'spec/other/diagnostic/base_spec.rb'
 
-# Offense count: 118
+# Offense count: 115
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: symmetrical, new_line, same_line
 Layout/MultilineMethodCallBraceLayout:
   Enabled: false
 
-# Offense count: 92
+# Offense count: 96
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: aligned, indented, indented_relative_to_receiver
@@ -146,18 +158,12 @@ Lint/AmbiguousOperator:
     - 'app/components/marty/script_form.rb'
     - 'lib/marty/diagnostic/aws/ec2_instance.rb'
 
-# Offense count: 3
+# Offense count: 2
 Lint/AmbiguousRegexpLiteral:
   Exclude:
     - 'spec/controllers/job_controller_spec.rb'
     - 'spec/models/posting_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: AllowSafeAssignment.
-Lint/AssignmentInCondition:
-  Exclude:
-    - 'app/components/marty/event_view.rb'
-
 # Offense count: 2
 Lint/Debugger:
   Exclude:
@@ -170,13 +176,6 @@ Lint/DuplicateMethods:
     - 'spec/support/components/netzke_grid.rb'
     - 'spec/support/shared_connection_db_helpers.rb'
 
-# Offense count: 2
-# Configuration parameters: AllowComments.
-Lint/HandleExceptions:
-  Exclude:
-    - 'spec/support/netzke.rb'
-    - 'lib/marty/delayed_job/scheduled_job_plugin.rb'
-
 # Offense count: 19
 Lint/IneffectiveAccessModifier:
   Exclude:
@@ -204,6 +203,14 @@ Lint/ParenthesesAsGroupedExpression:
     - 'spec/models/user_spec.rb'
     - 'spec/support/suite.rb'
 
+# Offense count: 7
+# Cop supports --auto-correct.
+Lint/RedundantStringCoercion:
+  Exclude:
+    - 'app/components/marty/api_log_view.rb'
+    - 'app/components/marty/import_view.rb'
+    - 'spec/support/netzke.rb'
+
 # Offense count: 1
 Lint/RescueException:
   Exclude:
@@ -226,12 +233,12 @@ Lint/ShadowingOuterLocalVariable:
     - 'lib/marty/diagnostic/database.rb'
     - 'lib/marty/json_schema.rb'
 
-# Offense count: 7
-# Cop supports --auto-correct.
-Lint/StringConversionInInterpolation:
+# Offense count: 5
+# Configuration parameters: AllowComments.
+Lint/SuppressedException:
   Exclude:
-    - 'app/components/marty/api_log_view.rb'
-    - 'app/components/marty/import_view.rb'
+    - 'lib/marty/delayed_job/scheduled_job_plugin.rb'
+    - 'spec/features/data_grid_spec.rb'
     - 'spec/support/netzke.rb'
 
 # Offense count: 2
@@ -257,7 +264,7 @@ Lint/UselessAccessModifier:
     - 'lib/marty/diagnostic/reporter.rb'
     - 'lib/marty/json_schema.rb'
 
-# Offense count: 90
+# Offense count: 105
 Lint/UselessAssignment:
   Enabled: false
 
@@ -271,35 +278,35 @@ Lint/Void:
     - 'spec/lib/xl_styles_spec.rb'
     - 'spec/models/posting_spec.rb'
 
-# Offense count: 107
+# Offense count: 105
 Metrics/AbcSize:
   Max: 129
 
-# Offense count: 21
+# Offense count: 22
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 452
 
-# Offense count: 65
+# Offense count: 66
 Metrics/CyclomaticComplexity:
   Max: 40
 
-# Offense count: 169
+# Offense count: 170
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 98
 
-# Offense count: 11
+# Offense count: 12
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
   Max: 598
 
-# Offense count: 17
+# Offense count: 16
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 10
 
-# Offense count: 48
+# Offense count: 50
 Metrics/PerceivedComplexity:
   Max: 35
 
@@ -325,9 +332,9 @@ Naming/HeredocDelimiterCase:
     - 'spec/controllers/rpc_controller_spec.rb'
     - 'spec/models/script_spec.rb'
 
-# Offense count: 64
-# Configuration parameters: Blacklist.
-# Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+# Offense count: 67
+# Configuration parameters: ForbiddenDelimiters.
+# ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'lib/marty/migrations.rb'
@@ -341,11 +348,17 @@ Naming/HeredocDelimiterNaming:
     - 'spec/lib/xl_styles_spec.rb'
     - 'spec/models/data_grid_spec.rb'
 
+# Offense count: 150
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: io, id, to, by, on, in, at, ip, db, os
+Naming/MethodParameterName:
+  Enabled: false
+
 # Offense count: 10
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
+# ForbiddenPrefixes: is_, has_, have_
+# AllowedMethods: is_a?
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:
@@ -358,13 +371,7 @@ Naming/PredicateName:
     - 'lib/marty/diagnostic/packer.rb'
     - 'lib/marty/permissions.rb'
 
-# Offense count: 145
-# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to, by, on, in, at, ip, db
-Naming/UncommunicativeMethodParamName:
-  Enabled: false
-
-# Offense count: 3
+# Offense count: 4
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: snake_case, camelCase
 Naming/VariableName:
@@ -379,12 +386,11 @@ Performance/Casecmp:
   Exclude:
     - 'app/components/marty/base_rule_view.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Cop supports --auto-correct.
 Performance/CompareWithBlock:
   Exclude:
     - 'app/components/marty/report_select.rb'
-    - 'app/models/marty/event.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -410,15 +416,13 @@ Performance/RedundantBlockCall:
     - 'spec/features/scripting_test_spec.rb'
     - 'spec/support/setup.rb'
 
-# Offense count: 4
+# Offense count: 2
 # Cop supports --auto-correct.
 Performance/RedundantMatch:
   Exclude:
     - 'lib/marty/migrations.rb'
-    - 'spec/support/components/netzke_combobox.rb'
-    - 'spec/support/components/netzke_grid.rb'
 
-# Offense count: 5
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: MaxKeyValuePairs.
 Performance/RedundantMerge:
@@ -426,7 +430,6 @@ Performance/RedundantMerge:
     - 'app/components/marty/api_config_view.rb'
     - 'app/components/marty/base_rule_view.rb'
     - 'app/components/marty/data_grid_view.rb'
-    - 'app/components/marty/event_view.rb'
     - 'app/components/marty/user_view.rb'
 
 # Offense count: 21
@@ -462,14 +465,13 @@ Style/Alias:
     - 'spec/support/components/netzke_grid.rb'
     - 'spec/support/shared_connection.rb'
 
-# Offense count: 3
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, conditionals
 Style/AndOr:
   Exclude:
     - 'app/components/marty/import_view.rb'
-    - 'app/models/marty/config.rb'
 
 # Offense count: 23
 # Cop supports --auto-correct.
@@ -485,20 +487,6 @@ Style/BarePercentLiterals:
     - 'spec/models/config_spec.rb'
     - 'spec/support/netzke.rb'
 
-# Offense count: 1
-Style/CaseEquality:
-  Exclude:
-    - 'app/components/marty/report_form.rb'
-    - 'app/models/marty/data_grid.rb'
-    - 'app/helpers/marty/enum_helper.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'
-    - 'lib/marty/api/base.rb'
-
 # Offense count: 132
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.
@@ -550,29 +538,27 @@ Style/CommentAnnotation:
     - 'app/models/marty/promise.rb'
     - 'lib/marty/xl.rb'
 
-# Offense count: 5
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
 # SupportedStyles: assign_to_condition, assign_inside_condition
 Style/ConditionalAssignment:
   Exclude:
-    - 'app/components/marty/auth_app.rb'
     - 'app/controllers/marty/application_controller.rb'
     - 'spec/other/diagnostic/reporter_spec.rb'
     - 'spec/support/components/netzke_combobox.rb'
     - 'spec/support/components/netzke_grid.rb'
 
-# Offense count: 164
+# Offense count: 189
 Style/Documentation:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 4
 Style/DoubleNegation:
   Exclude:
     - 'app/components/marty/auth_app.rb'
     - 'app/components/marty/report_form.rb'
     - 'app/models/marty/data_grid.rb'
-    - 'app/models/marty/event.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -623,7 +609,7 @@ Style/FormatString:
     - 'spec/models/rule_spec.rb'
     - 'spec/support/performance_helper.rb'
 
-# Offense count: 9
+# Offense count: 12
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: annotated, template, unannotated
 Style/FormatStringToken:
@@ -635,7 +621,7 @@ Style/FormatStringToken:
     - 'spec/models/rule_spec.rb'
     - 'spec/support/performance_helper.rb'
 
-# Offense count: 215
+# Offense count: 248
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, never
@@ -697,7 +683,7 @@ Style/InverseMethods:
     - 'lib/marty/xl.rb'
     - 'spec/support/download_helper.rb'
 
-# Offense count: 30
+# Offense count: 27
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: line_count_dependent, lambda, literal
@@ -707,7 +693,6 @@ Style/Lambda:
     - 'app/components/marty/api_log_view.rb'
     - 'app/components/marty/base_rule_view.rb'
     - 'app/components/marty/config_view.rb'
-    - 'app/components/marty/event_view.rb'
     - 'app/components/marty/extras/layout.rb'
     - 'app/components/marty/log_view.rb'
     - 'app/components/marty/promise_view.rb'
@@ -743,7 +728,7 @@ Style/MethodCallWithoutArgsParentheses:
     - 'spec/lib/xl_spec.rb'
     - 'spec/lib/xl_styles_spec.rb'
 
-# Offense count: 100
+# Offense count: 103
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
@@ -755,10 +740,9 @@ Style/MethodMissingSuper:
   Exclude:
     - 'lib/marty/promise_proxy.rb'
 
-# Offense count: 2
+# Offense count: 1
 Style/MissingRespondToMissing:
   Exclude:
-    - 'lib/marty/logger.rb'
     - 'lib/marty/promise_proxy.rb'
 
 # Offense count: 1
@@ -769,11 +753,10 @@ Style/ModuleFunction:
   Exclude:
     - 'spec/support/download_helper.rb'
 
-# Offense count: 8
+# Offense count: 5
 Style/MultilineBlockChain:
   Exclude:
     - 'app/components/marty/report_select.rb'
-    - 'app/models/marty/event.rb'
     - 'lib/marty/diagnostic/delayed_job_version.rb'
     - 'lib/marty/diagnostic/node.rb'
     - 'lib/marty/migrations.rb'
@@ -796,7 +779,7 @@ Style/MultilineIfModifier:
     - 'lib/marty/xl.rb'
     - 'spec/support/structure_compare.rb'
 
-# Offense count: 39
+# Offense count: 40
 Style/MultilineTernaryOperator:
   Enabled: false
 
@@ -806,7 +789,7 @@ Style/MultipleComparison:
     - 'app/components/marty/base_rule_view.rb'
     - 'lib/marty/xl.rb'
 
-# Offense count: 74
+# Offense count: 79
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: literals, strict
@@ -839,8 +822,8 @@ Style/NegatedWhile:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: Whitelist.
-# Whitelist: be, be_a, be_an, be_between, be_falsey, be_kind_of, be_instance_of, be_truthy, be_within, eq, eql, end_with, include, match, raise_error, respond_to, start_with
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: be, be_a, be_an, be_between, be_falsey, be_kind_of, be_instance_of, be_truthy, be_within, eq, eql, end_with, include, match, raise_error, respond_to, start_with
 Style/NestedParenthesizedCalls:
   Exclude:
     - 'spec/controllers/job_controller_spec.rb'
@@ -861,26 +844,25 @@ Style/Next:
   Exclude:
     - 'lib/marty/xl.rb'
 
-# Offense count: 11
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:
   MinDigits: 7
 
-# Offense count: 18
+# Offense count: 16
 # 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: 36
+# Offense count: 39
 # Cop supports --auto-correct.
 Style/ParallelAssignment:
   Enabled: false
@@ -894,7 +876,7 @@ Style/ParenthesesAroundCondition:
     - 'lib/marty/data_change.rb'
     - 'lib/marty/xl.rb'
 
-# Offense count: 11
+# Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -902,7 +884,6 @@ Style/PercentLiteralDelimiters:
     - 'app/components/marty/simple_app.rb'
     - 'app/models/marty/data_grid.rb'
     - 'lib/marty/migrations.rb'
-    - 'spec/models/event_spec.rb'
     - 'spec/models/rule_spec.rb'
 
 # Offense count: 12
@@ -921,7 +902,15 @@ Style/PerlBackrefs:
   Exclude:
     - 'lib/marty/migrations.rb'
 
-# Offense count: 6
+# Offense count: 12
+# Cop supports --auto-correct.
+Style/RedundantPercentQ:
+  Exclude:
+    - 'app/components/marty/simple_app.rb'
+    - 'spec/features/rule_spec.rb'
+    - 'spec/models/config_spec.rb'
+
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
@@ -932,30 +921,27 @@ Style/RegexpLiteral:
     - 'lib/marty/migrations.rb'
     - 'lib/marty/monkey.rb'
     - 'lib/marty/xl.rb'
-    - 'spec/models/event_spec.rb'
 
-# Offense count: 36
+# Offense count: 35
 # Cop supports --auto-correct.
 Style/RescueModifier:
   Enabled: false
 
-# Offense count: 20
+# Offense count: 18
 # Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
-# Whitelist: present?, blank?, presence, try, try!
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
+# AllowedMethods: 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'
@@ -1001,7 +987,7 @@ Style/TernaryParentheses:
     - 'app/models/marty/data_grid.rb'
     - 'lib/marty/xl.rb'
 
-# Offense count: 40
+# Offense count: 39
 # Cop supports --auto-correct.
 Style/TrailingBodyOnModule:
   Enabled: false
@@ -1013,42 +999,28 @@ Style/TrailingBodyOnModule:
 Style/TrailingCommaInArguments:
   Enabled: false
 
-# Offense count: 53
+# Offense count: 55
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
 Style/TrailingCommaInArrayLiteral:
   Enabled: false
 
-# Offense count: 146
+# Offense count: 148
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
 Style/TrailingCommaInHashLiteral:
   Enabled: false
 
-# Offense count: 12
-# Cop supports --auto-correct.
-Style/RedundantPercentQ:
-  Exclude:
-    - 'app/components/marty/simple_app.rb'
-    - 'spec/features/rule_spec.rb'
-    - 'spec/models/config_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantSort:
-  Exclude:
-    - 'app/models/marty/event.rb'
-
-# Offense count: 97
+# Offense count: 94
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, MinSize, WordRegex.
 # SupportedStyles: percent, brackets
 Style/WordArray:
   Enabled: false
 
-# Offense count: 137
+# Offense count: 149
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Declare your gem's dependencies in marty.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and

data/app/components/marty/extras/layout.rb

@@ -75,7 +75,7 @@ module Layout
 
   def enum_column(c, class_or_array, col = nil, allow_null = true)
     col ||= c.name.demodulize.tableize.singularize
-    vals = class_or_array.is_a?(Array) ? class_or_array : class_or_array::VALUES
+    vals = class_or_array.is_a?(Array) ? class_or_array : class_or_array.values
     editor_config = {
       trigger_action: :all,
       xtype:          :combo,
@@ -99,7 +99,7 @@ module Layout
   def enum_array(c, klass)
     editor_config = {
       multi_select: true,
-      store:        klass::VALUES.to_a.sort,
+      store:        klass.values.to_a.sort,
       type:         :string,
       xtype:        :combo,
     }

data/app/components/marty/user_view.rb

@@ -153,7 +153,7 @@ module Marty; class UserView < Marty::Grid
       Marty::RoleType.to_nice_names(r.user_roles.map(&:role))
     end
 
-    store = ::Marty::RoleType.to_nice_names(::Marty::RoleType::VALUES.sort)
+    store = ::Marty::RoleType.to_nice_names(::Marty::RoleType.values.sort)
 
     c.editor_config = {
       multi_select: true,

data/app/components/marty/users/user_view.rb

@@ -156,7 +156,7 @@ module Marty
           Marty::RoleType.to_nice_names(r.user_roles.map(&:role))
         end
 
-        store = ::Marty::RoleType.to_nice_names(::Marty::RoleType::VALUES.sort)
+        store = ::Marty::RoleType.to_nice_names(::Marty::RoleType.values.sort)
 
         c.editor_config = {
           multi_select: true,

data/app/controllers/marty/rpc_controller.rb

@@ -83,7 +83,9 @@ class Marty::RpcController < ActionController::Base
       ret_arr = true
     end
 
-    return { error: 'Malformed attrs' } unless attr =~ /\A[a-z][a-zA-Z0-9_]*\z/
+    return { error: 'Malformed attrs' } unless /\A[a-z][a-zA-Z0-9_]*\z/.match?(
+      attr.to_s
+    )
 
     begin
       case params

data/app/models/marty/base_rule.rb

@@ -42,9 +42,10 @@ class Marty::BaseRule < Marty::Base
       return errors[errtype] << "- Wrong type for #{ns}" unless
         gettypes(vv).member?(type)
     end
+
     return unless enum || values
 
-    vals = enum && enum::VALUES || values.to_set
+    vals = enum&.values || values.to_set
     bad = (vs - vals)
     p = bad.count > 1 ? 's' : ''
     return errors[errtype] <<

data/app/models/marty/data_grid.rb

@@ -48,7 +48,7 @@ class Marty::DataGrid < Marty::Base
 
         # enforce Delorean attr syntax (a bit Draconian)
         dg.errors.add(:base, "bad attribute '#{attr}'") unless
-          attr =~ /^[a-z][A-Za-z0-9_]*$/
+          /^[a-z][A-Za-z0-9_]*$/.match?(attr)
 
         dg.errors.add(:base, "unknown metadata type #{type}") unless
           Marty::DataGrid.type_to_index(type)

data/app/models/marty/delorean_rule.rb

@@ -13,7 +13,7 @@ class Marty::DeloreanRule < Marty::BaseRule
         eclass = engine && engine.constantize || Marty::RuleScriptSet
         eng = eclass.new('infinity').get_engine(self_as_hash)
       rescue StandardError => e
-        return errors[:computed] << '- ' + e.message
+        errors[:computed] << '- ' + e.message
       end
     end
   end

data/app/models/marty/name_validator.rb

@@ -8,7 +8,7 @@ class Marty::NameValidator < ActiveModel::Validator
     return if value.nil?
 
     # disallow leading, trailing, >1 internal spaces, special chars (|)
-    if value =~ /\A\s|\s\z|\A.*\s\s.*\z|.*\|.*/
+    if /\A\s|\s\z|\A.*\s\s.*\z|.*\|.*/.match?(value)
       entry.errors[field] <<
         I18n.t('activerecord.errors.messages.extraneous_spaces')
     end

data/app/models/marty/pg_enum.rb

@@ -4,7 +4,7 @@ module Marty::PgEnum
     index = (i1 || i0).to_s
 
     raise "no such #{name}: '#{index}'" unless
-      self::VALUES.include?(index)
+    values.include?(index)
 
     index
   end
@@ -14,7 +14,7 @@ module Marty::PgEnum
       extend ::Delorean::Functions unless respond_to?(:delorean_fn)
 
       delorean_fn :get_all do |_pt = nil|
-        self::VALUES.map(&:to_s)
+        values.map(&:to_s)
       end
 
       delorean_fn :[] do |i0, i1 = nil|
@@ -31,6 +31,10 @@ module Marty::PgEnum
     end
   end
 
+  def values
+    self::VALUES
+  end
+
   def seed
   end
 

data/app/services/marty/data_grid/constraint.rb

@@ -5,7 +5,7 @@ module Marty
         return [] unless constraint
 
         dt = DataGrid.convert_data_type(data_type)
-        if constraint =~ /[><]/
+        if /[><]/.match?(constraint)
           raise "range constraint not allowed for type #{dt}" unless
             ['integer', 'float'].include?(dt)
 

data/db/migrate/200_create_marty_event_operation_enum.rb

@@ -1,6 +1,6 @@
 class CreateMartyEventOperationEnum < ActiveRecord::Migration[4.2]
   def change
-      values = Marty::EnumEventOperation::VALUES
+      values = Marty::EnumEventOperation.values
       str_values = values.map {|v| ActiveRecord::Base.connection.quote v}.join ','
       execute <<-SQL
          CREATE TYPE enum_event_operations AS ENUM (#{str_values})

data/db/migrate/502_add_promise_type_enum.rb

@@ -1,6 +1,6 @@
 class AddPromiseTypeEnum < ActiveRecord::Migration[4.2]
   def up
-    values = Marty::EnumPromiseType::VALUES
+    values = Marty::EnumPromiseType.values
     str_values = values.map {|v| ActiveRecord::Base.connection.quote v}.join ','
     execute <<-SQL
        CREATE TYPE marty_promise_types AS ENUM (#{str_values})

data/db/migrate/507_migrate_marty_roles_to_enum.rb

@@ -38,7 +38,7 @@ class MigrateMartyRolesToEnum < ActiveRecord::Migration[5.1]
     add_column :marty_user_roles, :role_id, :integer
     add_column :marty_import_types, :role_id, :integer
 
-    Marty::RoleType::VALUES.each do |role|
+    Marty::RoleType.values.each do |role|
       Marty::Role.create!(name: role)
     end
 

data/db/migrate/519_create_marty_notifications_event_types.rb

@@ -1,6 +1,6 @@
 class CreateMartyNotificationsEventTypes < ActiveRecord::Migration[4.2]
   def up
-    values = ::Marty::Notifications::EventType::VALUES
+    values = ::Marty::Notifications::EventType.values
     str_values = values.map {|v| ActiveRecord::Base.connection.quote v}.join ','
 
     execute <<-SQL

data/lib/marty/api/base.rb

@@ -157,11 +157,11 @@ class Marty::Api::Base
       end
 
       # if attr is an array, return result as an array
-      return retval = params[:return_array] ? [res] : res
+      retval = params[:return_array] ? [res] : res
     rescue StandardError => e
       msg = Delorean::Engine.grok_runtime_exception(e).symbolize_keys
       Marty::Logger.info "Evaluation error: #{msg}"
-      return retval = msg
+      retval = msg
     ensure
       error = retval.is_a?(Hash) ? retval[:error] : nil
     end

data/lib/marty/data_conversion.rb

@@ -56,7 +56,7 @@ class Marty::DataConversion
       # Dates are kept as float in Google spreadsheets.  Need to
       # convert them to dates.
       begin
-        v =~ FLOAT_PAT ? EXCEL_START_DATE + v.to_f :
+        FLOAT_PAT.match?(v) ? EXCEL_START_DATE + v.to_f :
           Mcfly.is_infinity(v) ? 'infinity' : v.to_date
       rescue StandardError => e
         raise "date conversion failed for #{v.inspect}}"

data/lib/marty/json_schema.rb

@@ -10,7 +10,7 @@ module Marty
       begin
         cs = curr_schema.schema['pg_enum']
         enum = cs.constantize
-        values = enum::VALUES
+        values = enum.values
       rescue StandardError => e
         msg = "The property '#{path}': '#{cs}' is not a pg_enum class"
         validation_error(pro, msg, frag, curr_schema, self, opt[:record_errors])

data/lib/marty/migrations.rb

@@ -10,7 +10,7 @@ module Marty::Migrations
     raise 'model class needs VALUES (as Set)' unless
       klass.const_defined?(:VALUES)
 
-    values = klass::VALUES
+    values = klass.values
     str_values =
       values.map { |v| ActiveRecord::Base.connection.quote v }.join ','
 
@@ -41,7 +41,7 @@ module Marty::Migrations
     SQL
 
     db_values = res.first['enum_range'].gsub(/[{"}]/, '').split(',')
-    ex_values = klass::VALUES.map(&:to_s) - db_values
+    ex_values = klass.values.map(&:to_s) - db_values
 
     return if ex_values.empty?
 

data/lib/marty/promise_proxy.rb

@@ -14,7 +14,7 @@ class Marty::PromiseProxy < BasicObject
                    :as_json,
                   ]
 
-  instance_methods.each { |m| undef_method m unless m =~ /^(__.*|object_id)$/ }
+  instance_methods.each { |m| undef_method m unless /^(__.*|object_id)$/.match?(m) }
 
   def initialize(promise_id, timeout, attr = nil)
     promise_id, @timeout, @attr = promise_id, timeout, attr

data/lib/marty/version.rb

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

data/spec/controllers/rpc_controller_spec.rb

@@ -1022,9 +1022,18 @@ describe Marty::RpcController do
 
   class FruitsEnum
     VALUES = Set['Apple', 'Banana', 'Orange']
+
+    def self.values
+      VALUES
+    end
   end
+
   class CondEnum
     VALUES = Set['no opts', 'opt1', 'opt2', 'opttf']
+
+    def self.values
+      VALUES
+    end
   end
 
   it 'validates schema with a pg_enum (Positive)' do

data/spec/dummy/db/migrate/20171220150101_add_rule_type_enums.rb

@@ -2,7 +2,7 @@ class AddRuleTypeEnums < ActiveRecord::Migration[4.2]
   def change
     [Gemini::XyzRuleType, Gemini::MyRuleType, Gemini::GuardOne,
      Gemini::GuardTwo, Gemini::XyzEnum].each do |cl|
-      values = cl::VALUES
+      values = cl.values
       str_values = values.map {|v| ActiveRecord::Base.connection.quote v}.
                    join(',')
       clstr = cl.to_s.sub('Gemini::','').underscore

data/spec/features/data_grid_spec.rb

@@ -525,7 +525,7 @@ feature 'data grid view', js: true, speed: :super_slow do
     begin
       press('Edit Grid')
       press('Edit Grid')
-    rescue StandardError => e # rubocop:disable Lint/HandleExceptions
+    rescue StandardError => e
     end
     wait_for_ajax
     grid_setup
@@ -544,7 +544,7 @@ feature 'data grid view', js: true, speed: :super_slow do
     begin
       press('Edit Grid')
       press('Edit Grid')
-    rescue StandardError => e # rubocop:disable Lint/HandleExceptions
+    rescue StandardError => e
     end
     wait_for_ajax
     grid_setup

data/spec/fixtures/misc/struct_compare_tests.txt

@@ -176,5 +176,20 @@
   "v1": {"a": 1},
   "v2": {"a": {"b": 1}},
   "res": "path=[\"a\"] class mismatch Integer (1) != Hash"
+},
+{ "example_number": "33",
+  "v1": "[,64)",
+  "v2": "[70, 75]",
+  "res": "path= [,64) != [70, 75]"
+},
+{ "example_number": "34",
+  "v1": ["(65,70]"],
+  "v2": ["[70, 75)"],
+  "res": "path=[0] (65,70] != [70, 75)"
+},
+{ "example_number": "35",
+  "v1": "(65,70]",
+  "v2": "(65,70]",
+  "res": false
 }
 ]

data/spec/lib/json_schema_spec.rb

@@ -2,10 +2,18 @@ require 'spec_helper'
 
 class MammalEnum
   VALUES = Set['Dog', 'Cat', 'Human', 'Cow', 'Bear']
+
+  def self.values
+    VALUES
+  end
 end
 
 class ElectronicsEnum
   VALUES = Set['Phone', 'Keyboard', 'Terminator']
+
+  def self.values
+    VALUES
+  end
 end
 
 class NotAnEnum

data/spec/models/data_grid_spec.rb

@@ -933,7 +933,7 @@ EOS
       # rubocop:enable Style/NestedTernaryOperator
       con_part = constraint.present? ? "\t" + constraint : ''
       top = [lenient_str, type_str].compact.join(' ') + con_part + "\n"
-      (top =~ /\A\s*\z/ ? '' : top) +
+      (/\A\s*\z/.match?(top) ? '' : top) +
         <<~EOS
           b\tboolean\tv
           i\tinteger\tv

data/spec/support/components/netzke_combobox.rb

@@ -12,7 +12,7 @@ module Marty; module RSpec; module Components
 
     def initialize(name)
       @name = name
-      if /^\d+$/.match(name)
+      if /^\d+$/.match?(name)
         @combobox = ext_find('combobox', nil, name)
       else
         @combobox = ext_combo(name)

data/spec/support/components/netzke_grid.rb

@@ -13,7 +13,7 @@ module Marty; module RSpec; module Components
     def initialize(name, c_type)
       # for now, also allows treepanel
       @name = name
-      if /^\d+$/.match(name)
+      if /^\d+$/.match?(name)
         @grid = ext_find(c_type, nil, name)
       else
         @grid = ext_find(ext_arg(c_type, name: name))

data/spec/support/structure_compare.rb

@@ -27,13 +27,23 @@ module Marty::RSpec::StructureCompare
        [v1, v2].map(&:class).to_set == Set.new([Integer, Float]))
 
     override = (cmp_opts['ignore'] || []).include?(key)
+
     case v1
     when String
-      return errs + ["path=#{pathstr} #{v1} != #{v2}"] unless
-        v1 == v2 ||
-        Regexp.new('\A' + v1 + '\z').match(v2) ||
-        Regexp.new('\A' + v2 + '\z').match(v1) ||
-        override
+      return errs if override
+      return errs if v1 == v2
+
+      begin
+        return errs if
+          Regexp.new('\A' + v1 + '\z').match(v2) ||
+          Regexp.new('\A' + v2 + '\z').match(v1)
+
+      # Invalid regexp, for example: '[, 65)'
+      rescue RegexpError
+        return errs + ["path=#{pathstr} #{v1} != #{v2}"]
+      end
+
+      return errs + ["path=#{pathstr} #{v1} != #{v2}"]
     when Integer, DateTime, TrueClass, FalseClass, NilClass, Time, Date
       return errs + ["path=#{pathstr} #{v1} != #{v2}"] if v1 != v2 && !override
     when Float
@@ -72,15 +82,23 @@ module Marty::RSpec::StructureCompare
 end
 
 def struct_compare(v1raw, v2raw, cmp_opts = {})
-    res = Marty::RSpec::StructureCompare.struct_compare_all(v1raw, v2raw, nil,
-                                                            cmp_opts).first
+    res = Marty::RSpec::StructureCompare.struct_compare_all(
+      v1raw,
+      v2raw,
+      nil,
+      cmp_opts
+    ).first
 rescue StandardError => e
     e.message
 end
 
 def struct_compare_all(v1raw, v2raw, cmp_opts = {})
-    Marty::RSpec::StructureCompare.struct_compare_all(v1raw, v2raw, nil,
-                                                      cmp_opts)
+    Marty::RSpec::StructureCompare.struct_compare_all(
+      v1raw,
+      v2raw,
+      nil,
+      cmp_opts
+    )
 rescue StandardError => e
     e.message
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 8.3.1
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2019-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable