radius-spec 0.9.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6b5e94783c4ccbdf8bdf80de184fc19cd52ac9ee9f2a7f92329b261bdb00f59
-  data.tar.gz: e492ea78f99e146011d2279e74fc1a3b1091aac13f311ef81324df43088ce440
+  metadata.gz: 74f0fd0a301ab4e74f86ed4aa183e94c3cbd5c6c795ea67cf24ac76ec2390a76
+  data.tar.gz: 43c5ba09b93ff99efb70b05e653dce5e7a7663bcfb567df964a20ee010eca7e9
 SHA512:
-  metadata.gz: 83005750c2029b0a2765e176a8d819ed7984376c13ac17b881b442d055956ffd28548c32af56bb7298b1cc60d976c0c3cb25d10bbc2aed5bec0f4b16c72e8324
-  data.tar.gz: 95d8183b73cfa36c5f3e01680bf6d2212016e2355d0a14ed95b7d38800b4d2e44ce9d08dbcdd0336bf6beb20731bfb3a834258a13b6ad357443918c4ec505ae8
+  metadata.gz: 62e586e2fdb6396509465475db8d78af5c0e04ae66e8f07a86a740c2537d403490bc55eae9326d4cf4412668b9fd7fc3d82362798fbe0a2f02b5113fc57f62f4
+  data.tar.gz: 5194070d9b33c0771224abcfb58f7e63a4869680df3bef1e606fb04d6720a8ed44f5cbba8c5d7aad973e8ebb3b5815486c6e6b62ac3b8cceac83d140d3a73b51

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "11:00"
+  open-pull-requests-limit: 10
+#  allow:
+#  - dependency-type: direct

data/.rubocop.yml

@@ -1,11 +1,11 @@
 inherit_mode:
   merge:
     - Exclude
-    - IgnoredPatterns
+    - AllowedPatterns
 
 inherit_from: common_rubocop_rails.yml
 
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Exclude:

data/CHANGELOG.md

@@ -1,3 +1,102 @@
+## Development
+
+[Full Changelog](https://github.com/RadiusNetworks/radius-spec/compare/v0.9.0...main)
+
+### Enhancements
+
+- TODO
+
+### Bug Fixes
+
+- TODO
+
+## 0.12.0 (August 3, 2022)
+
+[Full Changelog](https://github.com/RadiusNetworks/radius-spec/compare/v0.12.0...0.12.0)
+
+### Enhancements
+
+- Added Dependabot
+- Upgraded VCR to 6.0
+- Upgrade Rubocop Rails to 2.16
+- Upgrade Rubocop to 1.33
+
+### Bug Fixes
+
+None
+## 0.11.0 (January 21, 2022)
+
+[Full Changelog](https://github.com/RadiusNetworks/radius-spec/compare/v0.10.0...0.11.0)
+
+### Enhancements
+
+- Adjust common Rubocop configuration (Aaron Hill, Aaron Kromer, Ben Reynolds, James Nebeker, JC Avena, Sam Kim)
+  - Enable `Lint/NoReturnInBeginEndBlocks` by default
+  - Set `AllowHttpProtocol: false` for `Bundler/InsecureProtocolSource` cop
+  - Set `AllowNil: false` for `Lint/SuppressedException` cop
+  - Enable `Naming/BlockForwarding` cop for future Ruby 3.1 usage
+  - Disallow Ruby 3 `Style/NumberedParameters`
+  - Enable `Style/StringChars` by default
+  - Set `AllowMethodsWithArguments: true` for `Style/SymbolProc` cop
+  - Disallow combined `&&` and `||` in single `unless` clauses
+  - Enable `Naming/InclusiveLanguage` by default
+- Adjust common Rubocop-Rails configuration (Alex Stone, James Nebeker, Aaron Kromer, Ben Reynolds, Sam Kim)
+  - Enable `Rails/EnvironmentVariableAccess` (`AllowReads` to `true`)
+  - Changed `Rails/FindBy`:`IgnoreWhereFirst` to `false`
+  - Enable `Rails/ReversibleMigrationMethodDefinition`
+- Upgrade to Rubocop Rails 2.12.x (Alex Stone, James Nebeker, Aaron Kromer, Ben Reynolds, Sam Kim)
+- Upgrade to Rubocop Rails 2.13.x (Alex Stone, James Nebeker, Aaron Kromer, Ben Reynolds, Sam Kim)
+- Upgrade to Rubocop 1.25.x (Alex Stone, James Nebeker, Aaron Kromer, Ben Reynolds, Sam Kim, JC Avena, Eric Ouellette, Aaron Hill)
+- Include model factory helpers in helper specs by default (Alex Stone, James Nebeker, Aaron Kromer, Ben Reynolds, JC Avena, Eric Ouellette)
+
+### Bug Fixes
+
+None
+
+## 0.10.0 (October 18, 2021)
+
+[Full Changelog](https://github.com/RadiusNetworks/radius-spec/compare/v0.9.0...v0.10.0)
+
+### Enhancements
+
+- Upgrade to Rubocop Rails 2.8.x (Aaron Hill, Aaron Kromer, Ben Reynolds, James Nebeker, JC Avena, Sam Kim, Alex
+  Stone #30, #32)
+- Adjust common Rubocop Rails configuration (Aaron Hill, Aaron Kromer, Ben Reynolds, James Nebeker, JC Avena,
+  Sam Kim, Alex Stone #30, #32)
+  - Enable `Rails/AttributeDefaultBlockValue` by default
+  - Enable `Rails/ArelStar` by default
+  - Enable `Rails/DefaultScope` by default
+  - Enable `Rails/FindById` by default
+  - Enable `Rails/PluckId` by default
+  - Enable `Rails/WhereEquals` by default
+  - Use the more aggressive `aggressive` check for `Rails/PluckInWhere`
+  - Use the more aggressive `aggressive` check for `Rails/ShortI18n`
+  - Switch to new `AllowedMethods` attribute name for `Rails/SkipsModelValidations`
+  - Disable `Rails/SquishedSQLHeredocs` by default
+- Adjust common Rubocop configuration (Aaron Hill, Aaron Kromer, JC Avena, Sam
+  Kim #32, #34)
+  - Enable `Style/ClassMethodsDefinitions` by default
+  - Enable `Style/CombinableLoops` by default
+  - Enable `Style/KeywordParametersOrder` by default
+  - Enable `Style/RedundantSelfAssignment` by default
+  - Enable `Style/SoleNestedConditional` by default
+  - Enable `Lint/DuplicateRequire` by default
+  - Enable `Lint/EmptyFile` by default
+  - Enable `Lint/TrailingCommaInAttributeDeclaration` by default
+  - Enable `Lint/UselessMethodDefinition` by default
+  - Exclude the following testing methods from `Metrics/BlockLength`
+    - 'describe'
+    - 'shared_context'
+    - 'shared_examples'
+    - 'RSpec.describe'
+    - 'RSpec.shared_context'
+    - 'RSpec.shared_examples'
+
+### Bug Fixes
+
+None
+
+
 ## 0.9.0 (September 30, 2021)
 
 [Full Changelog](https://github.com/RadiusNetworks/radius-spec/compare/v0.8.0...v0.9.0)

data/Gemfile

@@ -23,6 +23,6 @@ group :documentation do
 end
 
 group :plugins do
-  gem "vcr", "~> 4.0", require: false
+  gem "vcr", "~> 6.0", require: false
   gem "webmock", "~> 3.3", require: false
 end

data/README.md

@@ -94,7 +94,7 @@ end
 Projects can inherit from the [base Rubocop config](.rubocop.yml). This can be
 accomplished by using either the remote raw URL or dependency gem formats. With
 either method we also strongly suggest setting the `inherit_mode` to `merge`
-for both `Exclude` and `IgnoredPatterns`. This way you can append additional
+for both `Exclude` and `AllowedPatterns`. This way you can append additional
 exceptions without overwriting the defaults.
 
 #### Inherit from Gem (Recommended Method)
@@ -103,7 +103,7 @@ exceptions without overwriting the defaults.
 inherit_mode:
   merge:
     - Exclude
-    - IgnoredPatterns
+    - AllowedPatterns
 
 inherit_gem:
   radius-spec:
@@ -118,7 +118,7 @@ inherit_gem:
 inherit_mode:
   merge:
     - Exclude
-    - IgnoredPatterns
+    - AllowedPatterns
 
 # Available for projects which cannot include this gem (i.e. Ruby < 2.5)
 inherit_from:
@@ -154,7 +154,7 @@ inherit_from: .rubocop_todo.yml
 inherit_mode:
   merge:
     - Exclude
-    - IgnoredPatterns
+    - AllowedPatterns
 
 Style/For:
   inherit_mode:

data/benchmarks/bm_setup.rb

@@ -67,4 +67,4 @@ def display_benchmark_header
   puts "### Test Cases"
 end
 
-GC_DISABLED = as_boolean(ENV['GC_DISABLED'], default: false)
+GC_DISABLED = as_boolean(ENV.fetch('GC_DISABLED', nil), default: false)

data/benchmarks/format_string.rb

@@ -15,15 +15,15 @@ MULTI_TOKEN_HASH = {
 # rubocop:disable Style/FormatString
 section "Format String" do |bench|
   bench.report("String#%") do
-    '%10s' % 'hoge' # rubocop:disable Style/FormatStringToken
+    '%10s' % 'hoge'
   end
 
   bench.report("format") do
-    format '%10s', 'hoge' # rubocop:disable Style/FormatStringToken
+    format '%10s', 'hoge'
   end
 
   bench.report("sprintf") do
-    sprintf '%10s', 'hoge' # rubocop:disable Style/FormatStringToken
+    sprintf '%10s', 'hoge'
   end
 end
 # rubocop:enable Style/FormatString

data/benchmarks/hash_transform.rb

@@ -13,12 +13,12 @@ end
 
 # Bad per Rubocop
 def hash_transform_key_hash_collect(hash)
-  Hash[hash.collect { |k, v| [k + 100, v] }]
+  Hash[hash.collect { |k, v| [k + 100, v] }] # rubocop:disable Style/HashConversion
 end
 
 # Bad per Rubocop
 def hash_transform_key_map_to_h(hash)
-  hash.map { |k, v| [k + 100, v] }.to_h
+  hash.map { |k, v| [k + 100, v] }.to_h # rubocop:disable Style/MapToHash
 end
 
 # Bad per Rubocop
@@ -73,12 +73,12 @@ end
 
 # Bad per Rubocop
 def hash_transform_value_hash_collect(hash)
-  Hash[hash.collect { |k, v| [k, v + 100] }]
+  Hash[hash.collect { |k, v| [k, v + 100] }] # rubocop:disable Style/HashConversion
 end
 
 # Bad per Rubocop
 def hash_transform_value_map_to_h(hash)
-  hash.map { |k, v| [k, v + 100] }.to_h
+  hash.map { |k, v| [k, v + 100] }.to_h # rubocop:disable Style/MapToHash
 end
 
 # Bad per Rubocop

data/bin/bundle

@@ -0,0 +1,114 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+  module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+        bundler_version = a
+      end
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../../Gemfile", __FILE__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    Regexp.last_match(1)
+  end
+
+  def bundler_version
+    @bundler_version ||=
+      env_var_version || cli_arg_version ||
+        lockfile_version
+  end
+
+  def bundler_requirement
+    return "#{Gem::Requirement.default}.a" unless bundler_version
+
+    bundler_gem_version = Gem::Version.new(bundler_version)
+
+    requirement = bundler_gem_version.approximate_recommendation
+
+    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+
+    requirement += ".a" if bundler_gem_version.prerelease?
+
+    requirement
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    activate_bundler
+  end
+
+  def activate_bundler
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_requirement
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("bundler", "bundle")
+end

data/common_rubocop.yml

@@ -4,7 +4,7 @@ AllCops:
   # version by version without having to worry about adding an entry for each
   # new "enabled by default" check. If we want to jump multiple versions and
   # wish to be notified of all the enw check, then we'll need to change
-  # `NewCops` to `pending.
+  # `NewCops` to `pending`.
   NewCops: enable
   Exclude:
     # Exclude generated binstubs
@@ -24,6 +24,11 @@ AllCops:
     # Exclude vendored content
     - 'vendor/**/*'
 
+# We would like to disallow http for bundler sources and enforce https
+# as it is more secure.
+Bundler/InsecureProtocolSource:
+  AllowHttpProtocol: false
+
 # We prefer outdented access modifiers as we feel they provide demarcation of
 # the class similar to `rescue` and `ensure` in a method.
 #
@@ -36,6 +41,18 @@ Layout/AccessModifierIndentation:
     similar to `rescue` and `ensure` in a method.
   EnforcedStyle: outdent
 
+# This cop checks whether the end keyword of begin is aligned properly.
+#
+# Two modes are supported through the EnforcedStyleAlignWith configuration parameter. If it’s set to
+# begin, the end shall be aligned with the begin keyword. We chose this to be consistent with our if
+# statement styles, if you want the end to be aligned with the start of the line just put the begin
+# on the next line.
+#
+# Configuration parameters: EnforcedStyleAlignWith
+# SupportedStyles: start_of_line, begin
+Layout/BeginEndAlignment:
+  EnforcedStyleAlignWith: begin
+
 # Rubocop 0.60.0 changed how it handled value alignments in this cop. This
 # breaks our preference for wanting keys to be aligned, but allowing values to
 # either use the `key` or `table` style:
@@ -113,11 +130,11 @@ Layout/FirstArgumentIndentation:
 # this for a node pattern matcher in the future.
 #
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes,
-#                           IgnoreCopDirectives, IgnoredPatterns.
+#                           IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   IgnoreCopDirectives: true
-  IgnoredPatterns:
+  AllowedPatterns:
     # Leading comments
     - '\A\s*#'
     # Attempt at trailing comments
@@ -155,6 +172,18 @@ Layout/MultilineOperationIndentation:
 #     }.to change {
 #       object.state
 #     }
+#
+# WARNING TO FUTURE READERS (future being after 2021-12-10):
+# We tried to allowlist certain methods using the IgnoredMethods option (introduced 1.13.0),
+# and Rubocop successfully ignored `change` and `not_change` constructions, but it flag false
+# positives against code like
+#
+# expect { something }
+#   .to enqueue_job(SomeJobClass)
+#   .with { custom expectations about the enqueued payload }
+#
+# no matter what combination of `enqueue_job` and `with` we tried to add to the IgnoredMethods
+# array. We suspect the AST matching is somewhat half-baked.
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'spec/**/*_spec.rb'
@@ -184,6 +213,10 @@ Lint/HeredocMethodCallPosition:
 Lint/InheritException:
   EnforcedStyle: standard_error
 
+# Make developers explain themselves in a comment if they want their rescue block to do nothing.
+Lint/SuppressedException:
+  AllowNil: false
+
 # Often with benchmarking we don't explicitly "use" a variable or return value.
 # We simply need to perform the operation which generates said value for the
 # benchmark.
@@ -194,16 +227,11 @@ Lint/Void:
     - 'benchmarks/**/*'
 
 Metrics/AbcSize:
-  # TODO: When we are able to upgrade to Rubocop 1.5.0 we want to enable the
-  # following `CountRepeatedAttributes` option. We often find the
-  # multi-references to the same object to be necessary for reability and that
-  # for our team it does not increase complexity.
-  #
-  # CountRepeatedAttributes: false
+  CountRepeatedAttributes: false
   Max: 17
 
-# Configuration parameters: CountComments, ExcludedMethods, Max.
-# ExcludedMethods: refine
+# Configuration parameters: CountComments, IgnoredMethods, Max.
+# IgnoredMethods: refine
 Metrics/BlockLength:
   CountAsOne:
     - 'array'
@@ -215,11 +243,17 @@ Metrics/BlockLength:
     - 'spec/spec_helper.rb'
     - 'spec/**/*_spec.rb'
     - 'spec/support/model_factories.rb'
-  ExcludedMethods:
+  IgnoredMethods:
     - 'chdir'
+    - 'describe'
     - 'refine'
+    - 'shared_context'
+    - 'shared_examples'
     - 'Capybara.register_driver'
     - 'RSpec.configure'
+    - 'RSpec.describe'
+    - 'RSpec.shared_context'
+    - 'RSpec.shared_examples'
     - 'VCR.configure'
 
 # We want length related code metrics to count Hashs, Arrays, and
@@ -250,6 +284,21 @@ Metrics/MethodLength:
 Naming/BinaryOperatorParameterName:
   Enabled: false
 
+# We don't need this configured just yet, because we dont have any applications on
+# Ruby 3.1, but pre-emptively, we want to configure this to prefer the explicit style.
+#
+# bad
+# def foo(&)
+#   bar(&)
+# end
+
+# good
+# def foo(&block)
+#   bar(&block)
+# end
+Naming/BlockForwarding:
+  EnforcedStyle: explicit
+
 # Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
@@ -339,6 +388,9 @@ Style/AndOr:
 # These days most people have editors which support unicode and other
 # non-ASCII characters.
 #
+# In version 1.21.0, this is disabled by default. We've chosen to leave
+# it in the config, in case it changes in future versions.
+#
 # Configuration parameters: AllowedChars.
 Style/AsciiComments:
   Enabled: false
@@ -395,6 +447,15 @@ Style/BlockDelimiters:
     - proc
     - it
 
+# As a team we prefer the more explicit `def self.method_name` style. We find
+# the explicitness easier to read and grep for on the CLI.
+#
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: def_self, self_class
+Style/ClassMethodsDefinitions:
+  Enabled: true
+  EnforcedStyle: def_self
+
 # Prefer `Time` over `DateTime`.
 #
 # While these are not necessarily interchangeable we prefer `Time`. According
@@ -476,6 +537,11 @@ Style/EmptyMethod:
 Style/FrozenStringLiteralComment:
   EnforcedStyle: always_true
 
+# If we're using consecutive conditionals we probably know what we're doing. The good thing is this
+# cop will still flag consecutive conditionals that are identical.
+Style/GuardClause:
+  AllowConsecutiveConditionals: true
+
 # Prefer symbol keys using the 1.9 hash syntax. However, when keys are mixed
 # use a consistent mapping style; which generally means using hash rockets:
 #
@@ -496,6 +562,7 @@ Style/HashSyntax:
     Prefer symbol keys using the 1.9 hash syntax. However, when keys are mixed
     use a consistent mapping style; which generally means using hash rockets.
   EnforcedStyle: ruby19_no_mixed_keys
+  EnforcedShorthandSyntax: either
 
 # As part of our semantic style we generally use the literal `-> { }` format to
 # indicate this is a function with a return value we care about. As this cop
@@ -526,6 +593,11 @@ Style/MethodCalledOnDoEndBlock:
 Style/MultilineBlockChain:
   Enabled: false
 
+# Disallowing numbered parameter usage because we dont prefer this style.
+# We would rather name the paramaters to clearly communicate intent.
+Style/NumberedParameters:
+  EnforcedStyle: disallow
+
 # Context for this cop is too dependent.
 #
 # Often using the numeric comparison is faster. Also, depending on the context
@@ -542,6 +614,12 @@ Style/MultilineBlockChain:
 Style/NumericPredicate:
   Enabled: false
 
+# As a general rule, we want to be explicit here instead of requiring readers
+# of our code to know what the default arguments to methods like `#join` and
+# and `#split` so we disable this cop here.
+Style/RedundantArgument:
+  Enabled: false
+
 # In Ruby every method returns a value. Implicitly this is the value of the
 # last line of the method. This means using `return` is often redundant.
 # However, there isn't anything inherently wrong about doing so. In fact, in
@@ -654,6 +732,15 @@ Style/RescueStandardError:
 Style/SlicingWithRange:
   Enabled: false
 
+# We want to turn this cop on so that rubocop can yell at us instead of Aaron
+# yelling at us.
+Style/StaticClass:
+  Enabled: true
+
+# Enable Style/StringChars
+Style/StringChars:
+  Enabled: true
+
 # We generally prefer double quotes but many generators use single quotes. We
 # don't view the performance difference to be all that much so we don't care
 # if the style is mixed or double quotes are used for static strings.
@@ -684,6 +771,13 @@ Style/StringLiteralsInInterpolation:
 Style/SymbolArray:
   MinSize: 3
 
+# Allow either
+#   something.do_something(foo, &:bar)
+# or
+#   something.do_something(foo) { |s| s.bar }
+Style/SymbolProc:
+  AllowMethodsWithArguments: true
+
 # When ternaries become complex they can be difficult to read due to increased
 # cognitive load parsing the expression. Cognitive load can increase further
 # when assignment is involved.
@@ -746,6 +840,11 @@ Style/TrailingCommaInHashLiteral:
     simplifies adding, removing, and re-arranging the elements.
   EnforcedStyleForMultiline: consistent_comma
 
+# Don't combine && & || inside the same `unless` guard clause.
+Style/UnlessLogicalOperators:
+  Enabled: true
+  EnforcedStyle: forbid_mixed_logical_operators
+
 # We don't feel too strongly about percent vs bracket array style. We tend to
 # use the percent style, which also happens to be Rubocop's default. So for
 # pedantic consistency we'll enforce this.
@@ -765,3 +864,7 @@ Style/WordArray:
 # SupportedStyles: all_comparison_operators, equality_operators_only
 Style/YodaCondition:
   Enabled: false
+
+# Disabled in 1.21.0. Radius Networks has chosen to enable it.
+Naming/InclusiveLanguage:
+  Enabled: true

data/common_rubocop_rails.yml

@@ -3,7 +3,7 @@ require: rubocop-rails
 inherit_mode:
   merge:
     - Exclude
-    - IgnoredPatterns
+    - AllowedPatterns
 
 inherit_from: common_rubocop.yml
 
@@ -26,10 +26,10 @@ Style/Documentation:
 # Rails foreign keys and indexes can get long. We want to ignore our annotation
 # comments which are for these entries.
 #
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  IgnoredPatterns:
+  AllowedPatterns:
     - '\A#  fk_rails_'
     - '\A#  index_'
 
@@ -106,19 +106,39 @@ Rails/ApplicationRecord:
 Rails/CreateTableWithTimestamps:
   Enabled: false
 
+# This cop looks for uses of default_scope because named scopes are preferred:
+# https://rails.rubystyle.guide/#named-scopes
+Rails/DefaultScope:
+  Enabled: true
+
+# We were originally going to disable this, but after much discussion agreed that enabling
+# this cop with AllowReads: true should be relatively painless.
+Rails/EnvironmentVariableAccess:
+  Enabled: true
+  AllowReads: true
+
 # Usage of `find_by` is more expressive of intent than `where.first`. We should
 # check all app code, not just the models to improve intent expression.
 #
 # Since rake tasks often live in `lib` we also check all of lib as well.
 #
+# We are also disabling the default IgnoreWhereFirst that was added in version
+# 2.11
+#
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/FindBy:
   Enabled: true
+  IgnoreWhereFirst: false
   Include:
     - 'app/**/*.rb'
     - 'lib/**/*.rb'
 
+# This cop enforces that ActiveRecord#find is used instead of where.take!, find_by!, and find_by_id!
+# to retrieve a single record by primary key when you expect it to be found.
+Rails/FindById:
+  Enabled: true
+
 # Usage of `each` for large datasets can be a performance issue; specially a
 # drain on system memory. When possible it's better to use `find_each` so that
 # chunks of data are evaluated at a time.
@@ -174,6 +194,25 @@ Rails/IndexBy:
 Rails/IndexWith:
   Enabled: false
 
+# This would be extremely hard to implement with our app
+Rails/I18nLocaleTexts:
+  Enabled: false
+
+# This cop enforces the use of ids over pluck(:id) and pluck(primary_key).
+# https://rails.rubystyle.guide/#ids
+Rails/PluckId:
+  Enabled: true
+
+# This cop identifies places where pluck is used in where query methods and can be replaced with
+# select. Since pluck is an eager method and hits the database immediately, using select helps to
+# avoid additional database queries.
+#
+# When the EnforcedStyle is aggressive then all calls to pluck in the where is used as offenses.
+# This may lead to false positives as the cop cannot replace to select between calls to pluck on an
+# ActiveRecord::Relation instance vs a call to pluck on an Array instance.
+Rails/PluckInWhere:
+  EnforcedStyle: aggressive
+
 # The ActiveSupport monkey patches for `present?` are nearly all defined as:
 #
 #     !blank?
@@ -203,6 +242,10 @@ Rails/Present:
 Rails/ReadWriteAttribute:
   Enabled: false
 
+# Enabling this because it is disabled by default and we want it.
+Rails/ReversibleMigrationMethodDefinition:
+  Enabled: true
+
 # This ensures we do not ignore potential validation issues in the code. Doing
 # so can lead to strange and surprising bugs where records are expected to
 # be created, or be modified, but are not.
@@ -234,6 +277,13 @@ Rails/ReadWriteAttribute:
 Rails/SaveBang:
   Enabled: true
 
+# This cop enforces that short forms of I18n methods are used: t instead of translate and l instead
+# of localize. We want this because it's a pain to use the full method names over and over in view
+# code. When the EnforcedStyle is aggressive then all translate and localize calls without a
+# receiver are added as offenses.
+Rails/ShortI18n:
+  EnforcedStyle: aggressive
+
 # According to the Rails docs while the following methods skip validations they
 # only update the specified (single) attribute reducing risks. We'd rather not
 # warn for those cases:
@@ -251,14 +301,19 @@ Rails/SaveBang:
 #   - http://api.rubyonrails.org/classes/ActiveRecord/Persistence.html
 #   - http://api.rubyonrails.org/classes/ActiveRecord/Relation.html
 #
-# Configuration parameters: Blacklist, Whitelist.
-# Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
+# Configuration parameters: ForbiddenMethods, AllowedMethods.
+# ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
 Rails/SkipsModelValidations:
-  Whitelist:
+  AllowedMethods:
     - 'decrement!'
     - 'increment!'
     - 'touch'
 
+# We don't want to be forced to use squish in SQL or JSON heredocs (especially
+# in specs).
+Rails/SquishedSQLHeredocs:
+  Enabled: false
+
 # Rails uses compact style by default so we're disabling this with a :hammer:
 # for things likely to be generated by Rails (i.e. most things in app).
 #

data/lib/radius/spec/model_factory.rb

@@ -109,7 +109,14 @@ module Radius
       # factory {Radius::Spec::ModelFactory.catalog}.
       class TemplateNotFound < KeyError; end
 
-      class << self
+      class << self # rubocop:disable Style/ClassMethodsDefinitions
+        # Style Note: We are using this class method style because we need to
+        # call `alias_method` within this module's singleton class context.
+        # Ruby did not introduce access to `singleton_class` until 2.7. Once we
+        # drop support for Ruby < 2.7 we can switch styles and use:
+        #
+        #     singleton_class.alias_method :factory, :define_factory
+
         # Suggested method for defining multiple factory templates at once.
         #
         # Most projects end up having many domain models which need factories

data/lib/radius/spec/rspec.rb

@@ -133,6 +133,11 @@ RSpec.configure do |config|
     config.include Radius::Spec::ModelFactory, type: :feature
   end
 
+  config.when_first_matching_example_defined(type: :helper) do
+    require 'radius/spec/model_factory'
+    config.include Radius::Spec::ModelFactory, type: :helper
+  end
+
   config.when_first_matching_example_defined(type: :job) do
     require 'radius/spec/model_factory'
     config.include Radius::Spec::ModelFactory, type: :job

data/lib/radius/spec/vcr.rb

@@ -10,15 +10,15 @@ VCR.configure do |config|
   config.ignore_localhost = true
 
   record_mode = case
+                when ENV.fetch('CI', false)
+                  # Never let CI record
+                  :none
                 when RSpec.configuration.files_to_run.one?
                   # When developing new features we often run new specs in
                   # isolation as we write the code. This is the time to allow
                   # creating the cassettes.
                   :once
-                when ENV['CI']
-                  # Never let CI record
-                  :none
-                else
+                else # rubocop:disable Lint/DuplicateBranch
                   # Default to blocking new requests to catch issues
                   :none
                 end
@@ -42,14 +42,17 @@ VCR.configure do |config|
     RADIUS_OAUTH_PROVIDER_APP_SECRET
     RADIUS_OAUTH_PROVIDER_URL
   ].each do |secret|
-    config.filter_sensitive_data("<#{secret}>") { ENV[secret] }
+    # WARNING: It may seem tempting, but don't try to extract ENV[secret] to a local variable
+    # here. `filter_sensitive_data` calls its block instead of exec-ing it, so a local variable
+    # set outside the blocks won't be accessible inside them.
+    config.filter_sensitive_data("<#{secret}>") { ENV.fetch(secret, nil) }
 
     config.filter_sensitive_data("<#{secret}_FORM>") {
-      URI.encode_www_form_component(ENV[secret]) if ENV[secret]
+      URI.encode_www_form_component(ENV.fetch(secret, nil)) if ENV[secret]
     }
 
     config.filter_sensitive_data("<#{secret}_URI>") {
-      ERB::Util.url_encode(ENV[secret]) if ENV[secret]
+      ERB::Util.url_encode(ENV.fetch(secret, nil)) if ENV[secret]
     }
 
     config.filter_sensitive_data('<AUTHORIZATION_HEADER>') { |interaction|

data/lib/radius/spec/version.rb

@@ -2,6 +2,6 @@
 
 module Radius
   module Spec
-    VERSION = "0.9.0"
+    VERSION = "0.12.0"
   end
 end

data/radius-spec.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
     "bug_tracker_uri" => "https://github.com/RadiusNetworks/radius-spec/issues",
     "changelog_uri" => "https://github.com/RadiusNetworks/radius-spec/blob/v#{Radius::Spec::VERSION}/CHANGELOG.md",
     "source_code_uri" => "https://github.com/RadiusNetworks/radius-spec/tree/v#{Radius::Spec::VERSION}",
+    "rubygems_mfa_required" => "true",
   }
   spec.summary       = "Radius Networks RSpec setup and plug-ins"
   spec.description   = "Standard RSpec setup and a collection of plug-ins " \
@@ -31,8 +32,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.5" # rubocop:disable Gemspec/RequiredRubyVersion
 
   spec.add_runtime_dependency "rspec", "~> 3.7"
-  spec.add_runtime_dependency "rubocop", "~> 0.89.0"
-  spec.add_runtime_dependency "rubocop-rails", "~> 2.6.0"
+  spec.add_runtime_dependency "rubocop", ">= 1.25", "< 1.33"
+  spec.add_runtime_dependency "rubocop-rails", ">= 2.13", "< 2.16"
 
   spec.add_development_dependency "bundler", ">= 2.2.10"
   spec.add_development_dependency "rake", ">= 12.0", "< 14.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radius-spec
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Radius Networks
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -29,30 +29,42 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.25'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.89.0
+        version: '1.33'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.25'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.89.0
+        version: '1.33'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.13'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.13'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.16'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +106,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/reviewdog.yml"
 - ".gitignore"
@@ -126,6 +139,7 @@ files:
 - benchmarks/style_hash_like_case.rb
 - benchmarks/unfreeze_string.rb
 - benchmarks/unpack_first.rb
+- bin/bundle
 - bin/ci
 - bin/console
 - bin/pry
@@ -150,8 +164,9 @@ licenses:
 - Apache-2.0
 metadata:
   bug_tracker_uri: https://github.com/RadiusNetworks/radius-spec/issues
-  changelog_uri: https://github.com/RadiusNetworks/radius-spec/blob/v0.9.0/CHANGELOG.md
-  source_code_uri: https://github.com/RadiusNetworks/radius-spec/tree/v0.9.0
+  changelog_uri: https://github.com/RadiusNetworks/radius-spec/blob/v0.12.0/CHANGELOG.md
+  source_code_uri: https://github.com/RadiusNetworks/radius-spec/tree/v0.12.0
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -167,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Radius Networks RSpec setup and plug-ins