From 8bf78927d79fea5fb532aea02ecd9e4d04638faa Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Wed, 14 Sep 2022 20:15:56 -0400 Subject: [PATCH 001/126] Fallback to site name when title is empty in mirrored tags --- lib/meta_tags/meta_tags_collection.rb | 6 ++++-- spec/view_helper/open_graph_spec.rb | 11 ++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/meta_tags/meta_tags_collection.rb b/lib/meta_tags/meta_tags_collection.rb index 64ce9d27..b08146a2 100644 --- a/lib/meta_tags/meta_tags_collection.rb +++ b/lib/meta_tags/meta_tags_collection.rb @@ -70,14 +70,16 @@ def full_title(defaults = {}) with_defaults(defaults) { extract_full_title } end - # Constructs the title without site title (for normalized parameters). + # Constructs the title without site title (for normalized parameters). When title is empty, + # use the site title instead. # # @return [String] page title. # def page_title(defaults = {}) old_site = @meta_tags[:site] @meta_tags[:site] = nil - with_defaults(defaults) { extract_full_title } + full_title = with_defaults(defaults) { extract_full_title } + full_title.presence || old_site ensure @meta_tags[:site] = old_site end diff --git a/spec/view_helper/open_graph_spec.rb b/spec/view_helper/open_graph_spec.rb index 773ca43e..e60b82d9 100644 --- a/spec/view_helper/open_graph_spec.rb +++ b/spec/view_helper/open_graph_spec.rb @@ -65,7 +65,7 @@ end end - it "properlies handle title and site title in mirrored content" do + it "properly handle title and site title in mirrored content" do subject.set_meta_tags(title: 'someTitle', site: 'someSite') subject.display_meta_tags(open_graph: { title: :title, site_name: :site, full_title: :full_title }).tap do |meta| expect(meta).to have_tag('meta', with: { content: "someTitle", property: "og:title" }) @@ -74,6 +74,15 @@ end end + it "uses site_title for mirrored title, when title is empty" do + subject.set_meta_tags(title: '', site: 'someSite') + subject.display_meta_tags(open_graph: { title: :title, site_name: :site, full_title: :full_title }).tap do |meta| + expect(meta).to have_tag('meta', with: { content: "someSite", property: "og:title" }) + expect(meta).to have_tag('meta', with: { content: "someSite", property: "og:site_name" }) + expect(meta).to have_tag('meta', with: { content: "someSite", property: "og:full_title" }) + end + end + it "displays open graph meta tags with an array of images" do subject.set_meta_tags( open_graph: { From bf2be1e251e05edf6afaa2baa10834ee7fa70bc4 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Wed, 14 Sep 2022 20:23:14 -0400 Subject: [PATCH 002/126] Page title is not expected to be nil --- lib/meta_tags/meta_tags_collection.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/meta_tags/meta_tags_collection.rb b/lib/meta_tags/meta_tags_collection.rb index b08146a2..49e307f3 100644 --- a/lib/meta_tags/meta_tags_collection.rb +++ b/lib/meta_tags/meta_tags_collection.rb @@ -79,7 +79,7 @@ def page_title(defaults = {}) old_site = @meta_tags[:site] @meta_tags[:site] = nil full_title = with_defaults(defaults) { extract_full_title } - full_title.presence || old_site + full_title.presence || old_site || '' ensure @meta_tags[:site] = old_site end From 3d40c0da26e5e0778d57ede48db1be65568994c0 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Wed, 14 Sep 2022 20:24:32 -0400 Subject: [PATCH 003/126] Updated changelog --- CHANGELOG.md | 6 ++++++ lib/meta_tags/version.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc70916b..14df6a83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 2.18.0 (September 15, 2022) [☰](https://github.com/kpumuk/meta-tags/compare/v2.17.0...v2.18.0) + +Changes: + +- Fallback to site name when title is empty in mirrored tags ([243](https://github.com/kpumuk/meta-tags/pull/243)) + ## 2.17.0 (July 5, 2022) [☰](https://github.com/kpumuk/meta-tags/compare/v2.16.0...v2.17.0) Changes: diff --git a/lib/meta_tags/version.rb b/lib/meta_tags/version.rb index 134a4efd..c7eae840 100644 --- a/lib/meta_tags/version.rb +++ b/lib/meta_tags/version.rb @@ -2,6 +2,6 @@ module MetaTags # Gem version. - VERSION = '2.17.0' + VERSION = '2.18.0' public_constant :VERSION end From f98b16f7189d0e62e4dbca512814720fb2514a03 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Fri, 16 Sep 2022 11:50:46 -0400 Subject: [PATCH 004/126] Upgraded Steep to 1.1.1 --- Gemfile | 2 +- lib/meta_tags/view_helper.rb | 2 +- meta-tags.gemspec | 2 +- sig/lib/_internal/rails.rbs | 2 ++ sig/lib/meta_tags.rbs | 2 ++ sig/lib/meta_tags/controller_helper.rbs | 1 + sig/lib/meta_tags/view_helper.rbs | 2 ++ 7 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index ae2f4135..d725cf3d 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ end unless ENV["NO_STEEP"] == '1' # Ruby typings - gem 'steep', '~> 1.0.1', platform: :mri + gem 'steep', '~> 1.1.1', platform: :mri end group :test do diff --git a/lib/meta_tags/view_helper.rb b/lib/meta_tags/view_helper.rb index 892cb1e4..c7dcc60a 100644 --- a/lib/meta_tags/view_helper.rb +++ b/lib/meta_tags/view_helper.rb @@ -203,7 +203,7 @@ def display_meta_tags(defaults = {}) #
# def display_title(defaults = {}) - @meta_tags.full_title(defaults) + meta_tags.full_title(defaults) end end end diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 42c81f5a..b70f7a0f 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "railties", ">= 3.2.0", "< 7.1" spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "rspec", "~> 3.11.0" - spec.add_development_dependency "rspec-html-matchers", "~> 0.9.1" + spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0" spec.cert_chain = ["certs/kpumuk.pem"] spec.signing_key = File.expand_path("~/.ssh/gem-kpumuk.pem") if $PROGRAM_NAME.end_with?('gem') diff --git a/sig/lib/_internal/rails.rbs b/sig/lib/_internal/rails.rbs index 3812b842..3f8d7fb3 100644 --- a/sig/lib/_internal/rails.rbs +++ b/sig/lib/_internal/rails.rbs @@ -4,6 +4,8 @@ class ::Hash[unchecked out K, unchecked out V] end class ::Object + $OFS: String + def presence: () -> self? def blank?: () -> bool def present?: () -> bool diff --git a/sig/lib/meta_tags.rbs b/sig/lib/meta_tags.rbs index 7f020883..837736a9 100644 --- a/sig/lib/meta_tags.rbs +++ b/sig/lib/meta_tags.rbs @@ -1,4 +1,6 @@ module MetaTags + self.@config: Configuration + def self.config: () -> Configuration def self.configure: () { (Configuration) -> void } -> void diff --git a/sig/lib/meta_tags/controller_helper.rbs b/sig/lib/meta_tags/controller_helper.rbs index 03f1cf8e..608b57b1 100644 --- a/sig/lib/meta_tags/controller_helper.rbs +++ b/sig/lib/meta_tags/controller_helper.rbs @@ -1,5 +1,6 @@ module MetaTags module ControllerHelper : _ActionControllerBase + @meta_tags: MetaTagsCollection? @page_title: String? @page_description: String? @page_keywords: String? | Array[String] diff --git a/sig/lib/meta_tags/view_helper.rbs b/sig/lib/meta_tags/view_helper.rbs index e351757d..ca8da980 100644 --- a/sig/lib/meta_tags/view_helper.rbs +++ b/sig/lib/meta_tags/view_helper.rbs @@ -1,5 +1,7 @@ module MetaTags module ViewHelper : Module, _ActionViewBase + @meta_tags: MetaTagsCollection? + # type meta_tags = { # site: String?, # title: Array[String] | String?, From b7228e0639e7df67abc53570af744f89d714166a Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Fri, 16 Sep 2022 12:00:00 -0400 Subject: [PATCH 005/126] Updating CodeClimate configuration to the latest version --- .codeclimate.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 8a98a09f..ebe1dd4a 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,4 +1,5 @@ -engines: +version: "2" +plugins: duplication: enabled: true config: @@ -13,10 +14,6 @@ engines: # Check https://github.com/codeclimate/codeclimate-rubocop/branches/all?query=channel%2Frubocop channel: rubocop-1-31-0 -ratings: - paths: - - "**.rb" - -exclude_paths: +exclude_patterns: - spec/**/* - certs/**/* From 782b0547adc8694785e4fbbb723d8d1f5e838554 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Wed, 14 Sep 2022 20:04:56 -0400 Subject: [PATCH 006/126] Switching to standard gem for Ruby styling --- .codeclimate.yml | 2 +- .rubocop.yml | 176 +------------- Gemfile | 22 +- Rakefile | 31 ++- lib/generators/meta_tags/install_generator.rb | 2 +- lib/meta-tags.rb | 2 +- lib/meta_tags.rb | 24 +- lib/meta_tags/configuration.rb | 32 +-- lib/meta_tags/controller_helper.rb | 6 +- lib/meta_tags/meta_tags_collection.rb | 44 ++-- lib/meta_tags/railtie.rb | 4 +- lib/meta_tags/renderer.rb | 54 ++--- lib/meta_tags/text_normalizer.rb | 30 +-- lib/meta_tags/version.rb | 2 +- lib/meta_tags/view_helper.rb | 2 +- meta-tags.gemspec | 51 ++-- spec/configuration_spec.rb | 6 +- spec/controller_helper_spec.rb | 24 +- spec/spec_helper.rb | 10 +- spec/support/initialize_rails.rb | 26 +- .../shared_examples_for_set_meta_tags.rb | 48 ++-- .../normalize_description_spec.rb | 14 +- spec/text_normalizer/normalize_title_spec.rb | 136 +++++------ spec/text_normalizer/truncate_array_spec.rb | 42 ++-- spec/view_helper/article_spec.rb | 22 +- spec/view_helper/charset_spec.rb | 14 +- spec/view_helper/custom_spec.rb | 130 +++++----- spec/view_helper/description_spec.rb | 82 +++---- spec/view_helper/icon_spec.rb | 42 ++-- spec/view_helper/keywords_spec.rb | 66 ++--- spec/view_helper/links_spec.rb | 192 +++++++-------- spec/view_helper/module_spec.rb | 6 +- spec/view_helper/noindex_spec.rb | 218 ++++++++--------- spec/view_helper/open_graph_spec.rb | 130 +++++----- spec/view_helper/open_search_spec.rb | 44 ++-- spec/view_helper/open_tags_spec.rb | 28 +-- spec/view_helper/refresh_spec.rb | 24 +- spec/view_helper/title_spec.rb | 226 +++++++++--------- spec/view_helper/twitter_spec.rb | 38 +-- spec/view_helper_spec.rb | 94 ++++---- 40 files changed, 995 insertions(+), 1151 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index ebe1dd4a..924af099 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -12,7 +12,7 @@ plugins: rubocop: enabled: true # Check https://github.com/codeclimate/codeclimate-rubocop/branches/all?query=channel%2Frubocop - channel: rubocop-1-31-0 + channel: rubocop-1-35-1 exclude_patterns: - spec/**/* diff --git a/.rubocop.yml b/.rubocop.yml index d46219b7..a1e93626 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,7 +1,12 @@ require: + - standard - rubocop-rails + - rubocop-rake - rubocop-rspec +inherit_gem: + standard: config/base.yml + AllCops: # Enable all the rules by default EnabledByDefault: true @@ -11,92 +16,8 @@ AllCops: DisplayCopNames: true SuggestExtensions: false # Target versions - # We do not specify Ruby version, because CodeClimate should by default - # read .ruby-version, and send it down to Rubocop - # (see https://github.com/codeclimate/codeclimate-rubocop/pull/68) TargetRubyVersion: 2.6 - # We will lock Rails version to the newest we have in the company, so we're - # always looking to the future. TargetRailsVersion: 5.1 - # Exclude auto-generated and vendored files - Exclude: - - "db/schema.rb" - -#------------------------------------------------------------------------------- -# Rules configuration -#------------------------------------------------------------------------------- - -Bundler/OrderedGems: - TreatCommentsAsGroupSeparators: true - -Layout/HashAlignment: - EnforcedColonStyle: table - EnforcedHashRocketStyle: table - EnforcedLastArgumentHashStyle: always_inspect - -Layout/DotPosition: - EnforcedStyle: trailing - -Layout/LineLength: - Max: 120 - Exclude: - - "spec/**/*" - -Layout/MultilineAssignmentLayout: - EnforcedStyle: same_line - -Layout/MultilineMethodCallIndentation: - EnforcedStyle: indented_relative_to_receiver - -# Requere spaces inside of brackets, e.g. [ 1, 2, 3 ] -Layout/SpaceInsideArrayLiteralBrackets: - Enabled: false - EnforcedStyle: compact - -Metrics/AbcSize: - Max: 25 - -Metrics/BlockLength: - Exclude: - - "**/*.rake" - - "spec/**/*_spec.rb" - - "spec/spec_helper.rb" - - "meta-tags.gemspec" - -Metrics/ClassLength: - Max: 250 - CountComments: false - -Metrics/MethodLength: - Max: 30 - -Metrics/ModuleLength: - Max: 250 - CountComments: false - -Rails/SafeNavigation: - ConvertTry: true - -Style/Alias: - EnforcedStyle: prefer_alias_method - -Style/ClassCheck: - EnforcedStyle: kind_of? - -Style/Lambda: - EnforcedStyle: literal - -Style/TrailingCommaInArguments: - EnforcedStyleForMultiline: consistent_comma - -Style/TrailingCommaInArrayLiteral: - EnforcedStyleForMultiline: consistent_comma - -Style/TrailingCommaInHashLiteral: - EnforcedStyleForMultiline: consistent_comma - -Style/BlockDelimiters: - EnforcedStyle: braces_for_chaining #------------------------------------------------------------------------------- # RSpec rules @@ -130,14 +51,6 @@ RSpec/VerifiedDoubles: # Disabled rules #------------------------------------------------------------------------------- -# Yes, we have meta-tags.rb for simplicity -Naming/FileName: - Enabled: false - -# Allow not null columns without a default value -Rails/NotNullColumn: - Enabled: false - # Do not require loading Rails enviroment for Rake tasks as we are not a Rails application. Rails/RakeEnvironment: Enabled: false @@ -145,82 +58,3 @@ Rails/RakeEnvironment: # Do not require subclassing from ApplicationController as we're not a rails application Rails/ApplicationController: Enabled: false - -# This check does not distinguish between "private :x" and "private def x" -Style/AccessModifierDeclarations: - Enabled: false - -Style/ClassAndModuleChildren: - Enabled: false - -# Do not require copyright information -Style/Copyright: - Enabled: false - -# Do not require class and module documentation -Style/Documentation: - Enabled: false - -# Do not require method documentation -Style/DocumentationMethod: - Enabled: false - -# Allow double negation (!!@var) -Style/DoubleNegation: - Enabled: false - -# Do not enforce if modifier, sometimes it is better to split for long lines -Style/IfUnlessModifier: - Enabled: false - -# Allow trailing comments -Style/InlineComment: - Enabled: false - -# Do not require parentheses around method arguments -Style/MethodCallWithArgsParentheses: - Enabled: false - -# Do not enforce `else` on conditions -Style/MissingElse: - Enabled: false - -# Allow both `.positive?` and `> 0` variants -Style/NumericPredicate: - Enabled: false - -# Do not enforce using symbols for hash keys -Style/StringHashKeys: - Enabled: false - -# Do not enforce usage of single quotes on strings -Style/StringLiterals: - Enabled: false - -# Do not require to use %i[] around symbol arrays -Style/SymbolArray: - Enabled: false - -# Do not require to use %w[] around word arrays -Style/WordArray: - Enabled: false - -# Do not prohibit explicit Rubocop enable/disable directives -Style/DisableCopsWithinSourceCodeDirective: - Enabled: false - -# Do not require keyword arguments when defining method with boolean argument (historical API) -Style/OptionalBooleanParameter: - Enabled: false - -# Do not require fully qualified constants -Lint/ConstantResolution: - Enabled: false - -# Bundler is only used for gem development -Bundler/GemVersion: - Enabled: false - -# Developers can decide where to put their line breaks, thank you very much -Layout/RedundantLineBreak: - Enabled: false diff --git a/Gemfile b/Gemfile index d725cf3d..741df2a3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,30 +1,32 @@ # frozen_string_literal: true -source 'https://rubygems.org' +source "https://rubygems.org" # Specify your gem's dependencies in meta-tags.gemspec gemspec -if ENV['RAILS_VERSION'] +if ENV["RAILS_VERSION"] # Install specified version of actionpack if requested - gem 'railties', "~> #{ENV['RAILS_VERSION']}" + gem "railties", "~> #{ENV["RAILS_VERSION"]}" end -unless ENV["NO_STEEP"] == '1' +unless ENV["NO_STEEP"] == "1" # Ruby typings - gem 'steep', '~> 1.1.1', platform: :mri + gem "steep", "~> 1.1.1", platform: :mri end group :test do # Lock rubocop to a specific version we use on CI. If you update this, # don't forget to switch rubocop channel in the .codeclimate.yml - gem 'rubocop', '= 1.31.0' + gem "rubocop", "= 1.35.1" # Cops for rails apps - gem 'rubocop-rails' + gem "rubocop-rails" + # Cops for rake tasks + gem "rubocop-rake" # Apply RSpec rubocop cops - gem 'rubocop-rspec', require: false + gem "rubocop-rspec", require: false # We use this gem on CI to calculate code coverage. - gem 'simplecov', '~> 0.21.2' + gem "simplecov", "~> 0.21.2" # Format RSpec output for CircleCI - gem 'rspec_junit_formatter' + gem "rspec_junit_formatter" end diff --git a/Rakefile b/Rakefile index 1cd6a696..bd6cd15d 100644 --- a/Rakefile +++ b/Rakefile @@ -1,19 +1,20 @@ # frozen_string_literal: true -require 'bundler' +require "bundler" Bundler::GemHelper.install_tasks -require 'rspec/core/rake_task' +require "rspec/core/rake_task" RSpec::Core::RakeTask.new(:spec) +desc "Run RSpec tests" task test: :spec task default: :spec -desc 'Rebuild Circle CI configuration based on the build matrix template .circleci/config.yml.erb' +desc "Rebuild Circle CI configuration based on the build matrix template .circleci/config.yml.erb" task :circleci do - require 'erb' - template_path = File.expand_path('.circleci/config.yml.erb', __dir__) - config_path = File.expand_path('.circleci/config.yml', __dir__) + require "erb" + template_path = File.expand_path(".circleci/config.yml.erb", __dir__) + config_path = File.expand_path(".circleci/config.yml", __dir__) File.write config_path, ERB.new(File.read(template_path)).result end @@ -26,24 +27,30 @@ module SteepRunner end end -task :steep do - SteepRunner.run("check") -end +desc "Check type information" +task steep: "steep:check" namespace :steep do + desc "Check type information" + task :check do + SteepRunner.run("check") + end + + desc "Print type statistics" task :stats do SteepRunner.run("stats", "--log-level=fatal") end end namespace :rbs do + desc "Run RSpec tests with RBS enabled to test type signatures" task :spec do exec( { - 'RBS_TEST_TARGET' => 'MetaTags::*', - 'RUBYOPT' => '-rrbs/test/setup', + "RBS_TEST_TARGET" => "MetaTags::*", + "RUBYOPT" => "-rrbs/test/setup" }, - 'bundle exec rspec', + "bundle exec rspec" ) end end diff --git a/lib/generators/meta_tags/install_generator.rb b/lib/generators/meta_tags/install_generator.rb index 7e2080ab..d7885285 100644 --- a/lib/generators/meta_tags/install_generator.rb +++ b/lib/generators/meta_tags/install_generator.rb @@ -4,7 +4,7 @@ module MetaTags module Generators class InstallGenerator < Rails::Generators::Base desc "Copy MetaTags default files" - source_root File.expand_path('templates', __dir__) + source_root File.expand_path("templates", __dir__) def copy_config template "config/initializers/meta_tags.rb" diff --git a/lib/meta-tags.rb b/lib/meta-tags.rb index dc64c2d2..26247878 100644 --- a/lib/meta-tags.rb +++ b/lib/meta-tags.rb @@ -1,3 +1,3 @@ # frozen_string_literal: true -require 'meta_tags' +require "meta_tags" diff --git a/lib/meta_tags.rb b/lib/meta_tags.rb index f33aee90..7a5c5ce7 100644 --- a/lib/meta_tags.rb +++ b/lib/meta_tags.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require 'set' -require 'active_support/core_ext/hash/indifferent_access' +require "set" +require "active_support/core_ext/hash/indifferent_access" # MetaTags gem namespace. module MetaTags @@ -24,15 +24,15 @@ def self.configure end end -require 'meta_tags/version' +require "meta_tags/version" -require 'meta_tags/configuration' -require 'meta_tags/controller_helper' -require 'meta_tags/meta_tags_collection' -require 'meta_tags/renderer' -require 'meta_tags/tag' -require 'meta_tags/content_tag' -require 'meta_tags/text_normalizer' -require 'meta_tags/view_helper' +require "meta_tags/configuration" +require "meta_tags/controller_helper" +require "meta_tags/meta_tags_collection" +require "meta_tags/renderer" +require "meta_tags/tag" +require "meta_tags/content_tag" +require "meta_tags/text_normalizer" +require "meta_tags/view_helper" -require 'meta_tags/railtie' if defined?(Rails) +require "meta_tags/railtie" if defined?(Rails) diff --git a/lib/meta_tags/configuration.rb b/lib/meta_tags/configuration.rb index 093955db..a270e8c8 100644 --- a/lib/meta_tags/configuration.rb +++ b/lib/meta_tags/configuration.rb @@ -47,25 +47,25 @@ def initialize def default_property_tags [ # App Link metadata https://developers.facebook.com/docs/applinks/metadata-reference - 'al', + "al", # Open Graph Markup https://developers.facebook.com/docs/sharing/webmasters#markup - 'fb', - 'og', + "fb", + "og", # Facebook OpenGraph Object Types https://developers.facebook.com/docs/reference/opengraph # Note that these tags are used in a regex, so including e.g. 'restaurant' will affect # 'restaurant:category', 'restaurant:price_rating', and anything else under that namespace. - 'article', - 'book', - 'books', - 'business', - 'fitness', - 'game', - 'music', - 'place', - 'product', - 'profile', - 'restaurant', - 'video', + "article", + "book", + "books", + "business", + "fitness", + "game", + "music", + "place", + "product", + "profile", + "restaurant", + "video" ].freeze end @@ -78,7 +78,7 @@ def reset_defaults! @truncate_site_title_first = false @description_limit = 300 @keywords_limit = 255 - @keywords_separator = ', ' + @keywords_separator = ", " @keywords_lowercase = true @property_tags = default_property_tags.dup @open_meta_tags = true diff --git a/lib/meta_tags/controller_helper.rb b/lib/meta_tags/controller_helper.rb index 0927d48b..b7de811c 100644 --- a/lib/meta_tags/controller_helper.rb +++ b/lib/meta_tags/controller_helper.rb @@ -15,8 +15,8 @@ module ControllerHelper # Processes the @page_title, @page_keywords, and # @page_description instance variables and calls +render+. def render(*args, &block) - meta_tags[:title] = @page_title if defined?(@page_title) && @page_title - meta_tags[:keywords] = @page_keywords if defined?(@page_keywords) && @page_keywords + meta_tags[:title] = @page_title if defined?(@page_title) && @page_title + meta_tags[:keywords] = @page_keywords if defined?(@page_keywords) && @page_keywords meta_tags[:description] = @page_description if defined?(@page_description) && @page_description super @@ -25,7 +25,7 @@ def render(*args, &block) # Set meta tags for the page. # # See MetaTags::ViewHelper#set_meta_tags for details. - def set_meta_tags(meta_tags) # rubocop:disable Naming/AccessorMethodName + def set_meta_tags(meta_tags) self.meta_tags.update(meta_tags) end protected :set_meta_tags diff --git a/lib/meta_tags/meta_tags_collection.rb b/lib/meta_tags/meta_tags_collection.rb index 49e307f3..9119bcd6 100644 --- a/lib/meta_tags/meta_tags_collection.rb +++ b/lib/meta_tags/meta_tags_collection.rb @@ -39,12 +39,12 @@ def []=(name, value) # def update(object = {}) meta_tags = if object.respond_to?(:to_meta_tags) - # @type var object: (_MetaTagish & Object) - object.to_meta_tags - else - # @type var object: Hash[String | Symbol, untyped] - object - end + # @type var object: (_MetaTagish & Object) + object.to_meta_tags + else + # @type var object: Hash[String | Symbol, untyped] + object + end @meta_tags.deep_merge! normalize_open_graph(meta_tags) end @@ -79,7 +79,7 @@ def page_title(defaults = {}) old_site = @meta_tags[:site] @meta_tags[:site] = nil full_title = with_defaults(defaults) { extract_full_title } - full_title.presence || old_site || '' + full_title.presence || old_site || "" ensure @meta_tags[:site] = old_site end @@ -106,10 +106,10 @@ def delete(*names) # @return [String] page title. # def extract_full_title - site_title = extract(:site) || '' - title = extract_title - separator = extract_separator - reverse = extract(:reverse) == true + site_title = extract(:site) || "" + title = extract_title + separator = extract_separator + reverse = extract(:reverse) == true TextNormalizer.normalize_title(site_title, title, separator, reverse) end @@ -136,15 +136,15 @@ def extract_title def extract_separator if meta_tags[:separator] == false # Special case: if separator is hidden, do not display suffix/prefix - prefix = separator = suffix = '' + prefix = separator = suffix = "" else - prefix = extract_separator_section(:prefix, ' ') - separator = extract_separator_section(:separator, '|') - suffix = extract_separator_section(:suffix, ' ') + prefix = extract_separator_section(:prefix, " ") + separator = extract_separator_section(:separator, "|") + suffix = extract_separator_section(:suffix, " ") end delete(:separator, :prefix, :suffix) - TextNormalizer.safe_join([prefix, separator, suffix], '') + TextNormalizer.safe_join([prefix, separator, suffix], "") end # Extracts noindex settings as a Hash mapping noindex tag name to value. @@ -159,12 +159,12 @@ def extract_robots [:noindex, :index], # follow has higher priority than nofollow [:follow, :nofollow], - :noarchive, + :noarchive ].each do |attributes| calculate_robots_attributes(result, attributes) end - result.transform_values { |v| v.join(', ') } + result.transform_values { |v| v.join(", ") } end protected @@ -188,7 +188,7 @@ def normalize_open_graph(meta_tags) # @return [String] separator segment value. # def extract_separator_section(name, default) - meta_tags[name] == false ? '' : (meta_tags[name] || default) + meta_tags[name] == false ? "" : (meta_tags[name] || default) end # Extracts robots attribute (noindex, nofollow, etc) name and value. @@ -197,11 +197,11 @@ def extract_separator_section(name, default) # @return [Array] pair of noindex attribute name and value. # def extract_robots_attribute(name) - noindex = extract(name) - noindex_name = noindex.kind_of?(String) || noindex.kind_of?(Array) ? noindex : 'robots' + noindex = extract(name) + noindex_name = noindex.is_a?(String) || noindex.is_a?(Array) ? noindex : "robots" noindex_value = noindex ? name.to_s : nil - [ noindex_name, noindex_value ] + [noindex_name, noindex_value] end def calculate_robots_attributes(result, attributes) diff --git a/lib/meta_tags/railtie.rb b/lib/meta_tags/railtie.rb index f2d6d616..05dc6b18 100644 --- a/lib/meta_tags/railtie.rb +++ b/lib/meta_tags/railtie.rb @@ -2,13 +2,13 @@ module MetaTags class Railtie < Rails::Railtie - initializer 'meta_tags.setup_action_controller' do + initializer "meta_tags.setup_action_controller" do ActiveSupport.on_load :action_controller do ActionController::Base.include MetaTags::ControllerHelper end end - initializer 'meta_tags.setup_action_view' do + initializer "meta_tags.setup_action_view" do ActiveSupport.on_load :action_view do ActionView::Base.include MetaTags::ViewHelper end diff --git a/lib/meta_tags/renderer.rb b/lib/meta_tags/renderer.rb index 1ac9f3e4..cc519114 100644 --- a/lib/meta_tags/renderer.rb +++ b/lib/meta_tags/renderer.rb @@ -71,12 +71,12 @@ def render_icon(tags) return unless icon # String? Value is an href - icon = [{ href: icon }] if icon.kind_of?(String) + icon = [{href: icon}] if icon.is_a?(String) # Hash? Single icon instead of a list of icons - icon = [icon] if icon.kind_of?(Hash) + icon = [icon] if icon.is_a?(Hash) icon.each do |icon_params| - icon_params = { rel: 'icon', type: 'image/x-icon' }.with_indifferent_access.merge(icon_params) + icon_params = {rel: "icon", type: "image/x-icon"}.with_indifferent_access.merge(icon_params) tags << Tag.new(:link, icon_params) end end @@ -109,7 +109,7 @@ def render_noindex(tags) # def render_refresh(tags) refresh = meta_tags.extract(:refresh) - tags << Tag.new(:meta, 'http-equiv' => 'refresh', content: refresh.to_s) if refresh.present? + tags << Tag.new(:meta, "http-equiv" => "refresh", :content => refresh.to_s) if refresh.present? end # Renders alternate link tags. @@ -120,13 +120,13 @@ def render_alternate(tags) alternate = meta_tags.extract(:alternate) return unless alternate - if alternate.kind_of?(Hash) + if alternate.is_a?(Hash) alternate.each do |hreflang, href| - tags << Tag.new(:link, rel: 'alternate', href: href, hreflang: hreflang) if href.present? + tags << Tag.new(:link, rel: "alternate", href: href, hreflang: hreflang) if href.present? end - elsif alternate.kind_of?(Array) + elsif alternate.is_a?(Array) alternate.each do |link_params| - tags << Tag.new(:link, { rel: 'alternate' }.with_indifferent_access.merge(link_params)) + tags << Tag.new(:link, {rel: "alternate"}.with_indifferent_access.merge(link_params)) end end end @@ -143,7 +143,7 @@ def render_open_search(tags) title = open_search[:title] type = "application/opensearchdescription+xml" - tags << Tag.new(:link, rel: 'search', type: type, href: href, title: title) if href.present? + tags << Tag.new(:link, rel: "search", type: type, href: href, title: title) if href.present? end # Renders links. @@ -151,7 +151,7 @@ def render_open_search(tags) # @param [Array] tags a buffer object to store tag in. # def render_links(tags) - [ :amphtml, :prev, :next, :image_src, :manifest ].each do |tag_name| + [:amphtml, :prev, :next, :image_src, :manifest].each do |tag_name| href = meta_tags.extract(tag_name) if href.present? @normalized_meta_tags[tag_name] = href @@ -189,7 +189,7 @@ def render_hashes(tags, **opts) # def render_hash(tags, key, **opts) data = meta_tags.meta_tags[key] - return unless data.kind_of?(Hash) + return unless data.is_a?(Hash) process_hash(tags, key, data, **opts) meta_tags.extract(key) @@ -202,7 +202,7 @@ def render_hash(tags, key, **opts) def render_custom(tags) meta_tags.meta_tags.each do |name, data| Array(data).each do |val| - tags << Tag.new(:meta, configured_name_key(name) => name, content: val) + tags << Tag.new(:meta, configured_name_key(name) => name, :content => val) end meta_tags.extract(name) end @@ -217,14 +217,14 @@ def render_custom(tags) # def process_tree(tags, property, content, itemprop: nil, **opts) method = case content - when Hash - :process_hash - when Array - :process_array - else - iprop = itemprop - :render_tag - end + when Hash + :process_hash + when Array + :process_array + else + iprop = itemprop + :render_tag + end __send__(method, tags, property, content, itemprop: iprop, **opts) end @@ -237,18 +237,18 @@ def process_tree(tags, property, content, itemprop: nil, **opts) def process_hash(tags, property, content, **opts) itemprop = content.delete(:itemprop) content.each do |key, value| - if key.to_s == '_' + if key.to_s == "_" iprop = itemprop key = property else key = "#{property}:#{key}" end - normalized_value = if value.kind_of?(Symbol) - normalized_meta_tags[value] - else - value - end + normalized_value = if value.is_a?(Symbol) + normalized_meta_tags[value] + else + value + end process_tree(tags, key, normalized_value, **opts.merge(itemprop: iprop)) end end @@ -273,7 +273,7 @@ def process_array(tags, property, content, **opts) # def render_tag(tags, name, value, itemprop: nil) name_key ||= configured_name_key(name) - tags << Tag.new(:meta, name_key => name.to_s, content: value, itemprop: itemprop) if value.present? + tags << Tag.new(:meta, name_key => name.to_s, :content => value, :itemprop => itemprop) if value.present? end # Returns meta tag property name for a give meta tag based on the diff --git a/lib/meta_tags/text_normalizer.rb b/lib/meta_tags/text_normalizer.rb index 9e038aae..37f71078 100644 --- a/lib/meta_tags/text_normalizer.rb +++ b/lib/meta_tags/text_normalizer.rb @@ -44,7 +44,7 @@ def normalize_description(description) # serves the same purpose we could just as it to convert itself to str # and continue from there description = cleanup_string(description) - return '' if description.blank? + return "" if description.blank? truncate(description, MetaTags.config.description_limit) end @@ -56,7 +56,7 @@ def normalize_description(description) # def normalize_keywords(keywords) keywords = cleanup_strings(keywords) - return '' if keywords.blank? + return "" if keywords.blank? keywords.each(&:downcase!) if MetaTags.config.keywords_lowercase separator = cleanup_string MetaTags.config.keywords_separator, strip: false @@ -107,12 +107,12 @@ def safe_join(array, sep = $OFS) # space characters squashed into a single space. # def cleanup_string(string, strip: true) - return '' if string.nil? - raise ArgumentError, 'Expected a string or an object that implements #to_str' unless string.respond_to?(:to_str) + return "" if string.nil? + raise ArgumentError, "Expected a string or an object that implements #to_str" unless string.respond_to?(:to_str) s = strip_tags(string.to_str) s = s.dup if s.frozen? - s.gsub!(/\s+/, ' ') + s.gsub!(/\s+/, " ") s.strip! if strip s @@ -137,15 +137,15 @@ def cleanup_strings(strings, strip: true) # @param [String] natural_separator natural separator to truncate at. # @return [String] truncated string. # - def truncate(string, limit = nil, natural_separator = ' ') - return string if limit.to_i == 0 # rubocop:disable Lint/NumberConversion + def truncate(string, limit = nil, natural_separator = " ") + return string if limit.to_i == 0 helpers.truncate( string, - length: limit, + length: limit, separator: natural_separator, - omission: '', - escape: true, + omission: "", + escape: true ) end @@ -157,7 +157,7 @@ def truncate(string, limit = nil, natural_separator = ' ') # @param [String] natural_separator natural separator to truncate at. # @return [Array] truncated array of strings. # - def truncate_array(string_array, limit = nil, separator = '', natural_separator = ' ') + def truncate_array(string_array, limit = nil, separator = "", natural_separator = " ") return string_array if limit.nil? || limit <= 0 length = 0 @@ -188,10 +188,10 @@ def calculate_limit_left(limit, length, result, separator) end def truncate_title(site_title, title, separator) - global_limit = MetaTags.config.title_limit.to_i # rubocop:disable Lint/NumberConversion + global_limit = MetaTags.config.title_limit.to_i if global_limit > 0 site_title_limited_length, title_limited_length = calculate_title_limits( - site_title, title, separator, global_limit, + site_title, title, separator, global_limit ) title = title_limited_length > 0 ? truncate_array(title, title_limited_length, separator) : [] @@ -212,9 +212,9 @@ def calculate_title_limits(site_title, title, separator, global_limit) secondary_limited_length = [0, secondary_limited_length].max if MetaTags.config.truncate_site_title_first - [ secondary_limited_length, main_limited_length ] + [secondary_limited_length, main_limited_length] else - [ main_limited_length, secondary_limited_length ] + [main_limited_length, secondary_limited_length] end end end diff --git a/lib/meta_tags/version.rb b/lib/meta_tags/version.rb index c7eae840..7b737e3c 100644 --- a/lib/meta_tags/version.rb +++ b/lib/meta_tags/version.rb @@ -2,6 +2,6 @@ module MetaTags # Gem version. - VERSION = '2.18.0' + VERSION = "2.18.0" public_constant :VERSION end diff --git a/lib/meta_tags/view_helper.rb b/lib/meta_tags/view_helper.rb index c7dcc60a..ba49413d 100644 --- a/lib/meta_tags/view_helper.rb +++ b/lib/meta_tags/view_helper.rb @@ -55,7 +55,7 @@ def set_meta_tags(meta_tags = {}) # # @see #display_meta_tags # - def title(title = nil, headline = '') + def title(title = nil, headline = "") set_meta_tags(title: title) unless title.nil? headline.presence || meta_tags[:title] end diff --git a/meta-tags.gemspec b/meta-tags.gemspec index b70f7a0f..da773af9 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -1,25 +1,25 @@ # frozen_string_literal: true -lib = File.expand_path('lib', __dir__) +lib = File.expand_path("lib", __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'meta_tags/version' +require "meta_tags/version" Gem::Specification.new do |spec| - spec.name = "meta-tags" - spec.version = MetaTags::VERSION - spec.authors = ["Dmytro Shteflyuk"] - spec.email = ["kpumuk@kpumuk.info"] - - spec.summary = "Collection of SEO helpers for Ruby on Rails." - spec.description = "Search Engine Optimization (SEO) plugin for Ruby on Rails applications." - spec.homepage = "https://github.com/kpumuk/meta-tags" - spec.license = "MIT" - spec.platform = Gem::Platform::RUBY - spec.required_ruby_version = '>= 2.6.0' - - spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(\.|(bin|test|spec|features)/)}) } - spec.bindir = "exe" - spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } + spec.name = "meta-tags" + spec.version = MetaTags::VERSION + spec.authors = ["Dmytro Shteflyuk"] + spec.email = ["kpumuk@kpumuk.info"] + + spec.summary = "Collection of SEO helpers for Ruby on Rails." + spec.description = "Search Engine Optimization (SEO) plugin for Ruby on Rails applications." + spec.homepage = "https://github.com/kpumuk/meta-tags" + spec.license = "MIT" + spec.platform = Gem::Platform::RUBY + spec.required_ruby_version = ">= 2.6.0" + + spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(\.|(bin|test|spec|features)/)}) } + spec.bindir = "exe" + spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] spec.add_dependency "actionpack", ">= 3.2.0", "< 7.1" @@ -28,16 +28,17 @@ Gem::Specification.new do |spec| spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "rspec", "~> 3.11.0" spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0" + spec.add_development_dependency "standard", "~> 1.16.1" - spec.cert_chain = ["certs/kpumuk.pem"] - spec.signing_key = File.expand_path("~/.ssh/gem-kpumuk.pem") if $PROGRAM_NAME.end_with?('gem') + spec.cert_chain = ["certs/kpumuk.pem"] + spec.signing_key = File.expand_path("~/.ssh/gem-kpumuk.pem") if $PROGRAM_NAME.end_with?("gem") spec.metadata = { - "bug_tracker_uri" => "https://github.com/kpumuk/meta-tags/issues/", - "changelog_uri" => "https://github.com/kpumuk/meta-tags/blob/main/CHANGELOG.md", - "documentation_uri" => "https://rubydoc.info/github/kpumuk/meta-tags/", - "homepage_uri" => "https://github.com/kpumuk/meta-tags/", - "source_code_uri" => "https://github.com/kpumuk/meta-tags/", - "rubygems_mfa_required" => "true", + "bug_tracker_uri" => "https://github.com/kpumuk/meta-tags/issues/", + "changelog_uri" => "https://github.com/kpumuk/meta-tags/blob/main/CHANGELOG.md", + "documentation_uri" => "https://rubydoc.info/github/kpumuk/meta-tags/", + "homepage_uri" => "https://github.com/kpumuk/meta-tags/", + "source_code_uri" => "https://github.com/kpumuk/meta-tags/", + "rubygems_mfa_required" => "true" } end diff --git a/spec/configuration_spec.rb b/spec/configuration_spec.rb index 15c2d972..6687c7b6 100644 --- a/spec/configuration_spec.rb +++ b/spec/configuration_spec.rb @@ -1,13 +1,13 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" RSpec.describe MetaTags::Configuration do - it 'is returned by MetaTags.config' do + it "is returned by MetaTags.config" do expect(MetaTags.config).to be_instance_of(described_class) end - it 'is yielded by MetaTags.configure' do + it "is yielded by MetaTags.configure" do MetaTags.configure do |c| expect(c).to be_instance_of(described_class) expect(c).to be(MetaTags.config) diff --git a/spec/controller_helper_spec.rb b/spec/controller_helper_spec.rb index 71171024..35e4e689 100644 --- a/spec/controller_helper_spec.rb +++ b/spec/controller_helper_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" RSpec.describe MetaTags::ControllerHelper do subject do @@ -14,8 +14,8 @@ skip("Does not work properly with RBS") if ENV["RBS_TEST_TARGET"] # rubocop:disable RSpec/Pending end - describe 'module' do - it 'is mixed into ActionController::Base' do + describe "module" do + it "is mixed into ActionController::Base" do expect(ActionController::Base.included_modules).to include(described_class) end @@ -24,25 +24,25 @@ end end - describe '.render' do - it 'sets meta tags from instance variables' do + describe ".render" do + it "sets meta tags from instance variables" do subject.index - expect(subject.response.body).to eq('_rendered_') - expect(subject.meta_tags.meta_tags).to eq('title' => 'title', 'keywords' => 'key1, key2, key3', 'description' => 'description') + expect(subject.response.body).to eq("_rendered_") + expect(subject.meta_tags.meta_tags).to eq("title" => "title", "keywords" => "key1, key2, key3", "description" => "description") end - it 'does not require instance variables' do + it "does not require instance variables" do subject.show - expect(subject.response.body).to eq('_rendered_') + expect(subject.response.body).to eq("_rendered_") expect(subject.meta_tags.meta_tags).to eq({}) end - it 'does not fail when instance variables are not set' do + it "does not fail when instance variables are not set" do subject.hide - expect(subject.response.body).to eq('_rendered_') + expect(subject.response.body).to eq("_rendered_") expect(subject.meta_tags.meta_tags).to eq({}) end end - it_behaves_like '.set_meta_tags' + it_behaves_like ".set_meta_tags" end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 08a5b829..44c23045 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,14 +1,14 @@ # frozen_string_literal: true -if ENV['ENABLE_CODE_COVERAGE'] - require 'simplecov' +if ENV["ENABLE_CODE_COVERAGE"] + require "simplecov" SimpleCov.start do enable_coverage :branch end end -require 'meta_tags' -require 'rspec-html-matchers' +require "meta_tags" +require "rspec-html-matchers" Dir[File.expand_path("support/**/*.rb", __dir__)].sort.each { |f| require f } @@ -22,7 +22,7 @@ # Use the documentation formatter for detailed output, # unless a formatter has already been configured # (e.g. via a command-line flag). - config.formatter = 'doc' if config.formatters.none? + config.formatter = "doc" if config.formatters.none? end # Limits the available syntax to the non-monkey patched diff --git a/spec/support/initialize_rails.rb b/spec/support/initialize_rails.rb index 800e40e2..b2cae75f 100644 --- a/spec/support/initialize_rails.rb +++ b/spec/support/initialize_rails.rb @@ -6,14 +6,14 @@ # # TLDR. This is a real Rails application -require 'rails' -require 'action_controller/railtie' -require 'action_view/railtie' -require 'meta_tags/railtie' +require "rails" +require "action_controller/railtie" +require "action_view/railtie" +require "meta_tags/railtie" module MetaTagsRailsApp class Application < Rails::Application - config.secret_token = '572c86f5ede338bd8aba8dae0fd3a326aabababc98d1e6ce34b9f5' + config.secret_token = "572c86f5ede338bd8aba8dae0fd3a326aabababc98d1e6ce34b9f5" config.eager_load = false end @@ -21,23 +21,23 @@ class MetaTagsController < ActionController::Base include MetaTags::ControllerHelper def index - @page_title = 'title' - @page_keywords = 'key1, key2, key3' - @page_description = 'description' + @page_title = "title" + @page_keywords = "key1, key2, key3" + @page_description = "description" - render plain: '_rendered_' + render plain: "_rendered_" end def show - render plain: '_rendered_' + render plain: "_rendered_" end def hide - @page_title = nil - @page_keywords = nil + @page_title = nil + @page_keywords = nil @page_description = nil - render plain: '_rendered_' + render plain: "_rendered_" end public :set_meta_tags, :meta_tags diff --git a/spec/support/shared_examples_for_set_meta_tags.rb b/spec/support/shared_examples_for_set_meta_tags.rb index dfa95089..98ccd03e 100644 --- a/spec/support/shared_examples_for_set_meta_tags.rb +++ b/spec/support/shared_examples_for_set_meta_tags.rb @@ -1,42 +1,42 @@ # frozen_string_literal: true -shared_examples_for '.set_meta_tags' do - context 'with a Hash parameter' do - it 'updates meta tags' do - subject.set_meta_tags(title: 'hello') - expect(subject.meta_tags[:title]).to eq('hello') - - subject.set_meta_tags(title: 'world') - expect(subject.meta_tags[:title]).to eq('world') +shared_examples_for ".set_meta_tags" do + context "with a Hash parameter" do + it "updates meta tags" do + subject.set_meta_tags(title: "hello") + expect(subject.meta_tags[:title]).to eq("hello") + + subject.set_meta_tags(title: "world") + expect(subject.meta_tags[:title]).to eq("world") end end - context 'with an Object responding to #to_meta_tags parameter' do - it 'updates meta tags' do - object1 = double(to_meta_tags: { title: 'hello' }) - object2 = double(to_meta_tags: { title: 'world' }) + context "with an Object responding to #to_meta_tags parameter" do + it "updates meta tags" do + object1 = double(to_meta_tags: {title: "hello"}) + object2 = double(to_meta_tags: {title: "world"}) subject.set_meta_tags(object1) - expect(subject.meta_tags[:title]).to eq('hello') + expect(subject.meta_tags[:title]).to eq("hello") subject.set_meta_tags(object2) - expect(subject.meta_tags[:title]).to eq('world') + expect(subject.meta_tags[:title]).to eq("world") end end - it 'uses deep merge when updating meta tags' do - subject.set_meta_tags(og: { title: 'hello' }) - expect(subject.meta_tags[:og]).to eq('title' => 'hello') + it "uses deep merge when updating meta tags" do + subject.set_meta_tags(og: {title: "hello"}) + expect(subject.meta_tags[:og]).to eq("title" => "hello") - subject.set_meta_tags(og: { description: 'world' }) - expect(subject.meta_tags[:og]).to eq('title' => 'hello', 'description' => 'world') + subject.set_meta_tags(og: {description: "world"}) + expect(subject.meta_tags[:og]).to eq("title" => "hello", "description" => "world") - subject.set_meta_tags(og: { admin: { id: 1 } }) - expect(subject.meta_tags[:og]).to eq('title' => 'hello', 'description' => 'world', 'admin' => { 'id' => 1 }) + subject.set_meta_tags(og: {admin: {id: 1}}) + expect(subject.meta_tags[:og]).to eq("title" => "hello", "description" => "world", "admin" => {"id" => 1}) end - it 'normalizes :open_graph to :og' do - subject.set_meta_tags(open_graph: { title: 'hello' }) - expect(subject.meta_tags[:og]).to eq('title' => 'hello') + it "normalizes :open_graph to :og" do + subject.set_meta_tags(open_graph: {title: "hello"}) + expect(subject.meta_tags[:og]).to eq("title" => "hello") end end diff --git a/spec/text_normalizer/normalize_description_spec.rb b/spec/text_normalizer/normalize_description_spec.rb index 9380893f..b6e46477 100644 --- a/spec/text_normalizer/normalize_description_spec.rb +++ b/spec/text_normalizer/normalize_description_spec.rb @@ -1,16 +1,16 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" -RSpec.describe MetaTags::TextNormalizer, '.normalize_description' do - describe 'description limit setting' do - let(:description) { 'd' * (MetaTags.config.description_limit + 10) } +RSpec.describe MetaTags::TextNormalizer, ".normalize_description" do + describe "description limit setting" do + let(:description) { "d" * (MetaTags.config.description_limit + 10) } - it 'truncates description when limit is reached' do - expect(subject.normalize_description(description)).to eq('d' * MetaTags.config.description_limit) + it "truncates description when limit is reached" do + expect(subject.normalize_description(description)).to eq("d" * MetaTags.config.description_limit) end - it 'does not truncate description when limit is 0 or nil' do + it "does not truncate description when limit is 0 or nil" do MetaTags.config.description_limit = 0 expect(subject.normalize_description(description)).to eq(description) diff --git a/spec/text_normalizer/normalize_title_spec.rb b/spec/text_normalizer/normalize_title_spec.rb index 403c751e..ae0d54aa 100644 --- a/spec/text_normalizer/normalize_title_spec.rb +++ b/spec/text_normalizer/normalize_title_spec.rb @@ -1,125 +1,125 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" -RSpec.describe MetaTags::TextNormalizer, '.normalize_title' do - context 'when site_title is blank' do - it 'returns title when site_title is blank' do - expect(subject.normalize_title(nil, 'title', '-')).to eq('title') - expect(subject.normalize_title('', 'title', '-')).to eq('title') +RSpec.describe MetaTags::TextNormalizer, ".normalize_title" do + context "when site_title is blank" do + it "returns title when site_title is blank" do + expect(subject.normalize_title(nil, "title", "-")).to eq("title") + expect(subject.normalize_title("", "title", "-")).to eq("title") end - it 'joins title parts with separator' do - expect(subject.normalize_title('', %w[title subtitle], '-')).to eq('title-subtitle') + it "joins title parts with separator" do + expect(subject.normalize_title("", %w[title subtitle], "-")).to eq("title-subtitle") end - it 'reverses title parts when reverse is true' do - expect(subject.normalize_title('', %w[title subtitle], '-', true)).to eq('subtitle-title') + it "reverses title parts when reverse is true" do + expect(subject.normalize_title("", %w[title subtitle], "-", true)).to eq("subtitle-title") end - it 'does not truncate title when limit is equal to the title length' do - title = 'b' * MetaTags.config.title_limit - expect(subject.normalize_title('', title, '-')).to eq(title) + it "does not truncate title when limit is equal to the title length" do + title = "b" * MetaTags.config.title_limit + expect(subject.normalize_title("", title, "-")).to eq(title) end - it 'truncates title when limit is reached' do - title = 'b' * (MetaTags.config.title_limit + 20) - expect(subject.normalize_title('', title, '-')).to eq('b' * MetaTags.config.title_limit) + it "truncates title when limit is reached" do + title = "b" * (MetaTags.config.title_limit + 20) + expect(subject.normalize_title("", title, "-")).to eq("b" * MetaTags.config.title_limit) end - it 'truncates last part of the title when reverse is true' do + it "truncates last part of the title when reverse is true" do title = [ - 'a' * (MetaTags.config.title_limit - 20), - 'b' * 40, + "a" * (MetaTags.config.title_limit - 20), + "b" * 40 ] - expect(subject.normalize_title('', title, '-', true)).to eq("#{'b' * 40}-#{'a' * (MetaTags.config.title_limit - 41)}") + expect(subject.normalize_title("", title, "-", true)).to eq("#{"b" * 40}-#{"a" * (MetaTags.config.title_limit - 41)}") end end - context 'when site_title is specified' do - it 'returns site when title is blank' do - expect(subject.normalize_title('site', nil, '-')).to eq('site') - expect(subject.normalize_title('site', '', '-')).to eq('site') + context "when site_title is specified" do + it "returns site when title is blank" do + expect(subject.normalize_title("site", nil, "-")).to eq("site") + expect(subject.normalize_title("site", "", "-")).to eq("site") end - it 'joins title and site_title with separator' do - expect(subject.normalize_title('site', 'title', '-')).to eq('site-title') + it "joins title and site_title with separator" do + expect(subject.normalize_title("site", "title", "-")).to eq("site-title") end - it 'joins title parts and site_title with separator' do - expect(subject.normalize_title('site', %w[title subtitle], '-')).to eq('site-title-subtitle') + it "joins title parts and site_title with separator" do + expect(subject.normalize_title("site", %w[title subtitle], "-")).to eq("site-title-subtitle") end - it 'reverses title parts when reverse is true' do - expect(subject.normalize_title('site', %w[title subtitle], '-', true)).to eq('subtitle-title-site') + it "reverses title parts when reverse is true" do + expect(subject.normalize_title("site", %w[title subtitle], "-", true)).to eq("subtitle-title-site") end - it 'does not add title when site title is longer than limit' do + it "does not add title when site title is longer than limit" do l = MetaTags.config.title_limit - site_title = 'a' * (l + 1) - expect(subject.normalize_title(site_title, 'title', '---')).to eq(site_title[0, l]) - expect(subject.normalize_title(site_title[0, l - 0], 'title', '---')).to eq(site_title[0, l - 0]) - expect(subject.normalize_title(site_title[0, l - 1], 'title', '---')).to eq(site_title[0, l - 1]) - expect(subject.normalize_title(site_title[0, l - 2], 'title', '---')).to eq(site_title[0, l - 2]) - expect(subject.normalize_title(site_title[0, l - 3], 'title', '---')).to eq(site_title[0, l - 3]) - expect(subject.normalize_title(site_title[0, l - 4], 'title', '---')).to eq("#{site_title[0, l - 4]}---t") + site_title = "a" * (l + 1) + expect(subject.normalize_title(site_title, "title", "---")).to eq(site_title[0, l]) + expect(subject.normalize_title(site_title[0, l - 0], "title", "---")).to eq(site_title[0, l - 0]) + expect(subject.normalize_title(site_title[0, l - 1], "title", "---")).to eq(site_title[0, l - 1]) + expect(subject.normalize_title(site_title[0, l - 2], "title", "---")).to eq(site_title[0, l - 2]) + expect(subject.normalize_title(site_title[0, l - 3], "title", "---")).to eq(site_title[0, l - 3]) + expect(subject.normalize_title(site_title[0, l - 4], "title", "---")).to eq("#{site_title[0, l - 4]}---t") end - it 'truncates title when limit is reached' do - site_title = 'a' * 20 - title = 'b' * (MetaTags.config.title_limit + 10) - expect(subject.normalize_title(site_title, title, '-')).to eq("#{site_title}-#{'b' * (MetaTags.config.title_limit - 21)}") + it "truncates title when limit is reached" do + site_title = "a" * 20 + title = "b" * (MetaTags.config.title_limit + 10) + expect(subject.normalize_title(site_title, title, "-")).to eq("#{site_title}-#{"b" * (MetaTags.config.title_limit - 21)}") end - it 'does not truncate title when title_limit is 0 or nil' do - site_title = 'a' * 20 - title = 'b' * (MetaTags.config.title_limit + 10) + it "does not truncate title when title_limit is 0 or nil" do + site_title = "a" * 20 + title = "b" * (MetaTags.config.title_limit + 10) MetaTags.config.title_limit = 0 - expect(subject.normalize_title(site_title, title, '-')).to eq("#{site_title}-#{title}") + expect(subject.normalize_title(site_title, title, "-")).to eq("#{site_title}-#{title}") MetaTags.config.title_limit = nil - expect(subject.normalize_title(site_title, title, '-')).to eq("#{site_title}-#{title}") + expect(subject.normalize_title(site_title, title, "-")).to eq("#{site_title}-#{title}") end - it 'truncates title when limit is reached on unescaped value' do - site_title = 'a' * 20 + it "truncates title when limit is reached on unescaped value" do + site_title = "a" * 20 title = '"' * (MetaTags.config.title_limit + 10) - expect(subject.normalize_title(site_title, title, '-')).to eq("#{site_title}-#{'"' * (MetaTags.config.title_limit - 21)}") + expect(subject.normalize_title(site_title, title, "-")).to eq("#{site_title}-#{""" * (MetaTags.config.title_limit - 21)}") end end - context 'when truncate_site_title_first is true' do + context "when truncate_site_title_first is true" do before do MetaTags.config.truncate_site_title_first = true end - it 'does not add site title when title is longer than limit' do + it "does not add site title when title is longer than limit" do l = MetaTags.config.title_limit - title = 'a' * (l + 1) - expect(subject.normalize_title('site', title, '---')).to eq(title[0, l]) - expect(subject.normalize_title('site', title[0, l - 0], '---')).to eq(title[0, l - 0]) - expect(subject.normalize_title('site', title[0, l - 1], '---')).to eq(title[0, l - 1]) - expect(subject.normalize_title('site', title[0, l - 2], '---')).to eq(title[0, l - 2]) - expect(subject.normalize_title('site', title[0, l - 3], '---')).to eq(title[0, l - 3]) - expect(subject.normalize_title('site', title[0, l - 4], '---')).to eq("s---#{title[0, l - 4]}") + title = "a" * (l + 1) + expect(subject.normalize_title("site", title, "---")).to eq(title[0, l]) + expect(subject.normalize_title("site", title[0, l - 0], "---")).to eq(title[0, l - 0]) + expect(subject.normalize_title("site", title[0, l - 1], "---")).to eq(title[0, l - 1]) + expect(subject.normalize_title("site", title[0, l - 2], "---")).to eq(title[0, l - 2]) + expect(subject.normalize_title("site", title[0, l - 3], "---")).to eq(title[0, l - 3]) + expect(subject.normalize_title("site", title[0, l - 4], "---")).to eq("s---#{title[0, l - 4]}") end - it 'truncates site title when limit is reached' do - site_title = 'a' * (MetaTags.config.title_limit + 10) - title = 'b' * 20 - expect(subject.normalize_title(site_title, title, '-')).to eq("#{'a' * (MetaTags.config.title_limit - 21)}-#{title}") + it "truncates site title when limit is reached" do + site_title = "a" * (MetaTags.config.title_limit + 10) + title = "b" * 20 + expect(subject.normalize_title(site_title, title, "-")).to eq("#{"a" * (MetaTags.config.title_limit - 21)}-#{title}") end - it 'does not truncate site title when title_limit is 0 or nil' do - site_title = 'a' * (MetaTags.config.title_limit + 10) - title = 'b' * 20 + it "does not truncate site title when title_limit is 0 or nil" do + site_title = "a" * (MetaTags.config.title_limit + 10) + title = "b" * 20 MetaTags.config.title_limit = 0 - expect(subject.normalize_title(site_title, title, '-')).to eq("#{site_title}-#{title}") + expect(subject.normalize_title(site_title, title, "-")).to eq("#{site_title}-#{title}") MetaTags.config.title_limit = nil - expect(subject.normalize_title(site_title, title, '-')).to eq("#{site_title}-#{title}") + expect(subject.normalize_title(site_title, title, "-")).to eq("#{site_title}-#{title}") end end end diff --git a/spec/text_normalizer/truncate_array_spec.rb b/spec/text_normalizer/truncate_array_spec.rb index 41686426..17c72159 100644 --- a/spec/text_normalizer/truncate_array_spec.rb +++ b/spec/text_normalizer/truncate_array_spec.rb @@ -1,62 +1,62 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" -RSpec.describe MetaTags::TextNormalizer, '.truncate_array' do - it 'returns array as is when limit is not specified' do +RSpec.describe MetaTags::TextNormalizer, ".truncate_array" do + it "returns array as is when limit is not specified" do arr = %w[a] expect(subject.truncate_array(arr, nil)).to be(arr) expect(subject.truncate_array(arr, 0)).to be(arr) end - it 'returns a new array when limit is specified' do + it "returns a new array when limit is specified" do arr = %w[a] expect(subject.truncate_array(arr, 1)).not_to be(arr) end - context 'when separator is empty string' do - it 'returns the whole array when total size is less than or equal to limit' do + context "when separator is empty string" do + it "returns the whole array when total size is less than or equal to limit" do arr = %w[a a] expect(subject.truncate_array(arr, 5)).to eq(arr) expect(subject.truncate_array(arr, 2)).to eq(arr) end - it 'truncates array to specified limit' do + it "truncates array to specified limit" do arr = %w[a a a a a] expect(subject.truncate_array(arr, 3)).to eq(%w[a a a]) end - it 'truncates last word to match the limit' do + it "truncates last word to match the limit" do arr = %w[a a aaaa aa] expect(subject.truncate_array(arr, 4)).to eq(%w[a a aa]) end - it 'uses natural separator when truncating a long word' do - arr = ['a', 'aa aaaa', 'aa'] + it "uses natural separator when truncating a long word" do + arr = ["a", "aa aaaa", "aa"] expect(subject.truncate_array(arr, 7)).to eq(%w[a aa]) end end - context 'when separator is specified' do - it 'returns the whole array when total size is less than or equal to limit' do + context "when separator is specified" do + it "returns the whole array when total size is less than or equal to limit" do arr = %w[a a] - expect(subject.truncate_array(arr, 5, '-')).to eq(arr) - expect(subject.truncate_array(arr, 3, '-')).to eq(arr) + expect(subject.truncate_array(arr, 5, "-")).to eq(arr) + expect(subject.truncate_array(arr, 3, "-")).to eq(arr) end - it 'truncates array to specified limit' do + it "truncates array to specified limit" do arr = %w[a a a a a] - expect(subject.truncate_array(arr, 3, '-')).to eq(%w[a a]) + expect(subject.truncate_array(arr, 3, "-")).to eq(%w[a a]) end - it 'truncates last word to match the limit' do + it "truncates last word to match the limit" do arr = %w[a a aaaa aa] - expect(subject.truncate_array(arr, 5, '-')).to eq(%w[a a a]) + expect(subject.truncate_array(arr, 5, "-")).to eq(%w[a a a]) end - it 'uses natural separator when truncating a long word' do - arr = ['a', 'aa aaaa', 'aa'] - expect(subject.truncate_array(arr, 7, '-')).to eq(%w[a aa]) + it "uses natural separator when truncating a long word" do + arr = ["a", "aa aaaa", "aa"] + expect(subject.truncate_array(arr, 7, "-")).to eq(%w[a aa]) end end end diff --git a/spec/view_helper/article_spec.rb b/spec/view_helper/article_spec.rb index e3193d2b..52c3eb6a 100644 --- a/spec/view_helper/article_spec.rb +++ b/spec/view_helper/article_spec.rb @@ -4,30 +4,30 @@ RSpec.describe MetaTags::ViewHelper, "displaying Article meta tags" do it "displays meta tags specified with :article" do - subject.set_meta_tags(article: { author: "https://www.facebook.com/facebook" }) + subject.set_meta_tags(article: {author: "https://www.facebook.com/facebook"}) subject.display_meta_tags(site: "someSite").tap do |meta| - expect(meta).to have_tag("meta", with: { content: "https://www.facebook.com/facebook", property: "article:author" }) + expect(meta).to have_tag("meta", with: {content: "https://www.facebook.com/facebook", property: "article:author"}) end end it "uses deep merge when displaying open graph meta tags" do - subject.set_meta_tags(article: { author: "https://www.facebook.com/facebook" }) - subject.display_meta_tags(article: { publisher: "https://www.facebook.com/Google/" }).tap do |meta| - expect(meta).to have_tag("meta", with: { content: "https://www.facebook.com/facebook", property: "article:author" }) - expect(meta).to have_tag("meta", with: { content: "https://www.facebook.com/Google/", property: "article:publisher" }) + subject.set_meta_tags(article: {author: "https://www.facebook.com/facebook"}) + subject.display_meta_tags(article: {publisher: "https://www.facebook.com/Google/"}).tap do |meta| + expect(meta).to have_tag("meta", with: {content: "https://www.facebook.com/facebook", property: "article:author"}) + expect(meta).to have_tag("meta", with: {content: "https://www.facebook.com/Google/", property: "article:publisher"}) end end it "does not display meta tags without content" do subject.set_meta_tags( article: { - author: "", - publisher: "", - }, + author: "", + publisher: "" + } ) subject.display_meta_tags(site: "someSite").tap do |meta| - expect(meta).not_to have_tag("meta", with: { content: "", property: "article:author" }) - expect(meta).not_to have_tag("meta", with: { content: "", property: "article:publisher" }) + expect(meta).not_to have_tag("meta", with: {content: "", property: "article:author"}) + expect(meta).not_to have_tag("meta", with: {content: "", property: "article:publisher"}) end end end diff --git a/spec/view_helper/charset_spec.rb b/spec/view_helper/charset_spec.rb index 09d62be0..e90cc087 100644 --- a/spec/view_helper/charset_spec.rb +++ b/spec/view_helper/charset_spec.rb @@ -1,15 +1,15 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" -RSpec.describe MetaTags::ViewHelper, 'displaying charset' do - it 'does not display charset if blank' do - expect(subject.display_meta_tags).to eq('') - expect(subject.display_meta_tags(charset: '')).to eq('') +RSpec.describe MetaTags::ViewHelper, "displaying charset" do + it "does not display charset if blank" do + expect(subject.display_meta_tags).to eq("") + expect(subject.display_meta_tags(charset: "")).to eq("") end - it 'displays charset' do - subject.display_meta_tags(charset: 'UTF-8').tap do |meta| + it "displays charset" do + subject.display_meta_tags(charset: "UTF-8").tap do |meta| expect(meta).to eq('') end end diff --git a/spec/view_helper/custom_spec.rb b/spec/view_helper/custom_spec.rb index 6752f509..e9360b9a 100644 --- a/spec/view_helper/custom_spec.rb +++ b/spec/view_helper/custom_spec.rb @@ -1,93 +1,93 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" RSpec.describe MetaTags::ViewHelper do - describe 'display any named meta tag that you want to' do - it 'displays testing meta tag' do - subject.display_meta_tags(testing: 'this is a test').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "this is a test", name: "testing" }) + describe "display any named meta tag that you want to" do + it "displays testing meta tag" do + subject.display_meta_tags(testing: "this is a test").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "this is a test", name: "testing"}) end end - it 'supports Array values' do - subject.display_meta_tags(testing: ['test1', 'test2']).tap do |meta| - expect(meta).to have_tag('meta', with: { content: "test1", name: "testing" }) - expect(meta).to have_tag('meta', with: { content: "test2", name: "testing" }) + it "supports Array values" do + subject.display_meta_tags(testing: ["test1", "test2"]).tap do |meta| + expect(meta).to have_tag("meta", with: {content: "test1", name: "testing"}) + expect(meta).to have_tag("meta", with: {content: "test2", name: "testing"}) end end - it 'supports Hash values' do - subject.display_meta_tags(testing: { tag: 'value' }).tap do |meta| - expect(meta).to have_tag('meta', with: { content: "value", name: "testing:tag" }) + it "supports Hash values" do + subject.display_meta_tags(testing: {tag: "value"}).tap do |meta| + expect(meta).to have_tag("meta", with: {content: "value", name: "testing:tag"}) end end - it 'supports symbolic references in Hash values' do - subject.display_meta_tags(title: 'my title', testing: { tag: :title }).tap do |meta| - expect(meta).to have_tag('meta', with: { content: "my title", name: "testing:tag" }) + it "supports symbolic references in Hash values" do + subject.display_meta_tags(title: "my title", testing: {tag: :title}).tap do |meta| + expect(meta).to have_tag("meta", with: {content: "my title", name: "testing:tag"}) end end - it 'does not render when value is nil' do + it "does not render when value is nil" do subject.display_meta_tags(testing: nil).tap do |meta| - expect(meta).to eq('') + expect(meta).to eq("") end end - it 'allows to specify itemprop' do + it "allows to specify itemprop" do subject.set_meta_tags( og: { image: { - _: 'image.png', - type: 'image/jpeg', - width: 200, - height: { - _: 200, - itemprop: 'custom', + _: "image.png", + type: "image/jpeg", + width: 200, + height: { + _: 200, + itemprop: "custom" }, - itemprop: 'image', - }, - }, + itemprop: "image" + } + } ) meta = subject.display_meta_tags - aggregate_failures 'meta tags' do - expect(meta).to have_tag('meta', with: { property: "og:image", content: "image.png", itemprop: "image" }) - expect(meta).to have_tag('meta', with: { property: "og:image:type", content: "image/jpeg" }, without: { itemprop: "image" }) - expect(meta).to have_tag('meta', with: { property: "og:image:width", content: "200" }, without: { itemprop: "image" }) - expect(meta).to have_tag('meta', with: { property: "og:image:height", content: "200", itemprop: "custom" }) - expect(meta).not_to have_tag('meta', with: { property: "og:image:itemprop" }) + aggregate_failures "meta tags" do + expect(meta).to have_tag("meta", with: {property: "og:image", content: "image.png", itemprop: "image"}) + expect(meta).to have_tag("meta", with: {property: "og:image:type", content: "image/jpeg"}, without: {itemprop: "image"}) + expect(meta).to have_tag("meta", with: {property: "og:image:width", content: "200"}, without: {itemprop: "image"}) + expect(meta).to have_tag("meta", with: {property: "og:image:height", content: "200", itemprop: "custom"}) + expect(meta).not_to have_tag("meta", with: {property: "og:image:itemprop"}) end end - it 'displays meta tags with hashes and arrays' do + it "displays meta tags with hashes and arrays" do test_hashes_and_arrays end - it 'uses `property` attribute instead of `name` for custom tags listed under `property_tags` in config' do - MetaTags.config.property_tags.push(:testing1, 'testing2', 'namespace:') + it "uses `property` attribute instead of `name` for custom tags listed under `property_tags` in config" do + MetaTags.config.property_tags.push(:testing1, "testing2", "namespace:") - subject.display_meta_tags('testing1' => 'test').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "test", property: "testing1" }) + subject.display_meta_tags("testing1" => "test").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "test", property: "testing1"}) end - subject.display_meta_tags('testing2:nested' => 'nested test').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "nested test", property: "testing2:nested" }) + subject.display_meta_tags("testing2:nested" => "nested test").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "nested test", property: "testing2:nested"}) end - subject.display_meta_tags('namespace:thing' => 'namespace test').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "namespace test", property: "namespace:thing" }) + subject.display_meta_tags("namespace:thing" => "namespace test").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "namespace test", property: "namespace:thing"}) end end - it 'displays `property_tags` in hashes and arrays properly' do + it "displays `property_tags` in hashes and arrays properly" do MetaTags.config.property_tags.push(:foo) test_hashes_and_arrays(name_key: :property) end - it 'does not use `property` tag for the keys that do not match `property_tags`' do + it "does not use `property` tag for the keys that do not match `property_tags`" do MetaTags.config.property_tags.push(:foos) MetaTags.config.property_tags.push(:fo) @@ -95,35 +95,35 @@ end end - def test_hashes_and_arrays(name_key: :name) # rubocop:disable Metrics/AbcSize + def test_hashes_and_arrays(name_key: :name) subject.set_meta_tags( foo: { - _: "test", - bar: "lorem", - baz: { - qux: ["lorem", "ipsum"], + _: "test", + bar: "lorem", + baz: { + qux: ["lorem", "ipsum"] }, quux: [ { - corge: "lorem", - grault: "ipsum", + corge: "lorem", + grault: "ipsum" }, { - corge: "dolor", - grault: "sit", - }, - ], - }, + corge: "dolor", + grault: "sit" + } + ] + } ) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "lorem", name_key => "foo:bar" }) - expect(meta).to have_tag('meta', with: { content: "lorem", name_key => "foo:baz:qux" }) - expect(meta).to have_tag('meta', with: { content: "ipsum", name_key => "foo:baz:qux" }) - expect(meta).to have_tag('meta', with: { content: "lorem", name_key => "foo:quux:corge" }) - expect(meta).to have_tag('meta', with: { content: "ipsum", name_key => "foo:quux:grault" }) - expect(meta).to have_tag('meta', with: { content: "dolor", name_key => "foo:quux:corge" }) - expect(meta).to have_tag('meta', with: { content: "sit", name_key => "foo:quux:grault" }) - expect(meta).not_to have_tag('meta', with: { name: "foo:quux" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {:content => "lorem", name_key => "foo:bar"}) + expect(meta).to have_tag("meta", with: {:content => "lorem", name_key => "foo:baz:qux"}) + expect(meta).to have_tag("meta", with: {:content => "ipsum", name_key => "foo:baz:qux"}) + expect(meta).to have_tag("meta", with: {:content => "lorem", name_key => "foo:quux:corge"}) + expect(meta).to have_tag("meta", with: {:content => "ipsum", name_key => "foo:quux:grault"}) + expect(meta).to have_tag("meta", with: {:content => "dolor", name_key => "foo:quux:corge"}) + expect(meta).to have_tag("meta", with: {:content => "sit", name_key => "foo:quux:grault"}) + expect(meta).not_to have_tag("meta", with: {name: "foo:quux"}) end end end diff --git a/spec/view_helper/description_spec.rb b/spec/view_helper/description_spec.rb index 0e32867c..1b2e5a33 100644 --- a/spec/view_helper/description_spec.rb +++ b/spec/view_helper/description_spec.rb @@ -1,95 +1,95 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" -RSpec.describe MetaTags::ViewHelper, 'displaying description' do - it 'does not display description if blank' do - subject.description('') - expect(subject.display_meta_tags).to eq('') +RSpec.describe MetaTags::ViewHelper, "displaying description" do + it "does not display description if blank" do + subject.description("") + expect(subject.display_meta_tags).to eq("") end it 'displays description when "description" used' do - subject.description('someDescription') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "someDescription", name: "description" }) + subject.description("someDescription") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "someDescription", name: "description"}) end end it 'displays description when "set_meta_tags" used' do - subject.set_meta_tags(description: 'someDescription') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "someDescription", name: "description" }) + subject.set_meta_tags(description: "someDescription") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "someDescription", name: "description"}) end end - it 'displays default description' do - subject.display_meta_tags(site: 'someSite', description: 'someDescription').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "someDescription", name: "description" }) + it "displays default description" do + subject.display_meta_tags(site: "someSite", description: "someDescription").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "someDescription", name: "description"}) end end - it 'uses custom description if given' do - subject.description('someDescription') - subject.display_meta_tags(site: 'someSite', description: 'defaultDescription').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "someDescription", name: "description" }) + it "uses custom description if given" do + subject.description("someDescription") + subject.display_meta_tags(site: "someSite", description: "defaultDescription").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "someDescription", name: "description"}) end end - it 'strips multiple spaces' do - subject.display_meta_tags(site: 'someSite', description: "some \n\r\t description").tap do |meta| - expect(meta).to have_tag('meta', with: { content: "some description", name: "description" }) + it "strips multiple spaces" do + subject.display_meta_tags(site: "someSite", description: "some \n\r\t description").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "some description", name: "description"}) end end - it 'strips HTML' do - subject.display_meta_tags(site: 'someSite', description: "

some description

").tap do |meta| - expect(meta).to have_tag('meta', with: { content: "some description", name: "description" }) + it "strips HTML" do + subject.display_meta_tags(site: "someSite", description: "

some description

").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "some description", name: "description"}) end end - it 'escapes double quotes' do + it "escapes double quotes" do subject.display_meta_tags(description: 'some "description"').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "some \"description\"", name: "description" }) + expect(meta).to have_tag("meta", with: {content: "some \"description\"", name: "description"}) end end - it 'escapes ampersands properly' do - subject.display_meta_tags(description: 'verify & commit').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "verify & commit", name: "description" }) + it "escapes ampersands properly" do + subject.display_meta_tags(description: "verify & commit").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "verify & commit", name: "description"}) end end - it 'truncates correctly' do - subject.display_meta_tags(site: 'someSite', description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam dolor lorem, lobortis quis faucibus id, tristique at lorem. Nullam sit amet mollis libero. Morbi ut sem malesuada massa faucibus vestibulum non sed quam. Duis quis consectetur lacus. Donec vitae nunc risus. Sed placerat semper elit, sit amet tristique dolor. Maecenas hendrerit volutpat.").tap do |meta| - expect(meta).to have_tag('meta', with: { content: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam dolor lorem, lobortis quis faucibus id, tristique at lorem. Nullam sit amet mollis libero. Morbi ut sem malesuada massa faucibus vestibulum non sed quam. Duis quis consectetur lacus. Donec vitae nunc risus. Sed placerat semper elit, sit", name: "description" }) + it "truncates correctly" do + subject.display_meta_tags(site: "someSite", description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam dolor lorem, lobortis quis faucibus id, tristique at lorem. Nullam sit amet mollis libero. Morbi ut sem malesuada massa faucibus vestibulum non sed quam. Duis quis consectetur lacus. Donec vitae nunc risus. Sed placerat semper elit, sit amet tristique dolor. Maecenas hendrerit volutpat.").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam dolor lorem, lobortis quis faucibus id, tristique at lorem. Nullam sit amet mollis libero. Morbi ut sem malesuada massa faucibus vestibulum non sed quam. Duis quis consectetur lacus. Donec vitae nunc risus. Sed placerat semper elit, sit", name: "description"}) end end - it 'treats nil as an empty string' do + it "treats nil as an empty string" do subject.display_meta_tags(description: nil).tap do |meta| - expect(meta).not_to have_tag('meta', with: { name: "description" }) + expect(meta).not_to have_tag("meta", with: {name: "description"}) end end - it 'allows objects that respond to #to_str' do - description = double(to_str: 'some description') + it "allows objects that respond to #to_str" do + description = double(to_str: "some description") subject.display_meta_tags(description: description).tap do |meta| - expect(meta).to have_tag('meta', with: { content: "some description", name: "description" }) + expect(meta).to have_tag("meta", with: {content: "some description", name: "description"}) end end - it 'works with frozen strings' do + it "works with frozen strings" do allow(MetaTags::TextNormalizer).to receive(:strip_tags) { |s| s } subject.display_meta_tags(description: "some description").tap do |meta| - expect(meta).to have_tag('meta', with: { content: "some description", name: "description" }) + expect(meta).to have_tag("meta", with: {content: "some description", name: "description"}) end end - it 'fails when title is not a String-like object' do + it "fails when title is not a String-like object" do skip("Fails RBS") if ENV["RBS_TEST_TARGET"] # rubocop:disable RSpec/Pending expect { subject.display_meta_tags(description: 5) - }.to raise_error ArgumentError, 'Expected a string or an object that implements #to_str' + }.to raise_error ArgumentError, "Expected a string or an object that implements #to_str" end end diff --git a/spec/view_helper/icon_spec.rb b/spec/view_helper/icon_spec.rb index a9cd4f48..98799d98 100644 --- a/spec/view_helper/icon_spec.rb +++ b/spec/view_helper/icon_spec.rb @@ -1,44 +1,44 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" RSpec.describe MetaTags::ViewHelper do - it 'does not display icon by default' do - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('link', with: { rel: 'icon' }) + it "does not display icon by default" do + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("link", with: {rel: "icon"}) end end it 'displays icon when "set_meta_tags" used' do - subject.set_meta_tags(icon: '/favicon.ico') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('link', with: { href: '/favicon.ico', rel: 'icon', type: 'image/x-icon' }) + subject.set_meta_tags(icon: "/favicon.ico") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("link", with: {href: "/favicon.ico", rel: "icon", type: "image/x-icon"}) end end - it 'displays default canonical url' do - subject.display_meta_tags(site: 'someSite', icon: '/favicon.ico').tap do |meta| - expect(meta).to have_tag('link', with: { href: '/favicon.ico', rel: 'icon', type: 'image/x-icon' }) + it "displays default canonical url" do + subject.display_meta_tags(site: "someSite", icon: "/favicon.ico").tap do |meta| + expect(meta).to have_tag("link", with: {href: "/favicon.ico", rel: "icon", type: "image/x-icon"}) end end - it 'allows to specify hash as an icon' do - subject.set_meta_tags(icon: { href: '/favicon.png', type: 'image/png' }) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('link', with: { href: '/favicon.png', rel: 'icon', type: 'image/png' }) + it "allows to specify hash as an icon" do + subject.set_meta_tags(icon: {href: "/favicon.png", type: "image/png"}) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("link", with: {href: "/favicon.png", rel: "icon", type: "image/png"}) end end - it 'allows to specify multiple icons' do + it "allows to specify multiple icons" do subject.set_meta_tags( icon: [ - { href: '/images/icons/icon_96.png', sizes: '32x32 96x96', type: 'image/png' }, - { href: '/images/icons/icon_itouch_precomp_32.png', rel: 'apple-touch-icon-precomposed', sizes: '32x32', type: 'image/png' }, - ], + {href: "/images/icons/icon_96.png", sizes: "32x32 96x96", type: "image/png"}, + {href: "/images/icons/icon_itouch_precomp_32.png", rel: "apple-touch-icon-precomposed", sizes: "32x32", type: "image/png"} + ] ) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('link', with: { href: '/images/icons/icon_96.png', rel: 'icon', type: 'image/png', sizes: '32x32 96x96' }) - expect(meta).to have_tag('link', with: { href: '/images/icons/icon_itouch_precomp_32.png', rel: 'apple-touch-icon-precomposed', type: 'image/png', sizes: '32x32' }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("link", with: {href: "/images/icons/icon_96.png", rel: "icon", type: "image/png", sizes: "32x32 96x96"}) + expect(meta).to have_tag("link", with: {href: "/images/icons/icon_itouch_precomp_32.png", rel: "apple-touch-icon-precomposed", type: "image/png", sizes: "32x32"}) end end end diff --git a/spec/view_helper/keywords_spec.rb b/spec/view_helper/keywords_spec.rb index 2889ac05..beb5fc41 100644 --- a/spec/view_helper/keywords_spec.rb +++ b/spec/view_helper/keywords_spec.rb @@ -1,68 +1,68 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" -RSpec.describe MetaTags::ViewHelper, 'displaying keywords' do - it 'does not display keywords if blank' do - subject.keywords('') - expect(subject.display_meta_tags).to eq('') +RSpec.describe MetaTags::ViewHelper, "displaying keywords" do + it "does not display keywords if blank" do + subject.keywords("") + expect(subject.display_meta_tags).to eq("") subject.keywords([]) - expect(subject.display_meta_tags).to eq('') + expect(subject.display_meta_tags).to eq("") end it 'displays keywords when "keywords" used' do - subject.keywords('some-keywords') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "some-keywords", name: "keywords" }) + subject.keywords("some-keywords") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "some-keywords", name: "keywords"}) end end it 'displays keywords when "set_meta_tags" used' do - subject.set_meta_tags(keywords: 'some-keywords') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "some-keywords", name: "keywords" }) + subject.set_meta_tags(keywords: "some-keywords") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "some-keywords", name: "keywords"}) end end - it 'displays default keywords' do - subject.display_meta_tags(site: 'someSite', keywords: 'some-keywords').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "some-keywords", name: "keywords" }) + it "displays default keywords" do + subject.display_meta_tags(site: "someSite", keywords: "some-keywords").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "some-keywords", name: "keywords"}) end end - it 'uses custom keywords if given' do - subject.keywords('some-keywords') - subject.display_meta_tags(site: 'someSite', keywords: 'default_keywords').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "some-keywords", name: "keywords" }) + it "uses custom keywords if given" do + subject.keywords("some-keywords") + subject.display_meta_tags(site: "someSite", keywords: "default_keywords").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "some-keywords", name: "keywords"}) end end - it 'joins keywords from Array' do - subject.display_meta_tags(site: 'someSite', keywords: %w[keyword1 keyword2]).tap do |meta| - expect(meta).to have_tag('meta', with: { content: "keyword1, keyword2", name: "keywords" }) + it "joins keywords from Array" do + subject.display_meta_tags(site: "someSite", keywords: %w[keyword1 keyword2]).tap do |meta| + expect(meta).to have_tag("meta", with: {content: "keyword1, keyword2", name: "keywords"}) end end - it 'joins keywords from nested Arrays' do - subject.display_meta_tags(site: 'someSite', keywords: [%w[keyword1 keyword2], 'keyword3']).tap do |meta| - expect(meta).to have_tag('meta', with: { content: "keyword1, keyword2, keyword3", name: "keywords" }) + it "joins keywords from nested Arrays" do + subject.display_meta_tags(site: "someSite", keywords: [%w[keyword1 keyword2], "keyword3"]).tap do |meta| + expect(meta).to have_tag("meta", with: {content: "keyword1, keyword2, keyword3", name: "keywords"}) end end - context 'with the default configuration' do - it 'lowercases keywords' do - subject.display_meta_tags(site: 'someSite', keywords: 'someKeywords').tap do |meta| - expect(meta).to have_tag('meta', with: { content: 'somekeywords', name: 'keywords' }) + context "with the default configuration" do + it "lowercases keywords" do + subject.display_meta_tags(site: "someSite", keywords: "someKeywords").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "somekeywords", name: "keywords"}) end end end - context 'when `keywords_lowercase` is false' do - it 'does not lowercase keywords' do + context "when `keywords_lowercase` is false" do + it "does not lowercase keywords" do MetaTags.config.keywords_lowercase = false - subject.display_meta_tags(site: 'someSite', keywords: 'someKeywords').tap do |meta| - expect(meta).to have_tag('meta', with: { content: 'someKeywords', name: 'keywords' }) + subject.display_meta_tags(site: "someSite", keywords: "someKeywords").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "someKeywords", name: "keywords"}) end end end diff --git a/spec/view_helper/links_spec.rb b/spec/view_helper/links_spec.rb index 2aa47b33..50fad7bb 100644 --- a/spec/view_helper/links_spec.rb +++ b/spec/view_helper/links_spec.rb @@ -1,36 +1,36 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" RSpec.describe MetaTags::ViewHelper do - describe 'displaying canonical url' do - it 'does not display canonical url by default' do - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('link', with: { href: "http://example.com/base/url", rel: "canonical" }) + describe "displaying canonical url" do + it "does not display canonical url by default" do + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("link", with: {href: "http://example.com/base/url", rel: "canonical"}) end end it 'displays canonical url when "set_meta_tags" used' do - subject.set_meta_tags(canonical: 'http://example.com/base/url') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.com/base/url", rel: "canonical" }) + subject.set_meta_tags(canonical: "http://example.com/base/url") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("link", with: {href: "http://example.com/base/url", rel: "canonical"}) end end - it 'displays default canonical url' do - subject.display_meta_tags(site: 'someSite', canonical: 'http://example.com/base/url').tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.com/base/url", rel: "canonical" }) + it "displays default canonical url" do + subject.display_meta_tags(site: "someSite", canonical: "http://example.com/base/url").tap do |meta| + expect(meta).to have_tag("link", with: {href: "http://example.com/base/url", rel: "canonical"}) end end - it 'does display canonical url when page is marked as noindex per default' do - subject.set_meta_tags(canonical: 'http://example.com/base/url', noindex: true) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.com/base/url", rel: "canonical" }) + it "does display canonical url when page is marked as noindex per default" do + subject.set_meta_tags(canonical: "http://example.com/base/url", noindex: true) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("link", with: {href: "http://example.com/base/url", rel: "canonical"}) end end - describe 'with config.skip_canonical_links_on_noindex is set' do + describe "with config.skip_canonical_links_on_noindex is set" do around do |example| default = MetaTags.config.skip_canonical_links_on_noindex MetaTags.config.skip_canonical_links_on_noindex = true @@ -38,166 +38,166 @@ MetaTags.config.skip_canonical_links_on_noindex = default end - it 'does display canonical url when page is marked as index' do - subject.set_meta_tags(canonical: 'http://example.com/base/url', index: true) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.com/base/url", rel: "canonical" }) + it "does display canonical url when page is marked as index" do + subject.set_meta_tags(canonical: "http://example.com/base/url", index: true) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("link", with: {href: "http://example.com/base/url", rel: "canonical"}) end end - it 'does not display canonical url when page is marked as noindex' do - subject.set_meta_tags(canonical: 'http://example.com/base/url', noindex: true) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('link', with: { href: "http://example.com/base/url", rel: "canonical" }) - expect(meta).not_to have_tag('meta', with: { content: "http://example.com/base/url", name: "canonical" }) + it "does not display canonical url when page is marked as noindex" do + subject.set_meta_tags(canonical: "http://example.com/base/url", noindex: true) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("link", with: {href: "http://example.com/base/url", rel: "canonical"}) + expect(meta).not_to have_tag("meta", with: {content: "http://example.com/base/url", name: "canonical"}) end end end end - describe 'displaying alternate url' do - it 'does not display alternate url by default' do - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('link', with: { href: "http://example.fr/base/url", hreflang: "fr", rel: "alternate" }) + describe "displaying alternate url" do + it "does not display alternate url by default" do + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("link", with: {href: "http://example.fr/base/url", hreflang: "fr", rel: "alternate"}) end end it 'displays alternate url when "set_meta_tags" used' do - subject.set_meta_tags(alternate: { 'fr' => 'http://example.fr/base/url' }) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.fr/base/url", hreflang: "fr", rel: "alternate" }) + subject.set_meta_tags(alternate: {"fr" => "http://example.fr/base/url"}) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("link", with: {href: "http://example.fr/base/url", hreflang: "fr", rel: "alternate"}) end end - it 'displays default alternate url' do - subject.display_meta_tags(site: 'someSite', alternate: { 'fr' => 'http://example.fr/base/url' }).tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.fr/base/url", hreflang: "fr", rel: "alternate" }) + it "displays default alternate url" do + subject.display_meta_tags(site: "someSite", alternate: {"fr" => "http://example.fr/base/url"}).tap do |meta| + expect(meta).to have_tag("link", with: {href: "http://example.fr/base/url", hreflang: "fr", rel: "alternate"}) end end it "does not display alternate without content" do - subject.display_meta_tags(site: 'someSite', alternate: { 'zh-Hant' => '' }).tap do |meta| - expect(meta).not_to have_tag('link', with: { href: "", hreflang: "zh-Hant", rel: "alternate" }) + subject.display_meta_tags(site: "someSite", alternate: {"zh-Hant" => ""}).tap do |meta| + expect(meta).not_to have_tag("link", with: {href: "", hreflang: "zh-Hant", rel: "alternate"}) end end - it 'allows to specify an array of alternate links' do + it "allows to specify an array of alternate links" do subject.display_meta_tags( - site: 'someSite', + site: "someSite", alternate: [ - { href: 'http://example.fr/base/url', hreflang: 'fr' }, - { href: 'http://example.com/feed.rss', type: 'application/rss+xml', title: 'RSS' }, - { href: 'http://m.example.com/page-1', media: 'only screen and (max-width: 640px)' }, - ], + {href: "http://example.fr/base/url", hreflang: "fr"}, + {href: "http://example.com/feed.rss", type: "application/rss+xml", title: "RSS"}, + {href: "http://m.example.com/page-1", media: "only screen and (max-width: 640px)"} + ] ).tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.fr/base/url", hreflang: "fr", rel: "alternate" }) - expect(meta).to have_tag('link', with: { href: "http://example.com/feed.rss", type: "application/rss+xml", title: 'RSS', rel: "alternate" }) - expect(meta).to have_tag('link', with: { href: "http://m.example.com/page-1", media: 'only screen and (max-width: 640px)', rel: "alternate" }) + expect(meta).to have_tag("link", with: {href: "http://example.fr/base/url", hreflang: "fr", rel: "alternate"}) + expect(meta).to have_tag("link", with: {href: "http://example.com/feed.rss", type: "application/rss+xml", title: "RSS", rel: "alternate"}) + expect(meta).to have_tag("link", with: {href: "http://m.example.com/page-1", media: "only screen and (max-width: 640px)", rel: "alternate"}) end end end - describe 'displaying prev url' do - it 'does not display prev url by default' do - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('link', with: { href: "http://example.com/base/url", rel: "prev" }) + describe "displaying prev url" do + it "does not display prev url by default" do + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("link", with: {href: "http://example.com/base/url", rel: "prev"}) end end it 'displays prev url when "set_meta_tags" used' do - subject.set_meta_tags(prev: 'http://example.com/base/url') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.com/base/url", rel: "prev" }) + subject.set_meta_tags(prev: "http://example.com/base/url") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("link", with: {href: "http://example.com/base/url", rel: "prev"}) end end - it 'displays default prev url' do - subject.display_meta_tags(site: 'someSite', prev: 'http://example.com/base/url').tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.com/base/url", rel: "prev" }) + it "displays default prev url" do + subject.display_meta_tags(site: "someSite", prev: "http://example.com/base/url").tap do |meta| + expect(meta).to have_tag("link", with: {href: "http://example.com/base/url", rel: "prev"}) end end end - describe 'displaying next url' do - it 'does not display next url by default' do - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('link', with: { href: "http://example.com/base/url", rel: "next" }) + describe "displaying next url" do + it "does not display next url by default" do + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("link", with: {href: "http://example.com/base/url", rel: "next"}) end end it 'displays next url when "set_meta_tags" used' do - subject.set_meta_tags(next: 'http://example.com/base/url') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.com/base/url", rel: "next" }) + subject.set_meta_tags(next: "http://example.com/base/url") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("link", with: {href: "http://example.com/base/url", rel: "next"}) end end - it 'displays default next url' do - subject.display_meta_tags(site: 'someSite', next: 'http://example.com/base/url').tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.com/base/url", rel: "next" }) + it "displays default next url" do + subject.display_meta_tags(site: "someSite", next: "http://example.com/base/url").tap do |meta| + expect(meta).to have_tag("link", with: {href: "http://example.com/base/url", rel: "next"}) end end end - describe 'displaying image_src url' do - it 'does not display image_src url by default' do - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('link', with: { href: "http://example.com/base/url", rel: "image_src" }) + describe "displaying image_src url" do + it "does not display image_src url by default" do + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("link", with: {href: "http://example.com/base/url", rel: "image_src"}) end end it 'displays image_src url when "set_meta_tags" used' do - subject.set_meta_tags(image_src: 'http://example.com/base/url') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.com/base/url", rel: "image_src" }) + subject.set_meta_tags(image_src: "http://example.com/base/url") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("link", with: {href: "http://example.com/base/url", rel: "image_src"}) end end - it 'displays default image_src url' do - subject.display_meta_tags(site: 'someSite', image_src: 'http://example.com/base/url').tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.com/base/url", rel: "image_src" }) + it "displays default image_src url" do + subject.display_meta_tags(site: "someSite", image_src: "http://example.com/base/url").tap do |meta| + expect(meta).to have_tag("link", with: {href: "http://example.com/base/url", rel: "image_src"}) end end end - describe 'displaying amphtml url' do - it 'does not display amphtml url by default' do - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('link', with: { href: "http://example.com/base/url.amp", rel: "amphtml" }) + describe "displaying amphtml url" do + it "does not display amphtml url by default" do + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("link", with: {href: "http://example.com/base/url.amp", rel: "amphtml"}) end end it 'displays amphtml url when "set_meta_tags" used' do - subject.set_meta_tags(amphtml: 'http://example.com/base/url.amp') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.com/base/url.amp", rel: "amphtml" }) + subject.set_meta_tags(amphtml: "http://example.com/base/url.amp") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("link", with: {href: "http://example.com/base/url.amp", rel: "amphtml"}) end end - it 'displays default amphtml url' do - subject.display_meta_tags(site: 'someSite', amphtml: 'http://example.com/base/url.amp').tap do |meta| - expect(meta).to have_tag('link', with: { href: "http://example.com/base/url.amp", rel: "amphtml" }) + it "displays default amphtml url" do + subject.display_meta_tags(site: "someSite", amphtml: "http://example.com/base/url.amp").tap do |meta| + expect(meta).to have_tag("link", with: {href: "http://example.com/base/url.amp", rel: "amphtml"}) end end end - describe 'displaying manifest url' do - it 'does not display manifest url by default' do - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('link', with: { rel: "manifest" }) + describe "displaying manifest url" do + it "does not display manifest url by default" do + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("link", with: {rel: "manifest"}) end end it 'displays manifest url when "set_meta_tags" used' do - subject.set_meta_tags(manifest: '/manifest.webmanifest') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('link', with: { href: "/manifest.webmanifest", rel: "manifest" }) + subject.set_meta_tags(manifest: "/manifest.webmanifest") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("link", with: {href: "/manifest.webmanifest", rel: "manifest"}) end end - it 'displays default manifest url' do - subject.display_meta_tags(site: 'someSite', manifest: '/manifest.webmanifest').tap do |meta| - expect(meta).to have_tag('link', with: { href: "/manifest.webmanifest", rel: "manifest" }) + it "displays default manifest url" do + subject.display_meta_tags(site: "someSite", manifest: "/manifest.webmanifest").tap do |meta| + expect(meta).to have_tag("link", with: {href: "/manifest.webmanifest", rel: "manifest"}) end end end diff --git a/spec/view_helper/module_spec.rb b/spec/view_helper/module_spec.rb index a1c0b475..ac04a29e 100644 --- a/spec/view_helper/module_spec.rb +++ b/spec/view_helper/module_spec.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" -RSpec.describe MetaTags::ViewHelper, 'module' do - it 'is mixed into ActionView::Base' do +RSpec.describe MetaTags::ViewHelper, "module" do + it "is mixed into ActionView::Base" do expect(ActionView::Base.included_modules).to include(described_class) end diff --git a/spec/view_helper/noindex_spec.rb b/spec/view_helper/noindex_spec.rb index d055e55a..75a90d29 100644 --- a/spec/view_helper/noindex_spec.rb +++ b/spec/view_helper/noindex_spec.rb @@ -1,222 +1,222 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" RSpec.describe MetaTags::ViewHelper do - describe 'displaying noindex' do + describe "displaying noindex" do it 'displays noindex when "noindex" used' do subject.noindex(true) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "noindex", name: "robots" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "noindex", name: "robots"}) end end it 'displays noindex when "set_meta_tags" used' do subject.set_meta_tags(noindex: true) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "noindex", name: "robots" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "noindex", name: "robots"}) end end - it 'uses custom noindex if given' do - subject.noindex('some-noindex') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "noindex", name: "some-noindex" }) + it "uses custom noindex if given" do + subject.noindex("some-noindex") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "noindex", name: "some-noindex"}) end end - it 'accepts multiple custom noindex robots in an array' do - subject.noindex(['some-noindex', 'another-noindex']) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "noindex", name: "some-noindex" }) - expect(meta).to have_tag('meta', with: { content: "noindex", name: "another-noindex" }) + it "accepts multiple custom noindex robots in an array" do + subject.noindex(["some-noindex", "another-noindex"]) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "noindex", name: "some-noindex"}) + expect(meta).to have_tag("meta", with: {content: "noindex", name: "another-noindex"}) end end - it 'displays nothing by default' do - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('meta', with: { content: "noindex" }) + it "displays nothing by default" do + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("meta", with: {content: "noindex"}) end end it "displays nothing if given false" do subject.set_meta_tags(noindex: false) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('meta', with: { content: "robots" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("meta", with: {content: "robots"}) end - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('meta', with: { content: "noindex" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("meta", with: {content: "noindex"}) end end end - describe 'displaying nofollow' do + describe "displaying nofollow" do it 'displays nofollow when "nofollow" used' do subject.nofollow(true) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "nofollow", name: "robots" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "nofollow", name: "robots"}) end end it 'displays nofollow when "set_meta_tags" used' do subject.set_meta_tags(nofollow: true) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "nofollow", name: "robots" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "nofollow", name: "robots"}) end end - it 'uses custom nofollow if given' do - subject.nofollow('some-nofollow') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "nofollow", name: "some-nofollow" }) + it "uses custom nofollow if given" do + subject.nofollow("some-nofollow") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "nofollow", name: "some-nofollow"}) end end - it 'accepts multiple custom nofollow robots in an array' do - subject.nofollow(['some-nofollow', 'another-nofollow']) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "nofollow", name: "some-nofollow" }) - expect(meta).to have_tag('meta', with: { content: "nofollow", name: "another-nofollow" }) + it "accepts multiple custom nofollow robots in an array" do + subject.nofollow(["some-nofollow", "another-nofollow"]) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "nofollow", name: "some-nofollow"}) + expect(meta).to have_tag("meta", with: {content: "nofollow", name: "another-nofollow"}) end end - it 'displays nothing by default' do - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('meta', with: { content: "nofollow" }) + it "displays nothing by default" do + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("meta", with: {content: "nofollow"}) end end end - describe 'displaying both nofollow and noindex' do - it 'is displayed when set using helpers' do + describe "displaying both nofollow and noindex" do + it "is displayed when set using helpers" do subject.noindex(true) subject.nofollow(true) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "noindex, nofollow", name: "robots" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "noindex, nofollow", name: "robots"}) end end it 'is displayed when "set_meta_tags" used' do subject.set_meta_tags(nofollow: true, noindex: true) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "noindex, nofollow", name: "robots" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "noindex, nofollow", name: "robots"}) end end it 'displays two meta tags when different names used with "set_meta_tags"' do - subject.set_meta_tags(noindex: 'robots', nofollow: 'googlebot') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: 'noindex', name: 'robots' }) - expect(meta).to have_tag('meta', with: { content: 'nofollow', name: 'googlebot' }) + subject.set_meta_tags(noindex: "robots", nofollow: "googlebot") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "noindex", name: "robots"}) + expect(meta).to have_tag("meta", with: {content: "nofollow", name: "googlebot"}) end end - it 'uses custom name if string is used' do - subject.noindex('some-name') - subject.nofollow('some-name') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "noindex, nofollow", name: "some-name" }) + it "uses custom name if string is used" do + subject.noindex("some-name") + subject.nofollow("some-name") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "noindex, nofollow", name: "some-name"}) end end - it 'displays two meta tags when different names used' do - subject.noindex('some-noindex') - subject.nofollow('some-nofollow') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "noindex", name: "some-noindex" }) - expect(meta).to have_tag('meta', with: { content: "nofollow", name: "some-nofollow" }) + it "displays two meta tags when different names used" do + subject.noindex("some-noindex") + subject.nofollow("some-nofollow") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "noindex", name: "some-noindex"}) + expect(meta).to have_tag("meta", with: {content: "nofollow", name: "some-nofollow"}) end end end - context 'when displaying both follow and index' do + context "when displaying both follow and index" do it 'renders when "set_meta_tags" used' do subject.set_meta_tags(follow: true, index: true) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "index, follow", name: "robots" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "index, follow", name: "robots"}) end end - it 'uses custom name if string is used' do - subject.set_meta_tags(follow: 'some-name123', index: 'some-name123') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "index, follow", name: "some-name123" }) + it "uses custom name if string is used" do + subject.set_meta_tags(follow: "some-name123", index: "some-name123") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "index, follow", name: "some-name123"}) end end - it 'renders two meta tags when different names used' do - subject.set_meta_tags(follow: 'some-follow', index: 'some-index') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "index", name: "some-index" }) - expect(meta).to have_tag('meta', with: { content: "follow", name: "some-follow" }) + it "renders two meta tags when different names used" do + subject.set_meta_tags(follow: "some-follow", index: "some-index") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "index", name: "some-index"}) + expect(meta).to have_tag("meta", with: {content: "follow", name: "some-follow"}) end end end - context 'when displaying both follow and noindex when nofollow and index set by mistake' do + context "when displaying both follow and noindex when nofollow and index set by mistake" do it 'renders when "set_meta_tags" used' do subject.set_meta_tags(follow: true, index: true, nofollow: true, noindex: true) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "noindex, follow", name: "robots" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "noindex, follow", name: "robots"}) end end - it 'uses custom name if string is used' do - subject.set_meta_tags(follow: 'some-name', index: 'some-name', nofollow: 'some-name', noindex: 'some-name') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "noindex, follow", name: "some-name" }) + it "uses custom name if string is used" do + subject.set_meta_tags(follow: "some-name", index: "some-name", nofollow: "some-name", noindex: "some-name") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "noindex, follow", name: "some-name"}) end end - it 'renders two meta tags when different names used' do - subject.set_meta_tags(follow: 'some-follow', index: 'some-index', nofollow: 'some-nofollow', noindex: 'some-noindex') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "index", name: "some-index" }) - expect(meta).to have_tag('meta', with: { content: "follow", name: "some-follow" }) - expect(meta).to have_tag('meta', with: { content: "noindex", name: "some-noindex" }) - expect(meta).to have_tag('meta', with: { content: "nofollow", name: "some-nofollow" }) + it "renders two meta tags when different names used" do + subject.set_meta_tags(follow: "some-follow", index: "some-index", nofollow: "some-nofollow", noindex: "some-noindex") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "index", name: "some-index"}) + expect(meta).to have_tag("meta", with: {content: "follow", name: "some-follow"}) + expect(meta).to have_tag("meta", with: {content: "noindex", name: "some-noindex"}) + expect(meta).to have_tag("meta", with: {content: "nofollow", name: "some-nofollow"}) end end end - context 'when displaying noarchive' do + context "when displaying noarchive" do it 'renders noarchive when "set_meta_tags" used' do subject.set_meta_tags(noarchive: true) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "noarchive", name: "robots" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "noarchive", name: "robots"}) end end - it 'renders nothing if given false' do + it "renders nothing if given false" do subject.set_meta_tags(noarchive: false) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('meta', with: { content: "noarchive", name: "robots" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("meta", with: {content: "noarchive", name: "robots"}) end end - it 'uses custom noarchive if given' do - subject.set_meta_tags(noarchive: 'some-robots') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "noarchive", name: "some-robots" }) + it "uses custom noarchive if given" do + subject.set_meta_tags(noarchive: "some-robots") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "noarchive", name: "some-robots"}) end end end - it 'properly handles priorities and multiple robot names' do + it "properly handles priorities and multiple robot names" do subject.set_meta_tags( - noindex: true, - index: 'yahoo', - follow: ['google', 'yahoo', 'github'], - nofollow: ['yandex', :google], - noarchive: ['yahoo', 'bing'], + noindex: true, + index: "yahoo", + follow: ["google", "yahoo", "github"], + nofollow: ["yandex", :google], + noarchive: ["yahoo", "bing"] ) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { name: "robots", content: "noindex" }) - expect(meta).to have_tag('meta', with: { name: "yahoo", content: "index, follow, noarchive" }) - expect(meta).to have_tag('meta', with: { name: "google", content: "follow" }) - expect(meta).to have_tag('meta', with: { name: "github", content: "follow" }) - expect(meta).to have_tag('meta', with: { name: "yandex", content: "nofollow" }) - expect(meta).to have_tag('meta', with: { name: "bing", content: "noarchive" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {name: "robots", content: "noindex"}) + expect(meta).to have_tag("meta", with: {name: "yahoo", content: "index, follow, noarchive"}) + expect(meta).to have_tag("meta", with: {name: "google", content: "follow"}) + expect(meta).to have_tag("meta", with: {name: "github", content: "follow"}) + expect(meta).to have_tag("meta", with: {name: "yandex", content: "nofollow"}) + expect(meta).to have_tag("meta", with: {name: "bing", content: "noarchive"}) end end end diff --git a/spec/view_helper/open_graph_spec.rb b/spec/view_helper/open_graph_spec.rb index e60b82d9..ba165960 100644 --- a/spec/view_helper/open_graph_spec.rb +++ b/spec/view_helper/open_graph_spec.rb @@ -1,122 +1,122 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" -RSpec.describe MetaTags::ViewHelper, 'displaying Open Graph meta tags' do - it 'displays meta tags specified with :open_graph' do +RSpec.describe MetaTags::ViewHelper, "displaying Open Graph meta tags" do + it "displays meta tags specified with :open_graph" do subject.set_meta_tags( open_graph: { - title: 'Facebook Share Title', - description: 'Facebook Share Description', - }, + title: "Facebook Share Title", + description: "Facebook Share Description" + } ) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "Facebook Share Title", property: "og:title" }) - expect(meta).to have_tag('meta', with: { content: "Facebook Share Description", property: "og:description" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "Facebook Share Title", property: "og:title"}) + expect(meta).to have_tag("meta", with: {content: "Facebook Share Description", property: "og:description"}) end end - it 'displays meta tags specified with :og' do + it "displays meta tags specified with :og" do subject.set_meta_tags( og: { - title: 'Facebook Share Title', - description: 'Facebook Share Description', - }, + title: "Facebook Share Title", + description: "Facebook Share Description" + } ) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "Facebook Share Title", property: "og:title" }) - expect(meta).to have_tag('meta', with: { content: "Facebook Share Description", property: "og:description" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "Facebook Share Title", property: "og:title"}) + expect(meta).to have_tag("meta", with: {content: "Facebook Share Description", property: "og:description"}) end end - it 'uses deep merge when displaying open graph meta tags' do - subject.set_meta_tags(og: { title: 'Facebook Share Title' }) - subject.display_meta_tags(og: { description: 'Facebook Share Description' }).tap do |meta| - expect(meta).to have_tag('meta', with: { content: "Facebook Share Title", property: "og:title" }) - expect(meta).to have_tag('meta', with: { content: "Facebook Share Description", property: "og:description" }) + it "uses deep merge when displaying open graph meta tags" do + subject.set_meta_tags(og: {title: "Facebook Share Title"}) + subject.display_meta_tags(og: {description: "Facebook Share Description"}).tap do |meta| + expect(meta).to have_tag("meta", with: {content: "Facebook Share Title", property: "og:title"}) + expect(meta).to have_tag("meta", with: {content: "Facebook Share Description", property: "og:description"}) end end it "does not display meta tags without content" do subject.set_meta_tags( open_graph: { - title: '', - description: '', - }, + title: "", + description: "" + } ) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('meta', with: { content: "", property: "og:title" }) - expect(meta).not_to have_tag('meta', with: { content: "", property: "og:description" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("meta", with: {content: "", property: "og:title"}) + expect(meta).not_to have_tag("meta", with: {content: "", property: "og:description"}) end end it "displays locale meta tags" do - subject.display_meta_tags(open_graph: { locale: { _: 'en_GB', alternate: ['fr_FR', 'es_ES'] } }).tap do |meta| - expect(meta).to have_tag('meta', with: { content: "en_GB", property: "og:locale" }) - expect(meta).to have_tag('meta', with: { content: "fr_FR", property: "og:locale:alternate" }) - expect(meta).to have_tag('meta', with: { content: "es_ES", property: "og:locale:alternate" }) + subject.display_meta_tags(open_graph: {locale: {_: "en_GB", alternate: ["fr_FR", "es_ES"]}}).tap do |meta| + expect(meta).to have_tag("meta", with: {content: "en_GB", property: "og:locale"}) + expect(meta).to have_tag("meta", with: {content: "fr_FR", property: "og:locale:alternate"}) + expect(meta).to have_tag("meta", with: {content: "es_ES", property: "og:locale:alternate"}) end end it "displays mirrored content" do - subject.set_meta_tags(title: 'someTitle') - subject.display_meta_tags(open_graph: { title: :title }).tap do |meta| - expect(meta).to have_tag('meta', with: { content: "someTitle", property: "og:title" }) + subject.set_meta_tags(title: "someTitle") + subject.display_meta_tags(open_graph: {title: :title}).tap do |meta| + expect(meta).to have_tag("meta", with: {content: "someTitle", property: "og:title"}) end end it "properly handle title and site title in mirrored content" do - subject.set_meta_tags(title: 'someTitle', site: 'someSite') - subject.display_meta_tags(open_graph: { title: :title, site_name: :site, full_title: :full_title }).tap do |meta| - expect(meta).to have_tag('meta', with: { content: "someTitle", property: "og:title" }) - expect(meta).to have_tag('meta', with: { content: "someSite", property: "og:site_name" }) - expect(meta).to have_tag('meta', with: { content: "someSite | someTitle", property: "og:full_title" }) + subject.set_meta_tags(title: "someTitle", site: "someSite") + subject.display_meta_tags(open_graph: {title: :title, site_name: :site, full_title: :full_title}).tap do |meta| + expect(meta).to have_tag("meta", with: {content: "someTitle", property: "og:title"}) + expect(meta).to have_tag("meta", with: {content: "someSite", property: "og:site_name"}) + expect(meta).to have_tag("meta", with: {content: "someSite | someTitle", property: "og:full_title"}) end end it "uses site_title for mirrored title, when title is empty" do - subject.set_meta_tags(title: '', site: 'someSite') - subject.display_meta_tags(open_graph: { title: :title, site_name: :site, full_title: :full_title }).tap do |meta| - expect(meta).to have_tag('meta', with: { content: "someSite", property: "og:title" }) - expect(meta).to have_tag('meta', with: { content: "someSite", property: "og:site_name" }) - expect(meta).to have_tag('meta', with: { content: "someSite", property: "og:full_title" }) + subject.set_meta_tags(title: "", site: "someSite") + subject.display_meta_tags(open_graph: {title: :title, site_name: :site, full_title: :full_title}).tap do |meta| + expect(meta).to have_tag("meta", with: {content: "someSite", property: "og:title"}) + expect(meta).to have_tag("meta", with: {content: "someSite", property: "og:site_name"}) + expect(meta).to have_tag("meta", with: {content: "someSite", property: "og:full_title"}) end end it "displays open graph meta tags with an array of images" do subject.set_meta_tags( open_graph: { - title: 'someTitle', + title: "someTitle", image: [ { - _: 'http://example.com/1.png', - width: 75, - height: 75, + _: "http://example.com/1.png", + width: 75, + height: 75 }, { - _: 'http://example.com/2.png', - width: 50, - height: 50, - }, - ], - }, + _: "http://example.com/2.png", + width: 50, + height: 50 + } + ] + } ) - subject.display_meta_tags(site: 'someTitle').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "someTitle", property: "og:title" }) - expect(meta).to have_tag('meta', with: { content: "http://example.com/1.png", property: "og:image" }) - expect(meta).to have_tag('meta', with: { content: "75", property: "og:image:width" }) - expect(meta).to have_tag('meta', with: { content: "75", property: "og:image:height" }) - expect(meta).to have_tag('meta', with: { content: "http://example.com/2.png", property: "og:image" }) - expect(meta).to have_tag('meta', with: { content: "50", property: "og:image:width" }) - expect(meta).to have_tag('meta', with: { content: "50", property: "og:image:height" }) + subject.display_meta_tags(site: "someTitle").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "someTitle", property: "og:title"}) + expect(meta).to have_tag("meta", with: {content: "http://example.com/1.png", property: "og:image"}) + expect(meta).to have_tag("meta", with: {content: "75", property: "og:image:width"}) + expect(meta).to have_tag("meta", with: {content: "75", property: "og:image:height"}) + expect(meta).to have_tag("meta", with: {content: "http://example.com/2.png", property: "og:image"}) + expect(meta).to have_tag("meta", with: {content: "50", property: "og:image:width"}) + expect(meta).to have_tag("meta", with: {content: "50", property: "og:image:height"}) end end it "formats dates using ISO 8601" do time = Time.now.utc - subject.set_meta_tags(article: { published_time: time }) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: time.iso8601, property: "article:published_time" }) + subject.set_meta_tags(article: {published_time: time}) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: time.iso8601, property: "article:published_time"}) end end end diff --git a/spec/view_helper/open_search_spec.rb b/spec/view_helper/open_search_spec.rb index 5ec15a27..ef7fe957 100644 --- a/spec/view_helper/open_search_spec.rb +++ b/spec/view_helper/open_search_spec.rb @@ -1,42 +1,42 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" -RSpec.describe MetaTags::ViewHelper, 'displaying Open Search meta tags' do - it 'displays meta tags specified with :open_search' do +RSpec.describe MetaTags::ViewHelper, "displaying Open Search meta tags" do + it "displays meta tags specified with :open_search" do subject.set_meta_tags( open_search: { - title: 'Open Search Title', - href: '/open_search_path.xml', - }, + title: "Open Search Title", + href: "/open_search_path.xml" + } ) - subject.display_meta_tags(site: 'someSite').tap do |meta| + subject.display_meta_tags(site: "someSite").tap do |meta| expect(meta).to have_tag( - 'link', + "link", with: { - href: '/open_search_path.xml', - rel: 'search', - title: 'Open Search Title', - type: 'application/opensearchdescription+xml', - }, + href: "/open_search_path.xml", + rel: "search", + title: "Open Search Title", + type: "application/opensearchdescription+xml" + } ) end end - it 'does not display meta tags without content' do + it "does not display meta tags without content" do subject.set_meta_tags( open_search: { - title: '', - href: '', - }, + title: "", + href: "" + } ) - subject.display_meta_tags(site: 'someSite').tap do |meta| + subject.display_meta_tags(site: "someSite").tap do |meta| expect(meta).not_to have_tag( - 'link', + "link", with: { - rel: 'search', - type: 'application/opensearchdescription+xml', - }, + rel: "search", + type: "application/opensearchdescription+xml" + } ) end end diff --git a/spec/view_helper/open_tags_spec.rb b/spec/view_helper/open_tags_spec.rb index f0430f4c..a6bfa7ae 100644 --- a/spec/view_helper/open_tags_spec.rb +++ b/spec/view_helper/open_tags_spec.rb @@ -1,23 +1,23 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" -RSpec.describe MetaTags::ViewHelper, 'meta tags' do +RSpec.describe MetaTags::ViewHelper, "meta tags" do context "with open_meta_tags=true" do - it 'generates open charset tag' do - subject.display_meta_tags(charset: 'UTF-8').tap do |meta| + it "generates open charset tag" do + subject.display_meta_tags(charset: "UTF-8").tap do |meta| expect(meta).to eq('') end end - it 'generates open meta tags' do - subject.display_meta_tags(open_graph: { title: 'someSite' }).tap do |meta| + it "generates open meta tags" do + subject.display_meta_tags(open_graph: {title: "someSite"}).tap do |meta| expect(meta).to eq('') end end - it 'generates open link tags' do - subject.display_meta_tags(canonical: 'http://example.com/base/url').tap do |meta| + it "generates open link tags" do + subject.display_meta_tags(canonical: "http://example.com/base/url").tap do |meta| expect(meta).to eq('') end end @@ -28,20 +28,20 @@ MetaTags.config.open_meta_tags = false end - it 'generates closed charset tag' do - subject.display_meta_tags(charset: 'UTF-8').tap do |meta| + it "generates closed charset tag" do + subject.display_meta_tags(charset: "UTF-8").tap do |meta| expect(meta).to eq('') end end - it 'generates closed meta tags' do - subject.display_meta_tags(open_graph: { title: 'someSite' }).tap do |meta| + it "generates closed meta tags" do + subject.display_meta_tags(open_graph: {title: "someSite"}).tap do |meta| expect(meta).to eq('') end end - it 'generates closed link tags' do - subject.display_meta_tags(canonical: 'http://example.com/base/url').tap do |meta| + it "generates closed link tags" do + subject.display_meta_tags(canonical: "http://example.com/base/url").tap do |meta| expect(meta).to eq('') end end diff --git a/spec/view_helper/refresh_spec.rb b/spec/view_helper/refresh_spec.rb index 748d1cdf..f3614912 100644 --- a/spec/view_helper/refresh_spec.rb +++ b/spec/view_helper/refresh_spec.rb @@ -1,32 +1,32 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" -RSpec.describe MetaTags::ViewHelper, 'displaying refresh' do +RSpec.describe MetaTags::ViewHelper, "displaying refresh" do it 'displays refresh when "refresh" is used' do subject.refresh(5) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: '5', 'http-equiv' => 'refresh' }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {:content => "5", "http-equiv" => "refresh"}) end end it 'displays refresh when "set_meta_tags" used' do subject.set_meta_tags(refresh: 5) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: '5', 'http-equiv' => 'refresh' }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {:content => "5", "http-equiv" => "refresh"}) end end - it 'uses custom refresh if given' do + it "uses custom refresh if given" do subject.refresh("5;url=http://example.com/") - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: '5;url=http://example.com/', 'http-equiv' => "refresh" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {:content => "5;url=http://example.com/", "http-equiv" => "refresh"}) end end - it 'displays nothing by default' do - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).not_to have_tag('meta', with: { 'http-equiv' => "refresh" }) + it "displays nothing by default" do + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).not_to have_tag("meta", with: {"http-equiv" => "refresh"}) end end end diff --git a/spec/view_helper/title_spec.rb b/spec/view_helper/title_spec.rb index ddfcc853..b76a22e7 100644 --- a/spec/view_helper/title_spec.rb +++ b/spec/view_helper/title_spec.rb @@ -1,225 +1,225 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" RSpec.describe MetaTags::ViewHelper do - describe 'displaying title' do - it 'does not display title if blank' do - expect(subject.display_meta_tags).to eq('') - subject.title('') - expect(subject.display_meta_tags).to eq('') + describe "displaying title" do + it "does not display title if blank" do + expect(subject.display_meta_tags).to eq("") + subject.title("") + expect(subject.display_meta_tags).to eq("") end - it 'uses website name if title is empty' do - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to eq('someSite') + it "uses website name if title is empty" do + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to eq("someSite") end end it 'displays title when "title" used' do - subject.title('someTitle') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to eq('someSite | someTitle') + subject.title("someTitle") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to eq("someSite | someTitle") end end it 'displays title only when "site" is empty' do - subject.title('someTitle') - expect(subject.display_meta_tags).to eq('someTitle') + subject.title("someTitle") + expect(subject.display_meta_tags).to eq("someTitle") end it 'displays title when "set_meta_tags" is used' do - subject.set_meta_tags(title: 'someTitle') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to eq('someSite | someTitle') + subject.set_meta_tags(title: "someTitle") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to eq("someSite | someTitle") end end it 'escapes the title when "set_meta_tags" is used' do - subject.set_meta_tags(title: 'someTitle & somethingElse') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to eq('someSite | someTitle & somethingElse') + subject.set_meta_tags(title: "someTitle & somethingElse") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to eq("someSite | someTitle & somethingElse") end end it 'escapes a very long title when "set_meta_tags" is used' do - subject.set_meta_tags(title: 'Kombucha kale chips forage try-hard & green juice. IPhone marfa PBR&B venmo listicle, irony kitsch thundercats.') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to eq('someSite | Kombucha kale chips forage try-hard & green juice. IPhone') + subject.set_meta_tags(title: "Kombucha kale chips forage try-hard & green juice. IPhone marfa PBR&B venmo listicle, irony kitsch thundercats.") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to eq("someSite | Kombucha kale chips forage try-hard & green juice. IPhone") end end - it 'strips tags in the title' do - subject.set_meta_tags(title: 'hackxor') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to eq('someSite | hackxor') + it "strips tags in the title" do + subject.set_meta_tags(title: "hackxor") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to eq("someSite | hackxor") end end - it 'strips tags from very long titles' do - subject.set_meta_tags(title: 'Kombucha kale chips forage try-hard & green juice. IPhone marfa PBR&B venmo listicle, irony kitsch thundercats.') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to eq('someSite | Kombucha kale chips forage try-hard & green juice. IPhone') + it "strips tags from very long titles" do + subject.set_meta_tags(title: "Kombucha kale chips forage try-hard & green juice. IPhone marfa PBR&B venmo listicle, irony kitsch thundercats.") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to eq("someSite | Kombucha kale chips forage try-hard & green juice. IPhone") end end - it 'displays custom title if given' do - subject.title('someTitle') - subject.display_meta_tags(site: 'someSite', title: 'defaultTitle').tap do |meta| - expect(meta).to eq('someSite | someTitle') + it "displays custom title if given" do + subject.title("someTitle") + subject.display_meta_tags(site: "someSite", title: "defaultTitle").tap do |meta| + expect(meta).to eq("someSite | someTitle") end end - it 'uses website before page by default' do - subject.display_meta_tags(site: 'someSite', title: 'someTitle').tap do |meta| - expect(meta).to eq('someSite | someTitle') + it "uses website before page by default" do + subject.display_meta_tags(site: "someSite", title: "someTitle").tap do |meta| + expect(meta).to eq("someSite | someTitle") end end - it 'onlies use markup in titles in the view' do - expect(subject.title('someTitle')).to eq('someTitle') - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to eq('someSite | someTitle') + it "onlies use markup in titles in the view" do + expect(subject.title("someTitle")).to eq("someTitle") + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to eq("someSite | someTitle") end end - it 'uses page before website if :reverse' do - subject.display_meta_tags(site: 'someSite', title: 'someTitle', reverse: true).tap do |meta| - expect(meta).to eq('someTitle | someSite') + it "uses page before website if :reverse" do + subject.display_meta_tags(site: "someSite", title: "someTitle", reverse: true).tap do |meta| + expect(meta).to eq("someTitle | someSite") end end - it 'is lowercase if :lowercase' do - subject.display_meta_tags(site: 'someSite', title: 'someTitle', lowercase: true).tap do |meta| - expect(meta).to eq('someSite | sometitle') + it "is lowercase if :lowercase" do + subject.display_meta_tags(site: "someSite", title: "someTitle", lowercase: true).tap do |meta| + expect(meta).to eq("someSite | sometitle") end end - it 'does not change original title string' do + it "does not change original title string" do title = "TITLE" subject.display_meta_tags(title: title, lowercase: true).tap do |meta| - expect(meta).to eq('title') + expect(meta).to eq("title") end - expect(title).to eq('TITLE') + expect(title).to eq("TITLE") end - it 'uses custom separator when :separator specified' do - subject.title('someTitle') - subject.display_meta_tags(site: 'someSite', separator: '-').tap do |meta| - expect(meta).to eq('someSite - someTitle') + it "uses custom separator when :separator specified" do + subject.title("someTitle") + subject.display_meta_tags(site: "someSite", separator: "-").tap do |meta| + expect(meta).to eq("someSite - someTitle") end - subject.display_meta_tags(site: 'someSite', separator: ':').tap do |meta| - expect(meta).to eq('someSite : someTitle') + subject.display_meta_tags(site: "someSite", separator: ":").tap do |meta| + expect(meta).to eq("someSite : someTitle") end - subject.display_meta_tags(site: 'someSite', separator: '&').tap do |meta| - expect(meta).to eq('someSite &amp; someTitle') + subject.display_meta_tags(site: "someSite", separator: "&").tap do |meta| + expect(meta).to eq("someSite &amp; someTitle") end - subject.display_meta_tags(site: 'someSite', separator: '&').tap do |meta| - expect(meta).to eq('someSite & someTitle') + subject.display_meta_tags(site: "someSite", separator: "&").tap do |meta| + expect(meta).to eq("someSite & someTitle") end - subject.display_meta_tags(site: 'someSite', separator: '&'.html_safe).tap do |meta| - expect(meta).to eq('someSite & someTitle') + subject.display_meta_tags(site: "someSite", separator: "&".html_safe).tap do |meta| + expect(meta).to eq("someSite & someTitle") end - subject.display_meta_tags(site: 'someSite:', separator: false).tap do |meta| - expect(meta).to eq('someSite:someTitle') + subject.display_meta_tags(site: "someSite:", separator: false).tap do |meta| + expect(meta).to eq("someSite:someTitle") end end - it 'uses custom prefix and suffix if available' do - subject.display_meta_tags(site: 'someSite', title: 'someTitle', prefix: ' -', suffix: '- ').tap do |meta| - expect(meta).to eq('someSite -|- someTitle') + it "uses custom prefix and suffix if available" do + subject.display_meta_tags(site: "someSite", title: "someTitle", prefix: " -", suffix: "- ").tap do |meta| + expect(meta).to eq("someSite -|- someTitle") end end - it 'collapses prefix if false' do - subject.display_meta_tags(site: 'someSite', title: 'someTitle', prefix: false).tap do |meta| - expect(meta).to eq('someSite| someTitle') + it "collapses prefix if false" do + subject.display_meta_tags(site: "someSite", title: "someTitle", prefix: false).tap do |meta| + expect(meta).to eq("someSite| someTitle") end end - it 'collapses suffix if false' do - subject.display_meta_tags(site: 'someSite', title: 'someTitle', suffix: false).tap do |meta| - expect(meta).to eq('someSite |someTitle') + it "collapses suffix if false" do + subject.display_meta_tags(site: "someSite", title: "someTitle", suffix: false).tap do |meta| + expect(meta).to eq("someSite |someTitle") end end - it 'uses all custom options if available' do + it "uses all custom options if available" do subject.display_meta_tags( - site: 'someSite', - title: 'someTitle', - prefix: ' -', - suffix: '+ ', - separator: ':', + site: "someSite", + title: "someTitle", + prefix: " -", + suffix: "+ ", + separator: ":", lowercase: true, - reverse: true, + reverse: true ).tap do |meta| - expect(meta).to eq('sometitle -:+ someSite') + expect(meta).to eq("sometitle -:+ someSite") end end - it 'allows Arrays in title' do - subject.display_meta_tags(site: 'someSite', title: ['someTitle', 'anotherTitle']).tap do |meta| - expect(meta).to eq('someSite | someTitle | anotherTitle') + it "allows Arrays in title" do + subject.display_meta_tags(site: "someSite", title: ["someTitle", "anotherTitle"]).tap do |meta| + expect(meta).to eq("someSite | someTitle | anotherTitle") end end - it 'allows Arrays in title with :lowercase' do - subject.display_meta_tags(site: 'someSite', title: ['someTitle', 'anotherTitle'], lowercase: true).tap do |meta| - expect(meta).to eq('someSite | sometitle | anothertitle') + it "allows Arrays in title with :lowercase" do + subject.display_meta_tags(site: "someSite", title: ["someTitle", "anotherTitle"], lowercase: true).tap do |meta| + expect(meta).to eq("someSite | sometitle | anothertitle") end end - it 'treats nil as an empty string' do + it "treats nil as an empty string" do subject.display_meta_tags(title: nil).tap do |meta| - expect(meta).not_to have_tag('title') + expect(meta).not_to have_tag("title") end end - it 'allows objects that respond to #to_str' do - title = double(to_str: 'someTitle') - subject.display_meta_tags(site: 'someSite', title: title).tap do |meta| - expect(meta).to eq('someSite | someTitle') + it "allows objects that respond to #to_str" do + title = double(to_str: "someTitle") + subject.display_meta_tags(site: "someSite", title: title).tap do |meta| + expect(meta).to eq("someSite | someTitle") end end - it 'fails when title is not a String-like object' do + it "fails when title is not a String-like object" do skip("Fails RBS") if ENV["RBS_TEST_TARGET"] # rubocop:disable RSpec/Pending expect { - subject.display_meta_tags(site: 'someSite', title: 5) - }.to raise_error ArgumentError, 'Expected a string or an object that implements #to_str' + subject.display_meta_tags(site: "someSite", title: 5) + }.to raise_error ArgumentError, "Expected a string or an object that implements #to_str" end - it 'builds title in reverse order if :reverse' do + it "builds title in reverse order if :reverse" do subject.display_meta_tags( - site: 'someSite', - title: ['someTitle', 'anotherTitle'], - prefix: ' -', - suffix: '+ ', - separator: ':', - reverse: true, + site: "someSite", + title: ["someTitle", "anotherTitle"], + prefix: " -", + suffix: "+ ", + separator: ":", + reverse: true ).tap do |meta| - expect(meta).to eq('anotherTitle -:+ someTitle -:+ someSite') + expect(meta).to eq("anotherTitle -:+ someTitle -:+ someSite") end end - it 'minifies the output when asked to' do - subject.display_meta_tags(title: 'hello', description: 'world').tap do |meta| + it "minifies the output when asked to" do + subject.display_meta_tags(title: "hello", description: "world").tap do |meta| expect(meta).to eq("hello\n") end MetaTags.config.minify_output = true - subject.display_meta_tags(title: 'hello', description: 'world').tap do |meta| + subject.display_meta_tags(title: "hello", description: "world").tap do |meta| expect(meta).to eq("hello") end end end - describe '.display_title' do - it 'displays custom title if given' do - subject.title('someTitle') - subject.display_title(site: 'someSite', title: 'defaultTitle').tap do |meta| - expect(meta).to eq('someSite | someTitle') + describe ".display_title" do + it "displays custom title if given" do + subject.title("someTitle") + subject.display_title(site: "someSite", title: "defaultTitle").tap do |meta| + expect(meta).to eq("someSite | someTitle") end end end diff --git a/spec/view_helper/twitter_spec.rb b/spec/view_helper/twitter_spec.rb index 998e8f4d..6f3a16dd 100644 --- a/spec/view_helper/twitter_spec.rb +++ b/spec/view_helper/twitter_spec.rb @@ -1,33 +1,33 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" -RSpec.describe MetaTags::ViewHelper, 'displaying Twitter meta tags' do - it 'displays meta tags specified with :twitter' do +RSpec.describe MetaTags::ViewHelper, "displaying Twitter meta tags" do + it "displays meta tags specified with :twitter" do subject.set_meta_tags( twitter: { - title: 'Twitter Share Title', - card: 'photo', + title: "Twitter Share Title", + card: "photo", image: { - _: 'http://example.com/1.png', - width: 123, - height: 321, - }, - }, + _: "http://example.com/1.png", + width: 123, + height: 321 + } + } ) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "Twitter Share Title", name: "twitter:title" }) - expect(meta).to have_tag('meta', with: { content: "photo", name: "twitter:card" }) - expect(meta).to have_tag('meta', with: { content: "http://example.com/1.png", name: "twitter:image" }) - expect(meta).to have_tag('meta', with: { content: "123", name: "twitter:image:width" }) - expect(meta).to have_tag('meta', with: { content: "321", name: "twitter:image:height" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "Twitter Share Title", name: "twitter:title"}) + expect(meta).to have_tag("meta", with: {content: "photo", name: "twitter:card"}) + expect(meta).to have_tag("meta", with: {content: "http://example.com/1.png", name: "twitter:image"}) + expect(meta).to have_tag("meta", with: {content: "123", name: "twitter:image:width"}) + expect(meta).to have_tag("meta", with: {content: "321", name: "twitter:image:height"}) end end it "displays mirrored content" do - subject.set_meta_tags(title: 'someTitle') - subject.display_meta_tags(twitter: { title: :title }).tap do |meta| - expect(meta).to have_tag('meta', with: { content: "someTitle", name: "twitter:title" }) + subject.set_meta_tags(title: "someTitle") + subject.display_meta_tags(twitter: {title: :title}).tap do |meta| + expect(meta).to have_tag("meta", with: {content: "someTitle", name: "twitter:title"}) end end end diff --git a/spec/view_helper_spec.rb b/spec/view_helper_spec.rb index 58397114..59dac1ff 100644 --- a/spec/view_helper_spec.rb +++ b/spec/view_helper_spec.rb @@ -1,85 +1,85 @@ # frozen_string_literal: true -require 'spec_helper' +require "spec_helper" RSpec.describe MetaTags::ViewHelper, type: :view_helper do - describe 'returning values' do - it 'returns headline if specified' do - expect(subject.title('some-title', 'some-headline')).to eq('some-headline') + describe "returning values" do + it "returns headline if specified" do + expect(subject.title("some-title", "some-headline")).to eq("some-headline") end - it 'returns title' do - expect(subject.title('some-title')).to eq('some-title') - expect(subject.title).to eq('some-title') + it "returns title" do + expect(subject.title("some-title")).to eq("some-title") + expect(subject.title).to eq("some-title") end - it 'returns description' do - expect(subject.description('some-description')).to eq('some-description') + it "returns description" do + expect(subject.description("some-description")).to eq("some-description") end - it 'returns keywords' do - expect(subject.keywords('some-keywords')).to eq('some-keywords') + it "returns keywords" do + expect(subject.keywords("some-keywords")).to eq("some-keywords") end - it 'returns noindex' do - expect(subject.noindex('some-noindex')).to eq('some-noindex') + it "returns noindex" do + expect(subject.noindex("some-noindex")).to eq("some-noindex") end - it 'returns nofollow' do - expect(subject.noindex('some-nofollow')).to eq('some-nofollow') + it "returns nofollow" do + expect(subject.noindex("some-nofollow")).to eq("some-nofollow") end end - describe 'while handling string meta tag names' do - it 'works with common parameters' do - subject.display_meta_tags('site' => 'someSite', 'title' => 'someTitle').tap do |meta| - expect(meta).to eq('someSite | someTitle') + describe "while handling string meta tag names" do + it "works with common parameters" do + subject.display_meta_tags("site" => "someSite", "title" => "someTitle").tap do |meta| + expect(meta).to eq("someSite | someTitle") end end - it 'works with open graph parameters' do + it "works with open graph parameters" do subject.set_meta_tags( - 'og' => { - 'title' => 'facebook title', - 'description' => 'facebook description', - }, + "og" => { + "title" => "facebook title", + "description" => "facebook description" + } ) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "facebook title", property: "og:title" }) - expect(meta).to have_tag('meta', with: { content: "facebook description", property: "og:description" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "facebook title", property: "og:title"}) + expect(meta).to have_tag("meta", with: {content: "facebook description", property: "og:description"}) end end - it 'works with app links parameters' do + it "works with app links parameters" do subject.set_meta_tags( - 'al' => { - 'ios' => { - 'url' => 'applinks://docs', - 'app_store_id' => 12_345, - 'app_name' => 'App Links', - }, - }, + "al" => { + "ios" => { + "url" => "applinks://docs", + "app_store_id" => 12_345, + "app_name" => "App Links" + } + } ) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "applinks://docs", property: "al:ios:url" }) - expect(meta).to have_tag('meta', with: { content: "12345", property: "al:ios:app_store_id" }) - expect(meta).to have_tag('meta', with: { content: "App Links", property: "al:ios:app_name" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "applinks://docs", property: "al:ios:url"}) + expect(meta).to have_tag("meta", with: {content: "12345", property: "al:ios:app_store_id"}) + expect(meta).to have_tag("meta", with: {content: "App Links", property: "al:ios:app_name"}) end end - it 'works with facebook parameters' do + it "works with facebook parameters" do subject.set_meta_tags( - 'fb' => { + "fb" => { app_id: 12_345, - admins: "12345,23456", - }, + admins: "12345,23456" + } ) - subject.display_meta_tags(site: 'someSite').tap do |meta| - expect(meta).to have_tag('meta', with: { content: "12345", property: "fb:app_id" }) - expect(meta).to have_tag('meta', with: { content: "12345,23456", property: "fb:admins" }) + subject.display_meta_tags(site: "someSite").tap do |meta| + expect(meta).to have_tag("meta", with: {content: "12345", property: "fb:app_id"}) + expect(meta).to have_tag("meta", with: {content: "12345,23456", property: "fb:admins"}) end end end - it_behaves_like '.set_meta_tags' + it_behaves_like ".set_meta_tags" end From b66b639589d21ee35f215b7a657c8f3d3af0b743 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Fri, 25 Nov 2022 19:50:33 -0500 Subject: [PATCH 007/126] Switching from CodeClimate to Github Workflows --- .github/workflows/standard.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/workflows/standard.yml diff --git a/.github/workflows/standard.yml b/.github/workflows/standard.yml new file mode 100644 index 00000000..76455619 --- /dev/null +++ b/.github/workflows/standard.yml @@ -0,0 +1,13 @@ +name: StandardRB + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: StandardRB Linter + uses: andrewmcodes/standardrb-action@v1.0.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From d08c16d86377712f5cd34268bbe186f11297e98c Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Fri, 25 Nov 2022 19:56:51 -0500 Subject: [PATCH 008/126] Addressed "Style/TernaryParentheses: Use parentheses for ternary expressions with complex conditions" --- lib/meta_tags/meta_tags_collection.rb | 4 ++-- lib/meta_tags/text_normalizer.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/meta_tags/meta_tags_collection.rb b/lib/meta_tags/meta_tags_collection.rb index 9119bcd6..9d5b7a2a 100644 --- a/lib/meta_tags/meta_tags_collection.rb +++ b/lib/meta_tags/meta_tags_collection.rb @@ -188,7 +188,7 @@ def normalize_open_graph(meta_tags) # @return [String] separator segment value. # def extract_separator_section(name, default) - meta_tags[name] == false ? "" : (meta_tags[name] || default) + (meta_tags[name] == false) ? "" : (meta_tags[name] || default) end # Extracts robots attribute (noindex, nofollow, etc) name and value. @@ -198,7 +198,7 @@ def extract_separator_section(name, default) # def extract_robots_attribute(name) noindex = extract(name) - noindex_name = noindex.is_a?(String) || noindex.is_a?(Array) ? noindex : "robots" + noindex_name = (noindex.is_a?(String) || noindex.is_a?(Array)) ? noindex : "robots" noindex_value = noindex ? name.to_s : nil [noindex_name, noindex_value] diff --git a/lib/meta_tags/text_normalizer.rb b/lib/meta_tags/text_normalizer.rb index 37f71078..78c79f6d 100644 --- a/lib/meta_tags/text_normalizer.rb +++ b/lib/meta_tags/text_normalizer.rb @@ -194,8 +194,8 @@ def truncate_title(site_title, title, separator) site_title, title, separator, global_limit ) - title = title_limited_length > 0 ? truncate_array(title, title_limited_length, separator) : [] - site_title = site_title_limited_length > 0 ? truncate(site_title, site_title_limited_length) : nil + title = (title_limited_length > 0) ? truncate_array(title, title_limited_length, separator) : [] + site_title = (site_title_limited_length > 0) ? truncate(site_title, site_title_limited_length) : nil end [site_title, title] @@ -208,7 +208,7 @@ def calculate_title_limits(site_title, title, separator, global_limit) main_length = main_title.map(&:length).sum + ((main_title.size - 1) * separator.length) main_limited_length = global_limit - secondary_limited_length = global_limit - (main_length > 0 ? main_length + separator.length : 0) + secondary_limited_length = global_limit - ((main_length > 0) ? main_length + separator.length : 0) secondary_limited_length = [0, secondary_limited_length].max if MetaTags.config.truncate_site_title_first From 3db58623936ddee44b321e9a861fb03945e7cbb9 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Fri, 25 Nov 2022 20:00:19 -0500 Subject: [PATCH 009/126] Switching from Rubocop to StandardRB, deprecating CodeClimate --- .codeclimate.yml | 11 +++-------- Gemfile | 5 ++--- README.md | 1 + meta-tags.gemspec | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 924af099..08711550 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -4,16 +4,11 @@ plugins: enabled: true config: languages: - - ruby + - ruby fixme: enabled: true - rubocop: - enabled: true - # Check https://github.com/codeclimate/codeclimate-rubocop/branches/all?query=channel%2Frubocop - channel: rubocop-1-35-1 - exclude_patterns: -- spec/**/* -- certs/**/* + - spec/**/* + - certs/**/* diff --git a/Gemfile b/Gemfile index 741df2a3..e886d722 100644 --- a/Gemfile +++ b/Gemfile @@ -16,9 +16,8 @@ unless ENV["NO_STEEP"] == "1" end group :test do - # Lock rubocop to a specific version we use on CI. If you update this, - # don't forget to switch rubocop channel in the .codeclimate.yml - gem "rubocop", "= 1.35.1" + # Ruby Style Guide, with linter & automatic code fixer + gem "standard" # Cops for rails apps gem "rubocop-rails" # Cops for rake tasks diff --git a/README.md b/README.md index 80d1b9da..d02151e7 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [![CircleCI](https://circleci.com/gh/kpumuk/meta-tags.svg?style=shield)](https://circleci.com/gh/kpumuk/meta-tags) [![Gem Version](https://badge.fury.io/rb/meta-tags.svg)](https://badge.fury.io/rb/meta-tags) +[![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard) [![Code Climate](https://codeclimate.com/github/kpumuk/meta-tags/badges/gpa.svg)](https://codeclimate.com/github/kpumuk/meta-tags) [![Test Coverage](https://codeclimate.com/github/kpumuk/meta-tags/badges/coverage.svg)](https://codeclimate.com/github/kpumuk/meta-tags/coverage) [![Gem Downloads](https://img.shields.io/gem/dt/meta-tags.svg)](https://badge.fury.io/rb/meta-tags) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index da773af9..9519946c 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "rspec", "~> 3.11.0" spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0" - spec.add_development_dependency "standard", "~> 1.16.1" + spec.add_development_dependency "standard", "~> 1.18.1" spec.cert_chain = ["certs/kpumuk.pem"] spec.signing_key = File.expand_path("~/.ssh/gem-kpumuk.pem") if $PROGRAM_NAME.end_with?("gem") From 6f3d29c400d23a241e7b0bb8c924bf5432e5b99f Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Fri, 25 Nov 2022 20:05:25 -0500 Subject: [PATCH 010/126] Updated CHANGELOG --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14df6a83..8c59d9a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 2.19.0 (Development) + +Changes: + +- Switched code style from custom rules to Standard ([246](https://github.com/kpumuk/meta-tags/pull/246)). + ## 2.18.0 (September 15, 2022) [☰](https://github.com/kpumuk/meta-tags/compare/v2.17.0...v2.18.0) Changes: @@ -10,7 +16,7 @@ Changes: Changes: -- Separate RBS files to _internal directory to avoid exposing RBS ([237](https://github.com/kpumuk/meta-tags/pull/237)) +- Separate RBS files to \_internal directory to avoid exposing RBS ([237](https://github.com/kpumuk/meta-tags/pull/237)) - Added Ruby 3.1 to supported versions, Ruby 2.6 is minimum supported version ([235](https://github.com/kpumuk/meta-tags/pull/235/)) ## 2.16.0 (September 24, 2021) [☰](https://github.com/kpumuk/meta-tags/compare/v2.15.0...v2.16.0) From c84c4429363767ff613180a248d1a6b04aad97ea Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Mon, 28 Nov 2022 12:30:06 -0500 Subject: [PATCH 011/126] Switching gemspec from add_dependency to add_runtime_dependency --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 9519946c..60a85c1f 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency "actionpack", ">= 3.2.0", "< 7.1" + spec.add_runtime_dependency "actionpack", ">= 3.2.0", "< 7.1" spec.add_development_dependency "railties", ">= 3.2.0", "< 7.1" spec.add_development_dependency "rake", "~> 13.0" From c0d7400a61cb0b89be8a43d34c8bcf9bf7ba5e23 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Mon, 28 Nov 2022 13:44:34 -0500 Subject: [PATCH 012/126] Updated README with Standard formatting --- README.md | 186 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 97 insertions(+), 89 deletions(-) diff --git a/README.md b/README.md index d02151e7..8827d473 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Ruby on Rails older than 5.1, because they reached their [End of Life](https://e Add the "meta-tags" gem to your `Gemfile`. ```ruby -gem 'meta-tags' +gem "meta-tags" ``` And run `bundle install` command. @@ -56,14 +56,14 @@ First, add this code to your main layout: ```erb - <%= display_meta_tags site: 'My website' %> + <%= display_meta_tags site: "My website" %> ``` Then, to set the page title, add this to each of your views (see below for other options): ```erb -

<%= title 'My page title' %>

+

<%= title "My page title" %>

``` When views are rendered, the page title will be included in the right spots: @@ -84,17 +84,19 @@ You can find allowed options for `display_meta_tags` method below. You can define following instance variables: ```ruby -@page_title = 'Member Login' -@page_description = 'Member login page.' -@page_keywords = 'Site, Login, Members' +@page_title = "Member Login" +@page_description = "Member login page." +@page_keywords = "Site, Login, Members" ``` Also you could use `set_meta_tags` method to define all meta tags simultaneously: ```ruby -set_meta_tags title: 'Member Login', - description: 'Member login page.', - keywords: 'Site, Login, Members' +set_meta_tags( + title: "Member Login", + description: "Member login page.", + keywords: "Site, Login, Members" +) ``` You can find allowed options for `set_meta_tags` method below. @@ -104,9 +106,9 @@ You can find allowed options for `set_meta_tags` method below. To set meta tags you can use following methods: ```erb -<% title 'Member Login' %> -<% description 'Member login page.' %> -<% keywords 'Site, Login, Members' %> +<% title "Member Login" %> +<% description "Member login page." %> +<% keywords "Site, Login, Members" %> <% nofollow %> <% noindex %> <% refresh 3 %> @@ -115,9 +117,13 @@ To set meta tags you can use following methods: Also there is `set_meta_tags` method exists: ```erb -<% set_meta_tags title: 'Member Login', - description: 'Member login page.', - keywords: 'Site, Login, Members' %> +<% + set_meta_tags( + title: "Member Login", + description: "Member login page.", + keywords: "Site, Login, Members" + ) +%> ``` You can pass an object that implements `#to_meta_tags` method and returns a Hash: @@ -127,7 +133,7 @@ class Document < ApplicationRecord def to_meta_tags { title: title, - description: summary, + description: summary } end end @@ -140,13 +146,13 @@ The `title` method returns title itself, so you can use it to show the title somewhere on the page: ```erb -

<%= title 'Member Login' %>

+

<%= title "Member Login" %>

``` If you want to set the title and display another text, use this: ```erb -

<%= title 'Member Login', 'Here you can login to the site:' %>

+

<%= title "Member Login", "Here you can login to the site:" %>

``` ### Allowed options for `display_meta_tags` and `set_meta_tags` methods @@ -165,11 +171,11 @@ Use these options to customize the title format: | `:suffix` | text between separator and page title | | `:lowercase` | when true, the page name will be lowercase | | `:reverse` | when true, the page and site names will be reversed | -| `:noindex` | add noindex meta tag; when true, 'robots' will be used; accepts a string with a robot name, or an array of strings | -| `:index` | add index meta tag; when true, 'robots' will be used; accepts a string with a robot name, or an array of strings | -| `:nofollow` | add nofollow meta tag; when true, 'robots' will be used; accepts a string with a robot name, or an array of strings | -| `:follow` | add follow meta tag; when true, 'robots' will be used; accepts a string with a robot name, or an array of strings | -| `:noarchive` | add noarchive meta tag; when true, 'robots' will be used; accepts a string with a robot name, or an array of strings | +| `:noindex` | add noindex meta tag; when true, "robots" will be used; accepts a string with a robot name, or an array of strings | +| `:index` | add index meta tag; when true, "robots" will be used; accepts a string with a robot name, or an array of strings | +| `:nofollow` | add nofollow meta tag; when true, "robots" will be used; accepts a string with a robot name, or an array of strings | +| `:follow` | add follow meta tag; when true, "robots" will be used; accepts a string with a robot name, or an array of strings | +| `:noarchive` | add noarchive meta tag; when true, "robots" will be used; accepts a string with a robot name, or an array of strings | | `:canonical` | add canonical link tag | | `:prev` | add prev link tag | | `:next` | add next link tag | @@ -185,8 +191,8 @@ And here are a few examples to give you ideas. <%= display_meta_tags prefix: false, separator: ":" %> <%= display_meta_tags lowercase: true %> <%= display_meta_tags reverse: true, prefix: false %> -<%= display_meta_tags og: { title: 'The Rock', type: 'video.movie' } %> -<%= display_meta_tags alternate: { 'zh-Hant' => 'http://example.com.tw/base/url' } %> +<%= display_meta_tags og: { title: "The Rock", type: "video.movie" } %> +<%= display_meta_tags alternate: { "zh-Hant" => "http://example.com.tw/base/url" } %> ``` ### Allowed values @@ -194,16 +200,16 @@ And here are a few examples to give you ideas. You can specify `:title` as a string or array: ```ruby -set_meta_tags title: ['part1', 'part2'], site: 'site' +set_meta_tags title: ["part1", "part2"], site: "site" # site | part1 | part2 -set_meta_tags title: ['part1', 'part2'], reverse: true, site: 'site' +set_meta_tags title: ["part1", "part2"], reverse: true, site: "site" # part2 | part1 | site ``` Keywords can be passed as string of comma-separated values, or as an array: ```ruby -set_meta_tags keywords: ['tag1', 'tag2'] +set_meta_tags keywords: ["tag1", "tag2"] # tag1, tag2 ``` @@ -220,7 +226,7 @@ Say, you have the following in your application layout: ```ruby display_meta_tags og: { title: :title, - site_name: :site, + site_name: :site } ``` @@ -228,7 +234,7 @@ The value of `og[:title]` is a symbol and therefore references the value of the top level `title` meta tag. With the following in any view: ```ruby -title 'my great view' +title "my great view" ``` You get this open graph meta tag for free: @@ -262,10 +268,10 @@ code duplication, you can define a helper in `application_helper.rb`: ```ruby def default_meta_tags { - title: 'Member Login', - description: 'Member login page.', - keywords: 'Site, Login, Members', - separator: "—".html_safe, + title: "Member Login", + description: "Member login page.", + keywords: "Site, Login, Members", + separator: "—".html_safe } end ``` @@ -296,11 +302,11 @@ browser are displayed in the title bar. The search engines look at the title bar to determine what the page is all about. ```ruby -set_meta_tags title: 'Member Login' +set_meta_tags title: "Member Login" # Member Login -set_meta_tags site: 'Site Title', title: 'Member Login' +set_meta_tags site: "Site Title", title: "Member Login" # Site Title | Member Login -set_meta_tags site: 'Site Title', title: 'Member Login', reverse: true +set_meta_tags site: "Site Title", title: "Member Login", reverse: true # Member Login | Site Title ``` @@ -353,7 +359,7 @@ include specific pages in their indexes. ```ruby set_meta_tags noindex: true # -set_meta_tags noindex: 'googlebot' +set_meta_tags noindex: "googlebot" # ``` @@ -366,7 +372,7 @@ Further reading: ### Index -Although it is not required to add 'index' to 'robots' as it is default value for Google, some SEO specialists recommend to add it to website +Although it is not required to add "index" to "robots" as it is default value for Google, some SEO specialists recommend to add it to website ```ruby set_meta_tags index: true @@ -383,7 +389,7 @@ still arrives at your undesired page. ```ruby set_meta_tags nofollow: true # -set_meta_tags nofollow: 'googlebot' +set_meta_tags nofollow: "googlebot" # ``` @@ -430,13 +436,13 @@ icon, tab icon or bookmark icon, is a file containing one or more small icons, most commonly 16×16 pixels, associated with a particular website or web page. ```ruby -set_meta_tags icon: '/favicon.ico' +set_meta_tags icon: "/favicon.ico" # -set_meta_tags icon: '/favicon.png', type: 'image/png' +set_meta_tags icon: "/favicon.png", type: "image/png" # set_meta_tags icon: [ - { href: '/images/icons/icon_96.png', sizes: '32x32 96x96', type: 'image/png' }, - { href: '/images/icons/icon_itouch_precomp_32.png', rel: 'apple-touch-icon-precomposed', sizes: '32x32', type: 'image/png' }, + {href: "/images/icons/icon_96.png", sizes: "32x32 96x96", type: "image/png"}, + {href: "/images/icons/icon_itouch_precomp_32.png", rel: "apple-touch-icon-precomposed", sizes: "32x32", type: "image/png"} ] # # @@ -453,11 +459,11 @@ Alternate link elements tell a search engine when there is content that's translated or targeted to users in a certain region. ```ruby -set_meta_tags alternate: { "fr" => "http://yoursite.fr/alternate/url" } +set_meta_tags alternate: {"fr" => "http://yoursite.fr/alternate/url"} # -set_meta_tags alternate: { "fr" => "http://yoursite.fr/alternate/url", - "de" => "http://yoursite.de/alternate/url" } +set_meta_tags alternate: {"fr" => "http://yoursite.fr/alternate/url", + "de" => "http://yoursite.de/alternate/url"} # # ``` @@ -466,10 +472,10 @@ If you need more than just multi-lingual links, you can use an alternative synta ```ruby set_meta_tags alternate: [ - { href: 'http://example.fr/base/url', hreflang: 'fr' }, - { href: 'http://example.com/feed.rss', type: 'application/rss+xml', title: 'RSS' }, - { href: 'http://m.example.com/page-1', media: 'only screen and (max-width: 640px)'}, - ] + {href: "http://example.fr/base/url", hreflang: "fr"}, + {href: "http://example.com/feed.rss", type: "application/rss+xml", title: "RSS"}, + {href: "http://m.example.com/page-1", media: "only screen and (max-width: 640px)"} +] ``` Further reading: @@ -527,7 +533,7 @@ To link back to normal version, use `canonical`. ### Manifest links ```ruby -set_meta_tags manifest: 'manifest.json' +set_meta_tags manifest: "manifest.json" # ``` @@ -545,7 +551,7 @@ meta refresh to be used as a method of URL redirection. ```ruby set_meta_tags refresh: 5 # -set_meta_tags refresh: '5;url=http://example.com' +set_meta_tags refresh: "5;url=http://example.com" # ``` @@ -561,7 +567,7 @@ Open Search link element to describe a search engine in a standard and accessibl ```ruby set_meta_tags open_search: { title: "Open Search", - href: "/opensearch.xml" + href: "/opensearch.xml" } # ``` @@ -592,7 +598,7 @@ Repeated meta tags can be built just using an Array inside a Hash. For example: ```ruby set_meta_tags og: { - image: ["http://example.com/rock.jpg", "http://example.com/rock2.jpg"] + image: ["http://example.com/rock.jpg", "http://example.com/rock2.jpg"] } # # @@ -607,13 +613,13 @@ and in the future. Here's an example for a movie page: ```ruby set_meta_tags og: { - title: 'The Rock', - type: 'video.movie', - url: 'http://www.imdb.com/title/tt0117500/', - image: 'http://ia.media-imdb.com/rock.jpg', - video: { - director: 'http://www.imdb.com/name/nm0000881/', - writer: ['http://www.imdb.com/name/nm0918711/', 'http://www.imdb.com/name/nm0177018/'] + title: "The Rock", + type: "video.movie", + url: "http://www.imdb.com/title/tt0117500/", + image: "http://ia.media-imdb.com/rock.jpg", + video: { + director: "http://www.imdb.com/name/nm0000881/", + writer: ["http://www.imdb.com/name/nm0918711/", "http://www.imdb.com/name/nm0177018/"] } } # @@ -629,19 +635,21 @@ Multiple images declared as an **array** (look at the `_` character): ```ruby set_meta_tags og: { - title: 'Two structured image properties', - type: 'website', - url: 'view-source:http://examples.opengraphprotocol.us/image-array.html', - image: [{ - _: 'http://examples.opengraphprotocol.us/media/images/75.png', - width: 75, - height: 75, - }, - { - _: 'http://examples.opengraphprotocol.us/media/images/50.png', - width: 50, - height: 50, - }] + title: "Two structured image properties", + type: "website", + url: "view-source:http://examples.opengraphprotocol.us/image-array.html", + image: [ + { + _: "http://examples.opengraphprotocol.us/media/images/75.png", + width: 75, + height: 75 + }, + { + _: "http://examples.opengraphprotocol.us/media/images/50.png", + width: 50, + height: 50 + } + ] } # # @@ -658,10 +666,10 @@ Article meta tags are supported too: ```ruby set_meta_tags article: { - published_time: '2013-09-17T05:59:00+01:00', - modified_time: '2013-09-16T19:08:47+01:00', - section: 'Article Section', - tag: 'Article Tag', + published_time: "2013-09-17T05:59:00+01:00", + modified_time: "2013-09-16T19:08:47+01:00", + section: "Article Section", + tag: "Article Tag" } # # @@ -694,11 +702,11 @@ When you need to generate a [Twitter Photo card](https://dev.twitter.com/docs/ca ```ruby set_meta_tags twitter: { - card: "photo", + card: "photo", image: { - _: "http://example.com/1.png", - width: 100, - height: 100, + _: "http://example.com/1.png", + width: 100, + height: 100 } } # @@ -711,12 +719,12 @@ Special parameter `itemprop` can be used on a "anonymous" tag "\_" to generate " ```ruby set_meta_tags twitter: { - card: "photo", + card: "photo", image: { - _: "http://example.com/1.png", - width: 100, - height: 100, - itemprop: "image", + _: "http://example.com/1.png", + width: 100, + height: 100, + itemprop: "image" } } # @@ -766,7 +774,7 @@ You can also specify value as an Array, and values will be displayed as a list of `meta` tags: ```ruby -set_meta_tags author: [ "Dmytro Shteflyuk", "John Doe" ] +set_meta_tags author: ["Dmytro Shteflyuk", "John Doe"] # # ``` From 8c9dee4581540cf1b9dc1a0cfe0f22b218063843 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 3 Dec 2022 12:43:46 -0500 Subject: [PATCH 013/126] Updated dependencies (RSpec and Steep) --- Gemfile | 2 +- meta-tags.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index e886d722..32ae0556 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ end unless ENV["NO_STEEP"] == "1" # Ruby typings - gem "steep", "~> 1.1.1", platform: :mri + gem "steep", "~> 1.3.0", platform: :mri end group :test do diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 60a85c1f..c91aef84 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "railties", ">= 3.2.0", "< 7.1" spec.add_development_dependency "rake", "~> 13.0" - spec.add_development_dependency "rspec", "~> 3.11.0" + spec.add_development_dependency "rspec", "~> 3.12.0" spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0" spec.add_development_dependency "standard", "~> 1.18.1" From f5fb4c8593349f8f831974365058671959e2af1d Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 3 Dec 2022 13:17:29 -0500 Subject: [PATCH 014/126] Introducing Appraisals for multi-rails testing --- .circleci/config.yml | 164 ++++++++++++++++++------------------- .circleci/config.yml.erb | 60 ++++++-------- .gitignore | 3 +- Appraisals | 30 +++++++ Gemfile | 7 +- gemfiles/rails_5.1.gemfile | 17 ++++ gemfiles/rails_5.2.gemfile | 17 ++++ gemfiles/rails_6.0.gemfile | 17 ++++ gemfiles/rails_6.1.gemfile | 17 ++++ gemfiles/rails_7.0.gemfile | 17 ++++ meta-tags.gemspec | 1 + 11 files changed, 229 insertions(+), 121 deletions(-) create mode 100644 Appraisals create mode 100644 gemfiles/rails_5.1.gemfile create mode 100644 gemfiles/rails_5.2.gemfile create mode 100644 gemfiles/rails_6.0.gemfile create mode 100644 gemfiles/rails_6.1.gemfile create mode 100644 gemfiles/rails_7.0.gemfile diff --git a/.circleci/config.yml b/.circleci/config.yml index 425b0690..5cce2063 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,15 +21,15 @@ shared_build_steps: &shared_build_steps - run: name: Storing Rails Version command: | - echo "$RUBY_VERSION/$RAILS_VERSION" > RAILS_VERSION - cat RAILS_VERSION + echo "$RUBY_VERSION/$BUNDLE_GEMFILE" > CACHE_ENV_VERSION + cat CACHE_ENV_VERSION # Download and cache dependencies - restore_cache: keys: - - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "RAILS_VERSION" }}-{{ checksum "Gemfile" }}-{{ checksum "meta-tags.gemspec" }} + - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum .Environment.BUNDLE_GEMFILE }}-{{ checksum "meta-tags.gemspec" }} # fallback to using the latest cache if no exact match is found - - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "RAILS_VERSION" }} + - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }} - run: name: Installing Dependencies @@ -40,7 +40,7 @@ shared_build_steps: &shared_build_steps - save_cache: paths: - ./vendor/bundle - key: dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "RAILS_VERSION" }}-{{ checksum "Gemfile" }}-{{ checksum "meta-tags.gemspec" }} + key: dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum .Environment.BUNDLE_GEMFILE }}-{{ checksum "meta-tags.gemspec" }} # run tests! - run: @@ -89,7 +89,7 @@ shared_build_steps: &shared_build_steps jobs: - build-ruby26-rails-5_1_7: + build-ruby26-rails-51: parameters: is_main_build: type: boolean @@ -97,13 +97,13 @@ jobs: docker: - image: cimg/ruby:2.6 environment: - RAILS_VERSION: 5.1.7 + BUNDLE_GEMFILE: gemfiles/rails_5.1.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby26-rails-5.1.7 + working_directory: ~/meta-tags/ruby26-rails-51 steps: *shared_build_steps - build-ruby26-rails-5_2_8: + build-ruby26-rails-52: parameters: is_main_build: type: boolean @@ -111,13 +111,13 @@ jobs: docker: - image: cimg/ruby:2.6 environment: - RAILS_VERSION: 5.2.8 + BUNDLE_GEMFILE: gemfiles/rails_5.2.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby26-rails-5.2.8 + working_directory: ~/meta-tags/ruby26-rails-52 steps: *shared_build_steps - build-ruby26-rails-6_0_5: + build-ruby26-rails-60: parameters: is_main_build: type: boolean @@ -125,13 +125,13 @@ jobs: docker: - image: cimg/ruby:2.6 environment: - RAILS_VERSION: 6.0.5 + BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby26-rails-6.0.5 + working_directory: ~/meta-tags/ruby26-rails-60 steps: *shared_build_steps - build-ruby26-rails-6_1_6: + build-ruby26-rails-61: parameters: is_main_build: type: boolean @@ -139,13 +139,13 @@ jobs: docker: - image: cimg/ruby:2.6 environment: - RAILS_VERSION: 6.1.6 + BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby26-rails-6.1.6 + working_directory: ~/meta-tags/ruby26-rails-61 steps: *shared_build_steps - build-ruby27-rails-5_1_7: + build-ruby27-rails-51: parameters: is_main_build: type: boolean @@ -153,13 +153,13 @@ jobs: docker: - image: cimg/ruby:2.7 environment: - RAILS_VERSION: 5.1.7 + BUNDLE_GEMFILE: gemfiles/rails_5.1.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-5.1.7 + working_directory: ~/meta-tags/ruby27-rails-51 steps: *shared_build_steps - build-ruby27-rails-5_2_8: + build-ruby27-rails-52: parameters: is_main_build: type: boolean @@ -167,13 +167,13 @@ jobs: docker: - image: cimg/ruby:2.7 environment: - RAILS_VERSION: 5.2.8 + BUNDLE_GEMFILE: gemfiles/rails_5.2.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-5.2.8 + working_directory: ~/meta-tags/ruby27-rails-52 steps: *shared_build_steps - build-ruby27-rails-6_0_5: + build-ruby27-rails-60: parameters: is_main_build: type: boolean @@ -181,13 +181,13 @@ jobs: docker: - image: cimg/ruby:2.7 environment: - RAILS_VERSION: 6.0.5 + BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-6.0.5 + working_directory: ~/meta-tags/ruby27-rails-60 steps: *shared_build_steps - build-ruby27-rails-6_1_6: + build-ruby27-rails-61: parameters: is_main_build: type: boolean @@ -195,13 +195,13 @@ jobs: docker: - image: cimg/ruby:2.7 environment: - RAILS_VERSION: 6.1.6 + BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-6.1.6 + working_directory: ~/meta-tags/ruby27-rails-61 steps: *shared_build_steps - build-ruby27-rails-7_0_3: + build-ruby27-rails-70: parameters: is_main_build: type: boolean @@ -209,13 +209,13 @@ jobs: docker: - image: cimg/ruby:2.7 environment: - RAILS_VERSION: 7.0.3 + BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-7.0.3 + working_directory: ~/meta-tags/ruby27-rails-70 steps: *shared_build_steps - build-ruby30-rails-6_0_5: + build-ruby30-rails-60: parameters: is_main_build: type: boolean @@ -223,13 +223,13 @@ jobs: docker: - image: cimg/ruby:3.0 environment: - RAILS_VERSION: 6.0.5 + BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby30-rails-6.0.5 + working_directory: ~/meta-tags/ruby30-rails-60 steps: *shared_build_steps - build-ruby30-rails-6_1_6: + build-ruby30-rails-61: parameters: is_main_build: type: boolean @@ -237,13 +237,13 @@ jobs: docker: - image: cimg/ruby:3.0 environment: - RAILS_VERSION: 6.1.6 + BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby30-rails-6.1.6 + working_directory: ~/meta-tags/ruby30-rails-61 steps: *shared_build_steps - build-ruby30-rails-7_0_3: + build-ruby30-rails-70: parameters: is_main_build: type: boolean @@ -251,13 +251,13 @@ jobs: docker: - image: cimg/ruby:3.0 environment: - RAILS_VERSION: 7.0.3 + BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby30-rails-7.0.3 + working_directory: ~/meta-tags/ruby30-rails-70 steps: *shared_build_steps - build-ruby31-rails-6_0_5: + build-ruby31-rails-60: parameters: is_main_build: type: boolean @@ -265,13 +265,13 @@ jobs: docker: - image: cimg/ruby:3.1 environment: - RAILS_VERSION: 6.0.5 + BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby31-rails-6.0.5 + working_directory: ~/meta-tags/ruby31-rails-60 steps: *shared_build_steps - build-ruby31-rails-6_1_6: + build-ruby31-rails-61: parameters: is_main_build: type: boolean @@ -279,13 +279,13 @@ jobs: docker: - image: cimg/ruby:3.1 environment: - RAILS_VERSION: 6.1.6 + BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 1 - working_directory: ~/meta-tags/ruby31-rails-6.1.6 + working_directory: ~/meta-tags/ruby31-rails-61 steps: *shared_build_steps - build-ruby31-rails-7_0_3: + build-ruby31-rails-70: parameters: is_main_build: type: boolean @@ -293,10 +293,10 @@ jobs: docker: - image: cimg/ruby:3.1 environment: - RAILS_VERSION: 7.0.3 + BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: 0 - working_directory: ~/meta-tags/ruby31-rails-7.0.3 + working_directory: ~/meta-tags/ruby31-rails-70 steps: *shared_build_steps @@ -310,7 +310,7 @@ jobs: - run: name: Uploading Code Coverage command: | - cd /tmp/workspace/ruby31-rails-7.0.3 + cd /tmp/workspace/ruby31-rails-70 ./cc-test-reporter upload-coverage --input coverage/codeclimate.coverage.json || true tests: docker: @@ -325,86 +325,86 @@ workflows: test: jobs: - - build-ruby26-rails-5_1_7: + - build-ruby26-rails-51: is_main_build: false - - build-ruby26-rails-5_2_8: + - build-ruby26-rails-52: is_main_build: false - - build-ruby26-rails-6_0_5: + - build-ruby26-rails-60: is_main_build: false - - build-ruby26-rails-6_1_6: + - build-ruby26-rails-61: is_main_build: false - - build-ruby27-rails-5_1_7: + - build-ruby27-rails-51: is_main_build: false - - build-ruby27-rails-5_2_8: + - build-ruby27-rails-52: is_main_build: false - - build-ruby27-rails-6_0_5: + - build-ruby27-rails-60: is_main_build: false - - build-ruby27-rails-6_1_6: + - build-ruby27-rails-61: is_main_build: false - - build-ruby27-rails-7_0_3: + - build-ruby27-rails-70: is_main_build: false - - build-ruby30-rails-6_0_5: + - build-ruby30-rails-60: is_main_build: false - - build-ruby30-rails-6_1_6: + - build-ruby30-rails-61: is_main_build: false - - build-ruby30-rails-7_0_3: + - build-ruby30-rails-70: is_main_build: false - - build-ruby31-rails-6_0_5: + - build-ruby31-rails-60: is_main_build: false - - build-ruby31-rails-6_1_6: + - build-ruby31-rails-61: is_main_build: false - - build-ruby31-rails-7_0_3: + - build-ruby31-rails-70: is_main_build: true - upload-coverage: requires: - - build-ruby31-rails-7_0_3 + - build-ruby31-rails-70 - tests: requires: - - build-ruby26-rails-5_1_7 + - build-ruby26-rails-51 - - build-ruby26-rails-5_2_8 + - build-ruby26-rails-52 - - build-ruby26-rails-6_0_5 + - build-ruby26-rails-60 - - build-ruby26-rails-6_1_6 + - build-ruby26-rails-61 - - build-ruby27-rails-5_1_7 + - build-ruby27-rails-51 - - build-ruby27-rails-5_2_8 + - build-ruby27-rails-52 - - build-ruby27-rails-6_0_5 + - build-ruby27-rails-60 - - build-ruby27-rails-6_1_6 + - build-ruby27-rails-61 - - build-ruby27-rails-7_0_3 + - build-ruby27-rails-70 - - build-ruby30-rails-6_0_5 + - build-ruby30-rails-60 - - build-ruby30-rails-6_1_6 + - build-ruby30-rails-61 - - build-ruby30-rails-7_0_3 + - build-ruby30-rails-70 - - build-ruby31-rails-6_0_5 + - build-ruby31-rails-60 - - build-ruby31-rails-6_1_6 + - build-ruby31-rails-61 - - build-ruby31-rails-7_0_3 + - build-ruby31-rails-70 diff --git a/.circleci/config.yml.erb b/.circleci/config.yml.erb index 6d7b7f0c..799bf4f1 100644 --- a/.circleci/config.yml.erb +++ b/.circleci/config.yml.erb @@ -3,35 +3,29 @@ # rake circleci # <% - rails51 = '5.1.7' - rails52 = '5.2.8' - rails60 = '6.0.5' - rails61 = '6.1.6' - rails70 = '7.0.3' - builds = [ # 2.6 - ['2.6', rails51], - ['2.6', rails52], - ['2.6', rails60], - ['2.6', rails61], + %w[2.6 5.1], + %w[2.6 5.2], + %w[2.6 6.0], + %w[2.6 6.1], # 2.7 - ['2.7', rails51], - ['2.7', rails52], - ['2.7', rails60], - ['2.7', rails61], - ['2.7', rails70], + %w[2.7 5.1], + %w[2.7 5.2], + %w[2.7 6.0], + %w[2.7 6.1], + %w[2.7 7.0], # 3.0 - ['3.0', rails60], - ['3.0', rails61], - ['3.0', rails70], + %w[3.0 6.0], + %w[3.0 6.1], + %w[3.0 7.0], # 3.1 - ['3.1', rails60], - ['3.1', rails61], - ['3.1', rails70, true], + %w[3.1 6.0], + %w[3.1 6.1], + ['3.1', '7.0', true], ] main_build = builds.find { |_, _, is_main_build| is_main_build } @@ -54,15 +48,15 @@ shared_build_steps: &shared_build_steps - run: name: Storing Rails Version command: | - echo "$RUBY_VERSION/$RAILS_VERSION" > RAILS_VERSION - cat RAILS_VERSION + echo "$RUBY_VERSION/$BUNDLE_GEMFILE" > CACHE_ENV_VERSION + cat CACHE_ENV_VERSION # Download and cache dependencies - restore_cache: keys: - - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "RAILS_VERSION" }}-{{ checksum "Gemfile" }}-{{ checksum "meta-tags.gemspec" }} + - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum .Environment.BUNDLE_GEMFILE }}-{{ checksum "meta-tags.gemspec" }} # fallback to using the latest cache if no exact match is found - - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "RAILS_VERSION" }} + - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }} - run: name: Installing Dependencies @@ -73,7 +67,7 @@ shared_build_steps: &shared_build_steps - save_cache: paths: - ./vendor/bundle - key: dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "RAILS_VERSION" }}-{{ checksum "Gemfile" }}-{{ checksum "meta-tags.gemspec" }} + key: dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum .Environment.BUNDLE_GEMFILE }}-{{ checksum "meta-tags.gemspec" }} # run tests! - run: @@ -122,7 +116,7 @@ shared_build_steps: &shared_build_steps jobs: <% builds.each do |ruby_version, rails_version, is_main_build| %> - build-ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version.tr('.', '_') %>: + build-ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version.tr('.', '') %>: parameters: is_main_build: type: boolean @@ -130,10 +124,10 @@ jobs: docker: - image: cimg/ruby:<%= ruby_version %> environment: - RAILS_VERSION: <%= rails_version %> + BUNDLE_GEMFILE: gemfiles/rails_<%= rails_version %>.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: <%= is_main_build ? 0 : 1 %> - working_directory: ~/meta-tags/ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version %> + working_directory: ~/meta-tags/ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version.tr('.', '') %> steps: *shared_build_steps <% end %> @@ -147,7 +141,7 @@ jobs: - run: name: Uploading Code Coverage command: | - cd /tmp/workspace/ruby<%= main_build[0].tr('.', '') %>-rails-<%= main_build[1] %> + cd /tmp/workspace/ruby<%= main_build[0].tr('.', '') %>-rails-<%= main_build[1].tr('.', '') %> ./cc-test-reporter upload-coverage --input coverage/codeclimate.coverage.json || true tests: docker: @@ -162,16 +156,16 @@ workflows: test: jobs: <% builds.each do |ruby_version, rails_version, is_main_build| %> - - build-ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version.tr('.', '_') %>: + - build-ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version.tr('.', '') %>: is_main_build: <%= !!is_main_build %> <% end %> - upload-coverage: requires: - - build-ruby<%= main_build[0].tr('.', '') %>-rails-<%= main_build[1].tr('.', '_') %> + - build-ruby<%= main_build[0].tr('.', '') %>-rails-<%= main_build[1].tr('.', '') %> - tests: requires: <% builds.each do |ruby_version, rails_version| %> - - build-ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version.tr('.', '_') %> + - build-ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version.tr('.', '') %> <% end %> diff --git a/.gitignore b/.gitignore index 57a96b51..f02c3caf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .DS_Store .bundle Gemfile.lock +gemfiles/*.gemfile.lock .ruby-gemset coverage doc @@ -9,4 +10,4 @@ pkg *.gem .idea log/ -tmp/ \ No newline at end of file +tmp/ diff --git a/Appraisals b/Appraisals new file mode 100644 index 00000000..d15609fa --- /dev/null +++ b/Appraisals @@ -0,0 +1,30 @@ +# Uncomment after Appraisal 2.4.2+ is released +# customize_gemfiles do +# { +# heading: <<~HEADING +# frozen_string_literal: true +# +# File has been generated by Appraisal, do NOT modify it directly! +# HEADING +# } +# end + +appraise "rails-5.1" do + gem "railties", "5.1.7" +end + +appraise "rails-5.2" do + gem "railties", "5.2.8.1" +end + +appraise "rails-6.0" do + gem "railties", "6.0.6" +end + +appraise "rails-6.1" do + gem "railties", "6.1.7" +end + +appraise "rails-7.0" do + gem "railties", "7.0.4" +end diff --git a/Gemfile b/Gemfile index 32ae0556..6047aa3d 100644 --- a/Gemfile +++ b/Gemfile @@ -2,13 +2,10 @@ source "https://rubygems.org" -# Specify your gem's dependencies in meta-tags.gemspec +# Specify gem's dependencies in meta-tags.gemspec gemspec -if ENV["RAILS_VERSION"] - # Install specified version of actionpack if requested - gem "railties", "~> #{ENV["RAILS_VERSION"]}" -end +gem "railties", "~> 7.0.4" unless ENV["NO_STEEP"] == "1" # Ruby typings diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile new file mode 100644 index 00000000..0c23c2b9 --- /dev/null +++ b/gemfiles/rails_5.1.gemfile @@ -0,0 +1,17 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "railties", "5.1.7" +gem "steep", "~> 1.3.0", platform: :mri + +group :test do + gem "standard" + gem "rubocop-rails" + gem "rubocop-rake" + gem "rubocop-rspec", require: false + gem "simplecov", "~> 0.21.2" + gem "rspec_junit_formatter" +end + +gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile new file mode 100644 index 00000000..a0073ba8 --- /dev/null +++ b/gemfiles/rails_5.2.gemfile @@ -0,0 +1,17 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "railties", "5.2.8.1" +gem "steep", "~> 1.3.0", platform: :mri + +group :test do + gem "standard" + gem "rubocop-rails" + gem "rubocop-rake" + gem "rubocop-rspec", require: false + gem "simplecov", "~> 0.21.2" + gem "rspec_junit_formatter" +end + +gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile new file mode 100644 index 00000000..87730d24 --- /dev/null +++ b/gemfiles/rails_6.0.gemfile @@ -0,0 +1,17 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "railties", "6.0.6" +gem "steep", "~> 1.3.0", platform: :mri + +group :test do + gem "standard" + gem "rubocop-rails" + gem "rubocop-rake" + gem "rubocop-rspec", require: false + gem "simplecov", "~> 0.21.2" + gem "rspec_junit_formatter" +end + +gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile new file mode 100644 index 00000000..ddeab309 --- /dev/null +++ b/gemfiles/rails_6.1.gemfile @@ -0,0 +1,17 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "railties", "6.1.7" +gem "steep", "~> 1.3.0", platform: :mri + +group :test do + gem "standard" + gem "rubocop-rails" + gem "rubocop-rake" + gem "rubocop-rspec", require: false + gem "simplecov", "~> 0.21.2" + gem "rspec_junit_formatter" +end + +gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile new file mode 100644 index 00000000..1f8662c4 --- /dev/null +++ b/gemfiles/rails_7.0.gemfile @@ -0,0 +1,17 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "railties", "7.0.4" +gem "steep", "~> 1.3.0", platform: :mri + +group :test do + gem "standard" + gem "rubocop-rails" + gem "rubocop-rake" + gem "rubocop-rspec", require: false + gem "simplecov", "~> 0.21.2" + gem "rspec_junit_formatter" +end + +gemspec path: "../" diff --git a/meta-tags.gemspec b/meta-tags.gemspec index c91aef84..71b5ba8b 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -29,6 +29,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "rspec", "~> 3.12.0" spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0" spec.add_development_dependency "standard", "~> 1.18.1" + spec.add_development_dependency "appraisal", "~> 2.4.1" spec.cert_chain = ["certs/kpumuk.pem"] spec.signing_key = File.expand_path("~/.ssh/gem-kpumuk.pem") if $PROGRAM_NAME.end_with?("gem") From fc64f1cad7be23650f065978cb0ef3d2c1b2161d Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 3 Dec 2022 13:28:52 -0500 Subject: [PATCH 015/126] Tricking CircleCI into using cache based on the contents of the Gemfile for current Rails version --- .circleci/config.yml | 8 ++++++-- .circleci/config.yml.erb | 8 ++++++-- Appraisals | 11 +---------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5cce2063..0f39c275 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,11 +23,15 @@ shared_build_steps: &shared_build_steps command: | echo "$RUBY_VERSION/$BUNDLE_GEMFILE" > CACHE_ENV_VERSION cat CACHE_ENV_VERSION + # To generate cache checksum, we need a static file, but Gemfile is + # based on the Rails version we're testing against. This step just puts + # a dynamicly identified file into a known path. + cat "$BUNDLE_GEMFILE" > CACHE_GEMFILE # Download and cache dependencies - restore_cache: keys: - - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum .Environment.BUNDLE_GEMFILE }}-{{ checksum "meta-tags.gemspec" }} + - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum "CACHE_GEMFILE" }}-{{ checksum "meta-tags.gemspec" }} # fallback to using the latest cache if no exact match is found - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }} @@ -40,7 +44,7 @@ shared_build_steps: &shared_build_steps - save_cache: paths: - ./vendor/bundle - key: dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum .Environment.BUNDLE_GEMFILE }}-{{ checksum "meta-tags.gemspec" }} + key: dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum "CACHE_GEMFILE" }}-{{ checksum "meta-tags.gemspec" }} # run tests! - run: diff --git a/.circleci/config.yml.erb b/.circleci/config.yml.erb index 799bf4f1..3abd9d49 100644 --- a/.circleci/config.yml.erb +++ b/.circleci/config.yml.erb @@ -50,11 +50,15 @@ shared_build_steps: &shared_build_steps command: | echo "$RUBY_VERSION/$BUNDLE_GEMFILE" > CACHE_ENV_VERSION cat CACHE_ENV_VERSION + # To generate cache checksum, we need a static file, but Gemfile is + # based on the Rails version we're testing against. This step just puts + # a dynamicly identified file into a known path. + cat "$BUNDLE_GEMFILE" > CACHE_GEMFILE # Download and cache dependencies - restore_cache: keys: - - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum .Environment.BUNDLE_GEMFILE }}-{{ checksum "meta-tags.gemspec" }} + - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum "CACHE_GEMFILE" }}-{{ checksum "meta-tags.gemspec" }} # fallback to using the latest cache if no exact match is found - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }} @@ -67,7 +71,7 @@ shared_build_steps: &shared_build_steps - save_cache: paths: - ./vendor/bundle - key: dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum .Environment.BUNDLE_GEMFILE }}-{{ checksum "meta-tags.gemspec" }} + key: dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum "CACHE_GEMFILE" }}-{{ checksum "meta-tags.gemspec" }} # run tests! - run: diff --git a/Appraisals b/Appraisals index d15609fa..085bd5ca 100644 --- a/Appraisals +++ b/Appraisals @@ -1,13 +1,4 @@ -# Uncomment after Appraisal 2.4.2+ is released -# customize_gemfiles do -# { -# heading: <<~HEADING -# frozen_string_literal: true -# -# File has been generated by Appraisal, do NOT modify it directly! -# HEADING -# } -# end +# frozen_string_literal: true appraise "rails-5.1" do gem "railties", "5.1.7" From a32033fdf593e6e249c8d3d13af294d094e5ba29 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 3 Dec 2022 14:32:14 -0500 Subject: [PATCH 016/126] Added edge version of Rails into build matrix (7.1) --- .circleci/config.yml | 57 ++++++++++++++++++++++++++++++++++++++ .circleci/config.yml.erb | 3 ++ Appraisals | 4 +++ gemfiles/rails_7.1.gemfile | 17 ++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 gemfiles/rails_7.1.gemfile diff --git a/.circleci/config.yml b/.circleci/config.yml index 0f39c275..0b741ae6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -219,6 +219,20 @@ jobs: working_directory: ~/meta-tags/ruby27-rails-70 steps: *shared_build_steps + build-ruby27-rails-71: + parameters: + is_main_build: + type: boolean + default: false + docker: + - image: cimg/ruby:2.7 + environment: + BUNDLE_GEMFILE: gemfiles/rails_7.1.gemfile + ENABLE_CODE_COVERAGE: 1 + NO_STEEP: 1 + working_directory: ~/meta-tags/ruby27-rails-71 + steps: *shared_build_steps + build-ruby30-rails-60: parameters: is_main_build: @@ -261,6 +275,20 @@ jobs: working_directory: ~/meta-tags/ruby30-rails-70 steps: *shared_build_steps + build-ruby30-rails-71: + parameters: + is_main_build: + type: boolean + default: false + docker: + - image: cimg/ruby:3.0 + environment: + BUNDLE_GEMFILE: gemfiles/rails_7.1.gemfile + ENABLE_CODE_COVERAGE: 1 + NO_STEEP: 1 + working_directory: ~/meta-tags/ruby30-rails-71 + steps: *shared_build_steps + build-ruby31-rails-60: parameters: is_main_build: @@ -303,6 +331,20 @@ jobs: working_directory: ~/meta-tags/ruby31-rails-70 steps: *shared_build_steps + build-ruby31-rails-71: + parameters: + is_main_build: + type: boolean + default: false + docker: + - image: cimg/ruby:3.1 + environment: + BUNDLE_GEMFILE: gemfiles/rails_7.1.gemfile + ENABLE_CODE_COVERAGE: 1 + NO_STEEP: 1 + working_directory: ~/meta-tags/ruby31-rails-71 + steps: *shared_build_steps + upload-coverage: docker: @@ -356,6 +398,9 @@ workflows: - build-ruby27-rails-70: is_main_build: false + - build-ruby27-rails-71: + is_main_build: false + - build-ruby30-rails-60: is_main_build: false @@ -365,6 +410,9 @@ workflows: - build-ruby30-rails-70: is_main_build: false + - build-ruby30-rails-71: + is_main_build: false + - build-ruby31-rails-60: is_main_build: false @@ -374,6 +422,9 @@ workflows: - build-ruby31-rails-70: is_main_build: true + - build-ruby31-rails-71: + is_main_build: false + - upload-coverage: requires: @@ -400,15 +451,21 @@ workflows: - build-ruby27-rails-70 + - build-ruby27-rails-71 + - build-ruby30-rails-60 - build-ruby30-rails-61 - build-ruby30-rails-70 + - build-ruby30-rails-71 + - build-ruby31-rails-60 - build-ruby31-rails-61 - build-ruby31-rails-70 + - build-ruby31-rails-71 + diff --git a/.circleci/config.yml.erb b/.circleci/config.yml.erb index 3abd9d49..ab57d12a 100644 --- a/.circleci/config.yml.erb +++ b/.circleci/config.yml.erb @@ -16,16 +16,19 @@ %w[2.7 6.0], %w[2.7 6.1], %w[2.7 7.0], + %w[2.7 7.1], # 3.0 %w[3.0 6.0], %w[3.0 6.1], %w[3.0 7.0], + %w[3.0 7.1], # 3.1 %w[3.1 6.0], %w[3.1 6.1], ['3.1', '7.0', true], + %w[3.1 7.1], ] main_build = builds.find { |_, _, is_main_build| is_main_build } diff --git a/Appraisals b/Appraisals index 085bd5ca..e9fffaae 100644 --- a/Appraisals +++ b/Appraisals @@ -19,3 +19,7 @@ end appraise "rails-7.0" do gem "railties", "7.0.4" end + +appraise "rails-7.1" do + gem "railties", github: "rails" +end diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile new file mode 100644 index 00000000..e93e874a --- /dev/null +++ b/gemfiles/rails_7.1.gemfile @@ -0,0 +1,17 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "railties", github: "rails" +gem "steep", "~> 1.3.0", platform: :mri + +group :test do + gem "standard" + gem "rubocop-rails" + gem "rubocop-rake" + gem "rubocop-rspec", require: false + gem "simplecov", "~> 0.21.2" + gem "rspec_junit_formatter" +end + +gemspec path: "../" From 7a9bbc8f4a223245987f42ff818517c6cc42f743 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 3 Dec 2022 14:32:44 -0500 Subject: [PATCH 017/126] ActiveSupport.on_load executes the block in the context of the loaded module --- lib/meta_tags/railtie.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/meta_tags/railtie.rb b/lib/meta_tags/railtie.rb index 05dc6b18..2b27d139 100644 --- a/lib/meta_tags/railtie.rb +++ b/lib/meta_tags/railtie.rb @@ -4,13 +4,13 @@ module MetaTags class Railtie < Rails::Railtie initializer "meta_tags.setup_action_controller" do ActiveSupport.on_load :action_controller do - ActionController::Base.include MetaTags::ControllerHelper + include MetaTags::ControllerHelper end end initializer "meta_tags.setup_action_view" do ActiveSupport.on_load :action_view do - ActionView::Base.include MetaTags::ViewHelper + include MetaTags::ViewHelper end end end From c1bc63b2f07857fdd16f5090ee1e5cc261accb09 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 3 Dec 2022 15:04:27 -0500 Subject: [PATCH 018/126] Follow Ruby style guide in the circledi/config.yml.erb template --- .circleci/config.yml | 6 +++--- .circleci/config.yml.erb | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0b741ae6..d4b8019f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,8 +24,8 @@ shared_build_steps: &shared_build_steps echo "$RUBY_VERSION/$BUNDLE_GEMFILE" > CACHE_ENV_VERSION cat CACHE_ENV_VERSION # To generate cache checksum, we need a static file, but Gemfile is - # based on the Rails version we're testing against. This step just puts - # a dynamicly identified file into a known path. + # based on the Rails version we are testing against. This step just puts + # a dynamically identified file into a known path. cat "$BUNDLE_GEMFILE" > CACHE_GEMFILE # Download and cache dependencies @@ -364,7 +364,7 @@ jobs: steps: - run: name: All tests succeeded - command: ':' + command: ":" workflows: version: 2 diff --git a/.circleci/config.yml.erb b/.circleci/config.yml.erb index ab57d12a..acf5dfff 100644 --- a/.circleci/config.yml.erb +++ b/.circleci/config.yml.erb @@ -27,7 +27,7 @@ # 3.1 %w[3.1 6.0], %w[3.1 6.1], - ['3.1', '7.0', true], + ["3.1", "7.0", true], %w[3.1 7.1], ] @@ -54,8 +54,8 @@ shared_build_steps: &shared_build_steps echo "$RUBY_VERSION/$BUNDLE_GEMFILE" > CACHE_ENV_VERSION cat CACHE_ENV_VERSION # To generate cache checksum, we need a static file, but Gemfile is - # based on the Rails version we're testing against. This step just puts - # a dynamicly identified file into a known path. + # based on the Rails version we are testing against. This step just puts + # a dynamically identified file into a known path. cat "$BUNDLE_GEMFILE" > CACHE_GEMFILE # Download and cache dependencies @@ -123,7 +123,7 @@ shared_build_steps: &shared_build_steps jobs: <% builds.each do |ruby_version, rails_version, is_main_build| %> - build-ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version.tr('.', '') %>: + build-ruby<%= ruby_version.delete(".") %>-rails-<%= rails_version.delete(".") %>: parameters: is_main_build: type: boolean @@ -134,7 +134,7 @@ jobs: BUNDLE_GEMFILE: gemfiles/rails_<%= rails_version %>.gemfile ENABLE_CODE_COVERAGE: 1 NO_STEEP: <%= is_main_build ? 0 : 1 %> - working_directory: ~/meta-tags/ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version.tr('.', '') %> + working_directory: ~/meta-tags/ruby<%= ruby_version.delete(".") %>-rails-<%= rails_version.delete(".") %> steps: *shared_build_steps <% end %> @@ -148,7 +148,7 @@ jobs: - run: name: Uploading Code Coverage command: | - cd /tmp/workspace/ruby<%= main_build[0].tr('.', '') %>-rails-<%= main_build[1].tr('.', '') %> + cd /tmp/workspace/ruby<%= main_build[0].delete(".") %>-rails-<%= main_build[1].delete(".") %> ./cc-test-reporter upload-coverage --input coverage/codeclimate.coverage.json || true tests: docker: @@ -156,23 +156,23 @@ jobs: steps: - run: name: All tests succeeded - command: ':' + command: ":" workflows: version: 2 test: jobs: <% builds.each do |ruby_version, rails_version, is_main_build| %> - - build-ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version.tr('.', '') %>: + - build-ruby<%= ruby_version.delete(".") %>-rails-<%= rails_version.delete(".") %>: is_main_build: <%= !!is_main_build %> <% end %> - upload-coverage: requires: - - build-ruby<%= main_build[0].tr('.', '') %>-rails-<%= main_build[1].tr('.', '') %> + - build-ruby<%= main_build[0].delete(".") %>-rails-<%= main_build[1].delete(".") %> - tests: requires: <% builds.each do |ruby_version, rails_version| %> - - build-ruby<%= ruby_version.tr('.', '') %>-rails-<%= rails_version.tr('.', '') %> + - build-ruby<%= ruby_version.delete(".") %>-rails-<%= rails_version.delete(".") %> <% end %> From 6d215532f5df402ceecc67115b10809b924ffdb2 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 3 Dec 2022 15:39:46 -0500 Subject: [PATCH 019/126] Specify full path to vendor/bundle When relative path specified, it will be calculated from the path of the Gemfile, which is "gemfiles/*" with Appraisal. This breaks caching logic in CircleCI --- .circleci/config.yml | 2 +- .circleci/config.yml.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d4b8019f..85bacf45 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,7 +38,7 @@ shared_build_steps: &shared_build_steps - run: name: Installing Dependencies command: | - bundle config set --local path vendor/bundle + bundle config set --local path "${PWD}/vendor/bundle" bundle check || (bundle install --jobs=4 --retry=3 && bundle clean) - save_cache: diff --git a/.circleci/config.yml.erb b/.circleci/config.yml.erb index acf5dfff..0d46305f 100644 --- a/.circleci/config.yml.erb +++ b/.circleci/config.yml.erb @@ -68,7 +68,7 @@ shared_build_steps: &shared_build_steps - run: name: Installing Dependencies command: | - bundle config set --local path vendor/bundle + bundle config set --local path "${PWD}/vendor/bundle" bundle check || (bundle install --jobs=4 --retry=3 && bundle clean) - save_cache: From 79d6dd31efa0b762e4cf9a5210506afab43a8c36 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 3 Dec 2022 15:51:10 -0500 Subject: [PATCH 020/126] Updated changelog with information about Appraisal --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c59d9a3..54f4ef4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ Changes: -- Switched code style from custom rules to Standard ([246](https://github.com/kpumuk/meta-tags/pull/246)). +- Switched code style from custom rules to Standard ([246](https://github.com/kpumuk/meta-tags/pull/251)). +- Switched from testing Rails using environment variables to Appraisal gem ([251](https://github.com/kpumuk/meta-tags/pull/247)). ## 2.18.0 (September 15, 2022) [☰](https://github.com/kpumuk/meta-tags/compare/v2.17.0...v2.18.0) From 832856e9d9f9833c9d35844198d4703f5b355b06 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 3 Dec 2022 17:59:52 -0500 Subject: [PATCH 021/126] List all dependencies in the gemspec instead of Gemfile --- Gemfile | 17 ----------------- gemfiles/rails_5.1.gemfile | 11 +---------- gemfiles/rails_5.2.gemfile | 11 +---------- gemfiles/rails_6.0.gemfile | 11 +---------- gemfiles/rails_6.1.gemfile | 11 +---------- gemfiles/rails_7.0.gemfile | 11 +---------- gemfiles/rails_7.1.gemfile | 11 +---------- meta-tags.gemspec | 9 ++++++++- 8 files changed, 14 insertions(+), 78 deletions(-) diff --git a/Gemfile b/Gemfile index 6047aa3d..6d7c072a 100644 --- a/Gemfile +++ b/Gemfile @@ -5,24 +5,7 @@ source "https://rubygems.org" # Specify gem's dependencies in meta-tags.gemspec gemspec -gem "railties", "~> 7.0.4" - unless ENV["NO_STEEP"] == "1" # Ruby typings gem "steep", "~> 1.3.0", platform: :mri end - -group :test do - # Ruby Style Guide, with linter & automatic code fixer - gem "standard" - # Cops for rails apps - gem "rubocop-rails" - # Cops for rake tasks - gem "rubocop-rake" - # Apply RSpec rubocop cops - gem "rubocop-rspec", require: false - # We use this gem on CI to calculate code coverage. - gem "simplecov", "~> 0.21.2" - # Format RSpec output for CircleCI - gem "rspec_junit_formatter" -end diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 0c23c2b9..94d09d31 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -2,16 +2,7 @@ source "https://rubygems.org" -gem "railties", "5.1.7" gem "steep", "~> 1.3.0", platform: :mri - -group :test do - gem "standard" - gem "rubocop-rails" - gem "rubocop-rake" - gem "rubocop-rspec", require: false - gem "simplecov", "~> 0.21.2" - gem "rspec_junit_formatter" -end +gem "railties", "5.1.7" gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index a0073ba8..44c76276 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -2,16 +2,7 @@ source "https://rubygems.org" -gem "railties", "5.2.8.1" gem "steep", "~> 1.3.0", platform: :mri - -group :test do - gem "standard" - gem "rubocop-rails" - gem "rubocop-rake" - gem "rubocop-rspec", require: false - gem "simplecov", "~> 0.21.2" - gem "rspec_junit_formatter" -end +gem "railties", "5.2.8.1" gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 87730d24..872058b1 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -2,16 +2,7 @@ source "https://rubygems.org" -gem "railties", "6.0.6" gem "steep", "~> 1.3.0", platform: :mri - -group :test do - gem "standard" - gem "rubocop-rails" - gem "rubocop-rake" - gem "rubocop-rspec", require: false - gem "simplecov", "~> 0.21.2" - gem "rspec_junit_formatter" -end +gem "railties", "6.0.6" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index ddeab309..3994a1dc 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -2,16 +2,7 @@ source "https://rubygems.org" -gem "railties", "6.1.7" gem "steep", "~> 1.3.0", platform: :mri - -group :test do - gem "standard" - gem "rubocop-rails" - gem "rubocop-rake" - gem "rubocop-rspec", require: false - gem "simplecov", "~> 0.21.2" - gem "rspec_junit_formatter" -end +gem "railties", "6.1.7" gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 1f8662c4..1bb3ea66 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -2,16 +2,7 @@ source "https://rubygems.org" -gem "railties", "7.0.4" gem "steep", "~> 1.3.0", platform: :mri - -group :test do - gem "standard" - gem "rubocop-rails" - gem "rubocop-rake" - gem "rubocop-rspec", require: false - gem "simplecov", "~> 0.21.2" - gem "rspec_junit_formatter" -end +gem "railties", "7.0.4" gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index e93e874a..556b0bd8 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -2,16 +2,7 @@ source "https://rubygems.org" -gem "railties", github: "rails" gem "steep", "~> 1.3.0", platform: :mri - -group :test do - gem "standard" - gem "rubocop-rails" - gem "rubocop-rake" - gem "rubocop-rspec", require: false - gem "simplecov", "~> 0.21.2" - gem "rspec_junit_formatter" -end +gem "railties", github: "rails" gemspec path: "../" diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 71b5ba8b..87009cd3 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -28,8 +28,15 @@ Gem::Specification.new do |spec| spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "rspec", "~> 3.12.0" spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0" - spec.add_development_dependency "standard", "~> 1.18.1" spec.add_development_dependency "appraisal", "~> 2.4.1" + spec.add_development_dependency "simplecov", "~> 0.21.2" + # Code style + spec.add_development_dependency "standard", "~> 1.18.1" + spec.add_development_dependency "rubocop-rails", "~> 2.17.3" + spec.add_development_dependency "rubocop-rake", "~> 0.6.0" + spec.add_development_dependency "rubocop-rspec", "~> 2.15.0" + # Format RSpec output for CircleCI + spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" spec.cert_chain = ["certs/kpumuk.pem"] spec.signing_key = File.expand_path("~/.ssh/gem-kpumuk.pem") if $PROGRAM_NAME.end_with?("gem") From 29e2c20b108f27e45e3939a40c7712aba61b3026 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 3 Dec 2022 18:11:23 -0500 Subject: [PATCH 022/126] Added rubocop-performance to check for obvious performance issues --- .rubocop.yml | 1 + meta-tags.gemspec | 1 + 2 files changed, 2 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index a1e93626..a906441b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,6 @@ require: - standard + - rubocop-performance - rubocop-rails - rubocop-rake - rubocop-rspec diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 87009cd3..d6586175 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -32,6 +32,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "simplecov", "~> 0.21.2" # Code style spec.add_development_dependency "standard", "~> 1.18.1" + spec.add_development_dependency "rubocop-performance", "~> 1.15.1" spec.add_development_dependency "rubocop-rails", "~> 2.17.3" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" spec.add_development_dependency "rubocop-rspec", "~> 2.15.0" From 5ff25a5bf6f961aa085f999dec7faf50110f7bf0 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 3 Dec 2022 18:11:57 -0500 Subject: [PATCH 023/126] Addressed RSpec/NoExpectationExample complaint on test_hashes_and_arrays --- .rubocop.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index a906441b..3eef5908 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -48,6 +48,10 @@ RSpec/ExampleLength: RSpec/VerifiedDoubles: Enabled: false +RSpec/NoExpectationExample: + AllowedPatterns: + - test_hashes_and_arrays + #------------------------------------------------------------------------------- # Disabled rules #------------------------------------------------------------------------------- From be0a26308a9cd9746882e90c6795f7b3be08cfc9 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Mon, 16 Jan 2023 21:45:09 -0500 Subject: [PATCH 024/126] Initialize Rails application in tests before defining the controller to load controller helpers --- spec/support/initialize_rails.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/spec/support/initialize_rails.rb b/spec/support/initialize_rails.rb index b2cae75f..b1b44f26 100644 --- a/spec/support/initialize_rails.rb +++ b/spec/support/initialize_rails.rb @@ -17,9 +17,10 @@ class Application < Rails::Application config.eager_load = false end - class MetaTagsController < ActionController::Base - include MetaTags::ControllerHelper + # Alright, we're all set. Let's boot! + Rails.application.initialize! + class MetaTagsController < ActionController::Base def index @page_title = "title" @page_keywords = "key1, key2, key3" @@ -47,6 +48,3 @@ class MetaTagsView < ActionView::Base include MetaTags::ViewHelper end end - -# Alright, we're all set. Let's boot! -Rails.application.initialize! From 37784e8715e53043e6a297fdc20f64032eaaa573 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Mon, 16 Jan 2023 21:45:33 -0500 Subject: [PATCH 025/126] Switching from direct request/response assignment to set_request!/set_response! --- spec/controller_helper_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/controller_helper_spec.rb b/spec/controller_helper_spec.rb index 35e4e689..627e7e04 100644 --- a/spec/controller_helper_spec.rb +++ b/spec/controller_helper_spec.rb @@ -5,8 +5,8 @@ RSpec.describe MetaTags::ControllerHelper do subject do MetaTagsRailsApp::MetaTagsController.new.tap do |c| - c.request = ActionDispatch::TestRequest.create - c.response = ActionDispatch::TestResponse.new + c.set_request! ActionDispatch::TestRequest.create + c.set_response! ActionDispatch::TestResponse.new end end From 06e021dda14a9322bdd244c5b66a90322cb1deb3 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 14 Jan 2023 20:58:12 -0500 Subject: [PATCH 026/126] Switching from Rubocop to Standard completely --- .rubocop-rails.yml | 17 ++++++++++++++ .rubocop-rake.yml | 6 +++++ .rubocop.yml => .rubocop-rspec.yml | 35 ++-------------------------- .standard.yml | 5 ++++ meta-tags.gemspec | 7 +++--- spec/controller_helper_spec.rb | 2 +- spec/view_helper/description_spec.rb | 2 +- spec/view_helper/title_spec.rb | 2 +- 8 files changed, 36 insertions(+), 40 deletions(-) create mode 100644 .rubocop-rails.yml create mode 100644 .rubocop-rake.yml rename .rubocop.yml => .rubocop-rspec.yml (50%) create mode 100644 .standard.yml diff --git a/.rubocop-rails.yml b/.rubocop-rails.yml new file mode 100644 index 00000000..f344239a --- /dev/null +++ b/.rubocop-rails.yml @@ -0,0 +1,17 @@ +require: + - rubocop-rails + +inherit_gem: + rubocop-rails: + - config/default.yml + +AllCops: + TargetRailsVersion: 5.1 + +# Do not require loading Rails environment for Rake tasks as we are not a Rails application. +Rails/RakeEnvironment: + Enabled: false + +# Do not require subclassing from ApplicationController as we're not a rails application +Rails/ApplicationController: + Enabled: false diff --git a/.rubocop-rake.yml b/.rubocop-rake.yml new file mode 100644 index 00000000..8b952916 --- /dev/null +++ b/.rubocop-rake.yml @@ -0,0 +1,6 @@ +require: + - rubocop-rake + +inherit_gem: + rubocop-rake: + - config/default.yml diff --git a/.rubocop.yml b/.rubocop-rspec.yml similarity index 50% rename from .rubocop.yml rename to .rubocop-rspec.yml index 3eef5908..3bb1b340 100644 --- a/.rubocop.yml +++ b/.rubocop-rspec.yml @@ -1,28 +1,9 @@ require: - - standard - - rubocop-performance - - rubocop-rails - - rubocop-rake - rubocop-rspec inherit_gem: - standard: config/base.yml - -AllCops: - # Enable all the rules by default - EnabledByDefault: true - # Command line rubocop options - ExtraDetails: true - DisplayStyleGuide: true - DisplayCopNames: true - SuggestExtensions: false - # Target versions - TargetRubyVersion: 2.6 - TargetRailsVersion: 5.1 - -#------------------------------------------------------------------------------- -# RSpec rules -#------------------------------------------------------------------------------- + rubocop-rspec: + - config/default.yml RSpec/MultipleExpectations: Max: 7 @@ -51,15 +32,3 @@ RSpec/VerifiedDoubles: RSpec/NoExpectationExample: AllowedPatterns: - test_hashes_and_arrays - -#------------------------------------------------------------------------------- -# Disabled rules -#------------------------------------------------------------------------------- - -# Do not require loading Rails enviroment for Rake tasks as we are not a Rails application. -Rails/RakeEnvironment: - Enabled: false - -# Do not require subclassing from ApplicationController as we're not a rails application -Rails/ApplicationController: - Enabled: false diff --git a/.standard.yml b/.standard.yml new file mode 100644 index 00000000..f7a6f638 --- /dev/null +++ b/.standard.yml @@ -0,0 +1,5 @@ +ruby_version: 2.6.0 +extend_config: + - .rubocop-rake.yml + - .rubocop-rails.yml + - .rubocop-rspec.yml diff --git a/meta-tags.gemspec b/meta-tags.gemspec index d6586175..276efc82 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -29,13 +29,12 @@ Gem::Specification.new do |spec| spec.add_development_dependency "rspec", "~> 3.12.0" spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0" spec.add_development_dependency "appraisal", "~> 2.4.1" - spec.add_development_dependency "simplecov", "~> 0.21.2" + spec.add_development_dependency "simplecov", "~> 0.22.0" # Code style - spec.add_development_dependency "standard", "~> 1.18.1" - spec.add_development_dependency "rubocop-performance", "~> 1.15.1" + spec.add_development_dependency "standard", "~> 1.22.0" spec.add_development_dependency "rubocop-rails", "~> 2.17.3" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" - spec.add_development_dependency "rubocop-rspec", "~> 2.15.0" + spec.add_development_dependency "rubocop-rspec", "~> 2.17.0" # Format RSpec output for CircleCI spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" diff --git a/spec/controller_helper_spec.rb b/spec/controller_helper_spec.rb index 627e7e04..f3fbe292 100644 --- a/spec/controller_helper_spec.rb +++ b/spec/controller_helper_spec.rb @@ -11,7 +11,7 @@ end before do - skip("Does not work properly with RBS") if ENV["RBS_TEST_TARGET"] # rubocop:disable RSpec/Pending + skip("Does not work properly with RBS") if ENV["RBS_TEST_TARGET"] end describe "module" do diff --git a/spec/view_helper/description_spec.rb b/spec/view_helper/description_spec.rb index 1b2e5a33..0de886fd 100644 --- a/spec/view_helper/description_spec.rb +++ b/spec/view_helper/description_spec.rb @@ -86,7 +86,7 @@ end it "fails when title is not a String-like object" do - skip("Fails RBS") if ENV["RBS_TEST_TARGET"] # rubocop:disable RSpec/Pending + skip("Fails RBS") if ENV["RBS_TEST_TARGET"] expect { subject.display_meta_tags(description: 5) diff --git a/spec/view_helper/title_spec.rb b/spec/view_helper/title_spec.rb index b76a22e7..dc8dfd50 100644 --- a/spec/view_helper/title_spec.rb +++ b/spec/view_helper/title_spec.rb @@ -183,7 +183,7 @@ end it "fails when title is not a String-like object" do - skip("Fails RBS") if ENV["RBS_TEST_TARGET"] # rubocop:disable RSpec/Pending + skip("Fails RBS") if ENV["RBS_TEST_TARGET"] expect { subject.display_meta_tags(site: "someSite", title: 5) From 6c9492876c394189c7b473a905ed88aaa4937505 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Mon, 16 Jan 2023 21:02:11 -0500 Subject: [PATCH 027/126] Switching from andrewmcodes/standardrb-action to custom GitHub action as it does not support custom RuboCop extensions --- .github/workflows/standard.yml | 28 ++++++++++++++++++++++------ meta-tags.gemspec | 2 +- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.github/workflows/standard.yml b/.github/workflows/standard.yml index 76455619..357792f5 100644 --- a/.github/workflows/standard.yml +++ b/.github/workflows/standard.yml @@ -1,13 +1,29 @@ name: StandardRB -on: [push] +on: [push, pull_request] +env: + BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile jobs: build: runs-on: ubuntu-latest + steps: - - uses: actions/checkout@v1 - - name: StandardRB Linter - uses: andrewmcodes/standardrb-action@v1.0.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v3 + - name: Set up Ruby 3.2 + uses: ruby/setup-ruby@v1 + with: + ruby-version: 3.2.0 + - name: Cache gems + uses: actions/cache@v3 + with: + path: vendor/bundle + key: ${{ runner.os }}-rubocop-${{ hashFiles('gemfiles/rails_7.0.gemfile') }} + restore-keys: | + ${{ runner.os }}-rubocop- + - name: Install gems + run: | + bundle config path vendor/bundle + bundle install --jobs 4 --retry 3 + - name: Run StandardRB + run: bundle exec standardrb --parallel diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 276efc82..b1076921 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "standard", "~> 1.22.0" spec.add_development_dependency "rubocop-rails", "~> 2.17.3" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" - spec.add_development_dependency "rubocop-rspec", "~> 2.17.0" + spec.add_development_dependency "rubocop-rspec", "~> 2.18.0" # Format RSpec output for CircleCI spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" From 5eef51852ed681f8602644a31d5964f0ab829f9b Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Mon, 16 Jan 2023 21:09:26 -0500 Subject: [PATCH 028/126] Avoid GitHub actions run twice --- .github/workflows/standard.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/standard.yml b/.github/workflows/standard.yml index 357792f5..e80aadec 100644 --- a/.github/workflows/standard.yml +++ b/.github/workflows/standard.yml @@ -1,6 +1,9 @@ name: StandardRB -on: [push, pull_request] +on: + push: + pull_request: + types: [opened, reopened] env: BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile From da29aa011057f07712de385092eb88d9835b14a2 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Mon, 16 Jan 2023 21:09:46 -0500 Subject: [PATCH 029/126] Fixed cache path for the bundled gems on GitHub --- .github/workflows/standard.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/standard.yml b/.github/workflows/standard.yml index e80aadec..d51587b7 100644 --- a/.github/workflows/standard.yml +++ b/.github/workflows/standard.yml @@ -20,7 +20,7 @@ jobs: - name: Cache gems uses: actions/cache@v3 with: - path: vendor/bundle + path: gemfiles/vendor/bundle key: ${{ runner.os }}-rubocop-${{ hashFiles('gemfiles/rails_7.0.gemfile') }} restore-keys: | ${{ runner.os }}-rubocop- @@ -29,4 +29,5 @@ jobs: bundle config path vendor/bundle bundle install --jobs 4 --retry 3 - name: Run StandardRB - run: bundle exec standardrb --parallel + run: | + bundle exec standardrb From 7684e12a5e5ed7bd5b22924301470db580ef81ea Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Mon, 16 Jan 2023 21:11:47 -0500 Subject: [PATCH 030/126] Make sure bundled gems are not analyzed by StandardRB --- .standard.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.standard.yml b/.standard.yml index f7a6f638..9ae0900d 100644 --- a/.standard.yml +++ b/.standard.yml @@ -3,3 +3,5 @@ extend_config: - .rubocop-rake.yml - .rubocop-rails.yml - .rubocop-rspec.yml +ignore: + - "gemfiles/vendor/**/*" From 31817e13e05b80543865077d00b10e880011de23 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Mon, 16 Jan 2023 21:49:49 -0500 Subject: [PATCH 031/126] Check if all required gems are already in the cache --- .github/workflows/standard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/standard.yml b/.github/workflows/standard.yml index d51587b7..b151eb96 100644 --- a/.github/workflows/standard.yml +++ b/.github/workflows/standard.yml @@ -27,7 +27,7 @@ jobs: - name: Install gems run: | bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 + bundle check || (bundle install --jobs=4 --retry=3 && bundle clean) - name: Run StandardRB run: | bundle exec standardrb From b7496e396946aa853393329d60f03c961e34f4e5 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Tue, 17 Jan 2023 20:07:27 -0500 Subject: [PATCH 032/126] Standard now loads default configuration automatically --- .rubocop-rails.yml | 4 ---- .rubocop-rake.yml | 4 ---- .rubocop-rspec.yml | 4 ---- Gemfile | 2 ++ gemfiles/rails_5.1.gemfile | 1 + gemfiles/rails_5.2.gemfile | 1 + gemfiles/rails_6.0.gemfile | 1 + gemfiles/rails_6.1.gemfile | 1 + gemfiles/rails_7.0.gemfile | 1 + gemfiles/rails_7.1.gemfile | 1 + 10 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.rubocop-rails.yml b/.rubocop-rails.yml index f344239a..c6ee519b 100644 --- a/.rubocop-rails.yml +++ b/.rubocop-rails.yml @@ -1,10 +1,6 @@ require: - rubocop-rails -inherit_gem: - rubocop-rails: - - config/default.yml - AllCops: TargetRailsVersion: 5.1 diff --git a/.rubocop-rake.yml b/.rubocop-rake.yml index 8b952916..0395e899 100644 --- a/.rubocop-rake.yml +++ b/.rubocop-rake.yml @@ -1,6 +1,2 @@ require: - rubocop-rake - -inherit_gem: - rubocop-rake: - - config/default.yml diff --git a/.rubocop-rspec.yml b/.rubocop-rspec.yml index 3bb1b340..8798a2ca 100644 --- a/.rubocop-rspec.yml +++ b/.rubocop-rspec.yml @@ -1,10 +1,6 @@ require: - rubocop-rspec -inherit_gem: - rubocop-rspec: - - config/default.yml - RSpec/MultipleExpectations: Max: 7 diff --git a/Gemfile b/Gemfile index 6d7c072a..eca4e19c 100644 --- a/Gemfile +++ b/Gemfile @@ -9,3 +9,5 @@ unless ENV["NO_STEEP"] == "1" # Ruby typings gem "steep", "~> 1.3.0", platform: :mri end + +gem "standard", github: "palkan/standard", branch: "fix/extend-config-default-configuration-extensions" diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 94d09d31..3e85cc92 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -3,6 +3,7 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri +gem "standard", github: "palkan/standard", branch: "fix/extend-config-default-configuration-extensions" gem "railties", "5.1.7" gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index 44c76276..8cbaa721 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -3,6 +3,7 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri +gem "standard", github: "palkan/standard", branch: "fix/extend-config-default-configuration-extensions" gem "railties", "5.2.8.1" gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 872058b1..0ba56428 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -3,6 +3,7 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri +gem "standard", github: "palkan/standard", branch: "fix/extend-config-default-configuration-extensions" gem "railties", "6.0.6" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 3994a1dc..f05108e6 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -3,6 +3,7 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri +gem "standard", github: "palkan/standard", branch: "fix/extend-config-default-configuration-extensions" gem "railties", "6.1.7" gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 1bb3ea66..3d1b1546 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -3,6 +3,7 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri +gem "standard", github: "palkan/standard", branch: "fix/extend-config-default-configuration-extensions" gem "railties", "7.0.4" gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index 556b0bd8..877deb9a 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -3,6 +3,7 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri +gem "standard", github: "palkan/standard", branch: "fix/extend-config-default-configuration-extensions" gem "railties", github: "rails" gemspec path: "../" From 4342133d6b5ec6139a301650702d9691ec80b902 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Wed, 18 Jan 2023 19:27:39 -0500 Subject: [PATCH 033/126] The fix for Rubocop extension default configs landed on Standard master --- Gemfile | 2 +- gemfiles/rails_5.1.gemfile | 2 +- gemfiles/rails_5.2.gemfile | 2 +- gemfiles/rails_6.0.gemfile | 2 +- gemfiles/rails_6.1.gemfile | 2 +- gemfiles/rails_7.0.gemfile | 2 +- gemfiles/rails_7.1.gemfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index eca4e19c..fdfb91cb 100644 --- a/Gemfile +++ b/Gemfile @@ -10,4 +10,4 @@ unless ENV["NO_STEEP"] == "1" gem "steep", "~> 1.3.0", platform: :mri end -gem "standard", github: "palkan/standard", branch: "fix/extend-config-default-configuration-extensions" +gem "standard", github: "testdouble/standard" diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 3e85cc92..36ce7ce6 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri -gem "standard", github: "palkan/standard", branch: "fix/extend-config-default-configuration-extensions" +gem "standard", github: "testdouble/standard" gem "railties", "5.1.7" gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index 8cbaa721..8226bc8b 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri -gem "standard", github: "palkan/standard", branch: "fix/extend-config-default-configuration-extensions" +gem "standard", github: "testdouble/standard" gem "railties", "5.2.8.1" gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 0ba56428..f4c4f5da 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri -gem "standard", github: "palkan/standard", branch: "fix/extend-config-default-configuration-extensions" +gem "standard", github: "testdouble/standard" gem "railties", "6.0.6" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index f05108e6..86d95f69 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri -gem "standard", github: "palkan/standard", branch: "fix/extend-config-default-configuration-extensions" +gem "standard", github: "testdouble/standard" gem "railties", "6.1.7" gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 3d1b1546..89648938 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri -gem "standard", github: "palkan/standard", branch: "fix/extend-config-default-configuration-extensions" +gem "standard", github: "testdouble/standard" gem "railties", "7.0.4" gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index 877deb9a..f77bcebe 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri -gem "standard", github: "palkan/standard", branch: "fix/extend-config-default-configuration-extensions" +gem "standard", github: "testdouble/standard" gem "railties", github: "rails" gemspec path: "../" From 4c97fcf84ab580654d6430283b0e49d3bdfe0a1c Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Wed, 18 Jan 2023 22:13:52 -0500 Subject: [PATCH 034/126] Bumping Standard to 1.22.1 to address Rubocop extensions default configuration loading issue --- Gemfile | 2 -- gemfiles/rails_5.1.gemfile | 1 - gemfiles/rails_5.2.gemfile | 1 - gemfiles/rails_6.0.gemfile | 1 - gemfiles/rails_6.1.gemfile | 1 - gemfiles/rails_7.0.gemfile | 1 - gemfiles/rails_7.1.gemfile | 1 - meta-tags.gemspec | 2 +- 8 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index fdfb91cb..6d7c072a 100644 --- a/Gemfile +++ b/Gemfile @@ -9,5 +9,3 @@ unless ENV["NO_STEEP"] == "1" # Ruby typings gem "steep", "~> 1.3.0", platform: :mri end - -gem "standard", github: "testdouble/standard" diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 36ce7ce6..94d09d31 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -3,7 +3,6 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri -gem "standard", github: "testdouble/standard" gem "railties", "5.1.7" gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index 8226bc8b..44c76276 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -3,7 +3,6 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri -gem "standard", github: "testdouble/standard" gem "railties", "5.2.8.1" gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index f4c4f5da..872058b1 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -3,7 +3,6 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri -gem "standard", github: "testdouble/standard" gem "railties", "6.0.6" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 86d95f69..3994a1dc 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -3,7 +3,6 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri -gem "standard", github: "testdouble/standard" gem "railties", "6.1.7" gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 89648938..1bb3ea66 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -3,7 +3,6 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri -gem "standard", github: "testdouble/standard" gem "railties", "7.0.4" gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index f77bcebe..556b0bd8 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -3,7 +3,6 @@ source "https://rubygems.org" gem "steep", "~> 1.3.0", platform: :mri -gem "standard", github: "testdouble/standard" gem "railties", github: "rails" gemspec path: "../" diff --git a/meta-tags.gemspec b/meta-tags.gemspec index b1076921..10c2b65c 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "appraisal", "~> 2.4.1" spec.add_development_dependency "simplecov", "~> 0.22.0" # Code style - spec.add_development_dependency "standard", "~> 1.22.0" + spec.add_development_dependency "standard", "~> 1.22.1" spec.add_development_dependency "rubocop-rails", "~> 2.17.3" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" spec.add_development_dependency "rubocop-rspec", "~> 2.18.0" From bf2e36baed214a060f12448c6aa8749863f21a3f Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Thu, 6 Jul 2023 08:30:18 -0400 Subject: [PATCH 035/126] Updated certificate --- certs/kpumuk.pem | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/certs/kpumuk.pem b/certs/kpumuk.pem index aed5edd4..f773276e 100644 --- a/certs/kpumuk.pem +++ b/certs/kpumuk.pem @@ -1,20 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIDODCCAiCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhrcHVt -dWsvREM9a3B1bXVrL0RDPWluZm8wHhcNMjIwNzA1MjIyODU4WhcNMjMwNzA1MjIy -ODU4WjAjMSEwHwYDVQQDDBhrcHVtdWsvREM9a3B1bXVrL0RDPWluZm8wggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8NmK6GXPiE/q7PDbj7nNdw3pa8a6Q -IDxLtc7kW95e1mh0TVgOE8kvGegGtRtjvhXVGTTFtZ+yMD/0DCfTM2oUQYk5oYpO -ZGrCfbNIdZauf4WYsnJtKOTrRoqFMwpL5PlBDKczB2y5lUmQs2HIsjQ0Q21wdKyy -7tXiZPoCoJ+kH+b4/d4dcNvAXVnWgO2HoLW5oqWfqY5swkAHzwHLU+rlxxuHUqOy -8/Y4hUSOXVIsxWxl3EapENm+QAfBRZn3L26hEb80CgSAp8m47Cj9DaSd7xoDtrIe -RryRTj5NVZbq9p1/WRc5zxD9QhAEPjRa5ikbd+eWebIDpAKI0hpyC/9bAgMBAAGj -dzB1MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBT2uFRXNWDpVdbv -+xBk8DAgJPGBPTAdBgNVHREEFjAUgRJrcHVtdWtAa3B1bXVrLmluZm8wHQYDVR0S -BBYwFIESa3B1bXVrQGtwdW11ay5pbmZvMA0GCSqGSIb3DQEBCwUAA4IBAQBa5fMh -JcbhWBoP3kA32g3yM238fyJlre/ZeE6WIFxcuETff8AgPmk550qpAF/WBtP23X8Q -khIFv+bFiuBURvNbuFevs23to7NeNA7XMmEJqjB6fRzO/i/a3bkLG07u+o74MyXe -3/VAxl4Ce+C3aLwXccsbD+Fe3kQ6ku4ceIh2WebBSkpG3WRANReEAf7lcOt4aGEt -nkYjyHgDz6/gYamK15XtOivglkTJDwAVGBzF9o6j5IQ9nXho8Vd2P+hiawx76CoT -ANVO3I4ZwTKD12DMFqjalLwbSVVO4wpuMO3tcAgO4q7Fqh2tXTXom/YYl0SFvmx4 -evTPD0iY8lmGP3ZM +MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MQ8wDQYDVQQDDAZrcHVt +dWsxFjAUBgoJkiaJk/IsZAEZFgZrcHVtdWsxFDASBgoJkiaJk/IsZAEZFgRpbmZv +MB4XDTIzMDcwNjEyMjY0MVoXDTI0MDcwNTEyMjY0MVowPzEPMA0GA1UEAwwGa3B1 +bXVrMRYwFAYKCZImiZPyLGQBGRYGa3B1bXVrMRQwEgYKCZImiZPyLGQBGRYEaW5m +bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALw2YroZc+IT+rs8NuPu +c13DelrxrpAgPEu1zuRb3l7WaHRNWA4TyS8Z6Aa1G2O+FdUZNMW1n7IwP/QMJ9Mz +ahRBiTmhik5kasJ9s0h1lq5/hZiycm0o5OtGioUzCkvk+UEMpzMHbLmVSZCzYciy +NDRDbXB0rLLu1eJk+gKgn6Qf5vj93h1w28BdWdaA7YegtbmipZ+pjmzCQAfPActT +6uXHG4dSo7Lz9jiFRI5dUizFbGXcRqkQ2b5AB8FFmfcvbqERvzQKBICnybjsKP0N +pJ3vGgO2sh5GvJFOPk1Vlur2nX9ZFznPEP1CEAQ+NFrmKRt355Z5sgOkAojSGnIL +/1sCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFPa4 +VFc1YOlV1u/7EGTwMCAk8YE9MB0GA1UdEQQWMBSBEmtwdW11a0BrcHVtdWsuaW5m +bzAdBgNVHRIEFjAUgRJrcHVtdWtAa3B1bXVrLmluZm8wDQYJKoZIhvcNAQELBQAD +ggEBALwivjTzGErFzBtgPEQe7uO6DMysgm/OIF5jLFkvRiuFbuueHM2cUZZBx2Rd +2R5uQS4uiZ5KA+3SkgWQOFOzpFlo7ywS5264ULCcvfix6NQpb2aIDsZuzWGBIDbs +ixS+8wYslrzsOgUSn/RjF0sVB0dw4wv6G8YnVrR/Jf2SaO+Q2lYuKEOKfj52I+Yt +TdFiOjR+WwXSxs/XdSdFtqK2q/THbZdk+HkAe8guvXYtD/fzO2mBlk2AQ0hV1Pxu +ovz1LEphwrX/6v635mteXvl+OKWrNo1Q78sU364BgY5MvJMxFytmUrKMgO6RAiIM +N9+lhJiLa7+h0LrvPPDZRhV8ze0= -----END CERTIFICATE----- From b902039e92d99180e29bef492f9a278dbe682ab4 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Thu, 6 Jul 2023 08:40:56 -0400 Subject: [PATCH 036/126] Updated steep and RBS --- Gemfile | 2 +- Steepfile | 2 -- lib/meta_tags/meta_tags_collection.rb | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 6d7c072a..78a44a02 100644 --- a/Gemfile +++ b/Gemfile @@ -7,5 +7,5 @@ gemspec unless ENV["NO_STEEP"] == "1" # Ruby typings - gem "steep", "~> 1.3.0", platform: :mri + gem "steep", "~> 1.4.0", platform: :mri end diff --git a/Steepfile b/Steepfile index b53072e8..4bf0753a 100644 --- a/Steepfile +++ b/Steepfile @@ -10,6 +10,4 @@ target :lib do # (because we don't have RBS files for it) ignore "lib/meta_tags/railtie.rb" ignore "lib/generators" - - library "set" end diff --git a/lib/meta_tags/meta_tags_collection.rb b/lib/meta_tags/meta_tags_collection.rb index 9d5b7a2a..135676bf 100644 --- a/lib/meta_tags/meta_tags_collection.rb +++ b/lib/meta_tags/meta_tags_collection.rb @@ -39,7 +39,7 @@ def []=(name, value) # def update(object = {}) meta_tags = if object.respond_to?(:to_meta_tags) - # @type var object: (_MetaTagish & Object) + # @type var object: _MetaTagish & Object object.to_meta_tags else # @type var object: Hash[String | Symbol, untyped] From f59a0051e243b701f3f25b945eaac7a2226fe7a7 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Thu, 6 Jul 2023 08:42:49 -0400 Subject: [PATCH 037/126] Updated standardrd --- meta-tags.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 10c2b65c..79a0c50c 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -31,10 +31,10 @@ Gem::Specification.new do |spec| spec.add_development_dependency "appraisal", "~> 2.4.1" spec.add_development_dependency "simplecov", "~> 0.22.0" # Code style - spec.add_development_dependency "standard", "~> 1.22.1" - spec.add_development_dependency "rubocop-rails", "~> 2.17.3" + spec.add_development_dependency "standard", "~> 1.29" + spec.add_development_dependency "rubocop-rails", "~> 2.20.2" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" - spec.add_development_dependency "rubocop-rspec", "~> 2.18.0" + spec.add_development_dependency "rubocop-rspec", "~> 2.22.0" # Format RSpec output for CircleCI spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" From fb42caf6428566320b3c37d7ea6846d04540f0e2 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Thu, 6 Jul 2023 09:14:04 -0400 Subject: [PATCH 038/126] Commit gemfiles/*.gemfile.lock to the repo as per Bundler recommendations --- .gitignore | 1 - gemfiles/rails_5.1.gemfile | 2 +- gemfiles/rails_5.1.gemfile.lock | 197 +++++++++++++++++++++++++++++++ gemfiles/rails_5.2.gemfile | 2 +- gemfiles/rails_5.2.gemfile.lock | 197 +++++++++++++++++++++++++++++++ gemfiles/rails_6.0.gemfile | 2 +- gemfiles/rails_6.0.gemfile.lock | 199 +++++++++++++++++++++++++++++++ gemfiles/rails_6.1.gemfile | 2 +- gemfiles/rails_6.1.gemfile.lock | 198 +++++++++++++++++++++++++++++++ gemfiles/rails_7.0.gemfile | 2 +- gemfiles/rails_7.0.gemfile.lock | 198 +++++++++++++++++++++++++++++++ gemfiles/rails_7.1.gemfile | 2 +- gemfiles/rails_7.1.gemfile.lock | 203 ++++++++++++++++++++++++++++++++ 13 files changed, 1198 insertions(+), 7 deletions(-) create mode 100644 gemfiles/rails_5.1.gemfile.lock create mode 100644 gemfiles/rails_5.2.gemfile.lock create mode 100644 gemfiles/rails_6.0.gemfile.lock create mode 100644 gemfiles/rails_6.1.gemfile.lock create mode 100644 gemfiles/rails_7.0.gemfile.lock create mode 100644 gemfiles/rails_7.1.gemfile.lock diff --git a/.gitignore b/.gitignore index f02c3caf..118dc314 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ .DS_Store .bundle Gemfile.lock -gemfiles/*.gemfile.lock .ruby-gemset coverage doc diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 94d09d31..ba15f523 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.3.0", platform: :mri +gem "steep", "~> 1.4.0", platform: :mri gem "railties", "5.1.7" gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock new file mode 100644 index 00000000..7f6bd776 --- /dev/null +++ b/gemfiles/rails_5.1.gemfile.lock @@ -0,0 +1,197 @@ +PATH + remote: .. + specs: + meta-tags (2.18.0) + actionpack (>= 3.2.0, < 7.1) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (5.1.7) + actionview (= 5.1.7) + activesupport (= 5.1.7) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.7) + activesupport (= 5.1.7) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activesupport (5.1.7) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + builder (3.2.4) + concurrent-ruby (1.2.2) + crass (1.0.6) + csv (3.2.7) + diff-lcs (1.5.0) + docile (1.4.0) + erubi (1.12.0) + ffi (1.15.5) + fileutils (1.7.1) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + json (2.6.3) + language_server-protocol (3.17.0.3) + lint_roller (1.0.0) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.5.3) + loofah (2.21.3) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + method_source (1.0.0) + minitest (5.18.1) + nokogiri (1.15.3-arm64-darwin) + racc (~> 1.4) + parallel (1.23.0) + parser (3.2.2.3) + ast (~> 2.4.1) + racc + racc (1.7.1) + rack (2.2.7) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (5.1.7) + actionpack (= 5.1.7) + activesupport (= 5.1.7) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rainbow (3.1.1) + rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rbs (3.1.0) + regexp_parser (2.8.1) + rexml (3.2.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-html-matchers (0.10.0) + nokogiri (~> 1) + rspec (>= 3.0.0.a) + rspec-mocks (3.12.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rubocop (1.52.1) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.2.2.3) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.18.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.23.1) + rubocop (~> 1.33) + rubocop-performance (1.18.0) + rubocop (>= 1.7.0, < 2.0) + rubocop-ast (>= 0.4.0) + rubocop-rails (2.20.2) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.22.0) + rubocop (~> 1.33) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + securerandom (0.2.2) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + standard (1.29.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.52.0) + standard-custom (~> 1.0.0) + standard-performance (~> 1.1.0) + standard-custom (1.0.1) + lint_roller (~> 1.0) + standard-performance (1.1.0) + lint_roller (~> 1.0) + rubocop-performance (~> 1.18.0) + steep (1.4.0) + activesupport (>= 5.1) + concurrent-ruby (>= 1.2.2) + csv (>= 3.0.9) + fileutils (>= 1.1.0) + json (>= 2.1.0) + language_server-protocol (>= 3.15, < 4.0) + listen (~> 3.0) + logger (>= 1.3.0) + parser (>= 3.1) + rainbow (>= 2.2.2, < 4.0) + rbs (>= 2.8.0) + securerandom (>= 0.1) + strscan (>= 1.0.0) + terminal-table (>= 2, < 4) + strscan (3.0.6) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + thor (1.2.2) + thread_safe (0.3.6) + tzinfo (1.2.11) + thread_safe (~> 0.1) + unicode-display_width (2.4.2) + +PLATFORMS + arm64-darwin-21 + arm64-darwin-22 + +DEPENDENCIES + appraisal (~> 2.4.1) + meta-tags! + railties (= 5.1.7) + rake (~> 13.0) + rspec (~> 3.12.0) + rspec-html-matchers (~> 0.10.0) + rspec_junit_formatter (~> 0.6.0) + rubocop-rails (~> 2.20.2) + rubocop-rake (~> 0.6.0) + rubocop-rspec (~> 2.22.0) + simplecov (~> 0.22.0) + standard (~> 1.29) + steep (~> 1.4.0) + +BUNDLED WITH + 2.4.10 diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index 44c76276..99adb4a7 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.3.0", platform: :mri +gem "steep", "~> 1.4.0", platform: :mri gem "railties", "5.2.8.1" gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock new file mode 100644 index 00000000..467bd006 --- /dev/null +++ b/gemfiles/rails_5.2.gemfile.lock @@ -0,0 +1,197 @@ +PATH + remote: .. + specs: + meta-tags (2.18.0) + actionpack (>= 3.2.0, < 7.1) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (5.2.8.1) + actionview (= 5.2.8.1) + activesupport (= 5.2.8.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.8.1) + activesupport (= 5.2.8.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activesupport (5.2.8.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + builder (3.2.4) + concurrent-ruby (1.2.2) + crass (1.0.6) + csv (3.2.7) + diff-lcs (1.5.0) + docile (1.4.0) + erubi (1.12.0) + ffi (1.15.5) + fileutils (1.7.1) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + json (2.6.3) + language_server-protocol (3.17.0.3) + lint_roller (1.0.0) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.5.3) + loofah (2.21.3) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + method_source (1.0.0) + minitest (5.18.1) + nokogiri (1.15.3-arm64-darwin) + racc (~> 1.4) + parallel (1.23.0) + parser (3.2.2.3) + ast (~> 2.4.1) + racc + racc (1.7.1) + rack (2.2.7) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (5.2.8.1) + actionpack (= 5.2.8.1) + activesupport (= 5.2.8.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rainbow (3.1.1) + rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rbs (3.1.0) + regexp_parser (2.8.1) + rexml (3.2.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-html-matchers (0.10.0) + nokogiri (~> 1) + rspec (>= 3.0.0.a) + rspec-mocks (3.12.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rubocop (1.52.1) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.2.2.3) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.18.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.23.1) + rubocop (~> 1.33) + rubocop-performance (1.18.0) + rubocop (>= 1.7.0, < 2.0) + rubocop-ast (>= 0.4.0) + rubocop-rails (2.20.2) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.22.0) + rubocop (~> 1.33) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + securerandom (0.2.2) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + standard (1.29.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.52.0) + standard-custom (~> 1.0.0) + standard-performance (~> 1.1.0) + standard-custom (1.0.1) + lint_roller (~> 1.0) + standard-performance (1.1.0) + lint_roller (~> 1.0) + rubocop-performance (~> 1.18.0) + steep (1.4.0) + activesupport (>= 5.1) + concurrent-ruby (>= 1.2.2) + csv (>= 3.0.9) + fileutils (>= 1.1.0) + json (>= 2.1.0) + language_server-protocol (>= 3.15, < 4.0) + listen (~> 3.0) + logger (>= 1.3.0) + parser (>= 3.1) + rainbow (>= 2.2.2, < 4.0) + rbs (>= 2.8.0) + securerandom (>= 0.1) + strscan (>= 1.0.0) + terminal-table (>= 2, < 4) + strscan (3.0.6) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + thor (1.2.2) + thread_safe (0.3.6) + tzinfo (1.2.11) + thread_safe (~> 0.1) + unicode-display_width (2.4.2) + +PLATFORMS + arm64-darwin-21 + arm64-darwin-22 + +DEPENDENCIES + appraisal (~> 2.4.1) + meta-tags! + railties (= 5.2.8.1) + rake (~> 13.0) + rspec (~> 3.12.0) + rspec-html-matchers (~> 0.10.0) + rspec_junit_formatter (~> 0.6.0) + rubocop-rails (~> 2.20.2) + rubocop-rake (~> 0.6.0) + rubocop-rspec (~> 2.22.0) + simplecov (~> 0.22.0) + standard (~> 1.29) + steep (~> 1.4.0) + +BUNDLED WITH + 2.4.10 diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 872058b1..0c0307a6 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.3.0", platform: :mri +gem "steep", "~> 1.4.0", platform: :mri gem "railties", "6.0.6" gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock new file mode 100644 index 00000000..306ce003 --- /dev/null +++ b/gemfiles/rails_6.0.gemfile.lock @@ -0,0 +1,199 @@ +PATH + remote: .. + specs: + meta-tags (2.18.0) + actionpack (>= 3.2.0, < 7.1) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (6.0.6) + actionview (= 6.0.6) + activesupport (= 6.0.6) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actionview (6.0.6) + activesupport (= 6.0.6) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activesupport (6.0.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + builder (3.2.4) + concurrent-ruby (1.2.2) + crass (1.0.6) + csv (3.2.7) + diff-lcs (1.5.0) + docile (1.4.0) + erubi (1.12.0) + ffi (1.15.5) + fileutils (1.7.1) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + json (2.6.3) + language_server-protocol (3.17.0.3) + lint_roller (1.0.0) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.5.3) + loofah (2.21.3) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + method_source (1.0.0) + minitest (5.18.1) + nokogiri (1.15.3-arm64-darwin) + racc (~> 1.4) + parallel (1.23.0) + parser (3.2.2.3) + ast (~> 2.4.1) + racc + racc (1.7.1) + rack (2.2.7) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (6.0.6) + actionpack (= 6.0.6) + activesupport (= 6.0.6) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rainbow (3.1.1) + rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rbs (3.1.0) + regexp_parser (2.8.1) + rexml (3.2.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-html-matchers (0.10.0) + nokogiri (~> 1) + rspec (>= 3.0.0.a) + rspec-mocks (3.12.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rubocop (1.52.1) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.2.2.3) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.18.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.23.1) + rubocop (~> 1.33) + rubocop-performance (1.18.0) + rubocop (>= 1.7.0, < 2.0) + rubocop-ast (>= 0.4.0) + rubocop-rails (2.20.2) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.22.0) + rubocop (~> 1.33) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + securerandom (0.2.2) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + standard (1.29.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.52.0) + standard-custom (~> 1.0.0) + standard-performance (~> 1.1.0) + standard-custom (1.0.1) + lint_roller (~> 1.0) + standard-performance (1.1.0) + lint_roller (~> 1.0) + rubocop-performance (~> 1.18.0) + steep (1.4.0) + activesupport (>= 5.1) + concurrent-ruby (>= 1.2.2) + csv (>= 3.0.9) + fileutils (>= 1.1.0) + json (>= 2.1.0) + language_server-protocol (>= 3.15, < 4.0) + listen (~> 3.0) + logger (>= 1.3.0) + parser (>= 3.1) + rainbow (>= 2.2.2, < 4.0) + rbs (>= 2.8.0) + securerandom (>= 0.1) + strscan (>= 1.0.0) + terminal-table (>= 2, < 4) + strscan (3.0.6) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + thor (1.2.2) + thread_safe (0.3.6) + tzinfo (1.2.11) + thread_safe (~> 0.1) + unicode-display_width (2.4.2) + zeitwerk (2.6.8) + +PLATFORMS + arm64-darwin-21 + arm64-darwin-22 + +DEPENDENCIES + appraisal (~> 2.4.1) + meta-tags! + railties (= 6.0.6) + rake (~> 13.0) + rspec (~> 3.12.0) + rspec-html-matchers (~> 0.10.0) + rspec_junit_formatter (~> 0.6.0) + rubocop-rails (~> 2.20.2) + rubocop-rake (~> 0.6.0) + rubocop-rspec (~> 2.22.0) + simplecov (~> 0.22.0) + standard (~> 1.29) + steep (~> 1.4.0) + +BUNDLED WITH + 2.4.10 diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 3994a1dc..1d65bfd9 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.3.0", platform: :mri +gem "steep", "~> 1.4.0", platform: :mri gem "railties", "6.1.7" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock new file mode 100644 index 00000000..af48d231 --- /dev/null +++ b/gemfiles/rails_6.1.gemfile.lock @@ -0,0 +1,198 @@ +PATH + remote: .. + specs: + meta-tags (2.18.0) + actionpack (>= 3.2.0, < 7.1) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (6.1.7) + actionview (= 6.1.7) + activesupport (= 6.1.7) + rack (~> 2.0, >= 2.0.9) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actionview (6.1.7) + activesupport (= 6.1.7) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activesupport (6.1.7) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + builder (3.2.4) + concurrent-ruby (1.2.2) + crass (1.0.6) + csv (3.2.7) + diff-lcs (1.5.0) + docile (1.4.0) + erubi (1.12.0) + ffi (1.15.5) + fileutils (1.7.1) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + json (2.6.3) + language_server-protocol (3.17.0.3) + lint_roller (1.0.0) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.5.3) + loofah (2.21.3) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + method_source (1.0.0) + minitest (5.18.1) + nokogiri (1.15.3-arm64-darwin) + racc (~> 1.4) + parallel (1.23.0) + parser (3.2.2.3) + ast (~> 2.4.1) + racc + racc (1.7.1) + rack (2.2.7) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (6.1.7) + actionpack (= 6.1.7) + activesupport (= 6.1.7) + method_source + rake (>= 12.2) + thor (~> 1.0) + rainbow (3.1.1) + rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rbs (3.1.0) + regexp_parser (2.8.1) + rexml (3.2.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-html-matchers (0.10.0) + nokogiri (~> 1) + rspec (>= 3.0.0.a) + rspec-mocks (3.12.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rubocop (1.52.1) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.2.2.3) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.18.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.23.1) + rubocop (~> 1.33) + rubocop-performance (1.18.0) + rubocop (>= 1.7.0, < 2.0) + rubocop-ast (>= 0.4.0) + rubocop-rails (2.20.2) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.22.0) + rubocop (~> 1.33) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + securerandom (0.2.2) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + standard (1.29.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.52.0) + standard-custom (~> 1.0.0) + standard-performance (~> 1.1.0) + standard-custom (1.0.1) + lint_roller (~> 1.0) + standard-performance (1.1.0) + lint_roller (~> 1.0) + rubocop-performance (~> 1.18.0) + steep (1.4.0) + activesupport (>= 5.1) + concurrent-ruby (>= 1.2.2) + csv (>= 3.0.9) + fileutils (>= 1.1.0) + json (>= 2.1.0) + language_server-protocol (>= 3.15, < 4.0) + listen (~> 3.0) + logger (>= 1.3.0) + parser (>= 3.1) + rainbow (>= 2.2.2, < 4.0) + rbs (>= 2.8.0) + securerandom (>= 0.1) + strscan (>= 1.0.0) + terminal-table (>= 2, < 4) + strscan (3.0.6) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + thor (1.2.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.4.2) + zeitwerk (2.6.8) + +PLATFORMS + arm64-darwin-21 + arm64-darwin-22 + +DEPENDENCIES + appraisal (~> 2.4.1) + meta-tags! + railties (= 6.1.7) + rake (~> 13.0) + rspec (~> 3.12.0) + rspec-html-matchers (~> 0.10.0) + rspec_junit_formatter (~> 0.6.0) + rubocop-rails (~> 2.20.2) + rubocop-rake (~> 0.6.0) + rubocop-rspec (~> 2.22.0) + simplecov (~> 0.22.0) + standard (~> 1.29) + steep (~> 1.4.0) + +BUNDLED WITH + 2.4.10 diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 1bb3ea66..78f86830 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.3.0", platform: :mri +gem "steep", "~> 1.4.0", platform: :mri gem "railties", "7.0.4" gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock new file mode 100644 index 00000000..97e080b4 --- /dev/null +++ b/gemfiles/rails_7.0.gemfile.lock @@ -0,0 +1,198 @@ +PATH + remote: .. + specs: + meta-tags (2.18.0) + actionpack (>= 3.2.0, < 7.1) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (7.0.4) + actionview (= 7.0.4) + activesupport (= 7.0.4) + rack (~> 2.0, >= 2.2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actionview (7.0.4) + activesupport (= 7.0.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activesupport (7.0.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + builder (3.2.4) + concurrent-ruby (1.2.2) + crass (1.0.6) + csv (3.2.7) + diff-lcs (1.5.0) + docile (1.4.0) + erubi (1.12.0) + ffi (1.15.5) + fileutils (1.7.1) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + json (2.6.3) + language_server-protocol (3.17.0.3) + lint_roller (1.0.0) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.5.3) + loofah (2.21.3) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + method_source (1.0.0) + minitest (5.18.1) + nokogiri (1.15.3-arm64-darwin) + racc (~> 1.4) + parallel (1.23.0) + parser (3.2.2.3) + ast (~> 2.4.1) + racc + racc (1.7.1) + rack (2.2.7) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.0.4) + actionpack (= 7.0.4) + activesupport (= 7.0.4) + method_source + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) + rainbow (3.1.1) + rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rbs (3.1.0) + regexp_parser (2.8.1) + rexml (3.2.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-html-matchers (0.10.0) + nokogiri (~> 1) + rspec (>= 3.0.0.a) + rspec-mocks (3.12.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rubocop (1.52.1) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.2.2.3) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.18.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.23.1) + rubocop (~> 1.33) + rubocop-performance (1.18.0) + rubocop (>= 1.7.0, < 2.0) + rubocop-ast (>= 0.4.0) + rubocop-rails (2.20.2) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.22.0) + rubocop (~> 1.33) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + securerandom (0.2.2) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + standard (1.29.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.52.0) + standard-custom (~> 1.0.0) + standard-performance (~> 1.1.0) + standard-custom (1.0.1) + lint_roller (~> 1.0) + standard-performance (1.1.0) + lint_roller (~> 1.0) + rubocop-performance (~> 1.18.0) + steep (1.4.0) + activesupport (>= 5.1) + concurrent-ruby (>= 1.2.2) + csv (>= 3.0.9) + fileutils (>= 1.1.0) + json (>= 2.1.0) + language_server-protocol (>= 3.15, < 4.0) + listen (~> 3.0) + logger (>= 1.3.0) + parser (>= 3.1) + rainbow (>= 2.2.2, < 4.0) + rbs (>= 2.8.0) + securerandom (>= 0.1) + strscan (>= 1.0.0) + terminal-table (>= 2, < 4) + strscan (3.0.6) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + thor (1.2.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.4.2) + zeitwerk (2.6.8) + +PLATFORMS + arm64-darwin-21 + arm64-darwin-22 + +DEPENDENCIES + appraisal (~> 2.4.1) + meta-tags! + railties (= 7.0.4) + rake (~> 13.0) + rspec (~> 3.12.0) + rspec-html-matchers (~> 0.10.0) + rspec_junit_formatter (~> 0.6.0) + rubocop-rails (~> 2.20.2) + rubocop-rake (~> 0.6.0) + rubocop-rspec (~> 2.22.0) + simplecov (~> 0.22.0) + standard (~> 1.29) + steep (~> 1.4.0) + +BUNDLED WITH + 2.4.10 diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index 556b0bd8..18bffd7e 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.3.0", platform: :mri +gem "steep", "~> 1.4.0", platform: :mri gem "railties", github: "rails" gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock new file mode 100644 index 00000000..4d0afc50 --- /dev/null +++ b/gemfiles/rails_7.1.gemfile.lock @@ -0,0 +1,203 @@ +GIT + remote: https://github.com/rails/rails.git + revision: 1cbd88f918436b339d2d88398f216c8c1e7a09a3 + specs: + actionpack (7.1.0.alpha) + actionview (= 7.1.0.alpha) + activesupport (= 7.1.0.alpha) + rack (~> 2.0, >= 2.2.4) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actionview (7.1.0.alpha) + activesupport (= 7.1.0.alpha) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activesupport (7.1.0.alpha) + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + railties (7.1.0.alpha) + actionpack (= 7.1.0.alpha) + activesupport (= 7.1.0.alpha) + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.6) + +PATH + remote: .. + specs: + meta-tags (2.18.0) + actionpack (>= 3.2.0, < 7.1) + +GEM + remote: https://rubygems.org/ + specs: + appraisal (2.4.1) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + builder (3.2.4) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) + crass (1.0.6) + csv (3.2.7) + diff-lcs (1.5.0) + docile (1.4.0) + erubi (1.12.0) + ffi (1.15.5) + fileutils (1.7.1) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + json (2.6.3) + language_server-protocol (3.17.0.3) + lint_roller (1.0.0) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.5.3) + loofah (2.21.3) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + minitest (5.18.1) + nokogiri (1.15.3-arm64-darwin) + racc (~> 1.4) + parallel (1.23.0) + parser (3.2.2.3) + ast (~> 2.4.1) + racc + racc (1.7.1) + rack (2.2.7) + rack-test (2.1.0) + rack (>= 1.3) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + rainbow (3.1.1) + rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rbs (3.1.0) + regexp_parser (2.8.1) + rexml (3.2.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-html-matchers (0.10.0) + nokogiri (~> 1) + rspec (>= 3.0.0.a) + rspec-mocks (3.12.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rubocop (1.52.1) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.2.2.3) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.18.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.23.1) + rubocop (~> 1.33) + rubocop-performance (1.18.0) + rubocop (>= 1.7.0, < 2.0) + rubocop-ast (>= 0.4.0) + rubocop-rails (2.20.2) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.22.0) + rubocop (~> 1.33) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + securerandom (0.2.2) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + standard (1.29.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.52.0) + standard-custom (~> 1.0.0) + standard-performance (~> 1.1.0) + standard-custom (1.0.1) + lint_roller (~> 1.0) + standard-performance (1.1.0) + lint_roller (~> 1.0) + rubocop-performance (~> 1.18.0) + steep (1.4.0) + activesupport (>= 5.1) + concurrent-ruby (>= 1.2.2) + csv (>= 3.0.9) + fileutils (>= 1.1.0) + json (>= 2.1.0) + language_server-protocol (>= 3.15, < 4.0) + listen (~> 3.0) + logger (>= 1.3.0) + parser (>= 3.1) + rainbow (>= 2.2.2, < 4.0) + rbs (>= 2.8.0) + securerandom (>= 0.1) + strscan (>= 1.0.0) + terminal-table (>= 2, < 4) + strscan (3.0.6) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + thor (1.2.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.4.2) + zeitwerk (2.6.8) + +PLATFORMS + arm64-darwin-21 + arm64-darwin-22 + +DEPENDENCIES + appraisal (~> 2.4.1) + meta-tags! + railties! + rake (~> 13.0) + rspec (~> 3.12.0) + rspec-html-matchers (~> 0.10.0) + rspec_junit_formatter (~> 0.6.0) + rubocop-rails (~> 2.20.2) + rubocop-rake (~> 0.6.0) + rubocop-rspec (~> 2.22.0) + simplecov (~> 0.22.0) + standard (~> 1.29) + steep (~> 1.4.0) + +BUNDLED WITH + 2.4.10 From 72c48e3c18af378981e8156681338adaa140766c Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Thu, 6 Jul 2023 09:18:54 -0400 Subject: [PATCH 039/126] No longer support Ruby 2.6 --- .circleci/config.yml | 76 ---------------------------------------- .circleci/config.yml.erb | 6 ---- .standard.yml | 2 +- CHANGELOG.md | 1 + README.md | 2 +- meta-tags.gemspec | 2 +- 6 files changed, 4 insertions(+), 85 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 85bacf45..909ed28c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -93,62 +93,6 @@ shared_build_steps: &shared_build_steps jobs: - build-ruby26-rails-51: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:2.6 - environment: - BUNDLE_GEMFILE: gemfiles/rails_5.1.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby26-rails-51 - steps: *shared_build_steps - - build-ruby26-rails-52: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:2.6 - environment: - BUNDLE_GEMFILE: gemfiles/rails_5.2.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby26-rails-52 - steps: *shared_build_steps - - build-ruby26-rails-60: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:2.6 - environment: - BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby26-rails-60 - steps: *shared_build_steps - - build-ruby26-rails-61: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:2.6 - environment: - BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby26-rails-61 - steps: *shared_build_steps - build-ruby27-rails-51: parameters: is_main_build: @@ -371,18 +315,6 @@ workflows: test: jobs: - - build-ruby26-rails-51: - is_main_build: false - - - build-ruby26-rails-52: - is_main_build: false - - - build-ruby26-rails-60: - is_main_build: false - - - build-ruby26-rails-61: - is_main_build: false - - build-ruby27-rails-51: is_main_build: false @@ -433,14 +365,6 @@ workflows: - tests: requires: - - build-ruby26-rails-51 - - - build-ruby26-rails-52 - - - build-ruby26-rails-60 - - - build-ruby26-rails-61 - - build-ruby27-rails-51 - build-ruby27-rails-52 diff --git a/.circleci/config.yml.erb b/.circleci/config.yml.erb index 0d46305f..05c9ad73 100644 --- a/.circleci/config.yml.erb +++ b/.circleci/config.yml.erb @@ -4,12 +4,6 @@ # <% builds = [ - # 2.6 - %w[2.6 5.1], - %w[2.6 5.2], - %w[2.6 6.0], - %w[2.6 6.1], - # 2.7 %w[2.7 5.1], %w[2.7 5.2], diff --git a/.standard.yml b/.standard.yml index 9ae0900d..b2dc35f3 100644 --- a/.standard.yml +++ b/.standard.yml @@ -1,4 +1,4 @@ -ruby_version: 2.6.0 +ruby_version: 2.7.0 extend_config: - .rubocop-rake.yml - .rubocop-rails.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 54f4ef4d..2d08d321 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Changes: - Switched code style from custom rules to Standard ([246](https://github.com/kpumuk/meta-tags/pull/251)). - Switched from testing Rails using environment variables to Appraisal gem ([251](https://github.com/kpumuk/meta-tags/pull/247)). +- Ruby 2.7 is minimum supported version ([257](https://github.com/kpumuk/meta-tags/pull/257/)) ## 2.18.0 (September 15, 2022) [☰](https://github.com/kpumuk/meta-tags/compare/v2.17.0...v2.18.0) diff --git a/README.md b/README.md index 8827d473..4a4a694a 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Search Engine Optimization (SEO) plugin for Ruby on Rails applications. MetaTags main branch fully supports Ruby on Rails 5.1+, and is tested against all major Rails releases up to 7.0. -Ruby versions older than 2.6 are no longer officially supported. +Ruby versions older than 2.7 are no longer officially supported. _Please note_ that we no longer support Ruby versions older than 2.6.0 and Ruby on Rails older than 5.1, because they reached their [End of Life](https://endoflife.date/ruby). diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 79a0c50c..e0f7dbce 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |spec| spec.homepage = "https://github.com/kpumuk/meta-tags" spec.license = "MIT" spec.platform = Gem::Platform::RUBY - spec.required_ruby_version = ">= 2.6.0" + spec.required_ruby_version = ">= 2.7.0" spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(\.|(bin|test|spec|features)/)}) } spec.bindir = "exe" From 4eb1edae0817ef8d0ab152d6e301259988bb83cd Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Thu, 3 Aug 2023 20:00:31 -0400 Subject: [PATCH 040/126] Updated dependencies --- Gemfile | 2 +- meta-tags.gemspec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 78a44a02..e438bad1 100644 --- a/Gemfile +++ b/Gemfile @@ -7,5 +7,5 @@ gemspec unless ENV["NO_STEEP"] == "1" # Ruby typings - gem "steep", "~> 1.4.0", platform: :mri + gem "steep", "~> 1.5.2", platform: :mri end diff --git a/meta-tags.gemspec b/meta-tags.gemspec index e0f7dbce..04f8a987 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -28,13 +28,13 @@ Gem::Specification.new do |spec| spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "rspec", "~> 3.12.0" spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0" - spec.add_development_dependency "appraisal", "~> 2.4.1" + spec.add_development_dependency "appraisal", "~> 2.5.0" spec.add_development_dependency "simplecov", "~> 0.22.0" # Code style spec.add_development_dependency "standard", "~> 1.29" spec.add_development_dependency "rubocop-rails", "~> 2.20.2" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" - spec.add_development_dependency "rubocop-rspec", "~> 2.22.0" + spec.add_development_dependency "rubocop-rspec", "~> 2.23.0" # Format RSpec output for CircleCI spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" From 15e203ab3f34c3b67064de759e2df69e8974c850 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Thu, 3 Aug 2023 20:05:51 -0400 Subject: [PATCH 041/126] Create dependabot.yml --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..0b1d0405 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "bundler" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" From aa2e78d9879a9dc34113f1fda94904aa04003655 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Thu, 3 Aug 2023 20:08:26 -0400 Subject: [PATCH 042/126] Updated appraisal gemfiles --- gemfiles/rails_5.1.gemfile | 2 +- gemfiles/rails_5.1.gemfile.lock | 39 +++++++++--------- gemfiles/rails_5.2.gemfile | 2 +- gemfiles/rails_5.2.gemfile.lock | 39 +++++++++--------- gemfiles/rails_6.0.gemfile | 2 +- gemfiles/rails_6.0.gemfile.lock | 41 +++++++++---------- gemfiles/rails_6.1.gemfile | 2 +- gemfiles/rails_6.1.gemfile.lock | 41 +++++++++---------- gemfiles/rails_7.0.gemfile | 2 +- gemfiles/rails_7.0.gemfile.lock | 41 +++++++++---------- gemfiles/rails_7.1.gemfile | 2 +- gemfiles/rails_7.1.gemfile.lock | 70 ++++++++++++++++++++------------- 12 files changed, 152 insertions(+), 131 deletions(-) diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index ba15f523..481590fe 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.4.0", platform: :mri +gem "steep", "~> 1.5.2", platform: :mri gem "railties", "5.1.7" gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index 7f6bd776..7dd3cd65 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -25,7 +25,7 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - appraisal (2.4.1) + appraisal (2.5.0) bundler rake thor (>= 0.14.0) @@ -43,7 +43,7 @@ GEM concurrent-ruby (~> 1.0) json (2.6.3) language_server-protocol (3.17.0.3) - lint_roller (1.0.0) + lint_roller (1.1.0) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -52,7 +52,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.18.1) + minitest (5.19.0) nokogiri (1.15.3-arm64-darwin) racc (~> 1.4) parallel (1.23.0) @@ -60,10 +60,10 @@ GEM ast (~> 2.4.1) racc racc (1.7.1) - rack (2.2.7) + rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) - rails-dom-testing (2.1.1) + rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -81,9 +81,9 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.1.0) + rbs (3.1.3) regexp_parser (2.8.1) - rexml (3.2.5) + rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -96,7 +96,7 @@ GEM rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.5) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.1) @@ -127,7 +127,7 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.22.0) + rubocop-rspec (2.23.0) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -139,20 +139,21 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.29.0) + standard (1.30.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.52.0) standard-custom (~> 1.0.0) standard-performance (~> 1.1.0) - standard-custom (1.0.1) - lint_roller (~> 1.0) - standard-performance (1.1.0) + standard-custom (1.0.2) lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.1.2) + lint_roller (~> 1.1) rubocop-performance (~> 1.18.0) - steep (1.4.0) + steep (1.5.2) activesupport (>= 5.1) - concurrent-ruby (>= 1.2.2) + concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) fileutils (>= 1.1.0) json (>= 2.1.0) @@ -161,7 +162,7 @@ GEM logger (>= 1.3.0) parser (>= 3.1) rainbow (>= 2.2.2, < 4.0) - rbs (>= 2.8.0) + rbs (>= 3.1.0) securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) @@ -179,7 +180,7 @@ PLATFORMS arm64-darwin-22 DEPENDENCIES - appraisal (~> 2.4.1) + appraisal (~> 2.5.0) meta-tags! railties (= 5.1.7) rake (~> 13.0) @@ -188,10 +189,10 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.20.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.22.0) + rubocop-rspec (~> 2.23.0) simplecov (~> 0.22.0) standard (~> 1.29) - steep (~> 1.4.0) + steep (~> 1.5.2) BUNDLED WITH 2.4.10 diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index 99adb4a7..c39ac854 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.4.0", platform: :mri +gem "steep", "~> 1.5.2", platform: :mri gem "railties", "5.2.8.1" gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index 467bd006..6f65dd77 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -25,7 +25,7 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - appraisal (2.4.1) + appraisal (2.5.0) bundler rake thor (>= 0.14.0) @@ -43,7 +43,7 @@ GEM concurrent-ruby (~> 1.0) json (2.6.3) language_server-protocol (3.17.0.3) - lint_roller (1.0.0) + lint_roller (1.1.0) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -52,7 +52,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.18.1) + minitest (5.19.0) nokogiri (1.15.3-arm64-darwin) racc (~> 1.4) parallel (1.23.0) @@ -60,10 +60,10 @@ GEM ast (~> 2.4.1) racc racc (1.7.1) - rack (2.2.7) + rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) - rails-dom-testing (2.1.1) + rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -81,9 +81,9 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.1.0) + rbs (3.1.3) regexp_parser (2.8.1) - rexml (3.2.5) + rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -96,7 +96,7 @@ GEM rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.5) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.1) @@ -127,7 +127,7 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.22.0) + rubocop-rspec (2.23.0) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -139,20 +139,21 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.29.0) + standard (1.30.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.52.0) standard-custom (~> 1.0.0) standard-performance (~> 1.1.0) - standard-custom (1.0.1) - lint_roller (~> 1.0) - standard-performance (1.1.0) + standard-custom (1.0.2) lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.1.2) + lint_roller (~> 1.1) rubocop-performance (~> 1.18.0) - steep (1.4.0) + steep (1.5.2) activesupport (>= 5.1) - concurrent-ruby (>= 1.2.2) + concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) fileutils (>= 1.1.0) json (>= 2.1.0) @@ -161,7 +162,7 @@ GEM logger (>= 1.3.0) parser (>= 3.1) rainbow (>= 2.2.2, < 4.0) - rbs (>= 2.8.0) + rbs (>= 3.1.0) securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) @@ -179,7 +180,7 @@ PLATFORMS arm64-darwin-22 DEPENDENCIES - appraisal (~> 2.4.1) + appraisal (~> 2.5.0) meta-tags! railties (= 5.2.8.1) rake (~> 13.0) @@ -188,10 +189,10 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.20.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.22.0) + rubocop-rspec (~> 2.23.0) simplecov (~> 0.22.0) standard (~> 1.29) - steep (~> 1.4.0) + steep (~> 1.5.2) BUNDLED WITH 2.4.10 diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 0c0307a6..2919f039 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.4.0", platform: :mri +gem "steep", "~> 1.5.2", platform: :mri gem "railties", "6.0.6" gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 306ce003..3270abb0 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -26,7 +26,7 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - appraisal (2.4.1) + appraisal (2.5.0) bundler rake thor (>= 0.14.0) @@ -44,7 +44,7 @@ GEM concurrent-ruby (~> 1.0) json (2.6.3) language_server-protocol (3.17.0.3) - lint_roller (1.0.0) + lint_roller (1.1.0) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -53,7 +53,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.18.1) + minitest (5.19.0) nokogiri (1.15.3-arm64-darwin) racc (~> 1.4) parallel (1.23.0) @@ -61,10 +61,10 @@ GEM ast (~> 2.4.1) racc racc (1.7.1) - rack (2.2.7) + rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) - rails-dom-testing (2.1.1) + rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -82,9 +82,9 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.1.0) + rbs (3.1.3) regexp_parser (2.8.1) - rexml (3.2.5) + rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -97,7 +97,7 @@ GEM rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.5) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.1) @@ -128,7 +128,7 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.22.0) + rubocop-rspec (2.23.0) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -140,20 +140,21 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.29.0) + standard (1.30.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.52.0) standard-custom (~> 1.0.0) standard-performance (~> 1.1.0) - standard-custom (1.0.1) - lint_roller (~> 1.0) - standard-performance (1.1.0) + standard-custom (1.0.2) lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.1.2) + lint_roller (~> 1.1) rubocop-performance (~> 1.18.0) - steep (1.4.0) + steep (1.5.2) activesupport (>= 5.1) - concurrent-ruby (>= 1.2.2) + concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) fileutils (>= 1.1.0) json (>= 2.1.0) @@ -162,7 +163,7 @@ GEM logger (>= 1.3.0) parser (>= 3.1) rainbow (>= 2.2.2, < 4.0) - rbs (>= 2.8.0) + rbs (>= 3.1.0) securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) @@ -174,14 +175,14 @@ GEM tzinfo (1.2.11) thread_safe (~> 0.1) unicode-display_width (2.4.2) - zeitwerk (2.6.8) + zeitwerk (2.6.11) PLATFORMS arm64-darwin-21 arm64-darwin-22 DEPENDENCIES - appraisal (~> 2.4.1) + appraisal (~> 2.5.0) meta-tags! railties (= 6.0.6) rake (~> 13.0) @@ -190,10 +191,10 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.20.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.22.0) + rubocop-rspec (~> 2.23.0) simplecov (~> 0.22.0) standard (~> 1.29) - steep (~> 1.4.0) + steep (~> 1.5.2) BUNDLED WITH 2.4.10 diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 1d65bfd9..b0e0ec0a 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.4.0", platform: :mri +gem "steep", "~> 1.5.2", platform: :mri gem "railties", "6.1.7" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index af48d231..873f67fd 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -26,7 +26,7 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - appraisal (2.4.1) + appraisal (2.5.0) bundler rake thor (>= 0.14.0) @@ -44,7 +44,7 @@ GEM concurrent-ruby (~> 1.0) json (2.6.3) language_server-protocol (3.17.0.3) - lint_roller (1.0.0) + lint_roller (1.1.0) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -53,7 +53,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.18.1) + minitest (5.19.0) nokogiri (1.15.3-arm64-darwin) racc (~> 1.4) parallel (1.23.0) @@ -61,10 +61,10 @@ GEM ast (~> 2.4.1) racc racc (1.7.1) - rack (2.2.7) + rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) - rails-dom-testing (2.1.1) + rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -82,9 +82,9 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.1.0) + rbs (3.1.3) regexp_parser (2.8.1) - rexml (3.2.5) + rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -97,7 +97,7 @@ GEM rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.5) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.1) @@ -128,7 +128,7 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.22.0) + rubocop-rspec (2.23.0) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -140,20 +140,21 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.29.0) + standard (1.30.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.52.0) standard-custom (~> 1.0.0) standard-performance (~> 1.1.0) - standard-custom (1.0.1) - lint_roller (~> 1.0) - standard-performance (1.1.0) + standard-custom (1.0.2) lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.1.2) + lint_roller (~> 1.1) rubocop-performance (~> 1.18.0) - steep (1.4.0) + steep (1.5.2) activesupport (>= 5.1) - concurrent-ruby (>= 1.2.2) + concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) fileutils (>= 1.1.0) json (>= 2.1.0) @@ -162,7 +163,7 @@ GEM logger (>= 1.3.0) parser (>= 3.1) rainbow (>= 2.2.2, < 4.0) - rbs (>= 2.8.0) + rbs (>= 3.1.0) securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) @@ -173,14 +174,14 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.4.2) - zeitwerk (2.6.8) + zeitwerk (2.6.11) PLATFORMS arm64-darwin-21 arm64-darwin-22 DEPENDENCIES - appraisal (~> 2.4.1) + appraisal (~> 2.5.0) meta-tags! railties (= 6.1.7) rake (~> 13.0) @@ -189,10 +190,10 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.20.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.22.0) + rubocop-rspec (~> 2.23.0) simplecov (~> 0.22.0) standard (~> 1.29) - steep (~> 1.4.0) + steep (~> 1.5.2) BUNDLED WITH 2.4.10 diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 78f86830..837aa21f 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.4.0", platform: :mri +gem "steep", "~> 1.5.2", platform: :mri gem "railties", "7.0.4" gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 97e080b4..c2be3e77 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -25,7 +25,7 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - appraisal (2.4.1) + appraisal (2.5.0) bundler rake thor (>= 0.14.0) @@ -43,7 +43,7 @@ GEM concurrent-ruby (~> 1.0) json (2.6.3) language_server-protocol (3.17.0.3) - lint_roller (1.0.0) + lint_roller (1.1.0) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -52,7 +52,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.18.1) + minitest (5.19.0) nokogiri (1.15.3-arm64-darwin) racc (~> 1.4) parallel (1.23.0) @@ -60,10 +60,10 @@ GEM ast (~> 2.4.1) racc racc (1.7.1) - rack (2.2.7) + rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) - rails-dom-testing (2.1.1) + rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -82,9 +82,9 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.1.0) + rbs (3.1.3) regexp_parser (2.8.1) - rexml (3.2.5) + rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -97,7 +97,7 @@ GEM rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.5) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.1) @@ -128,7 +128,7 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.22.0) + rubocop-rspec (2.23.0) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -140,20 +140,21 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.29.0) + standard (1.30.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.52.0) standard-custom (~> 1.0.0) standard-performance (~> 1.1.0) - standard-custom (1.0.1) - lint_roller (~> 1.0) - standard-performance (1.1.0) + standard-custom (1.0.2) lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.1.2) + lint_roller (~> 1.1) rubocop-performance (~> 1.18.0) - steep (1.4.0) + steep (1.5.2) activesupport (>= 5.1) - concurrent-ruby (>= 1.2.2) + concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) fileutils (>= 1.1.0) json (>= 2.1.0) @@ -162,7 +163,7 @@ GEM logger (>= 1.3.0) parser (>= 3.1) rainbow (>= 2.2.2, < 4.0) - rbs (>= 2.8.0) + rbs (>= 3.1.0) securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) @@ -173,14 +174,14 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.4.2) - zeitwerk (2.6.8) + zeitwerk (2.6.11) PLATFORMS arm64-darwin-21 arm64-darwin-22 DEPENDENCIES - appraisal (~> 2.4.1) + appraisal (~> 2.5.0) meta-tags! railties (= 7.0.4) rake (~> 13.0) @@ -189,10 +190,10 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.20.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.22.0) + rubocop-rspec (~> 2.23.0) simplecov (~> 0.22.0) standard (~> 1.29) - steep (~> 1.4.0) + steep (~> 1.5.2) BUNDLED WITH 2.4.10 diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index 18bffd7e..de01d3dc 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.4.0", platform: :mri +gem "steep", "~> 1.5.2", platform: :mri gem "railties", github: "rails" gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 4d0afc50..1a8d16e1 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -1,20 +1,22 @@ GIT remote: https://github.com/rails/rails.git - revision: 1cbd88f918436b339d2d88398f216c8c1e7a09a3 + revision: 83e59883e990704fd57572708b7d61f776113345 specs: actionpack (7.1.0.alpha) actionview (= 7.1.0.alpha) activesupport (= 7.1.0.alpha) - rack (~> 2.0, >= 2.2.4) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) actionview (7.1.0.alpha) activesupport (= 7.1.0.alpha) builder (~> 3.1) erubi (~> 1.11) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) activesupport (7.1.0.alpha) concurrent-ruby (~> 1.0, >= 1.0.2) connection_pool (>= 2.2.5) @@ -24,8 +26,10 @@ GIT railties (7.1.0.alpha) actionpack (= 7.1.0.alpha) activesupport (= 7.1.0.alpha) + irb + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) + thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) PATH @@ -37,7 +41,7 @@ PATH GEM remote: https://rubygems.org/ specs: - appraisal (2.4.1) + appraisal (2.5.0) bundler rake thor (>= 0.14.0) @@ -54,9 +58,12 @@ GEM fileutils (1.7.1) i18n (1.14.1) concurrent-ruby (~> 1.0) + io-console (0.6.0) + irb (1.7.4) + reline (>= 0.3.6) json (2.6.3) language_server-protocol (3.17.0.3) - lint_roller (1.0.0) + lint_roller (1.1.0) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -64,7 +71,7 @@ GEM loofah (2.21.3) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.18.1) + minitest (5.19.0) nokogiri (1.15.3-arm64-darwin) racc (~> 1.4) parallel (1.23.0) @@ -72,10 +79,15 @@ GEM ast (~> 2.4.1) racc racc (1.7.1) - rack (2.2.7) + rack (3.0.8) + rack-session (2.0.0) + rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) - rails-dom-testing (2.1.1) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -87,9 +99,11 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.1.0) + rbs (3.1.3) regexp_parser (2.8.1) - rexml (3.2.5) + reline (0.3.7) + io-console (~> 0.5) + rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -102,7 +116,7 @@ GEM rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.5) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.1) @@ -133,7 +147,7 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.22.0) + rubocop-rspec (2.23.0) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -145,20 +159,21 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.29.0) + standard (1.30.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.52.0) standard-custom (~> 1.0.0) standard-performance (~> 1.1.0) - standard-custom (1.0.1) - lint_roller (~> 1.0) - standard-performance (1.1.0) + standard-custom (1.0.2) lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.1.2) + lint_roller (~> 1.1) rubocop-performance (~> 1.18.0) - steep (1.4.0) + steep (1.5.2) activesupport (>= 5.1) - concurrent-ruby (>= 1.2.2) + concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) fileutils (>= 1.1.0) json (>= 2.1.0) @@ -167,7 +182,7 @@ GEM logger (>= 1.3.0) parser (>= 3.1) rainbow (>= 2.2.2, < 4.0) - rbs (>= 2.8.0) + rbs (>= 3.1.0) securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) @@ -178,14 +193,15 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.4.2) - zeitwerk (2.6.8) + webrick (1.8.1) + zeitwerk (2.6.11) PLATFORMS arm64-darwin-21 arm64-darwin-22 DEPENDENCIES - appraisal (~> 2.4.1) + appraisal (~> 2.5.0) meta-tags! railties! rake (~> 13.0) @@ -194,10 +210,10 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.20.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.22.0) + rubocop-rspec (~> 2.23.0) simplecov (~> 0.22.0) standard (~> 1.29) - steep (~> 1.4.0) + steep (~> 1.5.2) BUNDLED WITH 2.4.10 From 740ed6b7b0957d3be745bf360a3d88ade2ab6629 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 00:31:07 +0000 Subject: [PATCH 043/126] Update rubocop-rspec requirement from ~> 2.23.0 to ~> 2.24.1 Updates the requirements on [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.23.0...v2.24.1) --- updated-dependencies: - dependency-name: rubocop-rspec dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 04f8a987..fb3e5de0 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "standard", "~> 1.29" spec.add_development_dependency "rubocop-rails", "~> 2.20.2" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" - spec.add_development_dependency "rubocop-rspec", "~> 2.23.0" + spec.add_development_dependency "rubocop-rspec", "~> 2.24.1" # Format RSpec output for CircleCI spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" From b6010933e65140a054e5dd98b102d70d86f0a0a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 00:28:10 +0000 Subject: [PATCH 044/126] Update rubocop-rails requirement from ~> 2.20.2 to ~> 2.21.2 Updates the requirements on [rubocop-rails](https://github.com/rubocop/rubocop-rails) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.20.2...v2.21.2) --- updated-dependencies: - dependency-name: rubocop-rails dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 04f8a987..d566e629 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "simplecov", "~> 0.22.0" # Code style spec.add_development_dependency "standard", "~> 1.29" - spec.add_development_dependency "rubocop-rails", "~> 2.20.2" + spec.add_development_dependency "rubocop-rails", "~> 2.21.2" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" spec.add_development_dependency "rubocop-rspec", "~> 2.23.0" # Format RSpec output for CircleCI From 32472dfb1267fed77bf4c54f2c9787cd4ccbb167 Mon Sep 17 00:00:00 2001 From: Eric Guo Date: Thu, 5 Oct 2023 19:26:18 +0800 Subject: [PATCH 045/126] Rails 7.1.0 released and seem no bug and test all pass. --- meta-tags.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 04f8a987..933ee0fa 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -22,9 +22,9 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_runtime_dependency "actionpack", ">= 3.2.0", "< 7.1" + spec.add_runtime_dependency "actionpack", ">= 3.2.0", "< 7.2" - spec.add_development_dependency "railties", ">= 3.2.0", "< 7.1" + spec.add_development_dependency "railties", ">= 3.2.0", "< 7.2" spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "rspec", "~> 3.12.0" spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0" From 901dd933502864fe4f9234d8837c31016919864a Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Thu, 5 Oct 2023 08:21:23 -0400 Subject: [PATCH 046/126] Workaround for codeclimate/test-reporter#418 --- spec/spec_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 44c23045..0eab8761 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,6 +2,7 @@ if ENV["ENABLE_CODE_COVERAGE"] require "simplecov" + SimpleCov.formatter = SimpleCov::Formatter::JSONFormatter SimpleCov.start do enable_coverage :branch end From f3f19af5d8d5138fc6b47851df5d7485213fa05b Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Thu, 5 Oct 2023 08:39:40 -0400 Subject: [PATCH 047/126] Added Ruby 3.2 to the build matrix --- .circleci/config.yml | 86 +++++++++++++++++++++++++++++++++++++--- .circleci/config.yml.erb | 8 +++- 2 files changed, 88 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 909ed28c..b863f775 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -271,7 +271,7 @@ jobs: environment: BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 0 + NO_STEEP: 1 working_directory: ~/meta-tags/ruby31-rails-70 steps: *shared_build_steps @@ -289,10 +289,66 @@ jobs: working_directory: ~/meta-tags/ruby31-rails-71 steps: *shared_build_steps + build-ruby32-rails-60: + parameters: + is_main_build: + type: boolean + default: false + docker: + - image: cimg/ruby:3.2 + environment: + BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile + ENABLE_CODE_COVERAGE: 1 + NO_STEEP: 1 + working_directory: ~/meta-tags/ruby32-rails-60 + steps: *shared_build_steps + + build-ruby32-rails-61: + parameters: + is_main_build: + type: boolean + default: false + docker: + - image: cimg/ruby:3.2 + environment: + BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile + ENABLE_CODE_COVERAGE: 1 + NO_STEEP: 1 + working_directory: ~/meta-tags/ruby32-rails-61 + steps: *shared_build_steps + + build-ruby32-rails-70: + parameters: + is_main_build: + type: boolean + default: false + docker: + - image: cimg/ruby:3.2 + environment: + BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile + ENABLE_CODE_COVERAGE: 1 + NO_STEEP: 1 + working_directory: ~/meta-tags/ruby32-rails-70 + steps: *shared_build_steps + + build-ruby32-rails-71: + parameters: + is_main_build: + type: boolean + default: false + docker: + - image: cimg/ruby:3.2 + environment: + BUNDLE_GEMFILE: gemfiles/rails_7.1.gemfile + ENABLE_CODE_COVERAGE: 1 + NO_STEEP: 0 + working_directory: ~/meta-tags/ruby32-rails-71 + steps: *shared_build_steps + upload-coverage: docker: - - image: cimg/ruby:3.1 + - image: cimg/ruby:3.2 steps: - attach_workspace: at: /tmp/workspace @@ -300,7 +356,7 @@ jobs: - run: name: Uploading Code Coverage command: | - cd /tmp/workspace/ruby31-rails-70 + cd /tmp/workspace/ruby32-rails-71 ./cc-test-reporter upload-coverage --input coverage/codeclimate.coverage.json || true tests: docker: @@ -352,15 +408,27 @@ workflows: is_main_build: false - build-ruby31-rails-70: - is_main_build: true + is_main_build: false - build-ruby31-rails-71: is_main_build: false + - build-ruby32-rails-60: + is_main_build: false + + - build-ruby32-rails-61: + is_main_build: false + + - build-ruby32-rails-70: + is_main_build: false + + - build-ruby32-rails-71: + is_main_build: true + - upload-coverage: requires: - - build-ruby31-rails-70 + - build-ruby32-rails-71 - tests: requires: @@ -393,3 +461,11 @@ workflows: - build-ruby31-rails-71 + - build-ruby32-rails-60 + + - build-ruby32-rails-61 + + - build-ruby32-rails-70 + + - build-ruby32-rails-71 + diff --git a/.circleci/config.yml.erb b/.circleci/config.yml.erb index 05c9ad73..5e0d1960 100644 --- a/.circleci/config.yml.erb +++ b/.circleci/config.yml.erb @@ -21,8 +21,14 @@ # 3.1 %w[3.1 6.0], %w[3.1 6.1], - ["3.1", "7.0", true], + %w[3.1 7.0], %w[3.1 7.1], + + # 3.2 + %w[3.2 6.0], + %w[3.2 6.1], + %w[3.2 7.0], + ["3.2", "7.1", true], ] main_build = builds.find { |_, _, is_main_build| is_main_build } From 5153420e47523a27defb7a37e55054cea3f47990 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Thu, 5 Oct 2023 08:41:38 -0400 Subject: [PATCH 048/126] Updated 7.1 appraisal file --- Appraisals | 2 +- gemfiles/rails_5.1.gemfile.lock | 46 +++++++------ gemfiles/rails_5.2.gemfile.lock | 46 +++++++------ gemfiles/rails_6.0.gemfile.lock | 48 ++++++------- gemfiles/rails_6.1.gemfile.lock | 48 ++++++------- gemfiles/rails_7.0.gemfile.lock | 48 ++++++------- gemfiles/rails_7.1.gemfile | 2 +- gemfiles/rails_7.1.gemfile.lock | 116 ++++++++++++++++++-------------- 8 files changed, 189 insertions(+), 167 deletions(-) diff --git a/Appraisals b/Appraisals index e9fffaae..80192f11 100644 --- a/Appraisals +++ b/Appraisals @@ -21,5 +21,5 @@ appraise "rails-7.0" do end appraise "rails-7.1" do - gem "railties", github: "rails" + gem "railties", "7.1.0" end diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index 7dd3cd65..b8348924 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -1,8 +1,8 @@ PATH remote: .. specs: - meta-tags (2.18.0) - actionpack (>= 3.2.0, < 7.1) + meta-tags (2.19.0) + actionpack (>= 3.2.0, < 7.2) GEM remote: https://rubygems.org/ @@ -30,6 +30,7 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) + base64 (0.1.1) builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) @@ -37,7 +38,7 @@ GEM diff-lcs (1.5.0) docile (1.4.0) erubi (1.12.0) - ffi (1.15.5) + ffi (1.16.3) fileutils (1.7.1) i18n (1.14.1) concurrent-ruby (~> 1.0) @@ -52,11 +53,11 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.19.0) - nokogiri (1.15.3-arm64-darwin) + minitest (5.20.0) + nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) parallel (1.23.0) - parser (3.2.2.3) + parser (3.2.2.4) ast (~> 2.4.1) racc racc (1.7.1) @@ -81,7 +82,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.1.3) + rbs (3.2.2) regexp_parser (2.8.1) rexml (3.2.6) rspec (3.12.0) @@ -102,23 +103,25 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.52.1) + rubocop (1.56.4) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) - rubocop-capybara (2.18.0) + rubocop-capybara (2.19.0) rubocop (~> 1.41) - rubocop-factory_bot (2.23.1) + rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-performance (1.18.0) + rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) rubocop-rails (2.20.2) @@ -127,7 +130,7 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.23.0) + rubocop-rspec (2.23.2) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -139,19 +142,19 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.30.1) + standard (1.31.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.52.0) + rubocop (~> 1.56.2) standard-custom (~> 1.0.0) - standard-performance (~> 1.1.0) + standard-performance (~> 1.2) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.1.2) + standard-performance (1.2.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.18.0) - steep (1.5.2) + rubocop-performance (~> 1.19.0) + steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -173,11 +176,10 @@ GEM thread_safe (0.3.6) tzinfo (1.2.11) thread_safe (~> 0.1) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) PLATFORMS - arm64-darwin-21 - arm64-darwin-22 + arm64-darwin DEPENDENCIES appraisal (~> 2.5.0) diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index 6f65dd77..25c44ba1 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -1,8 +1,8 @@ PATH remote: .. specs: - meta-tags (2.18.0) - actionpack (>= 3.2.0, < 7.1) + meta-tags (2.19.0) + actionpack (>= 3.2.0, < 7.2) GEM remote: https://rubygems.org/ @@ -30,6 +30,7 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) + base64 (0.1.1) builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) @@ -37,7 +38,7 @@ GEM diff-lcs (1.5.0) docile (1.4.0) erubi (1.12.0) - ffi (1.15.5) + ffi (1.16.3) fileutils (1.7.1) i18n (1.14.1) concurrent-ruby (~> 1.0) @@ -52,11 +53,11 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.19.0) - nokogiri (1.15.3-arm64-darwin) + minitest (5.20.0) + nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) parallel (1.23.0) - parser (3.2.2.3) + parser (3.2.2.4) ast (~> 2.4.1) racc racc (1.7.1) @@ -81,7 +82,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.1.3) + rbs (3.2.2) regexp_parser (2.8.1) rexml (3.2.6) rspec (3.12.0) @@ -102,23 +103,25 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.52.1) + rubocop (1.56.4) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) - rubocop-capybara (2.18.0) + rubocop-capybara (2.19.0) rubocop (~> 1.41) - rubocop-factory_bot (2.23.1) + rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-performance (1.18.0) + rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) rubocop-rails (2.20.2) @@ -127,7 +130,7 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.23.0) + rubocop-rspec (2.23.2) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -139,19 +142,19 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.30.1) + standard (1.31.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.52.0) + rubocop (~> 1.56.2) standard-custom (~> 1.0.0) - standard-performance (~> 1.1.0) + standard-performance (~> 1.2) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.1.2) + standard-performance (1.2.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.18.0) - steep (1.5.2) + rubocop-performance (~> 1.19.0) + steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -173,11 +176,10 @@ GEM thread_safe (0.3.6) tzinfo (1.2.11) thread_safe (~> 0.1) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) PLATFORMS - arm64-darwin-21 - arm64-darwin-22 + arm64-darwin DEPENDENCIES appraisal (~> 2.5.0) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 3270abb0..3c0f235d 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -1,8 +1,8 @@ PATH remote: .. specs: - meta-tags (2.18.0) - actionpack (>= 3.2.0, < 7.1) + meta-tags (2.19.0) + actionpack (>= 3.2.0, < 7.2) GEM remote: https://rubygems.org/ @@ -31,6 +31,7 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) + base64 (0.1.1) builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) @@ -38,7 +39,7 @@ GEM diff-lcs (1.5.0) docile (1.4.0) erubi (1.12.0) - ffi (1.15.5) + ffi (1.16.3) fileutils (1.7.1) i18n (1.14.1) concurrent-ruby (~> 1.0) @@ -53,11 +54,11 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.19.0) - nokogiri (1.15.3-arm64-darwin) + minitest (5.20.0) + nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) parallel (1.23.0) - parser (3.2.2.3) + parser (3.2.2.4) ast (~> 2.4.1) racc racc (1.7.1) @@ -82,7 +83,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.1.3) + rbs (3.2.2) regexp_parser (2.8.1) rexml (3.2.6) rspec (3.12.0) @@ -103,23 +104,25 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.52.1) + rubocop (1.56.4) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) - rubocop-capybara (2.18.0) + rubocop-capybara (2.19.0) rubocop (~> 1.41) - rubocop-factory_bot (2.23.1) + rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-performance (1.18.0) + rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) rubocop-rails (2.20.2) @@ -128,7 +131,7 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.23.0) + rubocop-rspec (2.23.2) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -140,19 +143,19 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.30.1) + standard (1.31.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.52.0) + rubocop (~> 1.56.2) standard-custom (~> 1.0.0) - standard-performance (~> 1.1.0) + standard-performance (~> 1.2) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.1.2) + standard-performance (1.2.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.18.0) - steep (1.5.2) + rubocop-performance (~> 1.19.0) + steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -174,12 +177,11 @@ GEM thread_safe (0.3.6) tzinfo (1.2.11) thread_safe (~> 0.1) - unicode-display_width (2.4.2) - zeitwerk (2.6.11) + unicode-display_width (2.5.0) + zeitwerk (2.6.12) PLATFORMS - arm64-darwin-21 - arm64-darwin-22 + arm64-darwin DEPENDENCIES appraisal (~> 2.5.0) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 873f67fd..b9b24a14 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -1,8 +1,8 @@ PATH remote: .. specs: - meta-tags (2.18.0) - actionpack (>= 3.2.0, < 7.1) + meta-tags (2.19.0) + actionpack (>= 3.2.0, < 7.2) GEM remote: https://rubygems.org/ @@ -31,6 +31,7 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) + base64 (0.1.1) builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) @@ -38,7 +39,7 @@ GEM diff-lcs (1.5.0) docile (1.4.0) erubi (1.12.0) - ffi (1.15.5) + ffi (1.16.3) fileutils (1.7.1) i18n (1.14.1) concurrent-ruby (~> 1.0) @@ -53,11 +54,11 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.19.0) - nokogiri (1.15.3-arm64-darwin) + minitest (5.20.0) + nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) parallel (1.23.0) - parser (3.2.2.3) + parser (3.2.2.4) ast (~> 2.4.1) racc racc (1.7.1) @@ -82,7 +83,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.1.3) + rbs (3.2.2) regexp_parser (2.8.1) rexml (3.2.6) rspec (3.12.0) @@ -103,23 +104,25 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.52.1) + rubocop (1.56.4) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) - rubocop-capybara (2.18.0) + rubocop-capybara (2.19.0) rubocop (~> 1.41) - rubocop-factory_bot (2.23.1) + rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-performance (1.18.0) + rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) rubocop-rails (2.20.2) @@ -128,7 +131,7 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.23.0) + rubocop-rspec (2.23.2) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -140,19 +143,19 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.30.1) + standard (1.31.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.52.0) + rubocop (~> 1.56.2) standard-custom (~> 1.0.0) - standard-performance (~> 1.1.0) + standard-performance (~> 1.2) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.1.2) + standard-performance (1.2.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.18.0) - steep (1.5.2) + rubocop-performance (~> 1.19.0) + steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -173,12 +176,11 @@ GEM thor (1.2.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.4.2) - zeitwerk (2.6.11) + unicode-display_width (2.5.0) + zeitwerk (2.6.12) PLATFORMS - arm64-darwin-21 - arm64-darwin-22 + arm64-darwin DEPENDENCIES appraisal (~> 2.5.0) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index c2be3e77..d715fa75 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -1,8 +1,8 @@ PATH remote: .. specs: - meta-tags (2.18.0) - actionpack (>= 3.2.0, < 7.1) + meta-tags (2.19.0) + actionpack (>= 3.2.0, < 7.2) GEM remote: https://rubygems.org/ @@ -30,6 +30,7 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) + base64 (0.1.1) builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) @@ -37,7 +38,7 @@ GEM diff-lcs (1.5.0) docile (1.4.0) erubi (1.12.0) - ffi (1.15.5) + ffi (1.16.3) fileutils (1.7.1) i18n (1.14.1) concurrent-ruby (~> 1.0) @@ -52,11 +53,11 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.19.0) - nokogiri (1.15.3-arm64-darwin) + minitest (5.20.0) + nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) parallel (1.23.0) - parser (3.2.2.3) + parser (3.2.2.4) ast (~> 2.4.1) racc racc (1.7.1) @@ -82,7 +83,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.1.3) + rbs (3.2.2) regexp_parser (2.8.1) rexml (3.2.6) rspec (3.12.0) @@ -103,23 +104,25 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.52.1) + rubocop (1.56.4) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) - rubocop-capybara (2.18.0) + rubocop-capybara (2.19.0) rubocop (~> 1.41) - rubocop-factory_bot (2.23.1) + rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-performance (1.18.0) + rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) rubocop-rails (2.20.2) @@ -128,7 +131,7 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.23.0) + rubocop-rspec (2.23.2) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -140,19 +143,19 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.30.1) + standard (1.31.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.52.0) + rubocop (~> 1.56.2) standard-custom (~> 1.0.0) - standard-performance (~> 1.1.0) + standard-performance (~> 1.2) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.1.2) + standard-performance (1.2.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.18.0) - steep (1.5.2) + rubocop-performance (~> 1.19.0) + steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -173,12 +176,11 @@ GEM thor (1.2.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.4.2) - zeitwerk (2.6.11) + unicode-display_width (2.5.0) + zeitwerk (2.6.12) PLATFORMS - arm64-darwin-21 - arm64-darwin-22 + arm64-darwin DEPENDENCIES appraisal (~> 2.5.0) diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index de01d3dc..d2c9fa22 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -3,6 +3,6 @@ source "https://rubygems.org" gem "steep", "~> 1.5.2", platform: :mri -gem "railties", github: "rails" +gem "railties", "7.1.0" gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 1a8d16e1..4c5f93ce 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -1,51 +1,44 @@ -GIT - remote: https://github.com/rails/rails.git - revision: 83e59883e990704fd57572708b7d61f776113345 +PATH + remote: .. + specs: + meta-tags (2.19.0) + actionpack (>= 3.2.0, < 7.2) + +GEM + remote: https://rubygems.org/ specs: - actionpack (7.1.0.alpha) - actionview (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) + actionpack (7.1.0) + actionview (= 7.1.0) + activesupport (= 7.1.0) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actionview (7.1.0.alpha) - activesupport (= 7.1.0.alpha) + actionview (7.1.0) + activesupport (= 7.1.0) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activesupport (7.1.0.alpha) + activesupport (7.1.0) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - railties (7.1.0.alpha) - actionpack (= 7.1.0.alpha) - activesupport (= 7.1.0.alpha) - irb - rackup (>= 1.0.0) - rake (>= 12.2) - thor (~> 1.0, >= 1.2.2) - zeitwerk (~> 2.6) - -PATH - remote: .. - specs: - meta-tags (2.18.0) - actionpack (>= 3.2.0, < 7.1) - -GEM - remote: https://rubygems.org/ - specs: appraisal (2.5.0) bundler rake thor (>= 0.14.0) ast (2.4.2) + base64 (0.1.1) + bigdecimal (3.1.4) builder (3.2.4) concurrent-ruby (1.2.2) connection_pool (2.4.1) @@ -53,14 +46,17 @@ GEM csv (3.2.7) diff-lcs (1.5.0) docile (1.4.0) + drb (2.1.1) + ruby2_keywords erubi (1.12.0) - ffi (1.15.5) + ffi (1.16.3) fileutils (1.7.1) i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.6.0) - irb (1.7.4) - reline (>= 0.3.6) + irb (1.8.1) + rdoc + reline (>= 0.3.8) json (2.6.3) language_server-protocol (3.17.0.3) lint_roller (1.1.0) @@ -71,13 +67,16 @@ GEM loofah (2.21.3) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.19.0) - nokogiri (1.15.3-arm64-darwin) + minitest (5.20.0) + mutex_m (0.1.2) + nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) parallel (1.23.0) - parser (3.2.2.3) + parser (3.2.2.4) ast (~> 2.4.1) racc + psych (5.1.0) + stringio racc (1.7.1) rack (3.0.8) rack-session (2.0.0) @@ -94,14 +93,24 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) + railties (7.1.0) + actionpack (= 7.1.0) + activesupport (= 7.1.0) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.1.3) + rbs (3.2.2) + rdoc (6.5.0) + psych (>= 4.0.0) regexp_parser (2.8.1) - reline (0.3.7) + reline (0.3.9) io-console (~> 0.5) rexml (3.2.6) rspec (3.12.0) @@ -122,23 +131,25 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.52.1) + rubocop (1.56.4) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) - rubocop-capybara (2.18.0) + rubocop-capybara (2.19.0) rubocop (~> 1.41) - rubocop-factory_bot (2.23.1) + rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-performance (1.18.0) + rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) rubocop-rails (2.20.2) @@ -147,11 +158,12 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.23.0) + rubocop-rspec (2.23.2) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) securerandom (0.2.2) simplecov (0.22.0) docile (~> 1.1) @@ -159,19 +171,19 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.30.1) + standard (1.31.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.52.0) + rubocop (~> 1.56.2) standard-custom (~> 1.0.0) - standard-performance (~> 1.1.0) + standard-performance (~> 1.2) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.1.2) + standard-performance (1.2.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.18.0) - steep (1.5.2) + rubocop-performance (~> 1.19.0) + steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -186,24 +198,24 @@ GEM securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) + stringio (3.0.8) strscan (3.0.6) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.2.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) webrick (1.8.1) - zeitwerk (2.6.11) + zeitwerk (2.6.12) PLATFORMS - arm64-darwin-21 - arm64-darwin-22 + arm64-darwin DEPENDENCIES appraisal (~> 2.5.0) meta-tags! - railties! + railties (= 7.1.0) rake (~> 13.0) rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) From 4fc1decdaa005f5de6cea48f4af64cc3d83b291c Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Thu, 5 Oct 2023 08:41:47 -0400 Subject: [PATCH 049/126] Preparing 2.19.0 release --- CHANGELOG.md | 3 ++- README.md | 2 +- lib/meta_tags/version.rb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d08d321..181b457b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,13 @@ # Changelog -## 2.19.0 (Development) +## 2.19.0 (October 5, 2023) [☰](https://github.com/kpumuk/meta-tags/compare/v2.18.0...v2.19.0) Changes: - Switched code style from custom rules to Standard ([246](https://github.com/kpumuk/meta-tags/pull/251)). - Switched from testing Rails using environment variables to Appraisal gem ([251](https://github.com/kpumuk/meta-tags/pull/247)). - Ruby 2.7 is minimum supported version ([257](https://github.com/kpumuk/meta-tags/pull/257/)) +- Added support for Rails 7.1 ([267](https://github.com/kpumuk/meta-tags/pull/267)) ## 2.18.0 (September 15, 2022) [☰](https://github.com/kpumuk/meta-tags/compare/v2.17.0...v2.18.0) diff --git a/README.md b/README.md index 4a4a694a..ae3972a2 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Search Engine Optimization (SEO) plugin for Ruby on Rails applications. ## Ruby on Rails MetaTags main branch fully supports Ruby on Rails 5.1+, and is tested against all -major Rails releases up to 7.0. +major Rails releases up to 7.1. Ruby versions older than 2.7 are no longer officially supported. diff --git a/lib/meta_tags/version.rb b/lib/meta_tags/version.rb index 7b737e3c..80f3c2c3 100644 --- a/lib/meta_tags/version.rb +++ b/lib/meta_tags/version.rb @@ -2,6 +2,6 @@ module MetaTags # Gem version. - VERSION = "2.18.0" + VERSION = "2.19.0" public_constant :VERSION end From 8ec8301141eb194be64a5a3d229a2bd8d33b5b41 Mon Sep 17 00:00:00 2001 From: hotoolong Date: Tue, 10 Oct 2023 14:48:46 +0900 Subject: [PATCH 050/126] fix link urls --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 181b457b..b24cadc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,9 @@ Changes: -- Switched code style from custom rules to Standard ([246](https://github.com/kpumuk/meta-tags/pull/251)). -- Switched from testing Rails using environment variables to Appraisal gem ([251](https://github.com/kpumuk/meta-tags/pull/247)). -- Ruby 2.7 is minimum supported version ([257](https://github.com/kpumuk/meta-tags/pull/257/)) +- Switched code style from custom rules to Standard ([246](https://github.com/kpumuk/meta-tags/pull/246)). +- Switched from testing Rails using environment variables to Appraisal gem ([251](https://github.com/kpumuk/meta-tags/pull/251)). +- Ruby 2.7 is minimum supported version ([257](https://github.com/kpumuk/meta-tags/pull/257)) - Added support for Rails 7.1 ([267](https://github.com/kpumuk/meta-tags/pull/267)) ## 2.18.0 (September 15, 2022) [☰](https://github.com/kpumuk/meta-tags/compare/v2.17.0...v2.18.0) From 85f6f0b5ac2469d9e1d46960ad38c4060300709f Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Tue, 10 Oct 2023 09:12:38 -0400 Subject: [PATCH 051/126] Fixed buils on CI, failing with 'uninitialized constant SimpleCov::Formatter::JSONFormatter' --- spec/spec_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0eab8761..1dc548a7 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,6 +2,7 @@ if ENV["ENABLE_CODE_COVERAGE"] require "simplecov" + require "simplecov_json_formatter" SimpleCov.formatter = SimpleCov::Formatter::JSONFormatter SimpleCov.start do enable_coverage :branch From 5be0717556acd8856455cee4e211c0fce310fbbc Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Wed, 11 Oct 2023 11:13:41 -0400 Subject: [PATCH 052/126] Added Rails 7.2 to the build matrix --- .circleci/config.yml | 57 ++++++++ .circleci/config.yml.erb | 3 + Appraisals | 4 + gemfiles/rails_5.1.gemfile.lock | 24 ++-- gemfiles/rails_5.2.gemfile.lock | 24 ++-- gemfiles/rails_6.0.gemfile.lock | 24 ++-- gemfiles/rails_6.1.gemfile.lock | 24 ++-- gemfiles/rails_7.0.gemfile.lock | 24 ++-- gemfiles/rails_7.1.gemfile.lock | 26 ++-- gemfiles/rails_7.2.gemfile | 8 ++ gemfiles/rails_7.2.gemfile.lock | 236 ++++++++++++++++++++++++++++++++ meta-tags.gemspec | 2 +- 12 files changed, 382 insertions(+), 74 deletions(-) create mode 100644 gemfiles/rails_7.2.gemfile create mode 100644 gemfiles/rails_7.2.gemfile.lock diff --git a/.circleci/config.yml b/.circleci/config.yml index b863f775..b94de622 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -233,6 +233,20 @@ jobs: working_directory: ~/meta-tags/ruby30-rails-71 steps: *shared_build_steps + build-ruby30-rails-72: + parameters: + is_main_build: + type: boolean + default: false + docker: + - image: cimg/ruby:3.0 + environment: + BUNDLE_GEMFILE: gemfiles/rails_7.2.gemfile + ENABLE_CODE_COVERAGE: 1 + NO_STEEP: 1 + working_directory: ~/meta-tags/ruby30-rails-72 + steps: *shared_build_steps + build-ruby31-rails-60: parameters: is_main_build: @@ -289,6 +303,20 @@ jobs: working_directory: ~/meta-tags/ruby31-rails-71 steps: *shared_build_steps + build-ruby31-rails-72: + parameters: + is_main_build: + type: boolean + default: false + docker: + - image: cimg/ruby:3.1 + environment: + BUNDLE_GEMFILE: gemfiles/rails_7.2.gemfile + ENABLE_CODE_COVERAGE: 1 + NO_STEEP: 1 + working_directory: ~/meta-tags/ruby31-rails-72 + steps: *shared_build_steps + build-ruby32-rails-60: parameters: is_main_build: @@ -345,6 +373,20 @@ jobs: working_directory: ~/meta-tags/ruby32-rails-71 steps: *shared_build_steps + build-ruby32-rails-72: + parameters: + is_main_build: + type: boolean + default: false + docker: + - image: cimg/ruby:3.2 + environment: + BUNDLE_GEMFILE: gemfiles/rails_7.2.gemfile + ENABLE_CODE_COVERAGE: 1 + NO_STEEP: 1 + working_directory: ~/meta-tags/ruby32-rails-72 + steps: *shared_build_steps + upload-coverage: docker: @@ -401,6 +443,9 @@ workflows: - build-ruby30-rails-71: is_main_build: false + - build-ruby30-rails-72: + is_main_build: false + - build-ruby31-rails-60: is_main_build: false @@ -413,6 +458,9 @@ workflows: - build-ruby31-rails-71: is_main_build: false + - build-ruby31-rails-72: + is_main_build: false + - build-ruby32-rails-60: is_main_build: false @@ -425,6 +473,9 @@ workflows: - build-ruby32-rails-71: is_main_build: true + - build-ruby32-rails-72: + is_main_build: false + - upload-coverage: requires: @@ -453,6 +504,8 @@ workflows: - build-ruby30-rails-71 + - build-ruby30-rails-72 + - build-ruby31-rails-60 - build-ruby31-rails-61 @@ -461,6 +514,8 @@ workflows: - build-ruby31-rails-71 + - build-ruby31-rails-72 + - build-ruby32-rails-60 - build-ruby32-rails-61 @@ -469,3 +524,5 @@ workflows: - build-ruby32-rails-71 + - build-ruby32-rails-72 + diff --git a/.circleci/config.yml.erb b/.circleci/config.yml.erb index 5e0d1960..32673f3d 100644 --- a/.circleci/config.yml.erb +++ b/.circleci/config.yml.erb @@ -17,18 +17,21 @@ %w[3.0 6.1], %w[3.0 7.0], %w[3.0 7.1], + %w[3.0 7.2], # 3.1 %w[3.1 6.0], %w[3.1 6.1], %w[3.1 7.0], %w[3.1 7.1], + %w[3.1 7.2], # 3.2 %w[3.2 6.0], %w[3.2 6.1], %w[3.2 7.0], ["3.2", "7.1", true], + %w[3.2 7.2], ] main_build = builds.find { |_, _, is_main_build| is_main_build } diff --git a/Appraisals b/Appraisals index 80192f11..85973263 100644 --- a/Appraisals +++ b/Appraisals @@ -23,3 +23,7 @@ end appraise "rails-7.1" do gem "railties", "7.1.0" end + +appraise "rails-7.2" do + gem "railties", github: "rails" +end diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index b8348924..d42b6b15 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -49,7 +49,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.5.3) - loofah (2.21.3) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) @@ -83,7 +83,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rbs (3.2.2) - regexp_parser (2.8.1) + regexp_parser (2.8.2) rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -124,13 +124,13 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.20.2) + rubocop-rails (2.21.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.23.2) + rubocop-rspec (2.24.1) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -142,18 +142,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.31.1) + standard (1.31.2) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.2) + rubocop (~> 1.56.4) standard-custom (~> 1.0.0) standard-performance (~> 1.2) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.0) + standard-performance (1.2.1) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.0) + rubocop-performance (~> 1.19.1) steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -169,7 +169,7 @@ GEM securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - strscan (3.0.6) + strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.2.2) @@ -189,11 +189,11 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.20.2) + rubocop-rails (~> 2.21.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.23.0) + rubocop-rspec (~> 2.24.1) simplecov (~> 0.22.0) - standard (~> 1.29) + standard (~> 1.31) steep (~> 1.5.2) BUNDLED WITH diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index 25c44ba1..cc691b09 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -49,7 +49,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.5.3) - loofah (2.21.3) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) @@ -83,7 +83,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rbs (3.2.2) - regexp_parser (2.8.1) + regexp_parser (2.8.2) rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -124,13 +124,13 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.20.2) + rubocop-rails (2.21.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.23.2) + rubocop-rspec (2.24.1) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -142,18 +142,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.31.1) + standard (1.31.2) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.2) + rubocop (~> 1.56.4) standard-custom (~> 1.0.0) standard-performance (~> 1.2) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.0) + standard-performance (1.2.1) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.0) + rubocop-performance (~> 1.19.1) steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -169,7 +169,7 @@ GEM securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - strscan (3.0.6) + strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.2.2) @@ -189,11 +189,11 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.20.2) + rubocop-rails (~> 2.21.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.23.0) + rubocop-rspec (~> 2.24.1) simplecov (~> 0.22.0) - standard (~> 1.29) + standard (~> 1.31) steep (~> 1.5.2) BUNDLED WITH diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 3c0f235d..f5e94498 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -50,7 +50,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.5.3) - loofah (2.21.3) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) @@ -84,7 +84,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rbs (3.2.2) - regexp_parser (2.8.1) + regexp_parser (2.8.2) rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -125,13 +125,13 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.20.2) + rubocop-rails (2.21.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.23.2) + rubocop-rspec (2.24.1) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -143,18 +143,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.31.1) + standard (1.31.2) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.2) + rubocop (~> 1.56.4) standard-custom (~> 1.0.0) standard-performance (~> 1.2) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.0) + standard-performance (1.2.1) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.0) + rubocop-performance (~> 1.19.1) steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -170,7 +170,7 @@ GEM securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - strscan (3.0.6) + strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.2.2) @@ -191,11 +191,11 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.20.2) + rubocop-rails (~> 2.21.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.23.0) + rubocop-rspec (~> 2.24.1) simplecov (~> 0.22.0) - standard (~> 1.29) + standard (~> 1.31) steep (~> 1.5.2) BUNDLED WITH diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index b9b24a14..17f5c9a3 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -50,7 +50,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.5.3) - loofah (2.21.3) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) @@ -84,7 +84,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rbs (3.2.2) - regexp_parser (2.8.1) + regexp_parser (2.8.2) rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -125,13 +125,13 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.20.2) + rubocop-rails (2.21.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.23.2) + rubocop-rspec (2.24.1) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -143,18 +143,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.31.1) + standard (1.31.2) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.2) + rubocop (~> 1.56.4) standard-custom (~> 1.0.0) standard-performance (~> 1.2) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.0) + standard-performance (1.2.1) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.0) + rubocop-performance (~> 1.19.1) steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -170,7 +170,7 @@ GEM securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - strscan (3.0.6) + strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.2.2) @@ -190,11 +190,11 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.20.2) + rubocop-rails (~> 2.21.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.23.0) + rubocop-rspec (~> 2.24.1) simplecov (~> 0.22.0) - standard (~> 1.29) + standard (~> 1.31) steep (~> 1.5.2) BUNDLED WITH diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index d715fa75..9f875a6d 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -49,7 +49,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.5.3) - loofah (2.21.3) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) @@ -84,7 +84,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rbs (3.2.2) - regexp_parser (2.8.1) + regexp_parser (2.8.2) rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -125,13 +125,13 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.20.2) + rubocop-rails (2.21.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.23.2) + rubocop-rspec (2.24.1) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -143,18 +143,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.31.1) + standard (1.31.2) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.2) + rubocop (~> 1.56.4) standard-custom (~> 1.0.0) standard-performance (~> 1.2) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.0) + standard-performance (1.2.1) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.0) + rubocop-performance (~> 1.19.1) steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -170,7 +170,7 @@ GEM securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - strscan (3.0.6) + strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.2.2) @@ -190,11 +190,11 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.20.2) + rubocop-rails (~> 2.21.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.23.0) + rubocop-rspec (~> 2.24.1) simplecov (~> 0.22.0) - standard (~> 1.29) + standard (~> 1.31) steep (~> 1.5.2) BUNDLED WITH diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 4c5f93ce..9dfd7707 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -64,7 +64,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.5.3) - loofah (2.21.3) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) minitest (5.20.0) @@ -75,7 +75,7 @@ GEM parser (3.2.2.4) ast (~> 2.4.1) racc - psych (5.1.0) + psych (5.1.1) stringio racc (1.7.1) rack (3.0.8) @@ -109,7 +109,7 @@ GEM rbs (3.2.2) rdoc (6.5.0) psych (>= 4.0.0) - regexp_parser (2.8.1) + regexp_parser (2.8.2) reline (0.3.9) io-console (~> 0.5) rexml (3.2.6) @@ -152,13 +152,13 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.20.2) + rubocop-rails (2.21.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.23.2) + rubocop-rspec (2.24.1) rubocop (~> 1.33) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -171,18 +171,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.31.1) + standard (1.31.2) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.2) + rubocop (~> 1.56.4) standard-custom (~> 1.0.0) standard-performance (~> 1.2) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.0) + standard-performance (1.2.1) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.0) + rubocop-performance (~> 1.19.1) steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -199,7 +199,7 @@ GEM strscan (>= 1.0.0) terminal-table (>= 2, < 4) stringio (3.0.8) - strscan (3.0.6) + strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.2.2) @@ -220,11 +220,11 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.20.2) + rubocop-rails (~> 2.21.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.23.0) + rubocop-rspec (~> 2.24.1) simplecov (~> 0.22.0) - standard (~> 1.29) + standard (~> 1.31) steep (~> 1.5.2) BUNDLED WITH diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile new file mode 100644 index 00000000..de01d3dc --- /dev/null +++ b/gemfiles/rails_7.2.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "steep", "~> 1.5.2", platform: :mri +gem "railties", github: "rails" + +gemspec path: "../" diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock new file mode 100644 index 00000000..ed3c8feb --- /dev/null +++ b/gemfiles/rails_7.2.gemfile.lock @@ -0,0 +1,236 @@ +GIT + remote: https://github.com/rails/rails.git + revision: 452c9f6c71b01ee27a129a8a2cfc3592f6ff0783 + specs: + actionpack (7.2.0.alpha) + actionview (= 7.2.0.alpha) + activesupport (= 7.2.0.alpha) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actionview (7.2.0.alpha) + activesupport (= 7.2.0.alpha) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activesupport (7.2.0.alpha) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + railties (7.2.0.alpha) + actionpack (= 7.2.0.alpha) + activesupport (= 7.2.0.alpha) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + +PATH + remote: .. + specs: + meta-tags (2.19.0) + actionpack (>= 3.2.0, < 7.2) + +GEM + remote: https://rubygems.org/ + specs: + appraisal (2.5.0) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + base64 (0.1.1) + bigdecimal (3.1.4) + builder (3.2.4) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) + crass (1.0.6) + csv (3.2.7) + diff-lcs (1.5.0) + docile (1.4.0) + drb (2.1.1) + ruby2_keywords + erubi (1.12.0) + ffi (1.16.3) + fileutils (1.7.1) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + io-console (0.6.0) + irb (1.8.1) + rdoc + reline (>= 0.3.8) + json (2.6.3) + language_server-protocol (3.17.0.3) + lint_roller (1.1.0) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.5.3) + loofah (2.21.4) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + minitest (5.20.0) + mutex_m (0.1.2) + nokogiri (1.15.4-arm64-darwin) + racc (~> 1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + psych (5.1.1) + stringio + racc (1.7.1) + rack (3.0.8) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + rainbow (3.1.1) + rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rbs (3.2.2) + rdoc (6.5.0) + psych (>= 4.0.0) + regexp_parser (2.8.2) + reline (0.3.9) + io-console (~> 0.5) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-html-matchers (0.10.0) + nokogiri (~> 1) + rspec (>= 3.0.0.a) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rubocop (1.56.4) + base64 (~> 0.1.1) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.2.2.3) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.24.0) + rubocop (~> 1.33) + rubocop-performance (1.19.1) + rubocop (>= 1.7.0, < 2.0) + rubocop-ast (>= 0.4.0) + rubocop-rails (2.21.2) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.24.1) + rubocop (~> 1.33) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + securerandom (0.2.2) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + standard (1.31.2) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.56.4) + standard-custom (~> 1.0.0) + standard-performance (~> 1.2) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.2.1) + lint_roller (~> 1.1) + rubocop-performance (~> 1.19.1) + steep (1.5.3) + activesupport (>= 5.1) + concurrent-ruby (>= 1.1.10) + csv (>= 3.0.9) + fileutils (>= 1.1.0) + json (>= 2.1.0) + language_server-protocol (>= 3.15, < 4.0) + listen (~> 3.0) + logger (>= 1.3.0) + parser (>= 3.1) + rainbow (>= 2.2.2, < 4.0) + rbs (>= 3.1.0) + securerandom (>= 0.1) + strscan (>= 1.0.0) + terminal-table (>= 2, < 4) + stringio (3.0.8) + strscan (3.0.7) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + thor (1.2.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.5.0) + webrick (1.8.1) + zeitwerk (2.6.12) + +PLATFORMS + arm64-darwin-23 + +DEPENDENCIES + appraisal (~> 2.5.0) + meta-tags! + railties! + rake (~> 13.0) + rspec (~> 3.12.0) + rspec-html-matchers (~> 0.10.0) + rspec_junit_formatter (~> 0.6.0) + rubocop-rails (~> 2.21.2) + rubocop-rake (~> 0.6.0) + rubocop-rspec (~> 2.24.1) + simplecov (~> 0.22.0) + standard (~> 1.31) + steep (~> 1.5.2) + +BUNDLED WITH + 2.4.10 diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 2ae36197..f42a0794 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "appraisal", "~> 2.5.0" spec.add_development_dependency "simplecov", "~> 0.22.0" # Code style - spec.add_development_dependency "standard", "~> 1.29" + spec.add_development_dependency "standard", "~> 1.31" spec.add_development_dependency "rubocop-rails", "~> 2.21.2" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" spec.add_development_dependency "rubocop-rspec", "~> 2.24.1" From c7a71b3b8ee218d6f5264d641e6fc3c916bbab71 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 14 Oct 2023 10:43:37 -0400 Subject: [PATCH 053/126] Added test Github workflow --- .github/workflows/test.yml | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 00000000..483e9036 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,42 @@ +name: Tests + +on: + push: + pull_request: + types: [opened, reopened] + +jobs: + test: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + ruby-version: + - "2.7" + - "3.0" + - "3.1" + - "3.2" + - "ruby-head" + gemfile: + - rails_5.1 + - rails_5.2 + - rails_6.0 + - rails_6.1 + - rails_7.0 + - rails_7.1 + - rails_7.2 + env: + BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile + + name: Specs - Ruby ${{ matrix.ruby-version }} + steps: + - uses: actions/checkout@v4 + - name: Set up Ruby ${{ matrix.ruby-version }} + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby-version }} + bundler-cache: true + - name: Run StandardRB + run: | + bundle exec rspec + From c59c22e6bf8b20f0495721a0304d65ae00f3cbcc Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 14 Oct 2023 10:50:44 -0400 Subject: [PATCH 054/126] Added x86_64-linux platform to all gemfiles --- gemfiles/rails_5.1.gemfile.lock | 3 +++ gemfiles/rails_5.2.gemfile.lock | 3 +++ gemfiles/rails_6.0.gemfile.lock | 3 +++ gemfiles/rails_6.1.gemfile.lock | 3 +++ gemfiles/rails_7.0.gemfile.lock | 3 +++ gemfiles/rails_7.1.gemfile.lock | 5 ++++- gemfiles/rails_7.2.gemfile.lock | 7 +++++-- 7 files changed, 24 insertions(+), 3 deletions(-) diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index d42b6b15..6262700f 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -56,6 +56,8 @@ GEM minitest (5.20.0) nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) + nokogiri (1.15.4-x86_64-linux) + racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) @@ -180,6 +182,7 @@ GEM PLATFORMS arm64-darwin + x86_64-linux DEPENDENCIES appraisal (~> 2.5.0) diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index cc691b09..c7538387 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -56,6 +56,8 @@ GEM minitest (5.20.0) nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) + nokogiri (1.15.4-x86_64-linux) + racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) @@ -180,6 +182,7 @@ GEM PLATFORMS arm64-darwin + x86_64-linux DEPENDENCIES appraisal (~> 2.5.0) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index f5e94498..5ef4c8e1 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -57,6 +57,8 @@ GEM minitest (5.20.0) nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) + nokogiri (1.15.4-x86_64-linux) + racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) @@ -182,6 +184,7 @@ GEM PLATFORMS arm64-darwin + x86_64-linux DEPENDENCIES appraisal (~> 2.5.0) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 17f5c9a3..da5a2712 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -57,6 +57,8 @@ GEM minitest (5.20.0) nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) + nokogiri (1.15.4-x86_64-linux) + racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) @@ -181,6 +183,7 @@ GEM PLATFORMS arm64-darwin + x86_64-linux DEPENDENCIES appraisal (~> 2.5.0) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 9f875a6d..0b80735b 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -56,6 +56,8 @@ GEM minitest (5.20.0) nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) + nokogiri (1.15.4-x86_64-linux) + racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) @@ -181,6 +183,7 @@ GEM PLATFORMS arm64-darwin + x86_64-linux DEPENDENCIES appraisal (~> 2.5.0) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 9dfd7707..5d34c94e 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -54,7 +54,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.6.0) - irb (1.8.1) + irb (1.8.3) rdoc reline (>= 0.3.8) json (2.6.3) @@ -71,6 +71,8 @@ GEM mutex_m (0.1.2) nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) + nokogiri (1.15.4-x86_64-linux) + racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) @@ -211,6 +213,7 @@ GEM PLATFORMS arm64-darwin + x86_64-linux DEPENDENCIES appraisal (~> 2.5.0) diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index ed3c8feb..7b79b349 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: 452c9f6c71b01ee27a129a8a2cfc3592f6ff0783 + revision: 0ed3c2a5f9575a5c58dde8fe88bbacae860dd7c7 specs: actionpack (7.2.0.alpha) actionview (= 7.2.0.alpha) @@ -67,7 +67,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.6.0) - irb (1.8.1) + irb (1.8.3) rdoc reline (>= 0.3.8) json (2.6.3) @@ -84,6 +84,8 @@ GEM mutex_m (0.1.2) nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) + nokogiri (1.15.4-x86_64-linux) + racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) @@ -216,6 +218,7 @@ GEM PLATFORMS arm64-darwin-23 + x86_64-linux DEPENDENCIES appraisal (~> 2.5.0) From f7baa1974f16d2712d77e51fd8127adc21c5e90e Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 14 Oct 2023 10:56:06 -0400 Subject: [PATCH 055/126] Do not test Rails 5.x in Ruby 3.0+ --- .github/workflows/test.yml | 6 +++--- Appraisals | 2 ++ gemfiles/rails_5.1.gemfile | 1 + gemfiles/rails_5.1.gemfile.lock | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 483e9036..b9e06ead 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,15 +16,15 @@ jobs: - "3.0" - "3.1" - "3.2" - - "ruby-head" gemfile: - - rails_5.1 - - rails_5.2 - rails_6.0 - rails_6.1 - rails_7.0 - rails_7.1 - rails_7.2 + include: + - ruby: "2.7" + gemfile: [rails_5.1, rails_5.2] env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile diff --git a/Appraisals b/Appraisals index 85973263..67e93a7d 100644 --- a/Appraisals +++ b/Appraisals @@ -2,6 +2,8 @@ appraise "rails-5.1" do gem "railties", "5.1.7" + + gem "rbs", "< 3.2.0" end appraise "rails-5.2" do diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 481590fe..405df685 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -4,5 +4,6 @@ source "https://rubygems.org" gem "steep", "~> 1.5.2", platform: :mri gem "railties", "5.1.7" +gem "rbs", "< 3.2.0" gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index 6262700f..f2c4151d 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -84,7 +84,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.2.2) + rbs (3.1.3) regexp_parser (2.8.2) rexml (3.2.6) rspec (3.12.0) @@ -189,6 +189,7 @@ DEPENDENCIES meta-tags! railties (= 5.1.7) rake (~> 13.0) + rbs (< 3.2.0) rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) From ccec389bc58bc50bc9ce17c966ace245dbe408a9 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 14 Oct 2023 10:59:29 -0400 Subject: [PATCH 056/126] Better name of the Github actions job --- .github/workflows/test.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b9e06ead..6f4c1b45 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,22 +16,22 @@ jobs: - "3.0" - "3.1" - "3.2" - gemfile: - - rails_6.0 - - rails_6.1 - - rails_7.0 - - rails_7.1 - - rails_7.2 + rails-version: + - "6.0" + - "6.1" + - "7.0" + - "7.1" + - "7.2" include: - - ruby: "2.7" - gemfile: [rails_5.1, rails_5.2] + - ruby-version: "2.7" + rails-version: ["5.1", "5.2"] env: - BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile + BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile - name: Specs - Ruby ${{ matrix.ruby-version }} + name: Specs - Ruby ${{ matrix.ruby-version }} on Rails ${{ matrix.rails-version }} steps: - uses: actions/checkout@v4 - - name: Set up Ruby ${{ matrix.ruby-version }} + - name: Set up Ruby uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} From fcbf4a669aff4f256f03a6ad53b2f9cd25e877d0 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 14 Oct 2023 11:10:32 -0400 Subject: [PATCH 057/126] Only install Steep on Ruby 3.2 --- Appraisals | 2 -- Gemfile | 6 ++---- gemfiles/rails_5.1.gemfile | 3 +-- gemfiles/rails_5.1.gemfile.lock | 3 +-- gemfiles/rails_5.2.gemfile | 2 +- gemfiles/rails_6.0.gemfile | 2 +- gemfiles/rails_6.1.gemfile | 2 +- gemfiles/rails_7.0.gemfile | 2 +- gemfiles/rails_7.1.gemfile | 2 +- gemfiles/rails_7.2.gemfile | 2 +- 10 files changed, 10 insertions(+), 16 deletions(-) diff --git a/Appraisals b/Appraisals index 67e93a7d..85973263 100644 --- a/Appraisals +++ b/Appraisals @@ -2,8 +2,6 @@ appraise "rails-5.1" do gem "railties", "5.1.7" - - gem "rbs", "< 3.2.0" end appraise "rails-5.2" do diff --git a/Gemfile b/Gemfile index e438bad1..b176423e 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,5 @@ source "https://rubygems.org" # Specify gem's dependencies in meta-tags.gemspec gemspec -unless ENV["NO_STEEP"] == "1" - # Ruby typings - gem "steep", "~> 1.5.2", platform: :mri -end +# Ruby typings +gem "steep", "~> 1.5.2", platform: :mri_32 diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 405df685..4e709bf6 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -2,8 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.5.2", platform: :mri +gem "steep", "~> 1.5.2", platform: :mri_32 gem "railties", "5.1.7" -gem "rbs", "< 3.2.0" gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index f2c4151d..6262700f 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -84,7 +84,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.1.3) + rbs (3.2.2) regexp_parser (2.8.2) rexml (3.2.6) rspec (3.12.0) @@ -189,7 +189,6 @@ DEPENDENCIES meta-tags! railties (= 5.1.7) rake (~> 13.0) - rbs (< 3.2.0) rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index c39ac854..9c78ea27 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.5.2", platform: :mri +gem "steep", "~> 1.5.2", platform: :mri_32 gem "railties", "5.2.8.1" gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 2919f039..b624dbe7 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.5.2", platform: :mri +gem "steep", "~> 1.5.2", platform: :mri_32 gem "railties", "6.0.6" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index b0e0ec0a..de9b39f1 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.5.2", platform: :mri +gem "steep", "~> 1.5.2", platform: :mri_32 gem "railties", "6.1.7" gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 837aa21f..e3afa936 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.5.2", platform: :mri +gem "steep", "~> 1.5.2", platform: :mri_32 gem "railties", "7.0.4" gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index d2c9fa22..7ace2fe8 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.5.2", platform: :mri +gem "steep", "~> 1.5.2", platform: :mri_32 gem "railties", "7.1.0" gemspec path: "../" diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile index de01d3dc..cc820330 100644 --- a/gemfiles/rails_7.2.gemfile +++ b/gemfiles/rails_7.2.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.5.2", platform: :mri +gem "steep", "~> 1.5.2", platform: :mri_32 gem "railties", github: "rails" gemspec path: "../" From bf1e54a7e4d356733ee10e0b814e273689d3f766 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 14 Oct 2023 11:12:18 -0400 Subject: [PATCH 058/126] Fixed tests for Rails 5.x --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6f4c1b45..5e0ff303 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,9 @@ jobs: - "7.2" include: - ruby-version: "2.7" - rails-version: ["5.1", "5.2"] + rails-version: "5.1" + - ruby-version: "2.7" + rails-version: "5.2" env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile @@ -36,7 +38,7 @@ jobs: with: ruby-version: ${{ matrix.ruby-version }} bundler-cache: true - - name: Run StandardRB + - name: Run RSpec run: | bundle exec rspec From bccdc389d676fec78b1bc5f6ed5d47c3d19c3c02 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 14 Oct 2023 11:21:49 -0400 Subject: [PATCH 059/126] Run Steep tests on GitHub --- .github/workflows/standard.yml | 30 ++++++++++---------- .github/workflows/steep.yml | 34 +++++++++++++++++++++++ .github/workflows/{test.yml => tests.yml} | 2 +- 3 files changed, 49 insertions(+), 17 deletions(-) create mode 100644 .github/workflows/steep.yml rename .github/workflows/{test.yml => tests.yml} (91%) diff --git a/.github/workflows/standard.yml b/.github/workflows/standard.yml index b151eb96..60542103 100644 --- a/.github/workflows/standard.yml +++ b/.github/workflows/standard.yml @@ -4,30 +4,28 @@ on: push: pull_request: types: [opened, reopened] -env: - BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile jobs: build: runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + ruby-version: + - "3.2" + rails-version: + - "7.1" + env: + BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile + name: StandardRB - Ruby ${{ matrix.ruby-version }} on Rails ${{ matrix.rails-version }} steps: - - uses: actions/checkout@v3 - - name: Set up Ruby 3.2 + - uses: actions/checkout@v4 + - name: Set up Ruby ${{ matrix.ruby-version }} on Rails ${{ matrix.rails-version }} uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.0 - - name: Cache gems - uses: actions/cache@v3 - with: - path: gemfiles/vendor/bundle - key: ${{ runner.os }}-rubocop-${{ hashFiles('gemfiles/rails_7.0.gemfile') }} - restore-keys: | - ${{ runner.os }}-rubocop- - - name: Install gems - run: | - bundle config path vendor/bundle - bundle check || (bundle install --jobs=4 --retry=3 && bundle clean) + ruby-version: ${{ matrix.ruby-version }} + bundler-cache: true - name: Run StandardRB run: | bundle exec standardrb diff --git a/.github/workflows/steep.yml b/.github/workflows/steep.yml new file mode 100644 index 00000000..7c6024a1 --- /dev/null +++ b/.github/workflows/steep.yml @@ -0,0 +1,34 @@ +name: Steep + +on: + push: + pull_request: + types: [opened, reopened] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + ruby-version: + - "3.2" + rails-version: + - "7.1" + env: + BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile + + name: Steep - Ruby ${{ matrix.ruby-version }} on Rails ${{ matrix.rails-version }} + steps: + - uses: actions/checkout@v4 + - name: Set up Ruby ${{ matrix.ruby-version }} on Rails ${{ matrix.rails-version }} + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby-version }} + bundler-cache: true + - name: Verify Ruby Types (Static) + run: | + bundle exec rake steep + - name: Verify Ruby Types (Runtime) + run: | + bundle exec rake rbs:spec diff --git a/.github/workflows/test.yml b/.github/workflows/tests.yml similarity index 91% rename from .github/workflows/test.yml rename to .github/workflows/tests.yml index 5e0ff303..e3ff8b0b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/tests.yml @@ -33,7 +33,7 @@ jobs: name: Specs - Ruby ${{ matrix.ruby-version }} on Rails ${{ matrix.rails-version }} steps: - uses: actions/checkout@v4 - - name: Set up Ruby + - name: Set up Ruby ${{ matrix.ruby-version }} on Rails ${{ matrix.rails-version }} uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} From 941912fc65172c0606556df8f78e20be51e7db2d Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 14 Oct 2023 11:40:03 -0400 Subject: [PATCH 060/126] Report code coverage to CodeClimate --- .github/workflows/tests.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e3ff8b0b..dbcf9f14 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,6 +27,9 @@ jobs: rails-version: "5.1" - ruby-version: "2.7" rails-version: "5.2" + - ruby-version: "3.2" + rails-version: "7.2" + code-coverage: true env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile @@ -39,6 +42,18 @@ jobs: ruby-version: ${{ matrix.ruby-version }} bundler-cache: true - name: Run RSpec + env: + CC_TEST_REPORTER_ID: ${{ vars.CC_TEST_REPORTER_ID }} + ENABLE_CODE_COVERAGE: true run: | - bundle exec rspec + bundle exec rspec --format RspecJunitFormatter --out ${{github.workspace}}/rspec-results.xml --format documentation + find . + + - uses: paambaati/codeclimate-action@v5 + if: matrix.code-coverage + env: + CC_TEST_REPORTER_ID: ${{ vars.CC_TEST_REPORTER_ID }} + with: + coverageLocations: | + ${{github.workspace}}/coverage/coverage.json:simplecov From eb81e6c783fa599efc8f9266c3eb7dcd84fd5234 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 14 Oct 2023 12:23:07 -0400 Subject: [PATCH 061/126] Removed CircleCI configs --- .circleci/config.yml | 528 --------------------------------------- .circleci/config.yml.erb | 181 -------------- README.md | 2 +- Rakefile | 8 - 4 files changed, 1 insertion(+), 718 deletions(-) delete mode 100644 .circleci/config.yml delete mode 100644 .circleci/config.yml.erb diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index b94de622..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,528 +0,0 @@ -# To update the build configuration, edit the "builds" array below and run: -# -# rake circleci -# - - -version: 2.1 - -shared_build_steps: &shared_build_steps - - checkout - - - attach_workspace: - at: /tmp/workspace - - - run: - name: Downloading CodeClimate Test Reporter - command: | - curl -sL https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - chmod +x ./cc-test-reporter - - - run: - name: Storing Rails Version - command: | - echo "$RUBY_VERSION/$BUNDLE_GEMFILE" > CACHE_ENV_VERSION - cat CACHE_ENV_VERSION - # To generate cache checksum, we need a static file, but Gemfile is - # based on the Rails version we are testing against. This step just puts - # a dynamically identified file into a known path. - cat "$BUNDLE_GEMFILE" > CACHE_GEMFILE - - # Download and cache dependencies - - restore_cache: - keys: - - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum "CACHE_GEMFILE" }}-{{ checksum "meta-tags.gemspec" }} - # fallback to using the latest cache if no exact match is found - - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }} - - - run: - name: Installing Dependencies - command: | - bundle config set --local path "${PWD}/vendor/bundle" - bundle check || (bundle install --jobs=4 --retry=3 && bundle clean) - - - save_cache: - paths: - - ./vendor/bundle - key: dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum "CACHE_GEMFILE" }}-{{ checksum "meta-tags.gemspec" }} - - # run tests! - - run: - name: Running Tests - command: | - mkdir /tmp/test-results - TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)" - - bundle exec rspec --format RspecJunitFormatter \ - --out /tmp/test-results/rspec/results.xml \ - --format documentation \ - $TEST_FILES - - - run: - name: Formatting Coverage - condition: << parameters.is_main_build >> - command: | - ./cc-test-reporter format-coverage --input-type simplecov --output coverage/codeclimate.coverage.json - - - when: - condition: << parameters.is_main_build >> - steps: - - run: - name: Verify Ruby Types (Static) - command: | - bundle exec rake steep - - - run: - name: Verify Ruby Types (Runtime) - command: | - bundle exec rake rbs:spec - - - # collect reports - - store_test_results: - path: /tmp/test-results - - store_artifacts: - path: /tmp/test-results - destination: test-results - - - persist_to_workspace: - root: ~/meta-tags - paths: - - "*/coverage/codeclimate.coverage.json" - - "*/cc-test-reporter" - -jobs: - - build-ruby27-rails-51: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:2.7 - environment: - BUNDLE_GEMFILE: gemfiles/rails_5.1.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-51 - steps: *shared_build_steps - - build-ruby27-rails-52: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:2.7 - environment: - BUNDLE_GEMFILE: gemfiles/rails_5.2.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-52 - steps: *shared_build_steps - - build-ruby27-rails-60: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:2.7 - environment: - BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-60 - steps: *shared_build_steps - - build-ruby27-rails-61: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:2.7 - environment: - BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-61 - steps: *shared_build_steps - - build-ruby27-rails-70: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:2.7 - environment: - BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-70 - steps: *shared_build_steps - - build-ruby27-rails-71: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:2.7 - environment: - BUNDLE_GEMFILE: gemfiles/rails_7.1.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby27-rails-71 - steps: *shared_build_steps - - build-ruby30-rails-60: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.0 - environment: - BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby30-rails-60 - steps: *shared_build_steps - - build-ruby30-rails-61: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.0 - environment: - BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby30-rails-61 - steps: *shared_build_steps - - build-ruby30-rails-70: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.0 - environment: - BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby30-rails-70 - steps: *shared_build_steps - - build-ruby30-rails-71: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.0 - environment: - BUNDLE_GEMFILE: gemfiles/rails_7.1.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby30-rails-71 - steps: *shared_build_steps - - build-ruby30-rails-72: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.0 - environment: - BUNDLE_GEMFILE: gemfiles/rails_7.2.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby30-rails-72 - steps: *shared_build_steps - - build-ruby31-rails-60: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.1 - environment: - BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby31-rails-60 - steps: *shared_build_steps - - build-ruby31-rails-61: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.1 - environment: - BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby31-rails-61 - steps: *shared_build_steps - - build-ruby31-rails-70: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.1 - environment: - BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby31-rails-70 - steps: *shared_build_steps - - build-ruby31-rails-71: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.1 - environment: - BUNDLE_GEMFILE: gemfiles/rails_7.1.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby31-rails-71 - steps: *shared_build_steps - - build-ruby31-rails-72: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.1 - environment: - BUNDLE_GEMFILE: gemfiles/rails_7.2.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby31-rails-72 - steps: *shared_build_steps - - build-ruby32-rails-60: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.2 - environment: - BUNDLE_GEMFILE: gemfiles/rails_6.0.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby32-rails-60 - steps: *shared_build_steps - - build-ruby32-rails-61: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.2 - environment: - BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby32-rails-61 - steps: *shared_build_steps - - build-ruby32-rails-70: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.2 - environment: - BUNDLE_GEMFILE: gemfiles/rails_7.0.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby32-rails-70 - steps: *shared_build_steps - - build-ruby32-rails-71: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.2 - environment: - BUNDLE_GEMFILE: gemfiles/rails_7.1.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 0 - working_directory: ~/meta-tags/ruby32-rails-71 - steps: *shared_build_steps - - build-ruby32-rails-72: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:3.2 - environment: - BUNDLE_GEMFILE: gemfiles/rails_7.2.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: 1 - working_directory: ~/meta-tags/ruby32-rails-72 - steps: *shared_build_steps - - - upload-coverage: - docker: - - image: cimg/ruby:3.2 - steps: - - attach_workspace: - at: /tmp/workspace - - - run: - name: Uploading Code Coverage - command: | - cd /tmp/workspace/ruby32-rails-71 - ./cc-test-reporter upload-coverage --input coverage/codeclimate.coverage.json || true - tests: - docker: - - image: alpine - steps: - - run: - name: All tests succeeded - command: ":" - -workflows: - version: 2 - test: - jobs: - - - build-ruby27-rails-51: - is_main_build: false - - - build-ruby27-rails-52: - is_main_build: false - - - build-ruby27-rails-60: - is_main_build: false - - - build-ruby27-rails-61: - is_main_build: false - - - build-ruby27-rails-70: - is_main_build: false - - - build-ruby27-rails-71: - is_main_build: false - - - build-ruby30-rails-60: - is_main_build: false - - - build-ruby30-rails-61: - is_main_build: false - - - build-ruby30-rails-70: - is_main_build: false - - - build-ruby30-rails-71: - is_main_build: false - - - build-ruby30-rails-72: - is_main_build: false - - - build-ruby31-rails-60: - is_main_build: false - - - build-ruby31-rails-61: - is_main_build: false - - - build-ruby31-rails-70: - is_main_build: false - - - build-ruby31-rails-71: - is_main_build: false - - - build-ruby31-rails-72: - is_main_build: false - - - build-ruby32-rails-60: - is_main_build: false - - - build-ruby32-rails-61: - is_main_build: false - - - build-ruby32-rails-70: - is_main_build: false - - - build-ruby32-rails-71: - is_main_build: true - - - build-ruby32-rails-72: - is_main_build: false - - - - upload-coverage: - requires: - - build-ruby32-rails-71 - - - tests: - requires: - - - build-ruby27-rails-51 - - - build-ruby27-rails-52 - - - build-ruby27-rails-60 - - - build-ruby27-rails-61 - - - build-ruby27-rails-70 - - - build-ruby27-rails-71 - - - build-ruby30-rails-60 - - - build-ruby30-rails-61 - - - build-ruby30-rails-70 - - - build-ruby30-rails-71 - - - build-ruby30-rails-72 - - - build-ruby31-rails-60 - - - build-ruby31-rails-61 - - - build-ruby31-rails-70 - - - build-ruby31-rails-71 - - - build-ruby31-rails-72 - - - build-ruby32-rails-60 - - - build-ruby32-rails-61 - - - build-ruby32-rails-70 - - - build-ruby32-rails-71 - - - build-ruby32-rails-72 - diff --git a/.circleci/config.yml.erb b/.circleci/config.yml.erb deleted file mode 100644 index 32673f3d..00000000 --- a/.circleci/config.yml.erb +++ /dev/null @@ -1,181 +0,0 @@ -# To update the build configuration, edit the "builds" array below and run: -# -# rake circleci -# -<% - builds = [ - # 2.7 - %w[2.7 5.1], - %w[2.7 5.2], - %w[2.7 6.0], - %w[2.7 6.1], - %w[2.7 7.0], - %w[2.7 7.1], - - # 3.0 - %w[3.0 6.0], - %w[3.0 6.1], - %w[3.0 7.0], - %w[3.0 7.1], - %w[3.0 7.2], - - # 3.1 - %w[3.1 6.0], - %w[3.1 6.1], - %w[3.1 7.0], - %w[3.1 7.1], - %w[3.1 7.2], - - # 3.2 - %w[3.2 6.0], - %w[3.2 6.1], - %w[3.2 7.0], - ["3.2", "7.1", true], - %w[3.2 7.2], - ] - - main_build = builds.find { |_, _, is_main_build| is_main_build } -%> - -version: 2.1 - -shared_build_steps: &shared_build_steps - - checkout - - - attach_workspace: - at: /tmp/workspace - - - run: - name: Downloading CodeClimate Test Reporter - command: | - curl -sL https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - chmod +x ./cc-test-reporter - - - run: - name: Storing Rails Version - command: | - echo "$RUBY_VERSION/$BUNDLE_GEMFILE" > CACHE_ENV_VERSION - cat CACHE_ENV_VERSION - # To generate cache checksum, we need a static file, but Gemfile is - # based on the Rails version we are testing against. This step just puts - # a dynamically identified file into a known path. - cat "$BUNDLE_GEMFILE" > CACHE_GEMFILE - - # Download and cache dependencies - - restore_cache: - keys: - - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum "CACHE_GEMFILE" }}-{{ checksum "meta-tags.gemspec" }} - # fallback to using the latest cache if no exact match is found - - dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }} - - - run: - name: Installing Dependencies - command: | - bundle config set --local path "${PWD}/vendor/bundle" - bundle check || (bundle install --jobs=4 --retry=3 && bundle clean) - - - save_cache: - paths: - - ./vendor/bundle - key: dependencies-{{ .Environment.CACHE_VERSION }}-{{ checksum "CACHE_ENV_VERSION" }}-{{ checksum "CACHE_GEMFILE" }}-{{ checksum "meta-tags.gemspec" }} - - # run tests! - - run: - name: Running Tests - command: | - mkdir /tmp/test-results - TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)" - - bundle exec rspec --format RspecJunitFormatter \ - --out /tmp/test-results/rspec/results.xml \ - --format documentation \ - $TEST_FILES - - - run: - name: Formatting Coverage - condition: << parameters.is_main_build >> - command: | - ./cc-test-reporter format-coverage --input-type simplecov --output coverage/codeclimate.coverage.json - - - when: - condition: << parameters.is_main_build >> - steps: - - run: - name: Verify Ruby Types (Static) - command: | - bundle exec rake steep - - - run: - name: Verify Ruby Types (Runtime) - command: | - bundle exec rake rbs:spec - - - # collect reports - - store_test_results: - path: /tmp/test-results - - store_artifacts: - path: /tmp/test-results - destination: test-results - - - persist_to_workspace: - root: ~/meta-tags - paths: - - "*/coverage/codeclimate.coverage.json" - - "*/cc-test-reporter" - -jobs: - <% builds.each do |ruby_version, rails_version, is_main_build| %> - build-ruby<%= ruby_version.delete(".") %>-rails-<%= rails_version.delete(".") %>: - parameters: - is_main_build: - type: boolean - default: false - docker: - - image: cimg/ruby:<%= ruby_version %> - environment: - BUNDLE_GEMFILE: gemfiles/rails_<%= rails_version %>.gemfile - ENABLE_CODE_COVERAGE: 1 - NO_STEEP: <%= is_main_build ? 0 : 1 %> - working_directory: ~/meta-tags/ruby<%= ruby_version.delete(".") %>-rails-<%= rails_version.delete(".") %> - steps: *shared_build_steps - <% end %> - - upload-coverage: - docker: - - image: cimg/ruby:<%= main_build[0] %> - steps: - - attach_workspace: - at: /tmp/workspace - - - run: - name: Uploading Code Coverage - command: | - cd /tmp/workspace/ruby<%= main_build[0].delete(".") %>-rails-<%= main_build[1].delete(".") %> - ./cc-test-reporter upload-coverage --input coverage/codeclimate.coverage.json || true - tests: - docker: - - image: alpine - steps: - - run: - name: All tests succeeded - command: ":" - -workflows: - version: 2 - test: - jobs: - <% builds.each do |ruby_version, rails_version, is_main_build| %> - - build-ruby<%= ruby_version.delete(".") %>-rails-<%= rails_version.delete(".") %>: - is_main_build: <%= !!is_main_build %> - <% end %> - - - upload-coverage: - requires: - - build-ruby<%= main_build[0].delete(".") %>-rails-<%= main_build[1].delete(".") %> - - - tests: - requires: - <% builds.each do |ruby_version, rails_version| %> - - build-ruby<%= ruby_version.delete(".") %>-rails-<%= rails_version.delete(".") %> - <% end %> diff --git a/README.md b/README.md index ae3972a2..1ba617fe 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MetaTags: a gem to make your Rails application SEO-friendly -[![CircleCI](https://circleci.com/gh/kpumuk/meta-tags.svg?style=shield)](https://circleci.com/gh/kpumuk/meta-tags) +[![Tests](https://github.com/kpumuk/meta-tags/actions/workflows/tests.yml/badge.svg)](https://github.com/kpumuk/meta-tags/actions/workflows/tests.yml) [![Gem Version](https://badge.fury.io/rb/meta-tags.svg)](https://badge.fury.io/rb/meta-tags) [![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard) [![Code Climate](https://codeclimate.com/github/kpumuk/meta-tags/badges/gpa.svg)](https://codeclimate.com/github/kpumuk/meta-tags) diff --git a/Rakefile b/Rakefile index bd6cd15d..1b278733 100644 --- a/Rakefile +++ b/Rakefile @@ -10,14 +10,6 @@ desc "Run RSpec tests" task test: :spec task default: :spec -desc "Rebuild Circle CI configuration based on the build matrix template .circleci/config.yml.erb" -task :circleci do - require "erb" - template_path = File.expand_path(".circleci/config.yml.erb", __dir__) - config_path = File.expand_path(".circleci/config.yml", __dir__) - File.write config_path, ERB.new(File.read(template_path)).result -end - module SteepRunner def self.run(*command) require "steep" From 72c537b24b1974c85d6e6230fc9b37ca593dfaab Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 14 Oct 2023 12:30:49 -0400 Subject: [PATCH 062/126] Removed a debug statement from the tests workflow --- .github/workflows/tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dbcf9f14..e567d770 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,7 +28,7 @@ jobs: - ruby-version: "2.7" rails-version: "5.2" - ruby-version: "3.2" - rails-version: "7.2" + rails-version: "7.1" code-coverage: true env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile @@ -47,7 +47,6 @@ jobs: ENABLE_CODE_COVERAGE: true run: | bundle exec rspec --format RspecJunitFormatter --out ${{github.workspace}}/rspec-results.xml --format documentation - find . - uses: paambaati/codeclimate-action@v5 if: matrix.code-coverage From 798b1f81b4c31a05a76b227e27ed544ae44d3be9 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 14 Oct 2023 12:31:08 -0400 Subject: [PATCH 063/126] Enabled dependabot for Github workflows --- .github/dependabot.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0b1d0405..36d83299 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,7 +5,11 @@ version: 2 updates: - - package-ecosystem: "bundler" # See documentation for possible values - directory: "/" # Location of package manifests + - package-ecosystem: "bundler" + directory: "/" schedule: - interval: "weekly" + interval: "daily" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" From d98a9a046778f920c4460ccda30b97f4a624a7dd Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Sat, 14 Oct 2023 12:32:10 -0400 Subject: [PATCH 064/126] Updated changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b24cadc2..fc6bee32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 2.20.0 (Development) + +Changes: + +- Switched builds from CircleCI to Github Actions ([273](https://github.com/kpumuk/meta-tags/pull/273)) + ## 2.19.0 (October 5, 2023) [☰](https://github.com/kpumuk/meta-tags/compare/v2.18.0...v2.19.0) Changes: From 2de2dd513ce4841a1a3a73bf826f0e86e97496f9 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Tue, 17 Oct 2023 18:16:04 -0400 Subject: [PATCH 065/126] Added a clarification about the difference between display_meta_tags and set_meta_tags methods (closes #258) --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 1ba617fe..625618d0 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,9 @@ When views are rendered, the page title will be included in the right spots: You can find allowed options for `display_meta_tags` method below. +> [!IMPORTANT] +> You **must** use `display_meta_tags` in the layout files to render the meta tags. In the views, you will instead use `set_meta_tags`, which accepts the same arguments but does not render anything in the place where it is called. + ### Using MetaTags in controller You can define following instance variables: From bc2e59417f0fa60757ba97fc5b98e0998ebff95d Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Tue, 17 Oct 2023 18:54:32 -0400 Subject: [PATCH 066/126] Refined language and corrected typos in README.md --- README.md | 235 +++++++++++++++++++++--------------------------------- 1 file changed, 92 insertions(+), 143 deletions(-) diff --git a/README.md b/README.md index 625618d0..fa79333e 100644 --- a/README.md +++ b/README.md @@ -12,13 +12,10 @@ Search Engine Optimization (SEO) plugin for Ruby on Rails applications. ## Ruby on Rails -MetaTags main branch fully supports Ruby on Rails 5.1+, and is tested against all -major Rails releases up to 7.1. +The MetaTags main branch fully supports Ruby on Rails 5.1+ and is tested against all major Ruby on Rails releases. -Ruby versions older than 2.7 are no longer officially supported. - -_Please note_ that we no longer support Ruby versions older than 2.6.0 and -Ruby on Rails older than 5.1, because they reached their [End of Life](https://endoflife.date/ruby). +> ![NOTE] +> Please note that we no longer support Ruby versions older than 2.7 and Ruby on Rails older than 5.1 since they reached their [End of Life](https://endoflife.date/ruby). ## Installation @@ -32,23 +29,15 @@ And run `bundle install` command. ## Configuration -MetaTags follows best-practices for meta tags. Although default limits for -truncation have recommended values, you can change them to reflect your own -preferences. Keywords are converted to lowercase by default, but this is also -configurable. +MetaTags follows best practices for meta tags. Although default limits for truncation have recommended values, you can change them to reflect your own preferences. Keywords are converted to lowercase by default, but this is also configurable. -To override the defaults, create an initializer -`config/initializers/meta_tags.rb` using the following command: +To override the defaults, create an initializer `config/initializers/meta_tags.rb` using the following command: ```bash rails generate meta_tags:install ``` -By default meta tags are rendered with the key `name`. Since, some meta tags are -required to use `property` instead (like Facebook Open Graph object), MetaTags gem -allows to configure which tags to render with `property` attribute. By default -the pre-configured list includes all possible Facebook Open Graph object types, but -you can add your own in case you need it. +By default, meta tags are rendered with the key `name`. However, some meta tags are required to use `property` instead (like Facebook Open Graph object). The MetaTags gem allows you to configure which tags to render with the `property` attribute. The pre-configured list includes all possible Facebook Open Graph object types by default, but you can add your own in case you need it. ## MetaTags Usage @@ -77,14 +66,14 @@ When views are rendered, the page title will be included in the right spots: ``` -You can find allowed options for `display_meta_tags` method below. +You can find allowed options for the `display_meta_tags` method below. > [!IMPORTANT] > You **must** use `display_meta_tags` in the layout files to render the meta tags. In the views, you will instead use `set_meta_tags`, which accepts the same arguments but does not render anything in the place where it is called. ### Using MetaTags in controller -You can define following instance variables: +You can define the following instance variables: ```ruby @page_title = "Member Login" @@ -92,7 +81,7 @@ You can define following instance variables: @page_keywords = "Site, Login, Members" ``` -Also you could use `set_meta_tags` method to define all meta tags simultaneously: +Also, you could use the `set_meta_tags` method to define all meta tags simultaneously: ```ruby set_meta_tags( @@ -102,11 +91,11 @@ set_meta_tags( ) ``` -You can find allowed options for `set_meta_tags` method below. +You can find the allowed options for the `set_meta_tags` method below. ### Using MetaTags in view -To set meta tags you can use following methods: +To set meta tags, you can use the following methods: ```erb <% title "Member Login" %> @@ -117,7 +106,7 @@ To set meta tags you can use following methods: <% refresh 3 %> ``` -Also there is `set_meta_tags` method exists: +Also, the `set_meta_tags` method exists: ```erb <% @@ -129,7 +118,7 @@ Also there is `set_meta_tags` method exists: %> ``` -You can pass an object that implements `#to_meta_tags` method and returns a Hash: +You can pass an object that implements the `#to_meta_tags` method and returns a Hash: ```ruby class Document < ApplicationRecord @@ -145,7 +134,7 @@ end set_meta_tags @document ``` -The `title` method returns title itself, so you can use it to show the title +The `title` method returns the title itself, so you can use it to show the title somewhere on the page: ```erb @@ -162,30 +151,30 @@ If you want to set the title and display another text, use this: Use these options to customize the title format: -| Option | Description | -| -------------- | -------------------------------------------------------------------------------------------------------------------- | -| `:site` | site title | -| `:title` | page title | -| `:description` | page description | -| `:keywords` | page keywords | -| `:charset` | page character set | -| `:prefix` | text between site name and separator | -| `:separator` | text used to separate website name from page title | -| `:suffix` | text between separator and page title | -| `:lowercase` | when true, the page name will be lowercase | -| `:reverse` | when true, the page and site names will be reversed | -| `:noindex` | add noindex meta tag; when true, "robots" will be used; accepts a string with a robot name, or an array of strings | -| `:index` | add index meta tag; when true, "robots" will be used; accepts a string with a robot name, or an array of strings | -| `:nofollow` | add nofollow meta tag; when true, "robots" will be used; accepts a string with a robot name, or an array of strings | -| `:follow` | add follow meta tag; when true, "robots" will be used; accepts a string with a robot name, or an array of strings | -| `:noarchive` | add noarchive meta tag; when true, "robots" will be used; accepts a string with a robot name, or an array of strings | -| `:canonical` | add canonical link tag | -| `:prev` | add prev link tag | -| `:next` | add next link tag | -| `:image_src` | add image_src link tag | -| `:og` | add Open Graph tags (Hash) | -| `:twitter` | add Twitter tags (Hash) | -| `:refresh` | refresh interval and optionally url to redirect to | +| Option | Description | +| -------------- | ------------------------------------------------------------------------------------------------------------------- | +| `:site` | Site title | +| `:title` | Page title | +| `:description` | Page description | +| `:keywords` | Page keywords | +| `:charset` | Page character set | +| `:prefix` | Text between site name and separator | +| `:separator` | Text used to separate the website name from the page title | +| `:suffix` | Text between separator and page title | +| `:lowercase` | When true, the page name will be lowercase | +| `:reverse` | When true, the page and site names will be reversed | +| `:noindex` | Add noindex meta tag; when true, "robots" will be used; accepts a string with a robot name or an array of strings | +| `:index` | Add index meta tag; when true, "robots" will be used; accepts a string with a robot name or an array of strings | +| `:nofollow` | Add nofollow meta tag; when true, "robots" will be used; accepts a string with a robot name or an array of strings | +| `:follow` | Add follow meta tag; when true, "robots" will be used; accepts a string with a robot name or an array of strings | +| `:noarchive` | Add noarchive meta tag; when true, "robots" will be used; accepts a string with a robot name or an array of strings | +| `:canonical` | Add canonical link tag | +| `:prev` | Add prev link tag | +| `:next` | Add next link tag | +| `:image_src` | Add image_src link tag | +| `:og` | Add Open Graph tags (Hash) | +| `:twitter` | Add Twitter tags (Hash) | +| `:refresh` | Refresh interval and optionally URL to redirect to | And here are a few examples to give you ideas. @@ -209,22 +198,20 @@ set_meta_tags title: ["part1", "part2"], reverse: true, site: "site" # part2 | part1 | site ``` -Keywords can be passed as string of comma-separated values, or as an array: +Keywords can be passed as a string of comma-separated values or as an array: ```ruby set_meta_tags keywords: ["tag1", "tag2"] # tag1, tag2 ``` -Description is a string (HTML will be stripped from output string). +The description is a string (HTML will be stripped from the output string). ### Mirrored values -Sometimes, it is desirable to mirror meta tag values down into namespaces. A -common use case is when you want open graph's `og:title` to be identical to -the `title`. +Sometimes, it is desirable to mirror meta tag values down into namespaces. A common use case is when you want the open graph's `og:title` to be identical to the `title`. -Say, you have the following in your application layout: +Let's say you have the following code in your application layout: ```ruby display_meta_tags og: { @@ -233,21 +220,20 @@ display_meta_tags og: { } ``` -The value of `og[:title]` is a symbol and therefore references the value of the -top level `title` meta tag. With the following in any view: +The value of `og[:title]` is a symbol, which refers to the value of the top-level `title` meta tag. In any view with the following code: ```ruby title "my great view" ``` -You get this open graph meta tag for free: +You will get this open graph meta tag automatically: ```html ``` -Please note, that title does not include site. If you need to reference the exact -value rendered in the `` meta tag, use `:full_title`. +> ![NOTE] +> Please note that the `title` does not include the site name. If you need to reference the exact value rendered in the `<title>` meta tag, use `:full_title`. ### Using with Turbolinks @@ -258,15 +244,9 @@ configuration is necessary. ### Using with pjax -[jQuery.pjax](https://github.com/defunkt/jquery-pjax) is a nice solution for navigation -without full page reload. The main difference is that layout file will not be rendered, -so page title will not change. To fix this, when using a page fragment, pjax will check -the fragment DOM element for a `title` or `data-title` attribute and use any value it finds. +[jQuery.pjax](https://github.com/defunkt/jquery-pjax) is a nice solution for navigation without a full-page reload. The main difference is that the layout file will not be rendered, so the page title will not change. To fix this, when using a page fragment, pjax will check the fragment DOM element for a `title` or `data-title` attribute and use any value it finds. -MetaTags simplifies this with `display_title` method, which returns fully resolved -page title (include site, prefix/suffix, etc.) But in this case you will have to -set default parameters (e.g, `:site`) both in layout file and in your views. To minimize -code duplication, you can define a helper in `application_helper.rb`: +MetaTags simplifies this with the `display_title` method, which returns the fully resolved page title (including site, prefix/suffix, etc.). But in this case, you will have to set default parameters (e.g., `:site`) both in the layout file and in your views. To minimize code duplication, you can define a helper in `application_helper.rb`: ```ruby def default_meta_tags @@ -279,7 +259,7 @@ def default_meta_tags end ``` -Then in your layout file use: +Then, in your layout file, use: ```erb <%= display_meta_tags(default_meta_tags) %> @@ -288,7 +268,7 @@ Then in your layout file use: And in your pjax templates: ```erb -<!-- set title here, so we can use it both in "display_title" and in "title" --> +<!-- set title here so we can use it both in "display_title" and in "title" --> <% title "My Page title" %> <%= content_tag :div, data: { title: display_title(default_meta_tags) } do %> <h1><%= title %></h1> @@ -300,9 +280,7 @@ And in your pjax templates: ### Titles -Page titles are very important for Search engines. The titles in the -browser are displayed in the title bar. The search engines look at -the title bar to determine what the page is all about. +Page titles are very important for search engines. The titles in the browser are displayed in the title bar. Search engines look at the title bar to determine what the page is all about. ```ruby set_meta_tags title: "Member Login" @@ -313,7 +291,7 @@ set_meta_tags site: "Site Title", title: "Member Login", reverse: true # <title>Member Login | Site Title ``` -Recommended title tag length: up to 70 characters, 10 words. +Recommended title tag length: up to **70 characters** in **10 words**. Further reading: @@ -321,17 +299,16 @@ Further reading: ### Description -Description tags are called meta tags as they are not displayed by the -browsers unlike the titles. However, these descriptions may be displayed by -some search engines. They are used to describe the contents of a page in -2 or 3 sentences. +Description meta tags are not displayed by browsers, unlike titles. However, some search engines may choose to display them. These tags are utilized to provide a concise summary of a webpage's content, typically within 2 or 3 sentences. + +Below is an example of how to set a description tag using Ruby: ```ruby -set_meta_tags description: "All text about keywords, other keywords" -# +set_meta_tags description: "This is a sample description" +# ``` -Recommended description tag length: up to 300 characters. +It is advisable to limit the length of the description tag to **300 characters**. Further reading: @@ -340,24 +317,21 @@ Further reading: ### Keywords -Meta keywords tag are used to place your keywords that you think a -surfer would search in Search engines. Repeating keywords unnecessarily -would be considered spam and you may get permanently banned from SERP's +Meta keywords tags are used to place keywords that you believe users would search for in search engines. It is important to avoid unnecessary repetition of keywords, as this could be considered spam and may result in a permanent ban from search engine results pages (SERPs). ```ruby -set_meta_tags keywords: %w[keyword1 Keyword2 KeyWord3] +set_meta_tags keywords: %w[keyword1 keyword2 keyword3] # ``` -Recommended keywords tag length: up to 255 characters, 20 words. +It is recommended to keep the length of the keywords tag under **255 characters** or **20 words**. -**Please note**, that both Google and Bing publicly indicated that keywords -meta tags is completely ignored. +> ![NOTE] +> Please note that both Google and Bing have publicly stated that they completely ignore keywords meta tags. ### Noindex -By using the noindex meta tag, you can signal to search engines to not -include specific pages in their indexes. +By using the noindex meta tag, you can signal to search engines not to include specific pages in their indexes. ```ruby set_meta_tags noindex: true @@ -375,7 +349,7 @@ Further reading: ### Index -Although it is not required to add "index" to "robots" as it is default value for Google, some SEO specialists recommend to add it to website +Although it is not required to add "index" to "robots" as it is the default value for Google, some SEO specialists recommend adding it to the website. ```ruby set_meta_tags index: true @@ -384,10 +358,7 @@ set_meta_tags index: true ### Nofollow -Nofollow meta tag tells a search engine not to follow the links on a specific -page. It's entirely likely that a robot might find the same links on some -other page without a nofollow (perhaps on some other site), and so -still arrives at your undesired page. +Nofollow meta tags tell a search engine not to follow the links on a specific page. It is entirely possible that a robot might find the same links on another page without a nofollow attribute, perhaps on another site, and still arrive at your undesired page. ```ruby set_meta_tags nofollow: true @@ -403,24 +374,21 @@ Further reading: ### Follow -Follow will work with Noindex meta tag +You can use the Noindex meta tag in conjunction with Follow. ```ruby set_meta_tags noindex: true, follow: true # ``` -It will not look at this page but will crawl through the rest of the pages on -your website. +This tag will prevent search engines from indexing this specific page, but it will still allow them to crawl and index the remaining pages on your website. ### Canonical URL -Canonical link element tells a search engine what is the canonical or main URL -for a content which have multiple URLs. The search engine will always return -that URL, and link popularity and authority will be applied to that URL. +Canonical link elements tell search engines what the canonical or main URL is for content that has multiple URLs. The search engine will always return that URL, and link popularity and authority will be applied to that URL. -Note: If you like follow a hint of John Mueller that you shouldn't mix canonical with noindex, then you can -set `MetaTags.config.skip_canonical_links_on_noindex = true` and we'll handle it for you. +> ![NOTE] +> Please note: If you follow John Mueller's suggestion not to mix canonical with noindex, then you can set `MetaTags.config.skip_canonical_links_on_noindex = true` and we'll handle it for you. ```ruby set_meta_tags canonical: "http://yoursite.com/canonical/url" @@ -434,9 +402,7 @@ Further reading: ### Icon -A favicon (short for Favorite icon), also known as a shortcut icon, Web site -icon, tab icon or bookmark icon, is a file containing one or more small icons, -most commonly 16×16 pixels, associated with a particular website or web page. +A favicon (short for Favorite icon), also known as a shortcut icon, website icon, tab icon, or bookmark icon, is a file containing one or more small icons, most commonly 16x16 pixels, associated with a particular website or web page. ```ruby set_meta_tags icon: "/favicon.ico" @@ -458,8 +424,7 @@ Further reading: ### Multi-regional and multilingual URLs, RSS and mobile links -Alternate link elements tell a search engine when there is content that's -translated or targeted to users in a certain region. +Alternate link elements tell a search engine when there is content that's translated or targeted to users in a certain region. ```ruby set_meta_tags alternate: {"fr" => "http://yoursite.fr/alternate/url"} @@ -489,9 +454,7 @@ Further reading: ### Pagination links -Previous and next links indicate indicate the relationship between individual -URLs. Using these attributes is a strong hint to Google that you want us to -treat these pages as a logical sequence. +Previous and next links indicate the relationship between individual URLs. Using these attributes is a strong hint to Google that you want us to treat these pages as a logical sequence. ```ruby set_meta_tags prev: "http://yoursite.com/url?page=1" @@ -507,10 +470,7 @@ Further reading: ### image_src links -Basically, when you submit/share this to Facebook , this helps Facebook determine -which image to put next to the link. If this is not present, Facebook tries to -put in the first image it finds on the page, which may not be the best one to -represent your site. +Basically, when you submit/share this to Facebook, it helps Facebook determine which image to put next to the link. If this is not present, Facebook tries to put in the first image it finds on the page, which may not be the best one to represent your site. ```ruby set_meta_tags image_src: "http://yoursite.com/icons/icon_32.png" @@ -519,22 +479,22 @@ set_meta_tags image_src: "http://yoursite.com/icons/icon_32.png" ### amphtml links -AMP is a way to build web pages for static content that render fast. If you have -two versions of the page – non-AMP and AMP, you can link the AMP version from -normal one using `amphtml` tag: +AMP is a method of building web pages for static content that renders quickly. If you have two versions of a page - non-AMP and AMP - you can link the AMP version from the normal one using the `amphtml` tag: ```ruby set_meta_tags amphtml: url_for(format: :amp, only_path: false) # ``` -To link back to normal version, use `canonical`. +To link back to the normal version, use the `canonical` tag. - [What Is AMP?](https://www.ampproject.org/learn/about-amp/) - [Make Your Page Discoverable](https://www.ampproject.org/docs/guides/discovery) ### Manifest links +By including the `rel="manifest"` attribute in the `` element of an HTML page, you can specify the location of the manifest file that describes the web application. This allows the browser to understand that the web page is an application and to provide features like offline access and the ability to add the application to the home screen of a mobile device. + ```ruby set_meta_tags manifest: "manifest.json" # @@ -544,12 +504,7 @@ set_meta_tags manifest: "manifest.json" ### Refresh interval and redirect URL -Meta refresh is a method of instructing a web browser to automatically -refresh the current web page or frame after a given time interval. It is also -possible to instruct the browser to fetch a different URL when the page is -refreshed, by including the alternative URL in the content parameter. By -setting the refresh time interval to zero (or a very low value), this allows -meta refresh to be used as a method of URL redirection. +Meta refresh is a method of instructing a web browser to automatically refresh the current web page or frame after a given time interval. It is also possible to instruct the browser to fetch a different URL when the page is refreshed, by including the alternative URL in the content parameter. By setting the refresh time interval to zero (or a very low value), this allows meta refresh to be used as a method of URL redirection. ```ruby set_meta_tags refresh: 5 @@ -565,7 +520,7 @@ Further reading: ### Open Search -Open Search link element to describe a search engine in a standard and accessible format. +Open Search is a link element used to describe a search engine in a standard and accessible format. ```ruby set_meta_tags open_search: { @@ -582,7 +537,7 @@ Further reading: ### Hashes -Any namespace can be built just passing any symbol name and a Hash. For example: +Any namespace can be created by simply passing a symbol name and a Hash. For example: ```ruby set_meta_tags foo: { @@ -597,7 +552,7 @@ set_meta_tags foo: { ### Arrays -Repeated meta tags can be built just using an Array inside a Hash. For example: +Repeated meta tags can be easily created by using an Array within a Hash. For example: ```ruby set_meta_tags og: { @@ -609,10 +564,7 @@ set_meta_tags og: { ### Open Graph -To turn your web pages into graph objects, you'll need to add Open Graph -protocol `` tags to your webpages. The tags allow you to specify -structured information about your web pages. The more information you provide, the more opportunities your web pages can be surfaced within Facebook today -and in the future. Here's an example for a movie page: +To turn your web pages into graph objects, you'll need to add Open Graph protocol `` tags to your webpages. The tags allow you to specify structured information about your web pages. The more information you provide, the more opportunities your web pages can be surfaced within Facebook today and in the future. Here's an example for a movie page: ```ruby set_meta_tags og: { @@ -687,8 +639,7 @@ Further reading: ### Twitter Cards -Twitter cards make it possible for you to attach media experiences to Tweets that link to your content. -There are 3 card types (summary, photo and player). Here's an example for summary: +Twitter cards make it possible for you to attach media experiences to Tweets that link to your content. There are 3 card types (summary, photo, and player). Here's an example for summary: ```ruby set_meta_tags twitter: { @@ -699,9 +650,9 @@ set_meta_tags twitter: { # ``` -Take in consideration that if you're already using OpenGraph to describe data on your page, it’s easy to generate a Twitter card without duplicating your tags and data. When the Twitter card processor looks for tags on your page, it first checks for the Twitter property, and if not present, falls back to the supported Open Graph property. This allows for both to be defined on the page independently, and minimizes the amount of duplicate markup required to describe your content and experience. +Take into consideration that if you're already using OpenGraph to describe data on your page, it’s easy to generate a Twitter card without duplicating your tags and data. When the Twitter card processor looks for tags on your page, it first checks for the Twitter property, and if not present, falls back to the supported Open Graph property. This allows both to be defined on the page independently and minimizes the amount of duplicate markup required to describe your content and experience. -When you need to generate a [Twitter Photo card](https://dev.twitter.com/docs/cards/types/photo-card), `twitter:image` property is a string, while image dimensions are specified using `twitter:image:width` and `twitter:image:height`, or a `Hash` objects in terms of MetaTags gems. There is a special syntax to make this work: +When you need to generate a [Twitter Photo card](https://dev.twitter.com/docs/cards/types/photo-card), the `twitter:image` property is a string, while image dimensions are specified using `twitter:image:width` and `twitter:image:height`, or a `Hash` object in terms of MetaTags gems. There is a special syntax to make this work: ```ruby set_meta_tags twitter: { @@ -718,7 +669,7 @@ set_meta_tags twitter: { # ``` -Special parameter `itemprop` can be used on a "anonymous" tag "\_" to generate "itemprop" HTML attribute: +A special parameter `itemprop` can be used on an "anonymous" tag "\_" to generate the "itemprop" HTML attribute: ```ruby set_meta_tags twitter: { @@ -742,7 +693,7 @@ Further reading: ### App Links -App Links is an open cross platform solution for deep linking to content in your mobile app. Here's an example for iOS app integration: +App Links is an open cross-platform solution for deep linking to content in your mobile app. Here's an example of iOS app integration: ```ruby set_meta_tags al: { @@ -763,8 +714,7 @@ Further reading: ### Custom meta tags -Starting from version 1.3.1, you can specify arbitrary meta tags, and they will -be rendered on the page, even if meta-tags gem does not know about them. +Starting from version 1.3.1, you can specify arbitrary meta tags, and they will be rendered on the page, even if the meta-tags gem does not know about them. Example: @@ -773,8 +723,7 @@ set_meta_tags author: "Dmytro Shteflyuk" # ``` -You can also specify value as an Array, and values will be displayed as a list -of `meta` tags: +You can also specify the value as an Array, and the values will be displayed as a list of `meta` tags: ```ruby set_meta_tags author: ["Dmytro Shteflyuk", "John Doe"] @@ -784,4 +733,4 @@ set_meta_tags author: ["Dmytro Shteflyuk", "John Doe"] ## Maintainers -[Dmytro Shteflyuk](https://github.com/kpumuk), [https://kpumuk.info](http://kpumuk.info/) +[Dmytro Shteflyuk](https://github.com/kpumuk), [https://dmytro.sh](https://dmytro.sh) From 74d70cd9c1d7f0aee5f68f49b28c6d02404ad5c0 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Tue, 17 Oct 2023 18:54:52 -0400 Subject: [PATCH 067/126] Switched Turbolinks to Turbo in the description --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fa79333e..e05a5529 100644 --- a/README.md +++ b/README.md @@ -235,12 +235,9 @@ You will get this open graph meta tag automatically: > ![NOTE] > Please note that the `title` does not include the site name. If you need to reference the exact value rendered in the `` meta tag, use `:full_title`. -### Using with Turbolinks +### Using with Turbo -[Turbolinks](https://github.com/turbolinks/turbolinks) is a simple solution for getting -the performance benefits of a single-page application without the added complexity of a -client-side JavaScript framework. MetaTags supports Turbolinks out of the box, no -configuration is necessary. +[Turbo](https://github.com/hotwired/turbo) is a simple solution for getting the performance benefits of a single-page application without the added complexity of a client-side JavaScript framework. MetaTags supports Turbo out of the box, so no configuration is necessary. ### Using with pjax From 22ad4ea41621147492aea5df407501a8c2b10a4f Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Tue, 17 Oct 2023 18:56:18 -0400 Subject: [PATCH 068/126] Fixed alerts usage --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e05a5529..c7e78e36 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ Search Engine Optimization (SEO) plugin for Ruby on Rails applications. The MetaTags main branch fully supports Ruby on Rails 5.1+ and is tested against all major Ruby on Rails releases. -> ![NOTE] -> Please note that we no longer support Ruby versions older than 2.7 and Ruby on Rails older than 5.1 since they reached their [End of Life](https://endoflife.date/ruby). +> [!NOTE] +> We no longer support Ruby versions older than 2.7 and Ruby on Rails older than 5.1 since they reached their [End of Life](https://endoflife.date/ruby). ## Installation @@ -232,8 +232,8 @@ You will get this open graph meta tag automatically: <meta property="og:title" content="my great view"></meta> ``` -> ![NOTE] -> Please note that the `title` does not include the site name. If you need to reference the exact value rendered in the `<title>` meta tag, use `:full_title`. +> [!NOTE] +> The `title` does not include the site name. If you need to reference the exact value rendered in the `<title>` meta tag, use `:full_title`. ### Using with Turbo @@ -323,8 +323,8 @@ set_meta_tags keywords: %w[keyword1 keyword2 keyword3] It is recommended to keep the length of the keywords tag under **255 characters** or **20 words**. -> ![NOTE] -> Please note that both Google and Bing have publicly stated that they completely ignore keywords meta tags. +> [!NOTE] +> Both Google and Bing have publicly stated that they completely ignore keywords meta tags. ### Noindex @@ -384,8 +384,8 @@ This tag will prevent search engines from indexing this specific page, but it wi Canonical link elements tell search engines what the canonical or main URL is for content that has multiple URLs. The search engine will always return that URL, and link popularity and authority will be applied to that URL. -> ![NOTE] -> Please note: If you follow John Mueller's suggestion not to mix canonical with noindex, then you can set `MetaTags.config.skip_canonical_links_on_noindex = true` and we'll handle it for you. +> [!NOTE] +> If you follow John Mueller's suggestion not to mix canonical with noindex, then you can set `MetaTags.config.skip_canonical_links_on_noindex = true` and we'll handle it for you. ```ruby set_meta_tags canonical: "http://yoursite.com/canonical/url" From 8293a0f678bcc255a194e8c76e926d36d7dd312a Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Sun, 19 Nov 2023 21:33:37 -0500 Subject: [PATCH 069/126] Add labels to dependabot MRs --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 36d83299..c1d8b1ef 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,7 +9,13 @@ updates: directory: "/" schedule: interval: "daily" + labels: + - dependencies + - bundler - package-ecosystem: "github-actions" directory: "/" schedule: interval: "daily" + labels: + - dependencies + - github-actions From 64ff788cac39f7f39ca93cf1abcb9b191559577d Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Sun, 19 Nov 2023 21:45:48 -0500 Subject: [PATCH 070/126] Added a workflow to update Appraisal files on dependabot MRs --- .github/workflows/dependabot.yml | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/dependabot.yml diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml new file mode 100644 index 00000000..32e9df08 --- /dev/null +++ b/.github/workflows/dependabot.yml @@ -0,0 +1,38 @@ +name: StandardRB + +on: + pull_request: + types: [labeled] +permissions: + contents: write + +jobs: + build: + if: contains(github.event.pull_request.labels.*.name, 'bundler') + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + ruby-version: + - "3.2" + + name: Appraisal - Ruby ${{ matrix.ruby-version }} + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.head_ref }} + - name: Set up Ruby ${{ matrix.ruby-version }} + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby-version }} + bundler-cache: true + - name: Update Appraisal gemfiles + run: | + bundle exec appraisal update + - name: Commit gemfiles + run: | + git config --global user.name "Github Workflow" + git config --global user.email "kpumuk@users.noreply.github.com" + git add gemfiles/* + git commit -am "Updated Appraisal gemfiles" + git push From 459973fc36fbfb2acd004046d8d25ff912e832d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 03:05:57 +0000 Subject: [PATCH 071/126] Update rubocop-rspec requirement from ~> 2.24.1 to ~> 2.25.0 Updates the requirements on [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.24.1...v2.25.0) --- updated-dependencies: - dependency-name: rubocop-rspec dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index f42a0794..5188f0ab 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "standard", "~> 1.31" spec.add_development_dependency "rubocop-rails", "~> 2.21.2" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" - spec.add_development_dependency "rubocop-rspec", "~> 2.24.1" + spec.add_development_dependency "rubocop-rspec", "~> 2.25.0" # Format RSpec output for CircleCI spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" From 0a4f01ae17b2e80d07ea1df7f9e6575c193d11c3 Mon Sep 17 00:00:00 2001 From: Github Workflow <kpumuk@users.noreply.github.com> Date: Mon, 20 Nov 2023 03:06:54 +0000 Subject: [PATCH 072/126] Updated Appraisal gemfiles --- gemfiles/rails_5.1.gemfile.lock | 42 +++++++++++----------- gemfiles/rails_5.2.gemfile.lock | 42 +++++++++++----------- gemfiles/rails_6.0.gemfile.lock | 42 +++++++++++----------- gemfiles/rails_6.1.gemfile.lock | 42 +++++++++++----------- gemfiles/rails_7.0.gemfile.lock | 42 +++++++++++----------- gemfiles/rails_7.1.gemfile.lock | 57 +++++++++++++++--------------- gemfiles/rails_7.2.gemfile.lock | 62 ++++++++++++++++----------------- 7 files changed, 165 insertions(+), 164 deletions(-) diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index 6262700f..ae633e1a 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -7,6 +7,7 @@ PATH GEM remote: https://rubygems.org/ specs: + abbrev (0.1.1) actionpack (5.1.7) actionview (= 5.1.7) activesupport (= 5.1.7) @@ -30,16 +31,15 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) - base64 (0.1.1) builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) - csv (3.2.7) + csv (3.2.8) diff-lcs (1.5.0) docile (1.4.0) erubi (1.12.0) ffi (1.16.3) - fileutils (1.7.1) + fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) @@ -48,21 +48,21 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.5.3) - loofah (2.21.4) + logger (1.6.0) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) minitest (5.20.0) - nokogiri (1.15.4-arm64-darwin) + nokogiri (1.15.5-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) racc - racc (1.7.1) + racc (1.7.3) rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) @@ -80,11 +80,12 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.1.1) - rake (13.0.6) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.2.2) + rbs (3.3.0) + abbrev regexp_parser (2.8.2) rexml (3.2.6) rspec (3.12.0) @@ -105,19 +106,18 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.56.4) - base64 (~> 0.1.1) + rubocop (1.57.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) rubocop-capybara (2.19.0) rubocop (~> 1.41) @@ -132,22 +132,22 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.24.1) - rubocop (~> 1.33) + rubocop-rspec (2.25.0) + rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) - securerandom (0.2.2) + securerandom (0.3.0) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.31.2) + standard (1.32.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.4) + rubocop (~> 1.57.2) standard-custom (~> 1.0.0) standard-performance (~> 1.2) standard-custom (1.0.2) @@ -174,7 +174,7 @@ GEM strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.2) + thor (1.3.0) thread_safe (0.3.6) tzinfo (1.2.11) thread_safe (~> 0.1) @@ -194,7 +194,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.21.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.24.1) + rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.5.2) diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index c7538387..5b8f9cc9 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -7,6 +7,7 @@ PATH GEM remote: https://rubygems.org/ specs: + abbrev (0.1.1) actionpack (5.2.8.1) actionview (= 5.2.8.1) activesupport (= 5.2.8.1) @@ -30,16 +31,15 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) - base64 (0.1.1) builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) - csv (3.2.7) + csv (3.2.8) diff-lcs (1.5.0) docile (1.4.0) erubi (1.12.0) ffi (1.16.3) - fileutils (1.7.1) + fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) @@ -48,21 +48,21 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.5.3) - loofah (2.21.4) + logger (1.6.0) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) minitest (5.20.0) - nokogiri (1.15.4-arm64-darwin) + nokogiri (1.15.5-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) racc - racc (1.7.1) + racc (1.7.3) rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) @@ -80,11 +80,12 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.1.1) - rake (13.0.6) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.2.2) + rbs (3.3.0) + abbrev regexp_parser (2.8.2) rexml (3.2.6) rspec (3.12.0) @@ -105,19 +106,18 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.56.4) - base64 (~> 0.1.1) + rubocop (1.57.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) rubocop-capybara (2.19.0) rubocop (~> 1.41) @@ -132,22 +132,22 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.24.1) - rubocop (~> 1.33) + rubocop-rspec (2.25.0) + rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) - securerandom (0.2.2) + securerandom (0.3.0) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.31.2) + standard (1.32.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.4) + rubocop (~> 1.57.2) standard-custom (~> 1.0.0) standard-performance (~> 1.2) standard-custom (1.0.2) @@ -174,7 +174,7 @@ GEM strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.2) + thor (1.3.0) thread_safe (0.3.6) tzinfo (1.2.11) thread_safe (~> 0.1) @@ -194,7 +194,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.21.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.24.1) + rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.5.2) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 5ef4c8e1..16071d74 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -7,6 +7,7 @@ PATH GEM remote: https://rubygems.org/ specs: + abbrev (0.1.1) actionpack (6.0.6) actionview (= 6.0.6) activesupport (= 6.0.6) @@ -31,16 +32,15 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) - base64 (0.1.1) builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) - csv (3.2.7) + csv (3.2.8) diff-lcs (1.5.0) docile (1.4.0) erubi (1.12.0) ffi (1.16.3) - fileutils (1.7.1) + fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) @@ -49,21 +49,21 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.5.3) - loofah (2.21.4) + logger (1.6.0) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) minitest (5.20.0) - nokogiri (1.15.4-arm64-darwin) + nokogiri (1.15.5-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) racc - racc (1.7.1) + racc (1.7.3) rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) @@ -81,11 +81,12 @@ GEM rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.1.1) - rake (13.0.6) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.2.2) + rbs (3.3.0) + abbrev regexp_parser (2.8.2) rexml (3.2.6) rspec (3.12.0) @@ -106,19 +107,18 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.56.4) - base64 (~> 0.1.1) + rubocop (1.57.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) rubocop-capybara (2.19.0) rubocop (~> 1.41) @@ -133,22 +133,22 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.24.1) - rubocop (~> 1.33) + rubocop-rspec (2.25.0) + rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) - securerandom (0.2.2) + securerandom (0.3.0) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.31.2) + standard (1.32.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.4) + rubocop (~> 1.57.2) standard-custom (~> 1.0.0) standard-performance (~> 1.2) standard-custom (1.0.2) @@ -175,7 +175,7 @@ GEM strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.2) + thor (1.3.0) thread_safe (0.3.6) tzinfo (1.2.11) thread_safe (~> 0.1) @@ -196,7 +196,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.21.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.24.1) + rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.5.2) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index da5a2712..4a329999 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -7,6 +7,7 @@ PATH GEM remote: https://rubygems.org/ specs: + abbrev (0.1.1) actionpack (6.1.7) actionview (= 6.1.7) activesupport (= 6.1.7) @@ -31,16 +32,15 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) - base64 (0.1.1) builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) - csv (3.2.7) + csv (3.2.8) diff-lcs (1.5.0) docile (1.4.0) erubi (1.12.0) ffi (1.16.3) - fileutils (1.7.1) + fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) @@ -49,21 +49,21 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.5.3) - loofah (2.21.4) + logger (1.6.0) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) minitest (5.20.0) - nokogiri (1.15.4-arm64-darwin) + nokogiri (1.15.5-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) racc - racc (1.7.1) + racc (1.7.3) rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) @@ -81,11 +81,12 @@ GEM rake (>= 12.2) thor (~> 1.0) rainbow (3.1.1) - rake (13.0.6) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.2.2) + rbs (3.3.0) + abbrev regexp_parser (2.8.2) rexml (3.2.6) rspec (3.12.0) @@ -106,19 +107,18 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.56.4) - base64 (~> 0.1.1) + rubocop (1.57.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) rubocop-capybara (2.19.0) rubocop (~> 1.41) @@ -133,22 +133,22 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.24.1) - rubocop (~> 1.33) + rubocop-rspec (2.25.0) + rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) - securerandom (0.2.2) + securerandom (0.3.0) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.31.2) + standard (1.32.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.4) + rubocop (~> 1.57.2) standard-custom (~> 1.0.0) standard-performance (~> 1.2) standard-custom (1.0.2) @@ -175,7 +175,7 @@ GEM strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.2) + thor (1.3.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) @@ -195,7 +195,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.21.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.24.1) + rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.5.2) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 0b80735b..f76cb1a9 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -7,6 +7,7 @@ PATH GEM remote: https://rubygems.org/ specs: + abbrev (0.1.1) actionpack (7.0.4) actionview (= 7.0.4) activesupport (= 7.0.4) @@ -30,16 +31,15 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) - base64 (0.1.1) builder (3.2.4) concurrent-ruby (1.2.2) crass (1.0.6) - csv (3.2.7) + csv (3.2.8) diff-lcs (1.5.0) docile (1.4.0) erubi (1.12.0) ffi (1.16.3) - fileutils (1.7.1) + fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) @@ -48,21 +48,21 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.5.3) - loofah (2.21.4) + logger (1.6.0) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) minitest (5.20.0) - nokogiri (1.15.4-arm64-darwin) + nokogiri (1.15.5-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) racc - racc (1.7.1) + racc (1.7.3) rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) @@ -81,11 +81,12 @@ GEM thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.0.6) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.2.2) + rbs (3.3.0) + abbrev regexp_parser (2.8.2) rexml (3.2.6) rspec (3.12.0) @@ -106,19 +107,18 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.56.4) - base64 (~> 0.1.1) + rubocop (1.57.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) rubocop-capybara (2.19.0) rubocop (~> 1.41) @@ -133,22 +133,22 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.24.1) - rubocop (~> 1.33) + rubocop-rspec (2.25.0) + rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) - securerandom (0.2.2) + securerandom (0.3.0) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.31.2) + standard (1.32.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.4) + rubocop (~> 1.57.2) standard-custom (~> 1.0.0) standard-performance (~> 1.2) standard-custom (1.0.2) @@ -175,7 +175,7 @@ GEM strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.2) + thor (1.3.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) @@ -195,7 +195,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.21.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.24.1) + rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.5.2) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 5d34c94e..ab7494b5 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -7,6 +7,7 @@ PATH GEM remote: https://rubygems.org/ specs: + abbrev (0.1.1) actionpack (7.1.0) actionview (= 7.1.0) activesupport (= 7.1.0) @@ -37,24 +38,24 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) - base64 (0.1.1) + base64 (0.2.0) bigdecimal (3.1.4) builder (3.2.4) concurrent-ruby (1.2.2) connection_pool (2.4.1) crass (1.0.6) - csv (3.2.7) + csv (3.2.8) diff-lcs (1.5.0) docile (1.4.0) - drb (2.1.1) + drb (2.2.0) ruby2_keywords erubi (1.12.0) ffi (1.16.3) - fileutils (1.7.1) + fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.6.0) - irb (1.8.3) + irb (1.9.0) rdoc reline (>= 0.3.8) json (2.6.3) @@ -63,23 +64,23 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.5.3) - loofah (2.21.4) + logger (1.6.0) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) minitest (5.20.0) - mutex_m (0.1.2) - nokogiri (1.15.4-arm64-darwin) + mutex_m (0.2.0) + nokogiri (1.15.5-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) racc - psych (5.1.1) + psych (5.1.1.1) stringio - racc (1.7.1) + racc (1.7.3) rack (3.0.8) rack-session (2.0.0) rack (>= 3.0.0) @@ -104,15 +105,16 @@ GEM thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.0.6) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.2.2) - rdoc (6.5.0) + rbs (3.3.0) + abbrev + rdoc (6.6.0) psych (>= 4.0.0) regexp_parser (2.8.2) - reline (0.3.9) + reline (0.4.0) io-console (~> 0.5) rexml (3.2.6) rspec (3.12.0) @@ -133,19 +135,18 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.56.4) - base64 (~> 0.1.1) + rubocop (1.57.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) rubocop-capybara (2.19.0) rubocop (~> 1.41) @@ -160,23 +161,23 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.24.1) - rubocop (~> 1.33) + rubocop-rspec (2.25.0) + rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - securerandom (0.2.2) + securerandom (0.3.0) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.31.2) + standard (1.32.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.4) + rubocop (~> 1.57.2) standard-custom (~> 1.0.0) standard-performance (~> 1.2) standard-custom (1.0.2) @@ -200,11 +201,11 @@ GEM securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - stringio (3.0.8) + stringio (3.0.9) strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.2) + thor (1.3.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) @@ -225,7 +226,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.21.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.24.1) + rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.5.2) diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index 7b79b349..0af71e8f 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -1,11 +1,12 @@ GIT remote: https://github.com/rails/rails.git - revision: 0ed3c2a5f9575a5c58dde8fe88bbacae860dd7c7 + revision: c2a33059d8f98890662572fbc10c033cc790b361 specs: actionpack (7.2.0.alpha) actionview (= 7.2.0.alpha) activesupport (= 7.2.0.alpha) nokogiri (>= 1.8.5) + racc rack (>= 2.2.4) rack-session (>= 1.0.1) rack-test (>= 0.6.3) @@ -25,8 +26,7 @@ GIT drb i18n (>= 1.6, < 2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + tzinfo (~> 2.0, >= 2.0.5) railties (7.2.0.alpha) actionpack (= 7.2.0.alpha) activesupport (= 7.2.0.alpha) @@ -45,29 +45,30 @@ PATH GEM remote: https://rubygems.org/ specs: + abbrev (0.1.1) appraisal (2.5.0) bundler rake thor (>= 0.14.0) ast (2.4.2) - base64 (0.1.1) + base64 (0.2.0) bigdecimal (3.1.4) builder (3.2.4) concurrent-ruby (1.2.2) connection_pool (2.4.1) crass (1.0.6) - csv (3.2.7) + csv (3.2.8) diff-lcs (1.5.0) docile (1.4.0) - drb (2.1.1) + drb (2.2.0) ruby2_keywords erubi (1.12.0) ffi (1.16.3) - fileutils (1.7.1) + fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.6.0) - irb (1.8.3) + irb (1.9.0) rdoc reline (>= 0.3.8) json (2.6.3) @@ -76,23 +77,22 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.5.3) - loofah (2.21.4) + logger (1.6.0) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) minitest (5.20.0) - mutex_m (0.1.2) - nokogiri (1.15.4-arm64-darwin) + nokogiri (1.15.5-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) racc - psych (5.1.1) + psych (5.1.1.1) stringio - racc (1.7.1) + racc (1.7.3) rack (3.0.8) rack-session (2.0.0) rack (>= 3.0.0) @@ -109,15 +109,16 @@ GEM loofah (~> 2.21) nokogiri (~> 1.14) rainbow (3.1.1) - rake (13.0.6) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.2.2) - rdoc (6.5.0) + rbs (3.3.0) + abbrev + rdoc (6.6.0) psych (>= 4.0.0) regexp_parser (2.8.2) - reline (0.3.9) + reline (0.4.0) io-console (~> 0.5) rexml (3.2.6) rspec (3.12.0) @@ -138,19 +139,18 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.56.4) - base64 (~> 0.1.1) + rubocop (1.57.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) rubocop-capybara (2.19.0) rubocop (~> 1.41) @@ -165,23 +165,23 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.24.1) - rubocop (~> 1.33) + rubocop-rspec (2.25.0) + rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - securerandom (0.2.2) + securerandom (0.3.0) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.31.2) + standard (1.32.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.4) + rubocop (~> 1.57.2) standard-custom (~> 1.0.0) standard-performance (~> 1.2) standard-custom (1.0.2) @@ -205,11 +205,11 @@ GEM securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - stringio (3.0.8) + stringio (3.0.9) strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.2) + thor (1.3.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) @@ -230,7 +230,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.21.2) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.24.1) + rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.5.2) From e84de96f4d56d4be84855b569c775efd21802e6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 03:08:20 +0000 Subject: [PATCH 073/126] Update rubocop-rails requirement from ~> 2.21.2 to ~> 2.22.2 Updates the requirements on [rubocop-rails](https://github.com/rubocop/rubocop-rails) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.21.2...v2.22.2) --- updated-dependencies: - dependency-name: rubocop-rails dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 5188f0ab..1c4311a4 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "simplecov", "~> 0.22.0" # Code style spec.add_development_dependency "standard", "~> 1.31" - spec.add_development_dependency "rubocop-rails", "~> 2.21.2" + spec.add_development_dependency "rubocop-rails", "~> 2.22.2" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" spec.add_development_dependency "rubocop-rspec", "~> 2.25.0" # Format RSpec output for CircleCI From 1e6fef612784f890d4c02cb44c616b115dc7ce51 Mon Sep 17 00:00:00 2001 From: Github Workflow <kpumuk@users.noreply.github.com> Date: Mon, 20 Nov 2023 03:10:02 +0000 Subject: [PATCH 074/126] Updated Appraisal gemfiles --- gemfiles/rails_5.1.gemfile.lock | 5 +++-- gemfiles/rails_5.2.gemfile.lock | 5 +++-- gemfiles/rails_6.0.gemfile.lock | 5 +++-- gemfiles/rails_6.1.gemfile.lock | 5 +++-- gemfiles/rails_7.0.gemfile.lock | 5 +++-- gemfiles/rails_7.1.gemfile.lock | 5 +++-- gemfiles/rails_7.2.gemfile.lock | 5 +++-- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index ae633e1a..67884c7a 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -126,10 +126,11 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.21.2) + rubocop-rails (2.22.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) rubocop-rspec (2.25.0) @@ -192,7 +193,7 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.21.2) + rubocop-rails (~> 2.22.2) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index 5b8f9cc9..c8266cc6 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -126,10 +126,11 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.21.2) + rubocop-rails (2.22.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) rubocop-rspec (2.25.0) @@ -192,7 +193,7 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.21.2) + rubocop-rails (~> 2.22.2) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 16071d74..87adb1f6 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -127,10 +127,11 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.21.2) + rubocop-rails (2.22.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) rubocop-rspec (2.25.0) @@ -194,7 +195,7 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.21.2) + rubocop-rails (~> 2.22.2) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 4a329999..9923d762 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -127,10 +127,11 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.21.2) + rubocop-rails (2.22.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) rubocop-rspec (2.25.0) @@ -193,7 +194,7 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.21.2) + rubocop-rails (~> 2.22.2) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index f76cb1a9..3d953771 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -127,10 +127,11 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.21.2) + rubocop-rails (2.22.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) rubocop-rspec (2.25.0) @@ -193,7 +194,7 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.21.2) + rubocop-rails (~> 2.22.2) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index ab7494b5..6f3c54b8 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -155,10 +155,11 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.21.2) + rubocop-rails (2.22.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) rubocop-rspec (2.25.0) @@ -224,7 +225,7 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.21.2) + rubocop-rails (~> 2.22.2) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index 0af71e8f..8c66a7a5 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -159,10 +159,11 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.21.2) + rubocop-rails (2.22.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) rubocop-rspec (2.25.0) @@ -228,7 +229,7 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.21.2) + rubocop-rails (~> 2.22.2) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) From a52c0f8ad8e0f8eb0e49cb6c3a09cad431baec26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 01:14:32 +0000 Subject: [PATCH 075/126] Update rubocop-rails requirement from ~> 2.22.2 to ~> 2.23.0 Updates the requirements on [rubocop-rails](https://github.com/rubocop/rubocop-rails) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.22.2...v2.23.0) --- updated-dependencies: - dependency-name: rubocop-rails dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 1c4311a4..5aaed11a 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "simplecov", "~> 0.22.0" # Code style spec.add_development_dependency "standard", "~> 1.31" - spec.add_development_dependency "rubocop-rails", "~> 2.22.2" + spec.add_development_dependency "rubocop-rails", "~> 2.23.0" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" spec.add_development_dependency "rubocop-rspec", "~> 2.25.0" # Format RSpec output for CircleCI From a081fd812f19e0dbe3d7f4d910a728f684370ae6 Mon Sep 17 00:00:00 2001 From: Github Workflow <kpumuk@users.noreply.github.com> Date: Mon, 18 Dec 2023 01:15:55 +0000 Subject: [PATCH 076/126] Updated Appraisal gemfiles --- gemfiles/rails_5.1.gemfile.lock | 18 +++++++++--------- gemfiles/rails_5.2.gemfile.lock | 18 +++++++++--------- gemfiles/rails_6.0.gemfile.lock | 18 +++++++++--------- gemfiles/rails_6.1.gemfile.lock | 18 +++++++++--------- gemfiles/rails_7.0.gemfile.lock | 18 +++++++++--------- gemfiles/rails_7.1.gemfile.lock | 30 +++++++++++++++--------------- gemfiles/rails_7.2.gemfile.lock | 32 ++++++++++++++++---------------- 7 files changed, 76 insertions(+), 76 deletions(-) diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index 67884c7a..013a9e0f 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -7,7 +7,7 @@ PATH GEM remote: https://rubygems.org/ specs: - abbrev (0.1.1) + abbrev (0.1.2) actionpack (5.1.7) actionview (= 5.1.7) activesupport (= 5.1.7) @@ -42,7 +42,7 @@ GEM fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.6.3) + json (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) listen (3.8.0) @@ -58,7 +58,7 @@ GEM racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -84,9 +84,9 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.3.0) + rbs (3.3.2) abbrev - regexp_parser (2.8.2) + regexp_parser (2.8.3) rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -126,7 +126,7 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.22.2) + rubocop-rails (2.23.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -138,14 +138,14 @@ GEM rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) - securerandom (0.3.0) + securerandom (0.3.1) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.32.0) + standard (1.32.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.57.2) @@ -193,7 +193,7 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.22.2) + rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index c8266cc6..67b86188 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -7,7 +7,7 @@ PATH GEM remote: https://rubygems.org/ specs: - abbrev (0.1.1) + abbrev (0.1.2) actionpack (5.2.8.1) actionview (= 5.2.8.1) activesupport (= 5.2.8.1) @@ -42,7 +42,7 @@ GEM fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.6.3) + json (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) listen (3.8.0) @@ -58,7 +58,7 @@ GEM racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -84,9 +84,9 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.3.0) + rbs (3.3.2) abbrev - regexp_parser (2.8.2) + regexp_parser (2.8.3) rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -126,7 +126,7 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.22.2) + rubocop-rails (2.23.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -138,14 +138,14 @@ GEM rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) - securerandom (0.3.0) + securerandom (0.3.1) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.32.0) + standard (1.32.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.57.2) @@ -193,7 +193,7 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.22.2) + rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 87adb1f6..0e89de27 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -7,7 +7,7 @@ PATH GEM remote: https://rubygems.org/ specs: - abbrev (0.1.1) + abbrev (0.1.2) actionpack (6.0.6) actionview (= 6.0.6) activesupport (= 6.0.6) @@ -43,7 +43,7 @@ GEM fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.6.3) + json (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) listen (3.8.0) @@ -59,7 +59,7 @@ GEM racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -85,9 +85,9 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.3.0) + rbs (3.3.2) abbrev - regexp_parser (2.8.2) + regexp_parser (2.8.3) rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -127,7 +127,7 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.22.2) + rubocop-rails (2.23.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -139,14 +139,14 @@ GEM rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) - securerandom (0.3.0) + securerandom (0.3.1) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.32.0) + standard (1.32.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.57.2) @@ -195,7 +195,7 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.22.2) + rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 9923d762..9acab4ad 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -7,7 +7,7 @@ PATH GEM remote: https://rubygems.org/ specs: - abbrev (0.1.1) + abbrev (0.1.2) actionpack (6.1.7) actionview (= 6.1.7) activesupport (= 6.1.7) @@ -43,7 +43,7 @@ GEM fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.6.3) + json (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) listen (3.8.0) @@ -59,7 +59,7 @@ GEM racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -85,9 +85,9 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.3.0) + rbs (3.3.2) abbrev - regexp_parser (2.8.2) + regexp_parser (2.8.3) rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -127,7 +127,7 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.22.2) + rubocop-rails (2.23.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -139,14 +139,14 @@ GEM rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) - securerandom (0.3.0) + securerandom (0.3.1) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.32.0) + standard (1.32.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.57.2) @@ -194,7 +194,7 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.22.2) + rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 3d953771..d331de7f 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -7,7 +7,7 @@ PATH GEM remote: https://rubygems.org/ specs: - abbrev (0.1.1) + abbrev (0.1.2) actionpack (7.0.4) actionview (= 7.0.4) activesupport (= 7.0.4) @@ -42,7 +42,7 @@ GEM fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.6.3) + json (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) listen (3.8.0) @@ -58,7 +58,7 @@ GEM racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -85,9 +85,9 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.3.0) + rbs (3.3.2) abbrev - regexp_parser (2.8.2) + regexp_parser (2.8.3) rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -127,7 +127,7 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.22.2) + rubocop-rails (2.23.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -139,14 +139,14 @@ GEM rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) - securerandom (0.3.0) + securerandom (0.3.1) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.32.0) + standard (1.32.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.57.2) @@ -194,7 +194,7 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.22.2) + rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 6f3c54b8..2c7966aa 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -7,7 +7,7 @@ PATH GEM remote: https://rubygems.org/ specs: - abbrev (0.1.1) + abbrev (0.1.2) actionpack (7.1.0) actionview (= 7.1.0) activesupport (= 7.1.0) @@ -39,7 +39,7 @@ GEM thor (>= 0.14.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.4) + bigdecimal (3.1.5) builder (3.2.4) concurrent-ruby (1.2.2) connection_pool (2.4.1) @@ -54,11 +54,11 @@ GEM fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) - io-console (0.6.0) - irb (1.9.0) + io-console (0.7.1) + irb (1.10.1) rdoc reline (>= 0.3.8) - json (2.6.3) + json (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) listen (3.8.0) @@ -74,7 +74,7 @@ GEM racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -109,12 +109,12 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.3.0) + rbs (3.3.2) abbrev - rdoc (6.6.0) + rdoc (6.6.2) psych (>= 4.0.0) - regexp_parser (2.8.2) - reline (0.4.0) + regexp_parser (2.8.3) + reline (0.4.1) io-console (~> 0.5) rexml (3.2.6) rspec (3.12.0) @@ -155,7 +155,7 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.22.2) + rubocop-rails (2.23.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -168,14 +168,14 @@ GEM rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - securerandom (0.3.0) + securerandom (0.3.1) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.32.0) + standard (1.32.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.57.2) @@ -202,7 +202,7 @@ GEM securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - stringio (3.0.9) + stringio (3.1.0) strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -225,7 +225,7 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.22.2) + rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index 8c66a7a5..eeebf892 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: c2a33059d8f98890662572fbc10c033cc790b361 + revision: 1247932c809240638436836f9e61d991dab86e9f specs: actionpack (7.2.0.alpha) actionview (= 7.2.0.alpha) @@ -45,14 +45,14 @@ PATH GEM remote: https://rubygems.org/ specs: - abbrev (0.1.1) + abbrev (0.1.2) appraisal (2.5.0) bundler rake thor (>= 0.14.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.4) + bigdecimal (3.1.5) builder (3.2.4) concurrent-ruby (1.2.2) connection_pool (2.4.1) @@ -67,11 +67,11 @@ GEM fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) - io-console (0.6.0) - irb (1.9.0) + io-console (0.7.1) + irb (1.10.1) rdoc reline (>= 0.3.8) - json (2.6.3) + json (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) listen (3.8.0) @@ -86,7 +86,7 @@ GEM racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -113,12 +113,12 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.3.0) + rbs (3.3.2) abbrev - rdoc (6.6.0) + rdoc (6.6.2) psych (>= 4.0.0) - regexp_parser (2.8.2) - reline (0.4.0) + regexp_parser (2.8.3) + reline (0.4.1) io-console (~> 0.5) rexml (3.2.6) rspec (3.12.0) @@ -159,7 +159,7 @@ GEM rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.22.2) + rubocop-rails (2.23.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -172,14 +172,14 @@ GEM rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - securerandom (0.3.0) + securerandom (0.3.1) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.32.0) + standard (1.32.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.57.2) @@ -206,7 +206,7 @@ GEM securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - stringio (3.0.9) + stringio (3.1.0) strscan (3.0.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -229,7 +229,7 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.22.2) + rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) From 2c7430bab85a9d49ffdf993ca1155435d49b1aa8 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Tue, 26 Dec 2023 15:46:45 -0500 Subject: [PATCH 077/126] Introduce a new configuration options to add HTML attributes to <title> --- README.md | 18 ++++++++++++++++++ .../templates/config/initializers/meta_tags.rb | 3 +++ lib/meta_tags/configuration.rb | 4 ++++ lib/meta_tags/renderer.rb | 6 +++++- sig/lib/_internal/rails.rbs | 1 + sig/lib/meta_tags/configuration.rbs | 6 ++++++ spec/view_helper/title_spec.rb | 7 +++++++ 7 files changed, 44 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c7e78e36..e64e8d82 100644 --- a/README.md +++ b/README.md @@ -239,6 +239,24 @@ You will get this open graph meta tag automatically: [Turbo](https://github.com/hotwired/turbo) is a simple solution for getting the performance benefits of a single-page application without the added complexity of a client-side JavaScript framework. MetaTags supports Turbo out of the box, so no configuration is necessary. +In order to update the page title, you can use the following trick. First, set the ID for the `<title>` HTML tag using MetaTags configuration in your initializer `config/initializers/meta_tags.rb`: + +```ruby +MetaTags.configure do |config| + config.title_tag_attributes = {id: "page-title"} +end +```` + +Now in your turbo frame, you can update the title using a turbo stream: + +```html +<turbo-frame ...> + <turbo-stream action="update" target="page-title"> + <template>My new title</template> + </turbo-stream> +</turbo-frame> +``` + ### Using with pjax [jQuery.pjax](https://github.com/defunkt/jquery-pjax) is a nice solution for navigation without a full-page reload. The main difference is that the layout file will not be rendered, so the page title will not change. To fix this, when using a page fragment, pjax will check the fragment DOM element for a `title` or `data-title` attribute and use any value it finds. diff --git a/lib/generators/meta_tags/templates/config/initializers/meta_tags.rb b/lib/generators/meta_tags/templates/config/initializers/meta_tags.rb index 464d9649..7518234e 100644 --- a/lib/generators/meta_tags/templates/config/initializers/meta_tags.rb +++ b/lib/generators/meta_tags/templates/config/initializers/meta_tags.rb @@ -9,6 +9,9 @@ # When true, site title will be truncated instead of title. Default is false. # config.truncate_site_title_first = false + # Add HTML attributes to the <title> HTML tag. Default is {}. + # config.title_tag_attributes = {} + # Maximum length of the page description. Default is 300. # Set to nil or 0 to remove limits. # config.description_limit = 300 diff --git a/lib/meta_tags/configuration.rb b/lib/meta_tags/configuration.rb index a270e8c8..ac9c7074 100644 --- a/lib/meta_tags/configuration.rb +++ b/lib/meta_tags/configuration.rb @@ -6,6 +6,9 @@ class Configuration # How many characters to truncate title to. attr_accessor :title_limit + # HTML attributes for the title tag. + attr_accessor :title_tag_attributes + # Truncate site_title instead of title. attr_accessor :truncate_site_title_first @@ -76,6 +79,7 @@ def open_meta_tags? def reset_defaults! @title_limit = 70 @truncate_site_title_first = false + @title_tag_attributes = {} @description_limit = 300 @keywords_limit = 255 @keywords_separator = ", " diff --git a/lib/meta_tags/renderer.rb b/lib/meta_tags/renderer.rb index cc519114..62f42bda 100644 --- a/lib/meta_tags/renderer.rb +++ b/lib/meta_tags/renderer.rb @@ -59,7 +59,11 @@ def render_title(tags) normalized_meta_tags[:site] = meta_tags[:site] title = meta_tags.extract_full_title normalized_meta_tags[:full_title] = title - tags << ContentTag.new(:title, content: title) if title.present? + default_attributes = MetaTags.config.title_tag_attributes || {} + + if title.present? + tags << ContentTag.new(:title, {content: title}.with_defaults(default_attributes)) + end end # Renders icon(s) tag. diff --git a/sig/lib/_internal/rails.rbs b/sig/lib/_internal/rails.rbs index 3f8d7fb3..a5548e4d 100644 --- a/sig/lib/_internal/rails.rbs +++ b/sig/lib/_internal/rails.rbs @@ -1,6 +1,7 @@ class ::Hash[unchecked out K, unchecked out V] def with_indifferent_access: () -> ActiveSupport::HashWithIndifferentAccess[K, V] def deep_merge!: (instance | ActiveSupport::HashWithIndifferentAccess[K, V] other) -> self + def with_defaults: (instance | ActiveSupport::HashWithIndifferentAccess[K, V] other) -> self end class ::Object diff --git a/sig/lib/meta_tags/configuration.rbs b/sig/lib/meta_tags/configuration.rbs index 358a5532..740b4352 100644 --- a/sig/lib/meta_tags/configuration.rbs +++ b/sig/lib/meta_tags/configuration.rbs @@ -1,7 +1,13 @@ module MetaTags class Configuration + type html_tag_key = String | Symbol + type html_tag_value = Hash[html_tag_key, html_tag_value] | html_tag_content + type html_tag_content = String? | Symbol | (_Stringish & Object) + + attr_accessor title_limit: Integer? attr_accessor truncate_site_title_first: bool + attr_accessor title_tag_attributes: Hash[html_tag_key, html_tag_value]? attr_accessor description_limit: Integer attr_accessor keywords_limit: Integer attr_accessor keywords_separator: String diff --git a/spec/view_helper/title_spec.rb b/spec/view_helper/title_spec.rb index dc8dfd50..84226f3a 100644 --- a/spec/view_helper/title_spec.rb +++ b/spec/view_helper/title_spec.rb @@ -213,6 +213,13 @@ expect(meta).to eq("<title>hello") end end + + it "renders additional HTML attributes when configured" do + MetaTags.config.title_tag_attributes = {id: "page-title", data: {testid: "test-title"}} + subject.display_meta_tags(title: "hello").tap do |meta| + expect(meta).to eq("hello") + end + end end describe ".display_title" do From 79875a64d93d2650fb53511a90ec927131924329 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Tue, 26 Dec 2023 15:54:06 -0500 Subject: [PATCH 078/126] Require Ruby on Rails 6.0+ --- .github/workflows/tests.yml | 4 - Appraisals | 16 +-- CHANGELOG.md | 8 +- README.md | 4 +- gemfiles/rails_5.1.gemfile | 8 -- gemfiles/rails_5.1.gemfile.lock | 204 -------------------------------- gemfiles/rails_5.2.gemfile | 8 -- gemfiles/rails_5.2.gemfile.lock | 204 -------------------------------- gemfiles/rails_6.0.gemfile | 2 +- gemfiles/rails_6.0.gemfile.lock | 46 +++---- gemfiles/rails_6.1.gemfile | 2 +- gemfiles/rails_6.1.gemfile.lock | 46 +++---- gemfiles/rails_7.0.gemfile | 2 +- gemfiles/rails_7.0.gemfile.lock | 48 ++++---- gemfiles/rails_7.1.gemfile | 2 +- gemfiles/rails_7.1.gemfile.lock | 51 ++++---- gemfiles/rails_7.2.gemfile.lock | 32 ++--- meta-tags.gemspec | 2 +- 18 files changed, 129 insertions(+), 560 deletions(-) delete mode 100644 gemfiles/rails_5.1.gemfile delete mode 100644 gemfiles/rails_5.1.gemfile.lock delete mode 100644 gemfiles/rails_5.2.gemfile delete mode 100644 gemfiles/rails_5.2.gemfile.lock diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e567d770..e4008dbf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,10 +23,6 @@ jobs: - "7.1" - "7.2" include: - - ruby-version: "2.7" - rails-version: "5.1" - - ruby-version: "2.7" - rails-version: "5.2" - ruby-version: "3.2" rails-version: "7.1" code-coverage: true diff --git a/Appraisals b/Appraisals index 85973263..b847c0b7 100644 --- a/Appraisals +++ b/Appraisals @@ -1,27 +1,19 @@ # frozen_string_literal: true -appraise "rails-5.1" do - gem "railties", "5.1.7" -end - -appraise "rails-5.2" do - gem "railties", "5.2.8.1" -end - appraise "rails-6.0" do - gem "railties", "6.0.6" + gem "railties", "~> 6.0.6" end appraise "rails-6.1" do - gem "railties", "6.1.7" + gem "railties", "~> 6.1.7" end appraise "rails-7.0" do - gem "railties", "7.0.4" + gem "railties", "~> 7.0.8" end appraise "rails-7.1" do - gem "railties", "7.1.0" + gem "railties", "~> 7.1.2" end appraise "rails-7.2" do diff --git a/CHANGELOG.md b/CHANGELOG.md index fc6bee32..1fc9ee1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ Changes: - Switched builds from CircleCI to Github Actions ([273](https://github.com/kpumuk/meta-tags/pull/273)) +Changes: + +- Ruby on Rails < 6.0 is no longer supported. + ## 2.19.0 (October 5, 2023) [☰](https://github.com/kpumuk/meta-tags/compare/v2.18.0...v2.19.0) Changes: @@ -190,7 +194,7 @@ Features: Changes: -- Rails < 3.2 is not longer supported +- Ruby on Rails < 3.2 is no longer supported Features: @@ -209,7 +213,7 @@ Bugfixes: Changes: -- Ruby < 2.0 is not longer supported +- Ruby < 2.0 is no longer supported Features: diff --git a/README.md b/README.md index e64e8d82..2861f58a 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,10 @@ Search Engine Optimization (SEO) plugin for Ruby on Rails applications. ## Ruby on Rails -The MetaTags main branch fully supports Ruby on Rails 5.1+ and is tested against all major Ruby on Rails releases. +The MetaTags main branch fully supports Ruby on Rails 6.0+ and is tested against all major Ruby on Rails releases. > [!NOTE] -> We no longer support Ruby versions older than 2.7 and Ruby on Rails older than 5.1 since they reached their [End of Life](https://endoflife.date/ruby). +> We no longer support Ruby versions older than 2.7 and Ruby on Rails older than 6.0 since they reached their end of life (see [Ruby](https://endoflife.date/ruby) and [Ruby on Rails](https://endoflife.date/rails)). ## Installation diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile deleted file mode 100644 index 4e709bf6..00000000 --- a/gemfiles/rails_5.1.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "steep", "~> 1.5.2", platform: :mri_32 -gem "railties", "5.1.7" - -gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock deleted file mode 100644 index 013a9e0f..00000000 --- a/gemfiles/rails_5.1.gemfile.lock +++ /dev/null @@ -1,204 +0,0 @@ -PATH - remote: .. - specs: - meta-tags (2.19.0) - actionpack (>= 3.2.0, < 7.2) - -GEM - remote: https://rubygems.org/ - specs: - abbrev (0.1.2) - actionpack (5.1.7) - actionview (= 5.1.7) - activesupport (= 5.1.7) - rack (~> 2.0) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.7) - activesupport (= 5.1.7) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activesupport (5.1.7) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - appraisal (2.5.0) - bundler - rake - thor (>= 0.14.0) - ast (2.4.2) - builder (3.2.4) - concurrent-ruby (1.2.2) - crass (1.0.6) - csv (3.2.8) - diff-lcs (1.5.0) - docile (1.4.0) - erubi (1.12.0) - ffi (1.16.3) - fileutils (1.7.2) - i18n (1.14.1) - concurrent-ruby (~> 1.0) - json (2.7.1) - language_server-protocol (3.17.0.3) - lint_roller (1.1.0) - listen (3.8.0) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - logger (1.6.0) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - method_source (1.0.0) - minitest (5.20.0) - nokogiri (1.15.5-arm64-darwin) - racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) - racc (~> 1.4) - parallel (1.24.0) - parser (3.2.2.4) - ast (~> 2.4.1) - racc - racc (1.7.3) - rack (2.2.8) - rack-test (2.1.0) - rack (>= 1.3) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - railties (5.1.7) - actionpack (= 5.1.7) - activesupport (= 5.1.7) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (3.1.1) - rake (13.1.0) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - rbs (3.3.2) - abbrev - regexp_parser (2.8.3) - rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-html-matchers (0.10.0) - nokogiri (~> 1) - rspec (>= 3.0.0.a) - rspec-mocks (3.12.6) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - rspec_junit_formatter (0.6.0) - rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.57.2) - json (~> 2.3) - language_server-protocol (>= 3.17.0) - parallel (~> 1.10) - parser (>= 3.2.2.4) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) - rubocop (~> 1.33) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.23.0) - activesupport (>= 4.2.0) - rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rake (0.6.0) - rubocop (~> 1.0) - rubocop-rspec (2.25.0) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) - ruby-progressbar (1.13.0) - securerandom (0.3.1) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) - standard (1.32.1) - language_server-protocol (~> 3.17.0.2) - lint_roller (~> 1.0) - rubocop (~> 1.57.2) - standard-custom (~> 1.0.0) - standard-performance (~> 1.2) - standard-custom (1.0.2) - lint_roller (~> 1.0) - rubocop (~> 1.50) - standard-performance (1.2.1) - lint_roller (~> 1.1) - rubocop-performance (~> 1.19.1) - steep (1.5.3) - activesupport (>= 5.1) - concurrent-ruby (>= 1.1.10) - csv (>= 3.0.9) - fileutils (>= 1.1.0) - json (>= 2.1.0) - language_server-protocol (>= 3.15, < 4.0) - listen (~> 3.0) - logger (>= 1.3.0) - parser (>= 3.1) - rainbow (>= 2.2.2, < 4.0) - rbs (>= 3.1.0) - securerandom (>= 0.1) - strscan (>= 1.0.0) - terminal-table (>= 2, < 4) - strscan (3.0.7) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) - thor (1.3.0) - thread_safe (0.3.6) - tzinfo (1.2.11) - thread_safe (~> 0.1) - unicode-display_width (2.5.0) - -PLATFORMS - arm64-darwin - x86_64-linux - -DEPENDENCIES - appraisal (~> 2.5.0) - meta-tags! - railties (= 5.1.7) - rake (~> 13.0) - rspec (~> 3.12.0) - rspec-html-matchers (~> 0.10.0) - rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.23.0) - rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.25.0) - simplecov (~> 0.22.0) - standard (~> 1.31) - steep (~> 1.5.2) - -BUNDLED WITH - 2.4.10 diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile deleted file mode 100644 index 9c78ea27..00000000 --- a/gemfiles/rails_5.2.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "steep", "~> 1.5.2", platform: :mri_32 -gem "railties", "5.2.8.1" - -gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock deleted file mode 100644 index 67b86188..00000000 --- a/gemfiles/rails_5.2.gemfile.lock +++ /dev/null @@ -1,204 +0,0 @@ -PATH - remote: .. - specs: - meta-tags (2.19.0) - actionpack (>= 3.2.0, < 7.2) - -GEM - remote: https://rubygems.org/ - specs: - abbrev (0.1.2) - actionpack (5.2.8.1) - actionview (= 5.2.8.1) - activesupport (= 5.2.8.1) - rack (~> 2.0, >= 2.0.8) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.8.1) - activesupport (= 5.2.8.1) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activesupport (5.2.8.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - appraisal (2.5.0) - bundler - rake - thor (>= 0.14.0) - ast (2.4.2) - builder (3.2.4) - concurrent-ruby (1.2.2) - crass (1.0.6) - csv (3.2.8) - diff-lcs (1.5.0) - docile (1.4.0) - erubi (1.12.0) - ffi (1.16.3) - fileutils (1.7.2) - i18n (1.14.1) - concurrent-ruby (~> 1.0) - json (2.7.1) - language_server-protocol (3.17.0.3) - lint_roller (1.1.0) - listen (3.8.0) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - logger (1.6.0) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - method_source (1.0.0) - minitest (5.20.0) - nokogiri (1.15.5-arm64-darwin) - racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) - racc (~> 1.4) - parallel (1.24.0) - parser (3.2.2.4) - ast (~> 2.4.1) - racc - racc (1.7.3) - rack (2.2.8) - rack-test (2.1.0) - rack (>= 1.3) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - railties (5.2.8.1) - actionpack (= 5.2.8.1) - activesupport (= 5.2.8.1) - method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) - rainbow (3.1.1) - rake (13.1.0) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - rbs (3.3.2) - abbrev - regexp_parser (2.8.3) - rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-html-matchers (0.10.0) - nokogiri (~> 1) - rspec (>= 3.0.0.a) - rspec-mocks (3.12.6) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - rspec_junit_formatter (0.6.0) - rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.57.2) - json (~> 2.3) - language_server-protocol (>= 3.17.0) - parallel (~> 1.10) - parser (>= 3.2.2.4) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) - rubocop (~> 1.33) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.23.0) - activesupport (>= 4.2.0) - rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rake (0.6.0) - rubocop (~> 1.0) - rubocop-rspec (2.25.0) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) - ruby-progressbar (1.13.0) - securerandom (0.3.1) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) - standard (1.32.1) - language_server-protocol (~> 3.17.0.2) - lint_roller (~> 1.0) - rubocop (~> 1.57.2) - standard-custom (~> 1.0.0) - standard-performance (~> 1.2) - standard-custom (1.0.2) - lint_roller (~> 1.0) - rubocop (~> 1.50) - standard-performance (1.2.1) - lint_roller (~> 1.1) - rubocop-performance (~> 1.19.1) - steep (1.5.3) - activesupport (>= 5.1) - concurrent-ruby (>= 1.1.10) - csv (>= 3.0.9) - fileutils (>= 1.1.0) - json (>= 2.1.0) - language_server-protocol (>= 3.15, < 4.0) - listen (~> 3.0) - logger (>= 1.3.0) - parser (>= 3.1) - rainbow (>= 2.2.2, < 4.0) - rbs (>= 3.1.0) - securerandom (>= 0.1) - strscan (>= 1.0.0) - terminal-table (>= 2, < 4) - strscan (3.0.7) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) - thor (1.3.0) - thread_safe (0.3.6) - tzinfo (1.2.11) - thread_safe (~> 0.1) - unicode-display_width (2.5.0) - -PLATFORMS - arm64-darwin - x86_64-linux - -DEPENDENCIES - appraisal (~> 2.5.0) - meta-tags! - railties (= 5.2.8.1) - rake (~> 13.0) - rspec (~> 3.12.0) - rspec-html-matchers (~> 0.10.0) - rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.23.0) - rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.25.0) - simplecov (~> 0.22.0) - standard (~> 1.31) - steep (~> 1.5.2) - -BUNDLED WITH - 2.4.10 diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index b624dbe7..6bcdb80a 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -3,6 +3,6 @@ source "https://rubygems.org" gem "steep", "~> 1.5.2", platform: :mri_32 -gem "railties", "6.0.6" +gem "railties", "~> 6.0.6" gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 0e89de27..cfc5d502 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -2,26 +2,26 @@ PATH remote: .. specs: meta-tags (2.19.0) - actionpack (>= 3.2.0, < 7.2) + actionpack (>= 6.0.0, < 7.2) GEM remote: https://rubygems.org/ specs: abbrev (0.1.2) - actionpack (6.0.6) - actionview (= 6.0.6) - activesupport (= 6.0.6) + actionpack (6.0.6.1) + actionview (= 6.0.6.1) + activesupport (= 6.0.6.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.6) - activesupport (= 6.0.6) + actionview (6.0.6.1) + activesupport (= 6.0.6.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.0.6) + activesupport (6.0.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -74,9 +74,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (6.0.6) - actionpack (= 6.0.6) - activesupport (= 6.0.6) + railties (6.0.6.1) + actionpack (= 6.0.6.1) + activesupport (= 6.0.6.1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -85,7 +85,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.3.2) + rbs (3.4.1) abbrev regexp_parser (2.8.3) rexml (3.2.6) @@ -107,7 +107,7 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.57.2) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -115,7 +115,7 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) @@ -124,10 +124,10 @@ GEM rubocop (~> 1.41) rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.23.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.23.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -146,18 +146,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.32.1) + standard (1.33.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.57.2) + rubocop (~> 1.59.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.2) + standard-performance (~> 1.3) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.1) + standard-performance (1.3.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.1) + rubocop-performance (~> 1.20.1) steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -190,7 +190,7 @@ PLATFORMS DEPENDENCIES appraisal (~> 2.5.0) meta-tags! - railties (= 6.0.6) + railties (~> 6.0.6) rake (~> 13.0) rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index de9b39f1..3a241c5e 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -3,6 +3,6 @@ source "https://rubygems.org" gem "steep", "~> 1.5.2", platform: :mri_32 -gem "railties", "6.1.7" +gem "railties", "~> 6.1.7" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 9acab4ad..ffdd6d16 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -2,26 +2,26 @@ PATH remote: .. specs: meta-tags (2.19.0) - actionpack (>= 3.2.0, < 7.2) + actionpack (>= 6.0.0, < 7.2) GEM remote: https://rubygems.org/ specs: abbrev (0.1.2) - actionpack (6.1.7) - actionview (= 6.1.7) - activesupport (= 6.1.7) + actionpack (6.1.7.6) + actionview (= 6.1.7.6) + activesupport (= 6.1.7.6) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.7) - activesupport (= 6.1.7) + actionview (6.1.7.6) + activesupport (= 6.1.7.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.7) + activesupport (6.1.7.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -74,9 +74,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) + railties (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) method_source rake (>= 12.2) thor (~> 1.0) @@ -85,7 +85,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.3.2) + rbs (3.4.1) abbrev regexp_parser (2.8.3) rexml (3.2.6) @@ -107,7 +107,7 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.57.2) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -115,7 +115,7 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) @@ -124,10 +124,10 @@ GEM rubocop (~> 1.41) rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.23.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.23.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -146,18 +146,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.32.1) + standard (1.33.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.57.2) + rubocop (~> 1.59.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.2) + standard-performance (~> 1.3) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.1) + standard-performance (1.3.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.1) + rubocop-performance (~> 1.20.1) steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -189,7 +189,7 @@ PLATFORMS DEPENDENCIES appraisal (~> 2.5.0) meta-tags! - railties (= 6.1.7) + railties (~> 6.1.7) rake (~> 13.0) rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index e3afa936..0c8aea06 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -3,6 +3,6 @@ source "https://rubygems.org" gem "steep", "~> 1.5.2", platform: :mri_32 -gem "railties", "7.0.4" +gem "railties", "~> 7.0.8" gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index d331de7f..60c6ae34 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -2,26 +2,26 @@ PATH remote: .. specs: meta-tags (2.19.0) - actionpack (>= 3.2.0, < 7.2) + actionpack (>= 6.0.0, < 7.2) GEM remote: https://rubygems.org/ specs: abbrev (0.1.2) - actionpack (7.0.4) - actionview (= 7.0.4) - activesupport (= 7.0.4) - rack (~> 2.0, >= 2.2.0) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.4) - activesupport (= 7.0.4) + actionview (7.0.8) + activesupport (= 7.0.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (7.0.4) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -73,9 +73,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + railties (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) method_source rake (>= 12.2) thor (~> 1.0) @@ -85,7 +85,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.3.2) + rbs (3.4.1) abbrev regexp_parser (2.8.3) rexml (3.2.6) @@ -107,7 +107,7 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.57.2) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -115,7 +115,7 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) @@ -124,10 +124,10 @@ GEM rubocop (~> 1.41) rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.23.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.23.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -146,18 +146,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.32.1) + standard (1.33.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.57.2) + rubocop (~> 1.59.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.2) + standard-performance (~> 1.3) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.1) + standard-performance (1.3.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.1) + rubocop-performance (~> 1.20.1) steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -189,7 +189,7 @@ PLATFORMS DEPENDENCIES appraisal (~> 2.5.0) meta-tags! - railties (= 7.0.4) + railties (~> 7.0.8) rake (~> 13.0) rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index 7ace2fe8..8e40c703 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -3,6 +3,6 @@ source "https://rubygems.org" gem "steep", "~> 1.5.2", platform: :mri_32 -gem "railties", "7.1.0" +gem "railties", "~> 7.1.2" gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 2c7966aa..5b6daf2d 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -2,28 +2,29 @@ PATH remote: .. specs: meta-tags (2.19.0) - actionpack (>= 3.2.0, < 7.2) + actionpack (>= 6.0.0, < 7.2) GEM remote: https://rubygems.org/ specs: abbrev (0.1.2) - actionpack (7.1.0) - actionview (= 7.1.0) - activesupport (= 7.1.0) + actionpack (7.1.2) + actionview (= 7.1.2) + activesupport (= 7.1.2) nokogiri (>= 1.8.5) + racc rack (>= 2.2.4) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actionview (7.1.0) - activesupport (= 7.1.0) + actionview (7.1.2) + activesupport (= 7.1.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activesupport (7.1.0) + activesupport (7.1.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -55,7 +56,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.7.1) - irb (1.10.1) + irb (1.11.0) rdoc reline (>= 0.3.8) json (2.7.1) @@ -78,7 +79,7 @@ GEM parser (3.2.2.4) ast (~> 2.4.1) racc - psych (5.1.1.1) + psych (5.1.2) stringio racc (1.7.3) rack (3.0.8) @@ -96,9 +97,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.0) - actionpack (= 7.1.0) - activesupport (= 7.1.0) + railties (7.1.2) + actionpack (= 7.1.2) + activesupport (= 7.1.2) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -109,7 +110,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.3.2) + rbs (3.4.1) abbrev rdoc (6.6.2) psych (>= 4.0.0) @@ -135,7 +136,7 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.57.2) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -143,7 +144,7 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) @@ -152,10 +153,10 @@ GEM rubocop (~> 1.41) rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.23.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.23.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -175,18 +176,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.32.1) + standard (1.33.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.57.2) + rubocop (~> 1.59.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.2) + standard-performance (~> 1.3) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.1) + standard-performance (1.3.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.1) + rubocop-performance (~> 1.20.1) steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -220,7 +221,7 @@ PLATFORMS DEPENDENCIES appraisal (~> 2.5.0) meta-tags! - railties (= 7.1.0) + railties (~> 7.1.2) rake (~> 13.0) rspec (~> 3.12.0) rspec-html-matchers (~> 0.10.0) diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index eeebf892..3f1cb710 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: 1247932c809240638436836f9e61d991dab86e9f + revision: 5b62994778d197b26185472bbe94b6086760789d specs: actionpack (7.2.0.alpha) actionview (= 7.2.0.alpha) @@ -40,7 +40,7 @@ PATH remote: .. specs: meta-tags (2.19.0) - actionpack (>= 3.2.0, < 7.2) + actionpack (>= 6.0.0, < 7.2) GEM remote: https://rubygems.org/ @@ -68,7 +68,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.7.1) - irb (1.10.1) + irb (1.11.0) rdoc reline (>= 0.3.8) json (2.7.1) @@ -90,7 +90,7 @@ GEM parser (3.2.2.4) ast (~> 2.4.1) racc - psych (5.1.1.1) + psych (5.1.2) stringio racc (1.7.3) rack (3.0.8) @@ -113,7 +113,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.3.2) + rbs (3.4.1) abbrev rdoc (6.6.2) psych (>= 4.0.0) @@ -139,7 +139,7 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.57.2) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -147,7 +147,7 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) @@ -156,10 +156,10 @@ GEM rubocop (~> 1.41) rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.23.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.23.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -179,18 +179,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.32.1) + standard (1.33.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.57.2) + rubocop (~> 1.59.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.2) + standard-performance (~> 1.3) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.1) + standard-performance (1.3.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.1) + rubocop-performance (~> 1.20.1) steep (1.5.3) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 5aaed11a..4be769c7 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_runtime_dependency "actionpack", ">= 3.2.0", "< 7.2" + spec.add_runtime_dependency "actionpack", ">= 6.0.0", "< 7.2" spec.add_development_dependency "railties", ">= 3.2.0", "< 7.2" spec.add_development_dependency "rake", "~> 13.0" From cc55dafc989859cc3fa7b4c76802d35f20e865bf Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Tue, 26 Dec 2023 16:03:13 -0500 Subject: [PATCH 079/126] Updated changelog --- CHANGELOG.md | 4 ++++ lib/meta_tags/renderer.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fc9ee1d..408614e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 2.20.0 (Development) +Features: + +- Introduced `title_tag_attributes` configuration option to add HTML attributes to the title tag ([284](https://github.com/kpumuk/meta-tags/pull/284)). + Changes: - Switched builds from CircleCI to Github Actions ([273](https://github.com/kpumuk/meta-tags/pull/273)) diff --git a/lib/meta_tags/renderer.rb b/lib/meta_tags/renderer.rb index 62f42bda..5e3d7e49 100644 --- a/lib/meta_tags/renderer.rb +++ b/lib/meta_tags/renderer.rb @@ -92,7 +92,7 @@ def render_icon(tags) # @see TextNormalizer # def render_with_normalization(tags, name) - value = TextNormalizer.public_send("normalize_#{name}", meta_tags.extract(name)) + value = TextNormalizer.public_send(:"normalize_#{name}", meta_tags.extract(name)) normalized_meta_tags[name] = value tags << Tag.new(:meta, name: name, content: value) if value.present? end From f9863c0c1070ae04fa27f934db6277c869bdf394 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk Date: Tue, 26 Dec 2023 15:11:39 -0500 Subject: [PATCH 080/126] Introduce a new configuration option 'truncation_natural_separator' to change or remove natural separator --- .../config/initializers/meta_tags.rb | 3 ++ lib/meta_tags/configuration.rb | 4 ++ lib/meta_tags/text_normalizer.rb | 10 ++--- sig/lib/meta_tags/configuration.rbs | 1 + sig/lib/meta_tags/text_normalizer.rbs | 4 +- .../normalize_description_spec.rb | 43 +++++++++++++++---- spec/text_normalizer/normalize_title_spec.rb | 27 ++++++++++++ spec/text_normalizer/truncate_array_spec.rb | 23 ++++++++++ 8 files changed, 98 insertions(+), 17 deletions(-) diff --git a/lib/generators/meta_tags/templates/config/initializers/meta_tags.rb b/lib/generators/meta_tags/templates/config/initializers/meta_tags.rb index 7518234e..d9f2f84f 100644 --- a/lib/generators/meta_tags/templates/config/initializers/meta_tags.rb +++ b/lib/generators/meta_tags/templates/config/initializers/meta_tags.rb @@ -12,6 +12,9 @@ # Add HTML attributes to the HTML tag. Default is {}. # config.title_tag_attributes = {} + # Add HTML attributes to the <title> HTML tag. Default is {}. + # config.title_tag_attributes = {} + # Maximum length of the page description. Default is 300. # Set to nil or 0 to remove limits. # config.description_limit = 300 diff --git a/lib/meta_tags/configuration.rb b/lib/meta_tags/configuration.rb index ac9c7074..e51af824 100644 --- a/lib/meta_tags/configuration.rb +++ b/lib/meta_tags/configuration.rb @@ -12,6 +12,9 @@ class Configuration # Truncate site_title instead of title. attr_accessor :truncate_site_title_first + # A string or regexp separator to truncate text at a natural break. + attr_accessor :truncation_natural_separator + # How many characters to truncate description to. attr_accessor :description_limit @@ -79,6 +82,7 @@ def open_meta_tags? def reset_defaults! @title_limit = 70 @truncate_site_title_first = false + @truncation_natural_separator = " " @title_tag_attributes = {} @description_limit = 300 @keywords_limit = 255 diff --git a/lib/meta_tags/text_normalizer.rb b/lib/meta_tags/text_normalizer.rb index 78c79f6d..698125bf 100644 --- a/lib/meta_tags/text_normalizer.rb +++ b/lib/meta_tags/text_normalizer.rb @@ -134,16 +134,15 @@ def cleanup_strings(strings, strip: true) # # @param [String] string input strings. # @param [Integer,nil] limit characters number to truncate to. - # @param [String] natural_separator natural separator to truncate at. # @return [String] truncated string. # - def truncate(string, limit = nil, natural_separator = " ") + def truncate(string, limit = nil) return string if limit.to_i == 0 helpers.truncate( string, length: limit, - separator: natural_separator, + separator: MetaTags.config.truncation_natural_separator, omission: "", escape: true ) @@ -154,10 +153,9 @@ def truncate(string, limit = nil, natural_separator = " ") # @param [Array<String>] string_array input strings. # @param [Integer,nil] limit characters number to truncate to. # @param [String] separator separator that will be used to join array later. - # @param [String] natural_separator natural separator to truncate at. # @return [Array<String>] truncated array of strings. # - def truncate_array(string_array, limit = nil, separator = "", natural_separator = " ") + def truncate_array(string_array, limit = nil, separator = "") return string_array if limit.nil? || limit <= 0 length = 0 @@ -167,7 +165,7 @@ def truncate_array(string_array, limit = nil, separator = "", natural_separator limit_left = calculate_limit_left(limit, length, result, separator) if string.length > limit_left - result << truncate(string, limit_left, natural_separator) + result << truncate(string, limit_left) break string_array end diff --git a/sig/lib/meta_tags/configuration.rbs b/sig/lib/meta_tags/configuration.rbs index 740b4352..90426ce9 100644 --- a/sig/lib/meta_tags/configuration.rbs +++ b/sig/lib/meta_tags/configuration.rbs @@ -7,6 +7,7 @@ module MetaTags attr_accessor title_limit: Integer? attr_accessor truncate_site_title_first: bool + attr_accessor truncation_natural_separator: String?|Regexp attr_accessor title_tag_attributes: Hash[html_tag_key, html_tag_value]? attr_accessor description_limit: Integer attr_accessor keywords_limit: Integer diff --git a/sig/lib/meta_tags/text_normalizer.rbs b/sig/lib/meta_tags/text_normalizer.rbs index 57c6d686..191ea847 100644 --- a/sig/lib/meta_tags/text_normalizer.rbs +++ b/sig/lib/meta_tags/text_normalizer.rbs @@ -21,9 +21,9 @@ module MetaTags def cleanup_strings: (keywords? strings, ?strip: bool strip) -> Array[String] - def truncate: (String string, ?Integer? limit, ?String natural_separator) -> String + def truncate: (String string, ?Integer? limit) -> String - def truncate_array: (Array[String] string_array, ?Integer? limit, ?String separator, ?String natural_separator) -> Array[String] + def truncate_array: (Array[String] string_array, ?Integer? limit, ?String separator) -> Array[String] private diff --git a/spec/text_normalizer/normalize_description_spec.rb b/spec/text_normalizer/normalize_description_spec.rb index b6e46477..c570d477 100644 --- a/spec/text_normalizer/normalize_description_spec.rb +++ b/spec/text_normalizer/normalize_description_spec.rb @@ -3,19 +3,44 @@ require "spec_helper" RSpec.describe MetaTags::TextNormalizer, ".normalize_description" do - describe "description limit setting" do - let(:description) { "d" * (MetaTags.config.description_limit + 10) } + let(:description) { "d" * (MetaTags.config.description_limit + 10) } - it "truncates description when limit is reached" do - expect(subject.normalize_description(description)).to eq("d" * MetaTags.config.description_limit) + it "truncates description when limit is reached" do + expect(subject.normalize_description(description)).to eq("d" * MetaTags.config.description_limit) + end + + it "does not truncate description when limit is 0 or nil" do + MetaTags.config.description_limit = 0 + expect(subject.normalize_description(description)).to eq(description) + + MetaTags.config.title_limit = nil + expect(subject.normalize_description(description)).to eq(description) + end + + context "with text in Japanese" do + let(:description) do + "Microsoft Copilotは、あなたの言葉をパワフルなコンテンツに変える AI アシスタントです。あなたのニーズに合わせて、文章を生成、要約、編集、変換したり、コードや詩などの創造的なコンテンツを作成したりします。" + end + + before do + MetaTags.config.description_limit = 50 + end + + context "when natural separator has default value" do + it "truncates description on space character" do + expect(subject.normalize_description(description)) + .to eq("Microsoft Copilotは、あなたの言葉をパワフルなコンテンツに変える AI") + end end - it "does not truncate description when limit is 0 or nil" do - MetaTags.config.description_limit = 0 - expect(subject.normalize_description(description)).to eq(description) + context "when natural separator is set to nil" do + before do + MetaTags.config.truncation_natural_separator = nil + end - MetaTags.config.title_limit = nil - expect(subject.normalize_description(description)).to eq(description) + it "truncates description on unicode codepoint" do + expect(subject.normalize_description(description)).to eq(description[0, 50]) + end end end end diff --git a/spec/text_normalizer/normalize_title_spec.rb b/spec/text_normalizer/normalize_title_spec.rb index ae0d54aa..8f301e09 100644 --- a/spec/text_normalizer/normalize_title_spec.rb +++ b/spec/text_normalizer/normalize_title_spec.rb @@ -122,4 +122,31 @@ expect(subject.normalize_title(site_title, title, "-")).to eq("#{site_title}-#{title}") end end + + context "with text in Japanese" do + let(:title) do + "Microsoft Copilotは、あなたの言葉をパワフルなコンテンツに変える AI アシスタントです。あなたのニーズに合わせて、文章を生成、要約、編集、変換したり、コードや詩などの創造的なコンテンツを作成したりします。" + end + + before do + MetaTags.config.title_limit = 50 + end + + context "when natural separator has default value" do + it "truncates description on space character" do + expect(subject.normalize_title(nil, title, "-")) + .to eq("Microsoft Copilotは、あなたの言葉をパワフルなコンテンツに変える AI") + end + end + + context "when natural separator is set to nil" do + before do + MetaTags.config.truncation_natural_separator = nil + end + + it "truncates description on unicode codepoint" do + expect(subject.normalize_title(nil, title, "-")).to eq(title[0, 50]) + end + end + end end diff --git a/spec/text_normalizer/truncate_array_spec.rb b/spec/text_normalizer/truncate_array_spec.rb index 17c72159..1dc468f0 100644 --- a/spec/text_normalizer/truncate_array_spec.rb +++ b/spec/text_normalizer/truncate_array_spec.rb @@ -59,4 +59,27 @@ expect(subject.truncate_array(arr, 7, "-")).to eq(%w[a aa]) end end + + context "with text in Japanese" do + let(:title) do + "Microsoft Copilotは、あなたの言葉をパワフルなコンテンツに変える AI アシスタントです。あなたのニーズに合わせて、文章を生成、要約、編集、変換したり、コードや詩などの創造的なコンテンツを作成したりします。" + end + + context "when natural separator has default value" do + it "truncates description on space character" do + expect(subject.truncate_array([title], 50)) + .to eq(["Microsoft Copilotは、あなたの言葉をパワフルなコンテンツに変える AI"]) + end + end + + context "when natural separator is set to nil" do + before do + MetaTags.config.truncation_natural_separator = nil + end + + it "truncates description on unicode codepoint" do + expect(subject.truncate_array([title], 50)).to eq([title[0, 50]]) + end + end + end end From 473e931c80118138fe54515c1935668fc1375e4c Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Tue, 26 Dec 2023 16:15:07 -0500 Subject: [PATCH 081/126] Renamed truncation_natural_separator to truncate_on_natural_separator --- CHANGELOG.md | 1 + lib/meta_tags/configuration.rb | 4 ++-- lib/meta_tags/text_normalizer.rb | 2 +- sig/lib/meta_tags/configuration.rbs | 2 +- spec/text_normalizer/normalize_description_spec.rb | 2 +- spec/text_normalizer/normalize_title_spec.rb | 2 +- spec/text_normalizer/truncate_array_spec.rb | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 408614e7..c1504980 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Features: +- Introduced `truncate_on_natural_separator` configuration option to change or disable truncation on natural separator ([283](https://github.com/kpumuk/meta-tags/pull/283)). - Introduced `title_tag_attributes` configuration option to add HTML attributes to the title tag ([284](https://github.com/kpumuk/meta-tags/pull/284)). Changes: diff --git a/lib/meta_tags/configuration.rb b/lib/meta_tags/configuration.rb index e51af824..481372eb 100644 --- a/lib/meta_tags/configuration.rb +++ b/lib/meta_tags/configuration.rb @@ -13,7 +13,7 @@ class Configuration attr_accessor :truncate_site_title_first # A string or regexp separator to truncate text at a natural break. - attr_accessor :truncation_natural_separator + attr_accessor :truncate_on_natural_separator # How many characters to truncate description to. attr_accessor :description_limit @@ -82,7 +82,7 @@ def open_meta_tags? def reset_defaults! @title_limit = 70 @truncate_site_title_first = false - @truncation_natural_separator = " " + @truncate_on_natural_separator = " " @title_tag_attributes = {} @description_limit = 300 @keywords_limit = 255 diff --git a/lib/meta_tags/text_normalizer.rb b/lib/meta_tags/text_normalizer.rb index 698125bf..7ddff91e 100644 --- a/lib/meta_tags/text_normalizer.rb +++ b/lib/meta_tags/text_normalizer.rb @@ -142,7 +142,7 @@ def truncate(string, limit = nil) helpers.truncate( string, length: limit, - separator: MetaTags.config.truncation_natural_separator, + separator: MetaTags.config.truncate_on_natural_separator, omission: "", escape: true ) diff --git a/sig/lib/meta_tags/configuration.rbs b/sig/lib/meta_tags/configuration.rbs index 90426ce9..8fb46686 100644 --- a/sig/lib/meta_tags/configuration.rbs +++ b/sig/lib/meta_tags/configuration.rbs @@ -7,7 +7,7 @@ module MetaTags attr_accessor title_limit: Integer? attr_accessor truncate_site_title_first: bool - attr_accessor truncation_natural_separator: String?|Regexp + attr_accessor truncate_on_natural_separator: String?|Regexp attr_accessor title_tag_attributes: Hash[html_tag_key, html_tag_value]? attr_accessor description_limit: Integer attr_accessor keywords_limit: Integer diff --git a/spec/text_normalizer/normalize_description_spec.rb b/spec/text_normalizer/normalize_description_spec.rb index c570d477..21fa763f 100644 --- a/spec/text_normalizer/normalize_description_spec.rb +++ b/spec/text_normalizer/normalize_description_spec.rb @@ -35,7 +35,7 @@ context "when natural separator is set to nil" do before do - MetaTags.config.truncation_natural_separator = nil + MetaTags.config.truncate_on_natural_separator = nil end it "truncates description on unicode codepoint" do diff --git a/spec/text_normalizer/normalize_title_spec.rb b/spec/text_normalizer/normalize_title_spec.rb index 8f301e09..38b7a038 100644 --- a/spec/text_normalizer/normalize_title_spec.rb +++ b/spec/text_normalizer/normalize_title_spec.rb @@ -141,7 +141,7 @@ context "when natural separator is set to nil" do before do - MetaTags.config.truncation_natural_separator = nil + MetaTags.config.truncate_on_natural_separator = nil end it "truncates description on unicode codepoint" do diff --git a/spec/text_normalizer/truncate_array_spec.rb b/spec/text_normalizer/truncate_array_spec.rb index 1dc468f0..08b8db1a 100644 --- a/spec/text_normalizer/truncate_array_spec.rb +++ b/spec/text_normalizer/truncate_array_spec.rb @@ -74,7 +74,7 @@ context "when natural separator is set to nil" do before do - MetaTags.config.truncation_natural_separator = nil + MetaTags.config.truncate_on_natural_separator = nil end it "truncates description on unicode codepoint" do From ba4a658b91fc8d95fcee3e45640c0182c216169a Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Tue, 26 Dec 2023 16:22:18 -0500 Subject: [PATCH 082/126] Bumped version to 2.20 --- CHANGELOG.md | 5 +---- gemfiles/rails_6.0.gemfile.lock | 2 +- gemfiles/rails_6.1.gemfile.lock | 2 +- gemfiles/rails_7.0.gemfile.lock | 2 +- gemfiles/rails_7.1.gemfile.lock | 2 +- gemfiles/rails_7.2.gemfile.lock | 2 +- lib/meta_tags/version.rb | 2 +- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1504980..74353089 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 2.20.0 (Development) +## 2.20.0 (December 26, 2023) Features: @@ -10,9 +10,6 @@ Features: Changes: - Switched builds from CircleCI to Github Actions ([273](https://github.com/kpumuk/meta-tags/pull/273)) - -Changes: - - Ruby on Rails < 6.0 is no longer supported. ## 2.19.0 (October 5, 2023) [☰](https://github.com/kpumuk/meta-tags/compare/v2.18.0...v2.19.0) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index cfc5d502..e346a202 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - meta-tags (2.19.0) + meta-tags (2.20.0) actionpack (>= 6.0.0, < 7.2) GEM diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index ffdd6d16..2e481135 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - meta-tags (2.19.0) + meta-tags (2.20.0) actionpack (>= 6.0.0, < 7.2) GEM diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 60c6ae34..05a49b5e 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - meta-tags (2.19.0) + meta-tags (2.20.0) actionpack (>= 6.0.0, < 7.2) GEM diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 5b6daf2d..a762fef2 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - meta-tags (2.19.0) + meta-tags (2.20.0) actionpack (>= 6.0.0, < 7.2) GEM diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index 3f1cb710..76a4628a 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -39,7 +39,7 @@ GIT PATH remote: .. specs: - meta-tags (2.19.0) + meta-tags (2.20.0) actionpack (>= 6.0.0, < 7.2) GEM diff --git a/lib/meta_tags/version.rb b/lib/meta_tags/version.rb index 80f3c2c3..4086c655 100644 --- a/lib/meta_tags/version.rb +++ b/lib/meta_tags/version.rb @@ -2,6 +2,6 @@ module MetaTags # Gem version. - VERSION = "2.19.0" + VERSION = "2.20.0" public_constant :VERSION end From e0ba3551e23854b585253c4abe4b166d50d6d936 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Tue, 26 Dec 2023 16:31:30 -0500 Subject: [PATCH 083/126] Remove unnecessary files from the gem --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 4be769c7..3711394b 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |spec| spec.platform = Gem::Platform::RUBY spec.required_ruby_version = ">= 2.7.0" - spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(\.|(bin|test|spec|features)/)}) } + spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(\.|Gemfile|Appraisals|Steepfile|(bin|spec|gemfiles)/)}) } spec.bindir = "exe" spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] From a8bd1eefc9f2e4df8700e45b62d2cd5f39ce18c5 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Tue, 26 Dec 2023 09:03:15 -0500 Subject: [PATCH 084/126] Added Ruby 3.3 to the build matrix --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e4008dbf..54c6ac59 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,6 +16,7 @@ jobs: - "3.0" - "3.1" - "3.2" + - "3.3" rails-version: - "6.0" - "6.1" @@ -51,4 +52,3 @@ jobs: with: coverageLocations: | ${{github.workspace}}/coverage/coverage.json:simplecov - From 0c09c59072a607a967f24eb62f311c781508d98b Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Thu, 28 Dec 2023 07:49:19 -0500 Subject: [PATCH 085/126] Updated nokogiri and steep --- Gemfile | 2 +- gemfiles/rails_6.0.gemfile | 2 +- gemfiles/rails_6.0.gemfile.lock | 8 ++++---- gemfiles/rails_6.1.gemfile | 2 +- gemfiles/rails_6.1.gemfile.lock | 8 ++++---- gemfiles/rails_7.0.gemfile | 2 +- gemfiles/rails_7.0.gemfile.lock | 8 ++++---- gemfiles/rails_7.1.gemfile | 2 +- gemfiles/rails_7.1.gemfile.lock | 8 ++++---- gemfiles/rails_7.2.gemfile | 2 +- gemfiles/rails_7.2.gemfile.lock | 10 +++++----- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Gemfile b/Gemfile index b176423e..8d392249 100644 --- a/Gemfile +++ b/Gemfile @@ -6,4 +6,4 @@ source "https://rubygems.org" gemspec # Ruby typings -gem "steep", "~> 1.5.2", platform: :mri_32 +gem "steep", "~> 1.6.0", platform: :mri_32 diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 6bcdb80a..e263ef75 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.5.2", platform: :mri_32 +gem "steep", "~> 1.6.0", platform: :mri_32 gem "railties", "~> 6.0.6" gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index e346a202..6347d599 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -55,9 +55,9 @@ GEM nokogiri (>= 1.12.0) method_source (1.0.0) minitest (5.20.0) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) parallel (1.24.0) parser (3.2.2.4) @@ -158,7 +158,7 @@ GEM standard-performance (1.3.0) lint_roller (~> 1.1) rubocop-performance (~> 1.20.1) - steep (1.5.3) + steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -200,7 +200,7 @@ DEPENDENCIES rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) standard (~> 1.31) - steep (~> 1.5.2) + steep (~> 1.6.0) BUNDLED WITH 2.4.10 diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 3a241c5e..e159cbcc 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.5.2", platform: :mri_32 +gem "steep", "~> 1.6.0", platform: :mri_32 gem "railties", "~> 6.1.7" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 2e481135..3d166019 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -55,9 +55,9 @@ GEM nokogiri (>= 1.12.0) method_source (1.0.0) minitest (5.20.0) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) parallel (1.24.0) parser (3.2.2.4) @@ -158,7 +158,7 @@ GEM standard-performance (1.3.0) lint_roller (~> 1.1) rubocop-performance (~> 1.20.1) - steep (1.5.3) + steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -199,7 +199,7 @@ DEPENDENCIES rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) standard (~> 1.31) - steep (~> 1.5.2) + steep (~> 1.6.0) BUNDLED WITH 2.4.10 diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 0c8aea06..f0c76e04 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.5.2", platform: :mri_32 +gem "steep", "~> 1.6.0", platform: :mri_32 gem "railties", "~> 7.0.8" gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 05a49b5e..ef032b83 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -54,9 +54,9 @@ GEM nokogiri (>= 1.12.0) method_source (1.0.0) minitest (5.20.0) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) parallel (1.24.0) parser (3.2.2.4) @@ -158,7 +158,7 @@ GEM standard-performance (1.3.0) lint_roller (~> 1.1) rubocop-performance (~> 1.20.1) - steep (1.5.3) + steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -199,7 +199,7 @@ DEPENDENCIES rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) standard (~> 1.31) - steep (~> 1.5.2) + steep (~> 1.6.0) BUNDLED WITH 2.4.10 diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index 8e40c703..ae06faad 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.5.2", platform: :mri_32 +gem "steep", "~> 1.6.0", platform: :mri_32 gem "railties", "~> 7.1.2" gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index a762fef2..7bd322bc 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -71,9 +71,9 @@ GEM nokogiri (>= 1.12.0) minitest (5.20.0) mutex_m (0.2.0) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) parallel (1.24.0) parser (3.2.2.4) @@ -188,7 +188,7 @@ GEM standard-performance (1.3.0) lint_roller (~> 1.1) rubocop-performance (~> 1.20.1) - steep (1.5.3) + steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -231,7 +231,7 @@ DEPENDENCIES rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) standard (~> 1.31) - steep (~> 1.5.2) + steep (~> 1.6.0) BUNDLED WITH 2.4.10 diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile index cc820330..c742c1b5 100644 --- a/gemfiles/rails_7.2.gemfile +++ b/gemfiles/rails_7.2.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.5.2", platform: :mri_32 +gem "steep", "~> 1.6.0", platform: :mri_32 gem "railties", github: "rails" gemspec path: "../" diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index 76a4628a..431dd5c2 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: 5b62994778d197b26185472bbe94b6086760789d + revision: 354d1c42b45a380f201a24d060a3d1bc71010327 specs: actionpack (7.2.0.alpha) actionview (= 7.2.0.alpha) @@ -82,9 +82,9 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) minitest (5.20.0) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) parallel (1.24.0) parser (3.2.2.4) @@ -191,7 +191,7 @@ GEM standard-performance (1.3.0) lint_roller (~> 1.1) rubocop-performance (~> 1.20.1) - steep (1.5.3) + steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -234,7 +234,7 @@ DEPENDENCIES rubocop-rspec (~> 2.25.0) simplecov (~> 0.22.0) standard (~> 1.31) - steep (~> 1.5.2) + steep (~> 1.6.0) BUNDLED WITH 2.4.10 From 3c328a458af9e646c0b3cd93d92ae6a296de4896 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Thu, 28 Dec 2023 07:53:26 -0500 Subject: [PATCH 086/126] Dropped support for Ruby 2.7 --- .github/workflows/tests.yml | 5 ++--- .standard.yml | 2 +- CHANGELOG.md | 6 ++++++ README.md | 2 +- meta-tags.gemspec | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 54c6ac59..05ee1477 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,6 @@ jobs: fail-fast: false matrix: ruby-version: - - "2.7" - "3.0" - "3.1" - "3.2" @@ -24,8 +23,8 @@ jobs: - "7.1" - "7.2" include: - - ruby-version: "3.2" - rails-version: "7.1" + - ruby-version: "3.3" + rails-version: "7.2" code-coverage: true env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile diff --git a/.standard.yml b/.standard.yml index b2dc35f3..9fd7c83c 100644 --- a/.standard.yml +++ b/.standard.yml @@ -1,4 +1,4 @@ -ruby_version: 2.7.0 +ruby_version: 3.0.0 extend_config: - .rubocop-rake.yml - .rubocop-rails.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 74353089..ae0e4547 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 2.21.0 (Development) + +Changes: + +- Ruby older than 3.0 is no longer supported. + ## 2.20.0 (December 26, 2023) Features: diff --git a/README.md b/README.md index 2861f58a..796a44b8 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Search Engine Optimization (SEO) plugin for Ruby on Rails applications. The MetaTags main branch fully supports Ruby on Rails 6.0+ and is tested against all major Ruby on Rails releases. > [!NOTE] -> We no longer support Ruby versions older than 2.7 and Ruby on Rails older than 6.0 since they reached their end of life (see [Ruby](https://endoflife.date/ruby) and [Ruby on Rails](https://endoflife.date/rails)). +> We no longer support Ruby versions older than 3.0 and Ruby on Rails older than 6.0 since they reached their end of life (see [Ruby](https://endoflife.date/ruby) and [Ruby on Rails](https://endoflife.date/rails)). ## Installation diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 3711394b..4b7f3887 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |spec| spec.homepage = "https://github.com/kpumuk/meta-tags" spec.license = "MIT" spec.platform = Gem::Platform::RUBY - spec.required_ruby_version = ">= 2.7.0" + spec.required_ruby_version = ">= 3.0.0" spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(\.|Gemfile|Appraisals|Steepfile|(bin|spec|gemfiles)/)}) } spec.bindir = "exe" From 04ec421dfe75e9358b3b0107fbb5f4eb2b093b75 Mon Sep 17 00:00:00 2001 From: Joji Wakairo <jw1@ninegw.sakura.ne.jp> Date: Sat, 30 Dec 2023 07:12:44 +0900 Subject: [PATCH 087/126] Add truncate_on_natural_separator to the configuration template --- .../meta_tags/templates/config/initializers/meta_tags.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/generators/meta_tags/templates/config/initializers/meta_tags.rb b/lib/generators/meta_tags/templates/config/initializers/meta_tags.rb index d9f2f84f..752ed4cb 100644 --- a/lib/generators/meta_tags/templates/config/initializers/meta_tags.rb +++ b/lib/generators/meta_tags/templates/config/initializers/meta_tags.rb @@ -12,8 +12,11 @@ # Add HTML attributes to the <title> HTML tag. Default is {}. # config.title_tag_attributes = {} - # Add HTML attributes to the <title> HTML tag. Default is {}. - # config.title_tag_attributes = {} + # Natural separator when truncating. Default is " " (space character). + # Set to nil to disable natural separator. + # This also allows you to use a whitespace regular expression (/\s/) or + # a Unicode space (/\p{Space}/). + # config.truncate_on_natural_separator = " " # Maximum length of the page description. Default is 300. # Set to nil or 0 to remove limits. From cdbdee47ece3fa870b312a79074429a8c04f3e11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 00:37:05 +0000 Subject: [PATCH 088/126] Update rubocop-rspec requirement from ~> 2.25.0 to ~> 2.26.0 Updates the requirements on [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.25.0...v2.26.0) --- updated-dependencies: - dependency-name: rubocop-rspec dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 4b7f3887..172b62a2 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "standard", "~> 1.31" spec.add_development_dependency "rubocop-rails", "~> 2.23.0" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" - spec.add_development_dependency "rubocop-rspec", "~> 2.25.0" + spec.add_development_dependency "rubocop-rspec", "~> 2.26.0" # Format RSpec output for CircleCI spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" From 741b5b06613e2c8830efac60ad0137cdb952861e Mon Sep 17 00:00:00 2001 From: Github Workflow <kpumuk@users.noreply.github.com> Date: Fri, 5 Jan 2024 00:38:19 +0000 Subject: [PATCH 089/126] Updated Appraisal gemfiles --- gemfiles/rails_6.0.gemfile.lock | 8 ++++---- gemfiles/rails_6.1.gemfile.lock | 8 ++++---- gemfiles/rails_7.0.gemfile.lock | 8 ++++---- gemfiles/rails_7.1.gemfile.lock | 8 ++++---- gemfiles/rails_7.2.gemfile.lock | 12 +++++++----- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 6347d599..048cee44 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -120,9 +120,9 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) + rubocop-factory_bot (2.25.0) rubocop (~> 1.33) rubocop-performance (1.20.1) rubocop (>= 1.48.1, < 2.0) @@ -134,7 +134,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.25.0) + rubocop-rspec (2.26.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -197,7 +197,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.25.0) + rubocop-rspec (~> 2.26.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 3d166019..2444f224 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -120,9 +120,9 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) + rubocop-factory_bot (2.25.0) rubocop (~> 1.33) rubocop-performance (1.20.1) rubocop (>= 1.48.1, < 2.0) @@ -134,7 +134,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.25.0) + rubocop-rspec (2.26.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -196,7 +196,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.25.0) + rubocop-rspec (~> 2.26.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index ef032b83..4f749d34 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -120,9 +120,9 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) + rubocop-factory_bot (2.25.0) rubocop (~> 1.33) rubocop-performance (1.20.1) rubocop (>= 1.48.1, < 2.0) @@ -134,7 +134,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.25.0) + rubocop-rspec (2.26.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -196,7 +196,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.25.0) + rubocop-rspec (~> 2.26.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 7bd322bc..1b696466 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -149,9 +149,9 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) + rubocop-factory_bot (2.25.0) rubocop (~> 1.33) rubocop-performance (1.20.1) rubocop (>= 1.48.1, < 2.0) @@ -163,7 +163,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.25.0) + rubocop-rspec (2.26.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -228,7 +228,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.25.0) + rubocop-rspec (~> 2.26.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index 431dd5c2..f583b61d 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: 354d1c42b45a380f201a24d060a3d1bc71010327 + revision: 614ec5f8a0b8079ae05647af445f17e7efbaebe1 specs: actionpack (7.2.0.alpha) actionview (= 7.2.0.alpha) @@ -12,6 +12,7 @@ GIT rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) actionview (7.2.0.alpha) activesupport (= 7.2.0.alpha) builder (~> 3.1) @@ -152,9 +153,9 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) + rubocop-factory_bot (2.25.0) rubocop (~> 1.33) rubocop-performance (1.20.1) rubocop (>= 1.48.1, < 2.0) @@ -166,7 +167,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.25.0) + rubocop-rspec (2.26.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -214,6 +215,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) + useragent (0.16.10) webrick (1.8.1) zeitwerk (2.6.12) @@ -231,7 +233,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.25.0) + rubocop-rspec (~> 2.26.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) From 42dc628f0e45ee805f00d5ec1cfce36cd259a2b9 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Fri, 5 Jan 2024 09:01:54 -0500 Subject: [PATCH 090/126] Rails edge requires Ruby 3.1 or newer --- .github/workflows/tests.yml | 7 +- Appraisals | 2 +- .../{rails_7.2.gemfile => rails_edge.gemfile} | 0 gemfiles/rails_edge.gemfile.lock | 254 ++++++++++++++++++ 4 files changed, 260 insertions(+), 3 deletions(-) rename gemfiles/{rails_7.2.gemfile => rails_edge.gemfile} (100%) create mode 100644 gemfiles/rails_edge.gemfile.lock diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 05ee1477..145b5f24 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,11 +21,14 @@ jobs: - "6.1" - "7.0" - "7.1" - - "7.2" + - "edge" include: - ruby-version: "3.3" - rails-version: "7.2" + rails-version: "7.1" code-coverage: true + exclude: + - ruby-version: "3.0" + rails-version: "edge" env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile diff --git a/Appraisals b/Appraisals index b847c0b7..a4628cc1 100644 --- a/Appraisals +++ b/Appraisals @@ -16,6 +16,6 @@ appraise "rails-7.1" do gem "railties", "~> 7.1.2" end -appraise "rails-7.2" do +appraise "rails-edge" do gem "railties", github: "rails" end diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_edge.gemfile similarity index 100% rename from gemfiles/rails_7.2.gemfile rename to gemfiles/rails_edge.gemfile diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock new file mode 100644 index 00000000..16478af5 --- /dev/null +++ b/gemfiles/rails_edge.gemfile.lock @@ -0,0 +1,254 @@ +GIT + remote: https://github.com/rails/rails.git + revision: ccabc053b2ddd513fe183b2306ada0dc69ad4855 + specs: + actionpack (7.2.0.alpha) + actionview (= 7.2.0.alpha) + activesupport (= 7.2.0.alpha) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actionview (7.2.0.alpha) + activesupport (= 7.2.0.alpha) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activesupport (7.2.0.alpha) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0, >= 2.0.5) + railties (7.2.0.alpha) + actionpack (= 7.2.0.alpha) + activesupport (= 7.2.0.alpha) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + +PATH + remote: .. + specs: + meta-tags (2.20.0) + actionpack (>= 6.0.0, < 7.2) + +GEM + remote: https://rubygems.org/ + specs: + abbrev (0.1.2) + appraisal (2.5.0) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + base64 (0.2.0) + bigdecimal (3.1.5) + builder (3.2.4) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) + crass (1.0.6) + csv (3.2.8) + diff-lcs (1.5.0) + docile (1.4.0) + drb (2.2.0) + ruby2_keywords + erubi (1.12.0) + ffi (1.16.3) + fileutils (1.7.2) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + io-console (0.7.1) + irb (1.11.0) + rdoc + reline (>= 0.3.8) + json (2.7.1) + language_server-protocol (3.17.0.3) + lint_roller (1.1.0) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.0) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + minitest (5.20.0) + nokogiri (1.16.0-aarch64-linux) + racc (~> 1.4) + nokogiri (1.16.0-arm-linux) + racc (~> 1.4) + nokogiri (1.16.0-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.0-x86-linux) + racc (~> 1.4) + nokogiri (1.16.0-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.16.0-x86_64-linux) + racc (~> 1.4) + parallel (1.24.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + psych (5.1.2) + stringio + racc (1.7.3) + rack (3.0.8) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + rainbow (3.1.1) + rake (13.1.0) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rbs (3.4.1) + abbrev + rdoc (6.6.2) + psych (>= 4.0.0) + regexp_parser (2.8.3) + reline (0.4.1) + io-console (~> 0.5) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-html-matchers (0.10.0) + nokogiri (~> 1) + rspec (>= 3.0.0.a) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rubocop (1.59.0) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.2.2.4) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.30.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.20.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.25.0) + rubocop (~> 1.33) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.23.1) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.26.0) + rubocop (~> 1.40) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + securerandom (0.3.1) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + standard (1.33.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.59.0) + standard-custom (~> 1.0.0) + standard-performance (~> 1.3) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.3.0) + lint_roller (~> 1.1) + rubocop-performance (~> 1.20.1) + steep (1.6.0) + activesupport (>= 5.1) + concurrent-ruby (>= 1.1.10) + csv (>= 3.0.9) + fileutils (>= 1.1.0) + json (>= 2.1.0) + language_server-protocol (>= 3.15, < 4.0) + listen (~> 3.0) + logger (>= 1.3.0) + parser (>= 3.1) + rainbow (>= 2.2.2, < 4.0) + rbs (>= 3.1.0) + securerandom (>= 0.1) + strscan (>= 1.0.0) + terminal-table (>= 2, < 4) + stringio (3.1.0) + strscan (3.0.7) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + thor (1.3.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.5.0) + useragent (0.16.10) + webrick (1.8.1) + zeitwerk (2.6.12) + +PLATFORMS + aarch64-linux + arm-linux + arm64-darwin + x86-linux + x86_64-darwin + x86_64-linux + +DEPENDENCIES + appraisal (~> 2.5.0) + meta-tags! + railties! + rake (~> 13.0) + rspec (~> 3.12.0) + rspec-html-matchers (~> 0.10.0) + rspec_junit_formatter (~> 0.6.0) + rubocop-rails (~> 2.23.0) + rubocop-rake (~> 0.6.0) + rubocop-rspec (~> 2.26.0) + simplecov (~> 0.22.0) + standard (~> 1.31) + steep (~> 1.6.0) + +BUNDLED WITH + 2.5.3 From e5832cc5099a0ae10ffe3f8b1b5648a967da61e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 00:59:42 +0000 Subject: [PATCH 091/126] Update rspec requirement from ~> 3.12.0 to ~> 3.13.0 Updates the requirements on [rspec](https://github.com/rspec/rspec-metagem) to permit the latest version. - [Commits](https://github.com/rspec/rspec-metagem/compare/v3.12.0...v3.13.0) --- updated-dependencies: - dependency-name: rspec dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 172b62a2..6793f757 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "railties", ">= 3.2.0", "< 7.2" spec.add_development_dependency "rake", "~> 13.0" - spec.add_development_dependency "rspec", "~> 3.12.0" + spec.add_development_dependency "rspec", "~> 3.13.0" spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0" spec.add_development_dependency "appraisal", "~> 2.5.0" spec.add_development_dependency "simplecov", "~> 0.22.0" From 0a1824b6347954fb2b3cea2b3ace61d0f9b2e727 Mon Sep 17 00:00:00 2001 From: Github Workflow <kpumuk@users.noreply.github.com> Date: Mon, 5 Feb 2024 01:00:56 +0000 Subject: [PATCH 092/126] Updated Appraisal gemfiles --- gemfiles/rails_6.0.gemfile.lock | 56 ++++++++++----------- gemfiles/rails_6.1.gemfile.lock | 56 ++++++++++----------- gemfiles/rails_7.0.gemfile.lock | 56 ++++++++++----------- gemfiles/rails_7.1.gemfile.lock | 86 ++++++++++++++++---------------- gemfiles/rails_edge.gemfile.lock | 78 ++++++++++++++--------------- 5 files changed, 166 insertions(+), 166 deletions(-) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 048cee44..f886604f 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -33,10 +33,10 @@ GEM thor (>= 0.14.0) ast (2.4.2) builder (3.2.4) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) crass (1.0.6) csv (3.2.8) - diff-lcs (1.5.0) + diff-lcs (1.5.1) docile (1.4.0) erubi (1.12.0) ffi (1.16.3) @@ -54,13 +54,13 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.20.0) - nokogiri (1.16.0-arm64-darwin) + minitest (5.21.2) + nokogiri (1.16.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.0-x86_64-linux) + nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) parallel (1.24.0) - parser (3.2.2.4) + parser (3.3.0.5) ast (~> 2.4.1) racc racc (1.7.3) @@ -85,26 +85,26 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.4.1) + rbs (3.4.3) abbrev - regexp_parser (2.8.3) + regexp_parser (2.9.0) rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) + rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.6) + rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) + rspec-support (~> 3.13.0) + rspec-support (3.13.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (1.59.0) @@ -122,9 +122,9 @@ GEM parser (>= 3.2.1.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-factory_bot (2.25.0) - rubocop (~> 1.33) - rubocop-performance (1.20.1) + rubocop-factory_bot (2.25.1) + rubocop (~> 1.41) + rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) rubocop-rails (2.23.1) @@ -134,7 +134,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.26.0) + rubocop-rspec (2.26.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -155,9 +155,9 @@ GEM standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.0) + standard-performance (1.3.1) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.1) + rubocop-performance (~> 1.20.2) steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -173,7 +173,7 @@ GEM securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - strscan (3.0.7) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.3.0) @@ -192,7 +192,7 @@ DEPENDENCIES meta-tags! railties (~> 6.0.6) rake (~> 13.0) - rspec (~> 3.12.0) + rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) @@ -203,4 +203,4 @@ DEPENDENCIES steep (~> 1.6.0) BUNDLED WITH - 2.4.10 + 2.4.19 diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 2444f224..595195f7 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -33,10 +33,10 @@ GEM thor (>= 0.14.0) ast (2.4.2) builder (3.2.4) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) crass (1.0.6) csv (3.2.8) - diff-lcs (1.5.0) + diff-lcs (1.5.1) docile (1.4.0) erubi (1.12.0) ffi (1.16.3) @@ -54,13 +54,13 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.20.0) - nokogiri (1.16.0-arm64-darwin) + minitest (5.21.2) + nokogiri (1.16.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.0-x86_64-linux) + nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) parallel (1.24.0) - parser (3.2.2.4) + parser (3.3.0.5) ast (~> 2.4.1) racc racc (1.7.3) @@ -85,26 +85,26 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.4.1) + rbs (3.4.3) abbrev - regexp_parser (2.8.3) + regexp_parser (2.9.0) rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) + rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.6) + rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) + rspec-support (~> 3.13.0) + rspec-support (3.13.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (1.59.0) @@ -122,9 +122,9 @@ GEM parser (>= 3.2.1.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-factory_bot (2.25.0) - rubocop (~> 1.33) - rubocop-performance (1.20.1) + rubocop-factory_bot (2.25.1) + rubocop (~> 1.41) + rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) rubocop-rails (2.23.1) @@ -134,7 +134,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.26.0) + rubocop-rspec (2.26.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -155,9 +155,9 @@ GEM standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.0) + standard-performance (1.3.1) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.1) + rubocop-performance (~> 1.20.2) steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -173,7 +173,7 @@ GEM securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - strscan (3.0.7) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.3.0) @@ -191,7 +191,7 @@ DEPENDENCIES meta-tags! railties (~> 6.1.7) rake (~> 13.0) - rspec (~> 3.12.0) + rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) @@ -202,4 +202,4 @@ DEPENDENCIES steep (~> 1.6.0) BUNDLED WITH - 2.4.10 + 2.4.19 diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 4f749d34..e0d3a936 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -32,10 +32,10 @@ GEM thor (>= 0.14.0) ast (2.4.2) builder (3.2.4) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) crass (1.0.6) csv (3.2.8) - diff-lcs (1.5.0) + diff-lcs (1.5.1) docile (1.4.0) erubi (1.12.0) ffi (1.16.3) @@ -53,13 +53,13 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.20.0) - nokogiri (1.16.0-arm64-darwin) + minitest (5.21.2) + nokogiri (1.16.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.0-x86_64-linux) + nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) parallel (1.24.0) - parser (3.2.2.4) + parser (3.3.0.5) ast (~> 2.4.1) racc racc (1.7.3) @@ -85,26 +85,26 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.4.1) + rbs (3.4.3) abbrev - regexp_parser (2.8.3) + regexp_parser (2.9.0) rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) + rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.6) + rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) + rspec-support (~> 3.13.0) + rspec-support (3.13.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (1.59.0) @@ -122,9 +122,9 @@ GEM parser (>= 3.2.1.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-factory_bot (2.25.0) - rubocop (~> 1.33) - rubocop-performance (1.20.1) + rubocop-factory_bot (2.25.1) + rubocop (~> 1.41) + rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) rubocop-rails (2.23.1) @@ -134,7 +134,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.26.0) + rubocop-rspec (2.26.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -155,9 +155,9 @@ GEM standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.0) + standard-performance (1.3.1) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.1) + rubocop-performance (~> 1.20.2) steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -173,7 +173,7 @@ GEM securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - strscan (3.0.7) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.3.0) @@ -191,7 +191,7 @@ DEPENDENCIES meta-tags! railties (~> 7.0.8) rake (~> 13.0) - rspec (~> 3.12.0) + rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) @@ -202,4 +202,4 @@ DEPENDENCIES steep (~> 1.6.0) BUNDLED WITH - 2.4.10 + 2.4.19 diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 1b696466..b80ebb51 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -8,9 +8,9 @@ GEM remote: https://rubygems.org/ specs: abbrev (0.1.2) - actionpack (7.1.2) - actionview (= 7.1.2) - activesupport (= 7.1.2) + actionpack (7.1.3) + actionview (= 7.1.3) + activesupport (= 7.1.3) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -18,13 +18,13 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actionview (7.1.2) - activesupport (= 7.1.2) + actionview (7.1.3) + activesupport (= 7.1.3) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activesupport (7.1.2) + activesupport (7.1.3) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -40,13 +40,13 @@ GEM thor (>= 0.14.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.5) + bigdecimal (3.1.6) builder (3.2.4) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) connection_pool (2.4.1) crass (1.0.6) csv (3.2.8) - diff-lcs (1.5.0) + diff-lcs (1.5.1) docile (1.4.0) drb (2.2.0) ruby2_keywords @@ -55,10 +55,10 @@ GEM fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) - io-console (0.7.1) - irb (1.11.0) + io-console (0.7.2) + irb (1.11.1) rdoc - reline (>= 0.3.8) + reline (>= 0.4.2) json (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) @@ -69,20 +69,20 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.20.0) + minitest (5.21.2) mutex_m (0.2.0) - nokogiri (1.16.0-arm64-darwin) + nokogiri (1.16.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.0-x86_64-linux) + nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) parallel (1.24.0) - parser (3.2.2.4) + parser (3.3.0.5) ast (~> 2.4.1) racc psych (5.1.2) stringio racc (1.7.3) - rack (3.0.8) + rack (3.0.9) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -97,9 +97,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.2) - actionpack (= 7.1.2) - activesupport (= 7.1.2) + railties (7.1.3) + actionpack (= 7.1.3) + activesupport (= 7.1.3) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -110,30 +110,30 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.4.1) + rbs (3.4.3) abbrev rdoc (6.6.2) psych (>= 4.0.0) - regexp_parser (2.8.3) - reline (0.4.1) + regexp_parser (2.9.0) + reline (0.4.2) io-console (~> 0.5) rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) + rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.6) + rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) + rspec-support (~> 3.13.0) + rspec-support (3.13.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (1.59.0) @@ -151,9 +151,9 @@ GEM parser (>= 3.2.1.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-factory_bot (2.25.0) - rubocop (~> 1.33) - rubocop-performance (1.20.1) + rubocop-factory_bot (2.25.1) + rubocop (~> 1.41) + rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) rubocop-rails (2.23.1) @@ -163,7 +163,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.26.0) + rubocop-rspec (2.26.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -185,9 +185,9 @@ GEM standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.0) + standard-performance (1.3.1) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.1) + rubocop-performance (~> 1.20.2) steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -204,7 +204,7 @@ GEM strscan (>= 1.0.0) terminal-table (>= 2, < 4) stringio (3.1.0) - strscan (3.0.7) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.3.0) @@ -223,7 +223,7 @@ DEPENDENCIES meta-tags! railties (~> 7.1.2) rake (~> 13.0) - rspec (~> 3.12.0) + rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) @@ -234,4 +234,4 @@ DEPENDENCIES steep (~> 1.6.0) BUNDLED WITH - 2.4.10 + 2.4.19 diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index 16478af5..fb1f9e78 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: ccabc053b2ddd513fe183b2306ada0dc69ad4855 + revision: 0add5dba834f2f1b84fcf1bd1b758545b325fb73 specs: actionpack (7.2.0.alpha) actionview (= 7.2.0.alpha) @@ -53,13 +53,13 @@ GEM thor (>= 0.14.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.5) + bigdecimal (3.1.6) builder (3.2.4) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) connection_pool (2.4.1) crass (1.0.6) csv (3.2.8) - diff-lcs (1.5.0) + diff-lcs (1.5.1) docile (1.4.0) drb (2.2.0) ruby2_keywords @@ -68,10 +68,10 @@ GEM fileutils (1.7.2) i18n (1.14.1) concurrent-ruby (~> 1.0) - io-console (0.7.1) - irb (1.11.0) + io-console (0.7.2) + irb (1.11.1) rdoc - reline (>= 0.3.8) + reline (>= 0.4.2) json (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) @@ -82,27 +82,27 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.20.0) - nokogiri (1.16.0-aarch64-linux) + minitest (5.21.2) + nokogiri (1.16.2-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.0-arm-linux) + nokogiri (1.16.2-arm-linux) racc (~> 1.4) - nokogiri (1.16.0-arm64-darwin) + nokogiri (1.16.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.0-x86-linux) + nokogiri (1.16.2-x86-linux) racc (~> 1.4) - nokogiri (1.16.0-x86_64-darwin) + nokogiri (1.16.2-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.0-x86_64-linux) + nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) parallel (1.24.0) - parser (3.2.2.4) + parser (3.3.0.5) ast (~> 2.4.1) racc psych (5.1.2) stringio racc (1.7.3) - rack (3.0.8) + rack (3.0.9) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -122,30 +122,30 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.4.1) + rbs (3.4.3) abbrev rdoc (6.6.2) psych (>= 4.0.0) - regexp_parser (2.8.3) - reline (0.4.1) + regexp_parser (2.9.0) + reline (0.4.2) io-console (~> 0.5) rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) + rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.12.6) + rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) + rspec-support (~> 3.13.0) + rspec-support (3.13.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (1.59.0) @@ -163,9 +163,9 @@ GEM parser (>= 3.2.1.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-factory_bot (2.25.0) - rubocop (~> 1.33) - rubocop-performance (1.20.1) + rubocop-factory_bot (2.25.1) + rubocop (~> 1.41) + rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) rubocop-rails (2.23.1) @@ -175,7 +175,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.26.0) + rubocop-rspec (2.26.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -197,9 +197,9 @@ GEM standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.0) + standard-performance (1.3.1) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.1) + rubocop-performance (~> 1.20.2) steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -216,7 +216,7 @@ GEM strscan (>= 1.0.0) terminal-table (>= 2, < 4) stringio (3.1.0) - strscan (3.0.7) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) thor (1.3.0) @@ -240,7 +240,7 @@ DEPENDENCIES meta-tags! railties! rake (~> 13.0) - rspec (~> 3.12.0) + rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) @@ -251,4 +251,4 @@ DEPENDENCIES steep (~> 1.6.0) BUNDLED WITH - 2.5.3 + 2.4.19 From bd5a344a55d78bc87420ca7cb16fa9a289a57901 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 01:03:05 +0000 Subject: [PATCH 093/126] Update rubocop-rspec requirement from ~> 2.26.0 to ~> 2.27.0 Updates the requirements on [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.26.0...v2.27.0) --- updated-dependencies: - dependency-name: rubocop-rspec dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 6793f757..4f836035 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "standard", "~> 1.31" spec.add_development_dependency "rubocop-rails", "~> 2.23.0" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" - spec.add_development_dependency "rubocop-rspec", "~> 2.26.0" + spec.add_development_dependency "rubocop-rspec", "~> 2.27.0" # Format RSpec output for CircleCI spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" From dd0d024e72d5c0f14a2bfd9a286de46e30120dab Mon Sep 17 00:00:00 2001 From: Github Workflow <kpumuk@users.noreply.github.com> Date: Fri, 1 Mar 2024 01:04:45 +0000 Subject: [PATCH 094/126] Updated Appraisal gemfiles --- gemfiles/rails_6.0.gemfile.lock | 32 ++++++++++--------- gemfiles/rails_6.1.gemfile.lock | 50 +++++++++++++++-------------- gemfiles/rails_7.0.gemfile.lock | 50 +++++++++++++++-------------- gemfiles/rails_7.1.gemfile.lock | 54 +++++++++++++++++--------------- gemfiles/rails_edge.gemfile.lock | 38 +++++++++++----------- 5 files changed, 117 insertions(+), 107 deletions(-) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index f886604f..a18c4102 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -46,7 +46,7 @@ GEM json (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.6.0) @@ -54,7 +54,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.21.2) + minitest (5.22.2) nokogiri (1.16.2-arm64-darwin) racc (~> 1.4) nokogiri (1.16.2-x86_64-linux) @@ -63,8 +63,9 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc + prism (0.24.0) racc (1.7.3) - rack (2.2.8) + rack (2.2.8.1) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -85,7 +86,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.4.3) + rbs (3.4.4) abbrev regexp_parser (2.9.0) rexml (3.2.6) @@ -104,22 +105,23 @@ GEM rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.0) + rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.59.0) + rubocop (1.61.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + rubocop-ast (1.31.0) + parser (>= 3.3.0.4) + prism (>= 0.24.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) @@ -134,7 +136,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.26.1) + rubocop-rspec (2.27.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -146,10 +148,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.33.0) + standard (1.34.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.59.0) + rubocop (~> 1.60) standard-custom (~> 1.0.0) standard-performance (~> 1.3) standard-custom (1.0.2) @@ -176,12 +178,12 @@ GEM strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.3.0) + thor (1.3.1) thread_safe (0.3.6) tzinfo (1.2.11) thread_safe (~> 0.1) unicode-display_width (2.5.0) - zeitwerk (2.6.12) + zeitwerk (2.6.13) PLATFORMS arm64-darwin @@ -197,7 +199,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.26.0) + rubocop-rspec (~> 2.27.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 595195f7..25594f33 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -8,20 +8,20 @@ GEM remote: https://rubygems.org/ specs: abbrev (0.1.2) - actionpack (6.1.7.6) - actionview (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionpack (6.1.7.7) + actionview (= 6.1.7.7) + activesupport (= 6.1.7.7) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.7.6) - activesupport (= 6.1.7.6) + actionview (6.1.7.7) + activesupport (= 6.1.7.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.7.6) + activesupport (6.1.7.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -46,7 +46,7 @@ GEM json (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.6.0) @@ -54,7 +54,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.21.2) + minitest (5.22.2) nokogiri (1.16.2-arm64-darwin) racc (~> 1.4) nokogiri (1.16.2-x86_64-linux) @@ -63,8 +63,9 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc + prism (0.24.0) racc (1.7.3) - rack (2.2.8) + rack (2.2.8.1) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -74,9 +75,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + railties (6.1.7.7) + actionpack (= 6.1.7.7) + activesupport (= 6.1.7.7) method_source rake (>= 12.2) thor (~> 1.0) @@ -85,7 +86,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.4.3) + rbs (3.4.4) abbrev regexp_parser (2.9.0) rexml (3.2.6) @@ -104,22 +105,23 @@ GEM rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.0) + rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.59.0) + rubocop (1.61.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + rubocop-ast (1.31.0) + parser (>= 3.3.0.4) + prism (>= 0.24.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) @@ -134,7 +136,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.26.1) + rubocop-rspec (2.27.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -146,10 +148,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.33.0) + standard (1.34.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.59.0) + rubocop (~> 1.60) standard-custom (~> 1.0.0) standard-performance (~> 1.3) standard-custom (1.0.2) @@ -176,11 +178,11 @@ GEM strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.3.0) + thor (1.3.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) - zeitwerk (2.6.12) + zeitwerk (2.6.13) PLATFORMS arm64-darwin @@ -196,7 +198,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.26.0) + rubocop-rspec (~> 2.27.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index e0d3a936..9c9a6856 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -8,20 +8,20 @@ GEM remote: https://rubygems.org/ specs: abbrev (0.1.2) - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) + actionpack (7.0.8.1) + actionview (= 7.0.8.1) + activesupport (= 7.0.8.1) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8) - activesupport (= 7.0.8) + actionview (7.0.8.1) + activesupport (= 7.0.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (7.0.8) + activesupport (7.0.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -45,7 +45,7 @@ GEM json (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.6.0) @@ -53,7 +53,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.21.2) + minitest (5.22.2) nokogiri (1.16.2-arm64-darwin) racc (~> 1.4) nokogiri (1.16.2-x86_64-linux) @@ -62,8 +62,9 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc + prism (0.24.0) racc (1.7.3) - rack (2.2.8) + rack (2.2.8.1) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -73,9 +74,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + railties (7.0.8.1) + actionpack (= 7.0.8.1) + activesupport (= 7.0.8.1) method_source rake (>= 12.2) thor (~> 1.0) @@ -85,7 +86,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.4.3) + rbs (3.4.4) abbrev regexp_parser (2.9.0) rexml (3.2.6) @@ -104,22 +105,23 @@ GEM rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.0) + rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.59.0) + rubocop (1.61.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + rubocop-ast (1.31.0) + parser (>= 3.3.0.4) + prism (>= 0.24.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) @@ -134,7 +136,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.26.1) + rubocop-rspec (2.27.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -146,10 +148,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.33.0) + standard (1.34.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.59.0) + rubocop (~> 1.60) standard-custom (~> 1.0.0) standard-performance (~> 1.3) standard-custom (1.0.2) @@ -176,11 +178,11 @@ GEM strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.3.0) + thor (1.3.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) - zeitwerk (2.6.12) + zeitwerk (2.6.13) PLATFORMS arm64-darwin @@ -196,7 +198,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.26.0) + rubocop-rspec (~> 2.27.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index b80ebb51..865d617d 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -8,9 +8,9 @@ GEM remote: https://rubygems.org/ specs: abbrev (0.1.2) - actionpack (7.1.3) - actionview (= 7.1.3) - activesupport (= 7.1.3) + actionpack (7.1.3.2) + actionview (= 7.1.3.2) + activesupport (= 7.1.3.2) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -18,13 +18,13 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actionview (7.1.3) - activesupport (= 7.1.3) + actionview (7.1.3.2) + activesupport (= 7.1.3.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activesupport (7.1.3) + activesupport (7.1.3.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -56,20 +56,20 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.11.1) + irb (1.11.2) rdoc reline (>= 0.4.2) json (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.6.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.21.2) + minitest (5.22.2) mutex_m (0.2.0) nokogiri (1.16.2-arm64-darwin) racc (~> 1.4) @@ -79,10 +79,11 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc + prism (0.24.0) psych (5.1.2) stringio racc (1.7.3) - rack (3.0.9) + rack (3.0.9.1) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -97,9 +98,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.3) - actionpack (= 7.1.3) - activesupport (= 7.1.3) + railties (7.1.3.2) + actionpack (= 7.1.3.2) + activesupport (= 7.1.3.2) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -110,12 +111,12 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.4.3) + rbs (3.4.4) abbrev rdoc (6.6.2) psych (>= 4.0.0) regexp_parser (2.9.0) - reline (0.4.2) + reline (0.4.3) io-console (~> 0.5) rexml (3.2.6) rspec (3.13.0) @@ -133,22 +134,23 @@ GEM rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.0) + rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.59.0) + rubocop (1.61.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + rubocop-ast (1.31.0) + parser (>= 3.3.0.4) + prism (>= 0.24.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) @@ -163,7 +165,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.26.1) + rubocop-rspec (2.27.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -176,10 +178,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.33.0) + standard (1.34.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.59.0) + rubocop (~> 1.60) standard-custom (~> 1.0.0) standard-performance (~> 1.3) standard-custom (1.0.2) @@ -207,12 +209,12 @@ GEM strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.3.0) + thor (1.3.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) webrick (1.8.1) - zeitwerk (2.6.12) + zeitwerk (2.6.13) PLATFORMS arm64-darwin @@ -228,7 +230,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.26.0) + rubocop-rspec (~> 2.27.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index fb1f9e78..958ad362 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: 0add5dba834f2f1b84fcf1bd1b758545b325fb73 + revision: 1f6cef4ca546b3a9f7aa12c0f10c7d1d1cfbab5a specs: actionpack (7.2.0.alpha) actionview (= 7.2.0.alpha) @@ -26,7 +26,7 @@ GIT connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) - minitest (>= 5.1) + minitest (>= 5.1, < 5.22.0) tzinfo (~> 2.0, >= 2.0.5) railties (7.2.0.alpha) actionpack (= 7.2.0.alpha) @@ -69,13 +69,13 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.11.1) + irb (1.11.2) rdoc reline (>= 0.4.2) json (2.7.1) language_server-protocol (3.17.0.3) lint_roller (1.1.0) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.6.0) @@ -99,10 +99,11 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc + prism (0.24.0) psych (5.1.2) stringio racc (1.7.3) - rack (3.0.9) + rack (3.0.9.1) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -122,12 +123,12 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.4.3) + rbs (3.4.4) abbrev rdoc (6.6.2) psych (>= 4.0.0) regexp_parser (2.9.0) - reline (0.4.2) + reline (0.4.3) io-console (~> 0.5) rexml (3.2.6) rspec (3.13.0) @@ -145,22 +146,23 @@ GEM rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.0) + rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.59.0) + rubocop (1.61.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + rubocop-ast (1.31.0) + parser (>= 3.3.0.4) + prism (>= 0.24.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) @@ -175,7 +177,7 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.26.1) + rubocop-rspec (2.27.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -188,10 +190,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.33.0) + standard (1.34.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.59.0) + rubocop (~> 1.60) standard-custom (~> 1.0.0) standard-performance (~> 1.3) standard-custom (1.0.2) @@ -219,13 +221,13 @@ GEM strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.3.0) + thor (1.3.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) useragent (0.16.10) webrick (1.8.1) - zeitwerk (2.6.12) + zeitwerk (2.6.13) PLATFORMS aarch64-linux @@ -245,7 +247,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.23.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.26.0) + rubocop-rspec (~> 2.27.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) From c98bd1f125adda1a78412a4b126fcebfdd739526 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 01:15:02 +0000 Subject: [PATCH 095/126] Update rubocop-rails requirement from ~> 2.23.0 to ~> 2.24.0 Updates the requirements on [rubocop-rails](https://github.com/rubocop/rubocop-rails) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.23.0...v2.24.0) --- updated-dependencies: - dependency-name: rubocop-rails dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 4f836035..3c86392d 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "simplecov", "~> 0.22.0" # Code style spec.add_development_dependency "standard", "~> 1.31" - spec.add_development_dependency "rubocop-rails", "~> 2.23.0" + spec.add_development_dependency "rubocop-rails", "~> 2.24.0" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" spec.add_development_dependency "rubocop-rspec", "~> 2.27.0" # Format RSpec output for CircleCI From 47722eec0f1a08c9766f5c628f7077aa931ab6b0 Mon Sep 17 00:00:00 2001 From: Github Workflow <kpumuk@users.noreply.github.com> Date: Mon, 4 Mar 2024 01:16:31 +0000 Subject: [PATCH 096/126] Updated Appraisal gemfiles --- gemfiles/rails_6.0.gemfile.lock | 12 +++++------- gemfiles/rails_6.1.gemfile.lock | 12 +++++------- gemfiles/rails_7.0.gemfile.lock | 12 +++++------- gemfiles/rails_7.1.gemfile.lock | 16 ++++++---------- gemfiles/rails_edge.gemfile.lock | 18 +++++++----------- 5 files changed, 28 insertions(+), 42 deletions(-) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index a18c4102..75670499 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -63,7 +63,6 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc - prism (0.24.0) racc (1.7.3) rack (2.2.8.1) rack-test (2.1.0) @@ -119,9 +118,8 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.0) + rubocop-ast (1.31.1) parser (>= 3.3.0.4) - prism (>= 0.24.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) @@ -129,14 +127,14 @@ GEM rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.23.1) + rubocop-rails (2.24.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.27.0) + rubocop-rspec (2.27.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -197,7 +195,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.23.0) + rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.27.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 25594f33..cd06b163 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -63,7 +63,6 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc - prism (0.24.0) racc (1.7.3) rack (2.2.8.1) rack-test (2.1.0) @@ -119,9 +118,8 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.0) + rubocop-ast (1.31.1) parser (>= 3.3.0.4) - prism (>= 0.24.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) @@ -129,14 +127,14 @@ GEM rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.23.1) + rubocop-rails (2.24.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.27.0) + rubocop-rspec (2.27.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -196,7 +194,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.23.0) + rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.27.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 9c9a6856..a4a138fc 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -62,7 +62,6 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc - prism (0.24.0) racc (1.7.3) rack (2.2.8.1) rack-test (2.1.0) @@ -119,9 +118,8 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.0) + rubocop-ast (1.31.1) parser (>= 3.3.0.4) - prism (>= 0.24.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) @@ -129,14 +127,14 @@ GEM rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.23.1) + rubocop-rails (2.24.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.27.0) + rubocop-rspec (2.27.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -196,7 +194,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.23.0) + rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.27.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 865d617d..a10a2c45 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -48,8 +48,7 @@ GEM csv (3.2.8) diff-lcs (1.5.1) docile (1.4.0) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) erubi (1.12.0) ffi (1.16.3) fileutils (1.7.2) @@ -79,7 +78,6 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc - prism (0.24.0) psych (5.1.2) stringio racc (1.7.3) @@ -148,9 +146,8 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.0) + rubocop-ast (1.31.1) parser (>= 3.3.0.4) - prism (>= 0.24.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) @@ -158,19 +155,18 @@ GEM rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.23.1) + rubocop-rails (2.24.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.27.0) + rubocop-rspec (2.27.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) securerandom (0.3.1) simplecov (0.22.0) docile (~> 1.1) @@ -228,7 +224,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.23.0) + rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.27.0) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index 958ad362..117a1420 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: 1f6cef4ca546b3a9f7aa12c0f10c7d1d1cfbab5a + revision: db30dd6fe71341ac132bb1e850bd4df2596a2803 specs: actionpack (7.2.0.alpha) actionview (= 7.2.0.alpha) @@ -61,8 +61,7 @@ GEM csv (3.2.8) diff-lcs (1.5.1) docile (1.4.0) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) erubi (1.12.0) ffi (1.16.3) fileutils (1.7.2) @@ -99,7 +98,6 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc - prism (0.24.0) psych (5.1.2) stringio racc (1.7.3) @@ -160,9 +158,8 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.0) + rubocop-ast (1.31.1) parser (>= 3.3.0.4) - prism (>= 0.24.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) @@ -170,19 +167,18 @@ GEM rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.23.1) + rubocop-rails (2.24.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.27.0) + rubocop-rspec (2.27.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) securerandom (0.3.1) simplecov (0.22.0) docile (~> 1.1) @@ -245,7 +241,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.23.0) + rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.27.0) simplecov (~> 0.22.0) From d7abd87688389692d4c937156d971e48561c5a58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 00:39:47 +0000 Subject: [PATCH 097/126] Update rubocop-rspec requirement from ~> 2.27.0 to ~> 2.28.0 Updates the requirements on [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.27.0...v2.28.0) --- updated-dependencies: - dependency-name: rubocop-rspec dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 3c86392d..1f3fa576 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "standard", "~> 1.31" spec.add_development_dependency "rubocop-rails", "~> 2.24.0" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" - spec.add_development_dependency "rubocop-rspec", "~> 2.27.0" + spec.add_development_dependency "rubocop-rspec", "~> 2.28.0" # Format RSpec output for CircleCI spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" From 5d106346f70d223f89c7a58b4c2e839b12cad700 Mon Sep 17 00:00:00 2001 From: Github Workflow <kpumuk@users.noreply.github.com> Date: Mon, 1 Apr 2024 00:41:17 +0000 Subject: [PATCH 098/126] Updated Appraisal gemfiles --- gemfiles/rails_6.0.gemfile.lock | 31 +++++++++++---------- gemfiles/rails_6.1.gemfile.lock | 31 +++++++++++---------- gemfiles/rails_7.0.gemfile.lock | 31 +++++++++++---------- gemfiles/rails_7.1.gemfile.lock | 39 ++++++++++++++------------ gemfiles/rails_edge.gemfile.lock | 47 +++++++++++++++++--------------- 5 files changed, 97 insertions(+), 82 deletions(-) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 75670499..59dfc427 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -35,13 +35,13 @@ GEM builder (3.2.4) concurrent-ruby (1.2.3) crass (1.0.6) - csv (3.2.8) + csv (3.3.0) diff-lcs (1.5.1) docile (1.4.0) erubi (1.12.0) ffi (1.16.3) fileutils (1.7.2) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) json (2.7.1) language_server-protocol (3.17.0.3) @@ -54,17 +54,17 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.22.2) - nokogiri (1.16.2-arm64-darwin) + minitest (5.22.3) + nokogiri (1.16.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.3-x86_64-linux) racc (~> 1.4) parallel (1.24.0) parser (3.3.0.5) ast (~> 2.4.1) racc racc (1.7.3) - rack (2.2.8.1) + rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -107,7 +107,7 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.61.0) + rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -115,10 +115,10 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.1) + rubocop-ast (1.31.2) parser (>= 3.3.0.4) rubocop-capybara (2.20.0) rubocop (~> 1.41) @@ -127,17 +127,20 @@ GEM rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.24.0) + rubocop-rails (2.24.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.27.1) + rubocop-rspec (2.28.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.28.2) + rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) simplecov (0.22.0) @@ -146,10 +149,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.34.0) + standard (1.35.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.60) + rubocop (~> 1.62.0) standard-custom (~> 1.0.0) standard-performance (~> 1.3) standard-custom (1.0.2) @@ -197,7 +200,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.27.0) + rubocop-rspec (~> 2.28.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index cd06b163..a8d1d5b3 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -35,13 +35,13 @@ GEM builder (3.2.4) concurrent-ruby (1.2.3) crass (1.0.6) - csv (3.2.8) + csv (3.3.0) diff-lcs (1.5.1) docile (1.4.0) erubi (1.12.0) ffi (1.16.3) fileutils (1.7.2) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) json (2.7.1) language_server-protocol (3.17.0.3) @@ -54,17 +54,17 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.22.2) - nokogiri (1.16.2-arm64-darwin) + minitest (5.22.3) + nokogiri (1.16.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.3-x86_64-linux) racc (~> 1.4) parallel (1.24.0) parser (3.3.0.5) ast (~> 2.4.1) racc racc (1.7.3) - rack (2.2.8.1) + rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -107,7 +107,7 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.61.0) + rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -115,10 +115,10 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.1) + rubocop-ast (1.31.2) parser (>= 3.3.0.4) rubocop-capybara (2.20.0) rubocop (~> 1.41) @@ -127,17 +127,20 @@ GEM rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.24.0) + rubocop-rails (2.24.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.27.1) + rubocop-rspec (2.28.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.28.2) + rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) simplecov (0.22.0) @@ -146,10 +149,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.34.0) + standard (1.35.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.60) + rubocop (~> 1.62.0) standard-custom (~> 1.0.0) standard-performance (~> 1.3) standard-custom (1.0.2) @@ -196,7 +199,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.27.0) + rubocop-rspec (~> 2.28.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index a4a138fc..fa881523 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -34,13 +34,13 @@ GEM builder (3.2.4) concurrent-ruby (1.2.3) crass (1.0.6) - csv (3.2.8) + csv (3.3.0) diff-lcs (1.5.1) docile (1.4.0) erubi (1.12.0) ffi (1.16.3) fileutils (1.7.2) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) json (2.7.1) language_server-protocol (3.17.0.3) @@ -53,17 +53,17 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.0.0) - minitest (5.22.2) - nokogiri (1.16.2-arm64-darwin) + minitest (5.22.3) + nokogiri (1.16.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.3-x86_64-linux) racc (~> 1.4) parallel (1.24.0) parser (3.3.0.5) ast (~> 2.4.1) racc racc (1.7.3) - rack (2.2.8.1) + rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -107,7 +107,7 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.61.0) + rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -115,10 +115,10 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.1) + rubocop-ast (1.31.2) parser (>= 3.3.0.4) rubocop-capybara (2.20.0) rubocop (~> 1.41) @@ -127,17 +127,20 @@ GEM rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.24.0) + rubocop-rails (2.24.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.27.1) + rubocop-rspec (2.28.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.28.2) + rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) simplecov (0.22.0) @@ -146,10 +149,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.34.0) + standard (1.35.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.60) + rubocop (~> 1.62.0) standard-custom (~> 1.0.0) standard-performance (~> 1.3) standard-custom (1.0.2) @@ -196,7 +199,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.27.0) + rubocop-rspec (~> 2.28.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index a10a2c45..1252f174 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -40,22 +40,22 @@ GEM thor (>= 0.14.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.6) + bigdecimal (3.1.7) builder (3.2.4) concurrent-ruby (1.2.3) connection_pool (2.4.1) crass (1.0.6) - csv (3.2.8) + csv (3.3.0) diff-lcs (1.5.1) docile (1.4.0) drb (2.2.1) erubi (1.12.0) ffi (1.16.3) fileutils (1.7.2) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.11.2) + irb (1.12.0) rdoc reline (>= 0.4.2) json (2.7.1) @@ -68,11 +68,11 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.22.2) + minitest (5.22.3) mutex_m (0.2.0) - nokogiri (1.16.2-arm64-darwin) + nokogiri (1.16.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.3-x86_64-linux) racc (~> 1.4) parallel (1.24.0) parser (3.3.0.5) @@ -81,7 +81,7 @@ GEM psych (5.1.2) stringio racc (1.7.3) - rack (3.0.9.1) + rack (3.0.10) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -111,10 +111,10 @@ GEM ffi (~> 1.0) rbs (3.4.4) abbrev - rdoc (6.6.2) + rdoc (6.6.3.1) psych (>= 4.0.0) regexp_parser (2.9.0) - reline (0.4.3) + reline (0.5.0) io-console (~> 0.5) rexml (3.2.6) rspec (3.13.0) @@ -135,7 +135,7 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.61.0) + rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -143,10 +143,10 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.1) + rubocop-ast (1.31.2) parser (>= 3.3.0.4) rubocop-capybara (2.20.0) rubocop (~> 1.41) @@ -155,17 +155,20 @@ GEM rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.24.0) + rubocop-rails (2.24.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.27.1) + rubocop-rspec (2.28.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.28.2) + rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) simplecov (0.22.0) @@ -174,10 +177,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.34.0) + standard (1.35.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.60) + rubocop (~> 1.62.0) standard-custom (~> 1.0.0) standard-performance (~> 1.3) standard-custom (1.0.2) @@ -226,7 +229,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.27.0) + rubocop-rspec (~> 2.28.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index 117a1420..274dd3ae 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: db30dd6fe71341ac132bb1e850bd4df2596a2803 + revision: ee4a37164509bb04fa59adf8a8b717461bbbcb06 specs: actionpack (7.2.0.alpha) actionview (= 7.2.0.alpha) @@ -53,22 +53,22 @@ GEM thor (>= 0.14.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.6) + bigdecimal (3.1.7) builder (3.2.4) concurrent-ruby (1.2.3) connection_pool (2.4.1) crass (1.0.6) - csv (3.2.8) + csv (3.3.0) diff-lcs (1.5.1) docile (1.4.0) drb (2.2.1) erubi (1.12.0) ffi (1.16.3) fileutils (1.7.2) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.11.2) + irb (1.12.0) rdoc reline (>= 0.4.2) json (2.7.1) @@ -82,17 +82,17 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) minitest (5.21.2) - nokogiri (1.16.2-aarch64-linux) + nokogiri (1.16.3-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.2-arm-linux) + nokogiri (1.16.3-arm-linux) racc (~> 1.4) - nokogiri (1.16.2-arm64-darwin) + nokogiri (1.16.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86-linux) + nokogiri (1.16.3-x86-linux) racc (~> 1.4) - nokogiri (1.16.2-x86_64-darwin) + nokogiri (1.16.3-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.3-x86_64-linux) racc (~> 1.4) parallel (1.24.0) parser (3.3.0.5) @@ -101,7 +101,7 @@ GEM psych (5.1.2) stringio racc (1.7.3) - rack (3.0.9.1) + rack (3.0.10) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -123,10 +123,10 @@ GEM ffi (~> 1.0) rbs (3.4.4) abbrev - rdoc (6.6.2) + rdoc (6.6.3.1) psych (>= 4.0.0) regexp_parser (2.9.0) - reline (0.4.3) + reline (0.5.0) io-console (~> 0.5) rexml (3.2.6) rspec (3.13.0) @@ -147,7 +147,7 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.61.0) + rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -155,10 +155,10 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.1) + rubocop-ast (1.31.2) parser (>= 3.3.0.4) rubocop-capybara (2.20.0) rubocop (~> 1.41) @@ -167,17 +167,20 @@ GEM rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.24.0) + rubocop-rails (2.24.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.27.1) + rubocop-rspec (2.28.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.28.2) + rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) simplecov (0.22.0) @@ -186,10 +189,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.34.0) + standard (1.35.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.60) + rubocop (~> 1.62.0) standard-custom (~> 1.0.0) standard-performance (~> 1.3) standard-custom (1.0.2) @@ -243,7 +246,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.27.0) + rubocop-rspec (~> 2.28.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) From 915752755ffbb0a32c7bd1695de238c8321821b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 01:04:41 +0000 Subject: [PATCH 099/126] Update rubocop-rspec requirement from ~> 2.28.0 to ~> 2.29.1 Updates the requirements on [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.28.0...v2.29.1) --- updated-dependencies: - dependency-name: rubocop-rspec dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 1f3fa576..b07da7cc 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "standard", "~> 1.31" spec.add_development_dependency "rubocop-rails", "~> 2.24.0" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" - spec.add_development_dependency "rubocop-rspec", "~> 2.28.0" + spec.add_development_dependency "rubocop-rspec", "~> 2.29.1" # Format RSpec output for CircleCI spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" From 69590da34e3ce583f9be7afcced924e3c9df7dd2 Mon Sep 17 00:00:00 2001 From: Github Workflow <kpumuk@users.noreply.github.com> Date: Fri, 5 Apr 2024 01:05:57 +0000 Subject: [PATCH 100/126] Updated Appraisal gemfiles --- gemfiles/rails_6.0.gemfile.lock | 8 ++++---- gemfiles/rails_6.1.gemfile.lock | 8 ++++---- gemfiles/rails_7.0.gemfile.lock | 8 ++++---- gemfiles/rails_7.1.gemfile.lock | 8 ++++---- gemfiles/rails_edge.gemfile.lock | 10 +++++----- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 59dfc427..ab2b5a29 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -43,7 +43,7 @@ GEM fileutils (1.7.2) i18n (1.14.4) concurrent-ruby (~> 1.0) - json (2.7.1) + json (2.7.2) language_server-protocol (3.17.0.3) lint_roller (1.1.0) listen (3.9.0) @@ -81,7 +81,7 @@ GEM rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -134,7 +134,7 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.28.0) + rubocop-rspec (2.29.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -200,7 +200,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.28.0) + rubocop-rspec (~> 2.29.1) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index a8d1d5b3..95365ab9 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -43,7 +43,7 @@ GEM fileutils (1.7.2) i18n (1.14.4) concurrent-ruby (~> 1.0) - json (2.7.1) + json (2.7.2) language_server-protocol (3.17.0.3) lint_roller (1.1.0) listen (3.9.0) @@ -81,7 +81,7 @@ GEM rake (>= 12.2) thor (~> 1.0) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -134,7 +134,7 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.28.0) + rubocop-rspec (2.29.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -199,7 +199,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.28.0) + rubocop-rspec (~> 2.29.1) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index fa881523..7925c642 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -42,7 +42,7 @@ GEM fileutils (1.7.2) i18n (1.14.4) concurrent-ruby (~> 1.0) - json (2.7.1) + json (2.7.2) language_server-protocol (3.17.0.3) lint_roller (1.1.0) listen (3.9.0) @@ -81,7 +81,7 @@ GEM thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -134,7 +134,7 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.28.0) + rubocop-rspec (2.29.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -199,7 +199,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.28.0) + rubocop-rspec (~> 2.29.1) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 1252f174..d3906c96 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -58,7 +58,7 @@ GEM irb (1.12.0) rdoc reline (>= 0.4.2) - json (2.7.1) + json (2.7.2) language_server-protocol (3.17.0.3) lint_roller (1.1.0) listen (3.9.0) @@ -105,7 +105,7 @@ GEM thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -162,7 +162,7 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.28.0) + rubocop-rspec (2.29.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -229,7 +229,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.28.0) + rubocop-rspec (~> 2.29.1) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index 274dd3ae..fbeef9f1 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: ee4a37164509bb04fa59adf8a8b717461bbbcb06 + revision: 84c4598c93f04d00383e5e27cdffd65fb31ae5e7 specs: actionpack (7.2.0.alpha) actionview (= 7.2.0.alpha) @@ -71,7 +71,7 @@ GEM irb (1.12.0) rdoc reline (>= 0.4.2) - json (2.7.1) + json (2.7.2) language_server-protocol (3.17.0.3) lint_roller (1.1.0) listen (3.9.0) @@ -117,7 +117,7 @@ GEM loofah (~> 2.21) nokogiri (~> 1.14) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) @@ -174,7 +174,7 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.28.0) + rubocop-rspec (2.29.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -246,7 +246,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.24.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.28.0) + rubocop-rspec (~> 2.29.1) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) From 341909b22772b19bbaa017a9adaa1646a5fe8cba Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Thu, 11 Apr 2024 10:42:58 -0400 Subject: [PATCH 101/126] Preparing 2.21.0 release --- CHANGELOG.md | 7 +- gemfiles/rails_6.0.gemfile.lock | 2 +- gemfiles/rails_6.1.gemfile.lock | 2 +- gemfiles/rails_7.0.gemfile.lock | 2 +- gemfiles/rails_7.1.gemfile.lock | 2 +- gemfiles/rails_7.2.gemfile.lock | 242 ------------------------------- gemfiles/rails_edge.gemfile.lock | 14 +- lib/meta_tags/version.rb | 2 +- 8 files changed, 12 insertions(+), 261 deletions(-) delete mode 100644 gemfiles/rails_7.2.gemfile.lock diff --git a/CHANGELOG.md b/CHANGELOG.md index ae0e4547..333b7abc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,15 @@ # Changelog -## 2.21.0 (Development) +## 2.21.0 (April 11, 2024) + +Bugfixes: + +- Removed a duplicated `title_tag_attributes` configuration from the initializer ([287](https://github.com/kpumuk/meta-tags/pull/287)). Changes: - Ruby older than 3.0 is no longer supported. +- Added `truncate_on_natural_separator` configuration option to the initializer ([287](https://github.com/kpumuk/meta-tags/pull/287)). ## 2.20.0 (December 26, 2023) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index ab2b5a29..e0bbe1e6 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - meta-tags (2.20.0) + meta-tags (2.21.0) actionpack (>= 6.0.0, < 7.2) GEM diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 95365ab9..dba7c8ea 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - meta-tags (2.20.0) + meta-tags (2.21.0) actionpack (>= 6.0.0, < 7.2) GEM diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 7925c642..63e1d4cc 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - meta-tags (2.20.0) + meta-tags (2.21.0) actionpack (>= 6.0.0, < 7.2) GEM diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index d3906c96..e6a26bcc 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - meta-tags (2.20.0) + meta-tags (2.21.0) actionpack (>= 6.0.0, < 7.2) GEM diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock deleted file mode 100644 index f583b61d..00000000 --- a/gemfiles/rails_7.2.gemfile.lock +++ /dev/null @@ -1,242 +0,0 @@ -GIT - remote: https://github.com/rails/rails.git - revision: 614ec5f8a0b8079ae05647af445f17e7efbaebe1 - specs: - actionpack (7.2.0.alpha) - actionview (= 7.2.0.alpha) - activesupport (= 7.2.0.alpha) - nokogiri (>= 1.8.5) - racc - rack (>= 2.2.4) - rack-session (>= 1.0.1) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - useragent (~> 0.16) - actionview (7.2.0.alpha) - activesupport (= 7.2.0.alpha) - builder (~> 3.1) - erubi (~> 1.11) - rails-dom-testing (~> 2.2) - rails-html-sanitizer (~> 1.6) - activesupport (7.2.0.alpha) - base64 - bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) - connection_pool (>= 2.2.5) - drb - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0, >= 2.0.5) - railties (7.2.0.alpha) - actionpack (= 7.2.0.alpha) - activesupport (= 7.2.0.alpha) - irb - rackup (>= 1.0.0) - rake (>= 12.2) - thor (~> 1.0, >= 1.2.2) - zeitwerk (~> 2.6) - -PATH - remote: .. - specs: - meta-tags (2.20.0) - actionpack (>= 6.0.0, < 7.2) - -GEM - remote: https://rubygems.org/ - specs: - abbrev (0.1.2) - appraisal (2.5.0) - bundler - rake - thor (>= 0.14.0) - ast (2.4.2) - base64 (0.2.0) - bigdecimal (3.1.5) - builder (3.2.4) - concurrent-ruby (1.2.2) - connection_pool (2.4.1) - crass (1.0.6) - csv (3.2.8) - diff-lcs (1.5.0) - docile (1.4.0) - drb (2.2.0) - ruby2_keywords - erubi (1.12.0) - ffi (1.16.3) - fileutils (1.7.2) - i18n (1.14.1) - concurrent-ruby (~> 1.0) - io-console (0.7.1) - irb (1.11.0) - rdoc - reline (>= 0.3.8) - json (2.7.1) - language_server-protocol (3.17.0.3) - lint_roller (1.1.0) - listen (3.8.0) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - logger (1.6.0) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - minitest (5.20.0) - nokogiri (1.16.0-arm64-darwin) - racc (~> 1.4) - nokogiri (1.16.0-x86_64-linux) - racc (~> 1.4) - parallel (1.24.0) - parser (3.2.2.4) - ast (~> 2.4.1) - racc - psych (5.1.2) - stringio - racc (1.7.3) - rack (3.0.8) - rack-session (2.0.0) - rack (>= 3.0.0) - rack-test (2.1.0) - rack (>= 1.3) - rackup (2.1.0) - rack (>= 3) - webrick (~> 1.8) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - rainbow (3.1.1) - rake (13.1.0) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - rbs (3.4.1) - abbrev - rdoc (6.6.2) - psych (>= 4.0.0) - regexp_parser (2.8.3) - reline (0.4.1) - io-console (~> 0.5) - rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-html-matchers (0.10.0) - nokogiri (~> 1) - rspec (>= 3.0.0.a) - rspec-mocks (3.12.6) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - rspec_junit_formatter (0.6.0) - rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.59.0) - json (~> 2.3) - language_server-protocol (>= 3.17.0) - parallel (~> 1.10) - parser (>= 3.2.2.4) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.20.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.25.0) - rubocop (~> 1.33) - rubocop-performance (1.20.1) - rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.23.1) - activesupport (>= 4.2.0) - rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rake (0.6.0) - rubocop (~> 1.0) - rubocop-rspec (2.26.0) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) - ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) - securerandom (0.3.1) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) - standard (1.33.0) - language_server-protocol (~> 3.17.0.2) - lint_roller (~> 1.0) - rubocop (~> 1.59.0) - standard-custom (~> 1.0.0) - standard-performance (~> 1.3) - standard-custom (1.0.2) - lint_roller (~> 1.0) - rubocop (~> 1.50) - standard-performance (1.3.0) - lint_roller (~> 1.1) - rubocop-performance (~> 1.20.1) - steep (1.6.0) - activesupport (>= 5.1) - concurrent-ruby (>= 1.1.10) - csv (>= 3.0.9) - fileutils (>= 1.1.0) - json (>= 2.1.0) - language_server-protocol (>= 3.15, < 4.0) - listen (~> 3.0) - logger (>= 1.3.0) - parser (>= 3.1) - rainbow (>= 2.2.2, < 4.0) - rbs (>= 3.1.0) - securerandom (>= 0.1) - strscan (>= 1.0.0) - terminal-table (>= 2, < 4) - stringio (3.1.0) - strscan (3.0.7) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) - thor (1.3.0) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - useragent (0.16.10) - webrick (1.8.1) - zeitwerk (2.6.12) - -PLATFORMS - arm64-darwin-23 - x86_64-linux - -DEPENDENCIES - appraisal (~> 2.5.0) - meta-tags! - railties! - rake (~> 13.0) - rspec (~> 3.12.0) - rspec-html-matchers (~> 0.10.0) - rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.23.0) - rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.26.0) - simplecov (~> 0.22.0) - standard (~> 1.31) - steep (~> 1.6.0) - -BUNDLED WITH - 2.4.10 diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index fbeef9f1..3f810fd4 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -40,7 +40,7 @@ GIT PATH remote: .. specs: - meta-tags (2.20.0) + meta-tags (2.21.0) actionpack (>= 6.0.0, < 7.2) GEM @@ -82,16 +82,8 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) minitest (5.21.2) - nokogiri (1.16.3-aarch64-linux) - racc (~> 1.4) - nokogiri (1.16.3-arm-linux) - racc (~> 1.4) nokogiri (1.16.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.3-x86-linux) - racc (~> 1.4) - nokogiri (1.16.3-x86_64-darwin) - racc (~> 1.4) nokogiri (1.16.3-x86_64-linux) racc (~> 1.4) parallel (1.24.0) @@ -229,11 +221,7 @@ GEM zeitwerk (2.6.13) PLATFORMS - aarch64-linux - arm-linux arm64-darwin - x86-linux - x86_64-darwin x86_64-linux DEPENDENCIES diff --git a/lib/meta_tags/version.rb b/lib/meta_tags/version.rb index 4086c655..e4152529 100644 --- a/lib/meta_tags/version.rb +++ b/lib/meta_tags/version.rb @@ -2,6 +2,6 @@ module MetaTags # Gem version. - VERSION = "2.20.0" + VERSION = "2.21.0" public_constant :VERSION end From 768470e390db773c8342931e83463e4b929cd786 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 01:04:13 +0000 Subject: [PATCH 102/126] Bump paambaati/codeclimate-action from 5 to 6 Bumps [paambaati/codeclimate-action](https://github.com/paambaati/codeclimate-action) from 5 to 6. - [Release notes](https://github.com/paambaati/codeclimate-action/releases) - [Changelog](https://github.com/paambaati/codeclimate-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/paambaati/codeclimate-action/compare/v5...v6) --- updated-dependencies: - dependency-name: paambaati/codeclimate-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 145b5f24..fdead472 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -47,7 +47,7 @@ jobs: run: | bundle exec rspec --format RspecJunitFormatter --out ${{github.workspace}}/rspec-results.xml --format documentation - - uses: paambaati/codeclimate-action@v5 + - uses: paambaati/codeclimate-action@v6 if: matrix.code-coverage env: CC_TEST_REPORTER_ID: ${{ vars.CC_TEST_REPORTER_ID }} From 379556086f618f2ef1df8a30a9a05af7c7d7c0ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 01:17:22 +0000 Subject: [PATCH 103/126] Update rubocop-rails requirement from ~> 2.24.0 to ~> 2.25.0 Updates the requirements on [rubocop-rails](https://github.com/rubocop/rubocop-rails) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.24.0...v2.25.0) --- updated-dependencies: - dependency-name: rubocop-rails dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index b07da7cc..4cc83319 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "simplecov", "~> 0.22.0" # Code style spec.add_development_dependency "standard", "~> 1.31" - spec.add_development_dependency "rubocop-rails", "~> 2.24.0" + spec.add_development_dependency "rubocop-rails", "~> 2.25.0" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" spec.add_development_dependency "rubocop-rspec", "~> 2.29.1" # Format RSpec output for CircleCI From 8b7b08f44abcca632a8b7f6daa00bd57853f49e9 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Sun, 2 Jun 2024 15:21:51 -0400 Subject: [PATCH 104/126] Updated Appraisal files, edge Rails is now 8.0 --- gemfiles/rails_6.0.gemfile.lock | 62 ++++++++++---------- gemfiles/rails_6.1.gemfile.lock | 62 ++++++++++---------- gemfiles/rails_7.0.gemfile.lock | 80 +++++++++++++------------- gemfiles/rails_7.1.gemfile.lock | 90 +++++++++++++++-------------- gemfiles/rails_edge.gemfile.lock | 98 ++++++++++++++++---------------- meta-tags.gemspec | 12 ++-- 6 files changed, 208 insertions(+), 196 deletions(-) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index e0bbe1e6..16bff251 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: meta-tags (2.21.0) - actionpack (>= 6.0.0, < 7.2) + actionpack (>= 6.0.0, < 8.0) GEM remote: https://rubygems.org/ @@ -33,15 +33,16 @@ GEM thor (>= 0.14.0) ast (2.4.2) builder (3.2.4) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.1) crass (1.0.6) csv (3.3.0) diff-lcs (1.5.1) docile (1.4.0) erubi (1.12.0) - ffi (1.16.3) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-linux-gnu) fileutils (1.7.2) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) json (2.7.2) language_server-protocol (3.17.0.3) @@ -53,17 +54,17 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - method_source (1.0.0) - minitest (5.22.3) - nokogiri (1.16.3-arm64-darwin) + method_source (1.1.0) + minitest (5.23.1) + nokogiri (1.16.5-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.3-x86_64-linux) + nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) parallel (1.24.0) - parser (3.3.0.5) + parser (3.3.2.0) ast (~> 2.4.1) racc - racc (1.7.3) + racc (1.8.0) rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) @@ -81,14 +82,15 @@ GEM rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.1.1) - rake (13.2.0) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) rbs (3.4.4) abbrev - regexp_parser (2.9.0) - rexml (3.2.6) + regexp_parser (2.9.2) + rexml (3.2.8) + strscan (>= 3.0.9) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -101,13 +103,13 @@ GEM rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.62.1) + rubocop (1.63.5) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -118,28 +120,28 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.2) - parser (>= 3.3.0.4) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) rubocop (~> 1.41) - rubocop-performance (1.20.2) + rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.24.1) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails (2.25.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.29.1) + rubocop-rspec (2.29.2) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.28.2) + rubocop-rspec_rails (2.28.3) rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -149,18 +151,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.35.1) + standard (1.36.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.62.0) + rubocop (~> 1.63.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.3) + standard-performance (~> 1.4) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.1) + standard-performance (1.4.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.2) + rubocop-performance (~> 1.21.0) steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -184,7 +186,7 @@ GEM tzinfo (1.2.11) thread_safe (~> 0.1) unicode-display_width (2.5.0) - zeitwerk (2.6.13) + zeitwerk (2.6.15) PLATFORMS arm64-darwin @@ -198,7 +200,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.24.0) + rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.29.1) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index dba7c8ea..f96ca650 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: meta-tags (2.21.0) - actionpack (>= 6.0.0, < 7.2) + actionpack (>= 6.0.0, < 8.0) GEM remote: https://rubygems.org/ @@ -33,15 +33,16 @@ GEM thor (>= 0.14.0) ast (2.4.2) builder (3.2.4) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.1) crass (1.0.6) csv (3.3.0) diff-lcs (1.5.1) docile (1.4.0) erubi (1.12.0) - ffi (1.16.3) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-linux-gnu) fileutils (1.7.2) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) json (2.7.2) language_server-protocol (3.17.0.3) @@ -53,17 +54,17 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - method_source (1.0.0) - minitest (5.22.3) - nokogiri (1.16.3-arm64-darwin) + method_source (1.1.0) + minitest (5.23.1) + nokogiri (1.16.5-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.3-x86_64-linux) + nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) parallel (1.24.0) - parser (3.3.0.5) + parser (3.3.2.0) ast (~> 2.4.1) racc - racc (1.7.3) + racc (1.8.0) rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) @@ -81,14 +82,15 @@ GEM rake (>= 12.2) thor (~> 1.0) rainbow (3.1.1) - rake (13.2.0) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) rbs (3.4.4) abbrev - regexp_parser (2.9.0) - rexml (3.2.6) + regexp_parser (2.9.2) + rexml (3.2.8) + strscan (>= 3.0.9) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -101,13 +103,13 @@ GEM rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.62.1) + rubocop (1.63.5) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -118,28 +120,28 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.2) - parser (>= 3.3.0.4) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) rubocop (~> 1.41) - rubocop-performance (1.20.2) + rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.24.1) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails (2.25.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.29.1) + rubocop-rspec (2.29.2) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.28.2) + rubocop-rspec_rails (2.28.3) rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -149,18 +151,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.35.1) + standard (1.36.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.62.0) + rubocop (~> 1.63.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.3) + standard-performance (~> 1.4) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.1) + standard-performance (1.4.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.2) + rubocop-performance (~> 1.21.0) steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -183,7 +185,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) - zeitwerk (2.6.13) + zeitwerk (2.6.15) PLATFORMS arm64-darwin @@ -197,7 +199,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.24.0) + rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.29.1) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 63e1d4cc..d9d4d6ba 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -2,26 +2,26 @@ PATH remote: .. specs: meta-tags (2.21.0) - actionpack (>= 6.0.0, < 7.2) + actionpack (>= 6.0.0, < 8.0) GEM remote: https://rubygems.org/ specs: abbrev (0.1.2) - actionpack (7.0.8.1) - actionview (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionpack (7.0.8.3) + actionview (= 7.0.8.3) + activesupport (= 7.0.8.3) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8.1) - activesupport (= 7.0.8.1) + actionview (7.0.8.3) + activesupport (= 7.0.8.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (7.0.8.1) + activesupport (7.0.8.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -32,15 +32,16 @@ GEM thor (>= 0.14.0) ast (2.4.2) builder (3.2.4) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.1) crass (1.0.6) csv (3.3.0) diff-lcs (1.5.1) docile (1.4.0) erubi (1.12.0) - ffi (1.16.3) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-linux-gnu) fileutils (1.7.2) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) json (2.7.2) language_server-protocol (3.17.0.3) @@ -52,17 +53,17 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - method_source (1.0.0) - minitest (5.22.3) - nokogiri (1.16.3-arm64-darwin) + method_source (1.1.0) + minitest (5.23.1) + nokogiri (1.16.5-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.3-x86_64-linux) + nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) parallel (1.24.0) - parser (3.3.0.5) + parser (3.3.2.0) ast (~> 2.4.1) racc - racc (1.7.3) + racc (1.8.0) rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) @@ -73,22 +74,23 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + railties (7.0.8.3) + actionpack (= 7.0.8.3) + activesupport (= 7.0.8.3) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.2.0) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) rbs (3.4.4) abbrev - regexp_parser (2.9.0) - rexml (3.2.6) + regexp_parser (2.9.2) + rexml (3.2.8) + strscan (>= 3.0.9) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -101,13 +103,13 @@ GEM rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.62.1) + rubocop (1.63.5) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -118,28 +120,28 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.2) - parser (>= 3.3.0.4) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) rubocop (~> 1.41) - rubocop-performance (1.20.2) + rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.24.1) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails (2.25.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.29.1) + rubocop-rspec (2.29.2) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.28.2) + rubocop-rspec_rails (2.28.3) rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -149,18 +151,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.35.1) + standard (1.36.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.62.0) + rubocop (~> 1.63.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.3) + standard-performance (~> 1.4) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.1) + standard-performance (1.4.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.2) + rubocop-performance (~> 1.21.0) steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -183,7 +185,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) - zeitwerk (2.6.13) + zeitwerk (2.6.15) PLATFORMS arm64-darwin @@ -197,7 +199,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.24.0) + rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.29.1) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index e6a26bcc..4a72823b 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -2,15 +2,15 @@ PATH remote: .. specs: meta-tags (2.21.0) - actionpack (>= 6.0.0, < 7.2) + actionpack (>= 6.0.0, < 8.0) GEM remote: https://rubygems.org/ specs: abbrev (0.1.2) - actionpack (7.1.3.2) - actionview (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionpack (7.1.3.3) + actionview (= 7.1.3.3) + activesupport (= 7.1.3.3) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -18,13 +18,13 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actionview (7.1.3.2) - activesupport (= 7.1.3.2) + actionview (7.1.3.3) + activesupport (= 7.1.3.3) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activesupport (7.1.3.2) + activesupport (7.1.3.3) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -40,9 +40,9 @@ GEM thor (>= 0.14.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.7) + bigdecimal (3.1.8) builder (3.2.4) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.1) connection_pool (2.4.1) crass (1.0.6) csv (3.3.0) @@ -50,13 +50,14 @@ GEM docile (1.4.0) drb (2.2.1) erubi (1.12.0) - ffi (1.16.3) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-linux-gnu) fileutils (1.7.2) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.12.0) - rdoc + irb (1.13.1) + rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.7.2) language_server-protocol (3.17.0.3) @@ -68,20 +69,20 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.22.3) + minitest (5.23.1) mutex_m (0.2.0) - nokogiri (1.16.3-arm64-darwin) + nokogiri (1.16.5-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.3-x86_64-linux) + nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) parallel (1.24.0) - parser (3.3.0.5) + parser (3.3.2.0) ast (~> 2.4.1) racc psych (5.1.2) stringio - racc (1.7.3) - rack (3.0.10) + racc (1.8.0) + rack (3.0.11) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -96,27 +97,28 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) + railties (7.1.3.3) + actionpack (= 7.1.3.3) + activesupport (= 7.1.3.3) irb rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.2.0) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) rbs (3.4.4) abbrev - rdoc (6.6.3.1) + rdoc (6.7.0) psych (>= 4.0.0) - regexp_parser (2.9.0) - reline (0.5.0) + regexp_parser (2.9.2) + reline (0.5.8) io-console (~> 0.5) - rexml (3.2.6) + rexml (3.2.8) + strscan (>= 3.0.9) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -129,13 +131,13 @@ GEM rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.62.1) + rubocop (1.63.5) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -146,28 +148,28 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.2) - parser (>= 3.3.0.4) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) rubocop (~> 1.41) - rubocop-performance (1.20.2) + rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.24.1) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails (2.25.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.29.1) + rubocop-rspec (2.29.2) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.28.2) + rubocop-rspec_rails (2.28.3) rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -177,18 +179,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.35.1) + standard (1.36.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.62.0) + rubocop (~> 1.63.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.3) + standard-performance (~> 1.4) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.1) + standard-performance (1.4.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.2) + rubocop-performance (~> 1.21.0) steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -213,7 +215,7 @@ GEM concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) webrick (1.8.1) - zeitwerk (2.6.13) + zeitwerk (2.6.15) PLATFORMS arm64-darwin @@ -227,7 +229,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.24.0) + rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.29.1) simplecov (~> 0.22.0) diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index 3f810fd4..990e68ec 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/rails/rails.git - revision: 84c4598c93f04d00383e5e27cdffd65fb31ae5e7 + revision: 8336aa7f0bfb9f87aa510e4e7aeae08a2089d206 specs: - actionpack (7.2.0.alpha) - actionview (= 7.2.0.alpha) - activesupport (= 7.2.0.alpha) + actionpack (8.0.0.alpha) + actionview (= 8.0.0.alpha) + activesupport (= 8.0.0.alpha) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -13,25 +13,25 @@ GIT rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actionview (7.2.0.alpha) - activesupport (= 7.2.0.alpha) + actionview (8.0.0.alpha) + activesupport (= 8.0.0.alpha) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activesupport (7.2.0.alpha) + activesupport (8.0.0.alpha) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) - minitest (>= 5.1, < 5.22.0) + minitest (>= 5.1) tzinfo (~> 2.0, >= 2.0.5) - railties (7.2.0.alpha) - actionpack (= 7.2.0.alpha) - activesupport (= 7.2.0.alpha) - irb + railties (8.0.0.alpha) + actionpack (= 8.0.0.alpha) + activesupport (= 8.0.0.alpha) + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) @@ -41,7 +41,7 @@ PATH remote: .. specs: meta-tags (2.21.0) - actionpack (>= 6.0.0, < 7.2) + actionpack (>= 6.0.0, < 8.0) GEM remote: https://rubygems.org/ @@ -53,9 +53,9 @@ GEM thor (>= 0.14.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.7) + bigdecimal (3.1.8) builder (3.2.4) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.1) connection_pool (2.4.1) crass (1.0.6) csv (3.3.0) @@ -63,13 +63,14 @@ GEM docile (1.4.0) drb (2.2.1) erubi (1.12.0) - ffi (1.16.3) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-linux-gnu) fileutils (1.7.2) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.12.0) - rdoc + irb (1.13.1) + rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.7.2) language_server-protocol (3.17.0.3) @@ -81,19 +82,19 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.21.2) - nokogiri (1.16.3-arm64-darwin) + minitest (5.23.1) + nokogiri (1.16.5-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.3-x86_64-linux) + nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) parallel (1.24.0) - parser (3.3.0.5) + parser (3.3.2.0) ast (~> 2.4.1) racc psych (5.1.2) stringio - racc (1.7.3) - rack (3.0.10) + racc (1.8.0) + rack (3.0.11) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -109,18 +110,19 @@ GEM loofah (~> 2.21) nokogiri (~> 1.14) rainbow (3.1.1) - rake (13.2.0) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) rbs (3.4.4) abbrev - rdoc (6.6.3.1) + rdoc (6.7.0) psych (>= 4.0.0) - regexp_parser (2.9.0) - reline (0.5.0) + regexp_parser (2.9.2) + reline (0.5.8) io-console (~> 0.5) - rexml (3.2.6) + rexml (3.2.8) + strscan (>= 3.0.9) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -133,13 +135,13 @@ GEM rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.62.1) + rubocop (1.63.5) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -150,28 +152,28 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.2) - parser (>= 3.3.0.4) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.25.1) rubocop (~> 1.41) - rubocop-performance (1.20.2) + rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.24.1) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails (2.25.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.29.1) + rubocop-rspec (2.29.2) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.28.2) + rubocop-rspec_rails (2.28.3) rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -181,18 +183,18 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.35.1) + standard (1.36.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.62.0) + rubocop (~> 1.63.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.3) + standard-performance (~> 1.4) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.1) + standard-performance (1.4.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.2) + rubocop-performance (~> 1.21.0) steep (1.6.0) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) @@ -218,7 +220,7 @@ GEM unicode-display_width (2.5.0) useragent (0.16.10) webrick (1.8.1) - zeitwerk (2.6.13) + zeitwerk (2.6.15) PLATFORMS arm64-darwin @@ -232,7 +234,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.24.0) + rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 2.29.1) simplecov (~> 0.22.0) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 4cc83319..6058e6b7 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -17,24 +17,26 @@ Gem::Specification.new do |spec| spec.platform = Gem::Platform::RUBY spec.required_ruby_version = ">= 3.0.0" - spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(\.|Gemfile|Appraisals|Steepfile|(bin|spec|gemfiles)/)}) } + spec.files = `git ls-files -z`.split("\x0").reject do |f| + f.match(%r{^(\.|Gemfile|Appraisals|Steepfile|(bin|spec|gemfiles)/)}) + end spec.bindir = "exe" spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_runtime_dependency "actionpack", ">= 6.0.0", "< 7.2" + spec.add_runtime_dependency "actionpack", ">= 6.0.0", "< 8.0" - spec.add_development_dependency "railties", ">= 3.2.0", "< 7.2" + spec.add_development_dependency "appraisal", "~> 2.5.0" + spec.add_development_dependency "railties", ">= 3.2.0", "< 8.0" spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "rspec", "~> 3.13.0" spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0" - spec.add_development_dependency "appraisal", "~> 2.5.0" spec.add_development_dependency "simplecov", "~> 0.22.0" # Code style - spec.add_development_dependency "standard", "~> 1.31" spec.add_development_dependency "rubocop-rails", "~> 2.25.0" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" spec.add_development_dependency "rubocop-rspec", "~> 2.29.1" + spec.add_development_dependency "standard", "~> 1.31" # Format RSpec output for CircleCI spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" From 5126d5e731bc722ca31877a4b40e3b07b6048e0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 01:06:23 +0000 Subject: [PATCH 105/126] Update rubocop-rspec requirement from ~> 2.29.1 to ~> 2.30.0 Updates the requirements on [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.29.1...v2.30.0) --- updated-dependencies: - dependency-name: rubocop-rspec dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 6058e6b7..295dab26 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| # Code style spec.add_development_dependency "rubocop-rails", "~> 2.25.0" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" - spec.add_development_dependency "rubocop-rspec", "~> 2.29.1" + spec.add_development_dependency "rubocop-rspec", "~> 2.30.0" spec.add_development_dependency "standard", "~> 1.31" # Format RSpec output for CircleCI spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" From 080dfb4171ea2c2af7e8609b9ce770d353c8d617 Mon Sep 17 00:00:00 2001 From: Github Workflow <kpumuk@users.noreply.github.com> Date: Tue, 4 Jun 2024 01:07:35 +0000 Subject: [PATCH 106/126] Updated Appraisal gemfiles --- gemfiles/rails_6.0.gemfile.lock | 4 ++-- gemfiles/rails_6.1.gemfile.lock | 4 ++-- gemfiles/rails_7.0.gemfile.lock | 4 ++-- gemfiles/rails_7.1.gemfile.lock | 4 ++-- gemfiles/rails_edge.gemfile.lock | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 16bff251..7072825d 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -136,7 +136,7 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.29.2) + rubocop-rspec (2.30.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -202,7 +202,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.29.1) + rubocop-rspec (~> 2.30.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index f96ca650..9e0f3a69 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -136,7 +136,7 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.29.2) + rubocop-rspec (2.30.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -201,7 +201,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.29.1) + rubocop-rspec (~> 2.30.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index d9d4d6ba..2d71c150 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -136,7 +136,7 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.29.2) + rubocop-rspec (2.30.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -201,7 +201,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.29.1) + rubocop-rspec (~> 2.30.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 4a72823b..a0c203f0 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -164,7 +164,7 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.29.2) + rubocop-rspec (2.30.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -231,7 +231,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.29.1) + rubocop-rspec (~> 2.30.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index 990e68ec..454b7e1f 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: 8336aa7f0bfb9f87aa510e4e7aeae08a2089d206 + revision: 3769f1eee6a1ec4f6438155d67477db6d192577f specs: actionpack (8.0.0.alpha) actionview (= 8.0.0.alpha) @@ -168,7 +168,7 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.29.2) + rubocop-rspec (2.30.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) @@ -236,7 +236,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.29.1) + rubocop-rspec (~> 2.30.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) From 6390c8990f104ff3870f840734efb268fc5e3e08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 00:38:46 +0000 Subject: [PATCH 107/126] Update rubocop-rspec requirement from ~> 2.30.0 to ~> 2.31.0 Updates the requirements on [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.30.0...v2.31.0) --- updated-dependencies: - dependency-name: rubocop-rspec dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 295dab26..86755339 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| # Code style spec.add_development_dependency "rubocop-rails", "~> 2.25.0" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" - spec.add_development_dependency "rubocop-rspec", "~> 2.30.0" + spec.add_development_dependency "rubocop-rspec", "~> 2.31.0" spec.add_development_dependency "standard", "~> 1.31" # Format RSpec output for CircleCI spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" From 204c0ad4729f47680f3ba842e3eed2caf2c23d44 Mon Sep 17 00:00:00 2001 From: Github Workflow <kpumuk@users.noreply.github.com> Date: Mon, 10 Jun 2024 00:39:53 +0000 Subject: [PATCH 108/126] Updated Appraisal gemfiles --- gemfiles/rails_6.0.gemfile.lock | 25 +++++++++---------- gemfiles/rails_6.1.gemfile.lock | 43 ++++++++++++++++---------------- gemfiles/rails_7.0.gemfile.lock | 43 ++++++++++++++++---------------- gemfiles/rails_7.1.gemfile.lock | 43 ++++++++++++++++---------------- gemfiles/rails_edge.gemfile.lock | 28 ++++++++++----------- 5 files changed, 89 insertions(+), 93 deletions(-) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 7072825d..5f00b401 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -7,7 +7,6 @@ PATH GEM remote: https://rubygems.org/ specs: - abbrev (0.1.2) actionpack (6.0.6.1) actionview (= 6.0.6.1) activesupport (= 6.0.6.1) @@ -32,8 +31,8 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) - builder (3.2.4) - concurrent-ruby (1.3.1) + builder (3.3.0) + concurrent-ruby (1.3.3) crass (1.0.6) csv (3.3.0) diff-lcs (1.5.1) @@ -60,7 +59,7 @@ GEM racc (~> 1.4) nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) - parallel (1.24.0) + parallel (1.25.1) parser (3.3.2.0) ast (~> 2.4.1) racc @@ -86,11 +85,11 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.4.4) - abbrev + rbs (3.5.1) + logger regexp_parser (2.9.2) - rexml (3.2.8) - strscan (>= 3.0.9) + rexml (3.2.9) + strscan rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -122,9 +121,9 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-capybara (2.20.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-factory_bot (2.25.1) + rubocop-factory_bot (2.26.0) rubocop (~> 1.41) rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) @@ -136,12 +135,12 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.30.0) + rubocop-rspec (2.31.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.28.3) + rubocop-rspec_rails (2.29.0) rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -202,7 +201,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.30.0) + rubocop-rspec (~> 2.31.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 9e0f3a69..5e78c332 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -7,21 +7,20 @@ PATH GEM remote: https://rubygems.org/ specs: - abbrev (0.1.2) - actionpack (6.1.7.7) - actionview (= 6.1.7.7) - activesupport (= 6.1.7.7) + actionpack (6.1.7.8) + actionview (= 6.1.7.8) + activesupport (= 6.1.7.8) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.7.7) - activesupport (= 6.1.7.7) + actionview (6.1.7.8) + activesupport (= 6.1.7.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.7.7) + activesupport (6.1.7.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -32,8 +31,8 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) - builder (3.2.4) - concurrent-ruby (1.3.1) + builder (3.3.0) + concurrent-ruby (1.3.3) crass (1.0.6) csv (3.3.0) diff-lcs (1.5.1) @@ -60,7 +59,7 @@ GEM racc (~> 1.4) nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) - parallel (1.24.0) + parallel (1.25.1) parser (3.3.2.0) ast (~> 2.4.1) racc @@ -75,9 +74,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (6.1.7.7) - actionpack (= 6.1.7.7) - activesupport (= 6.1.7.7) + railties (6.1.7.8) + actionpack (= 6.1.7.8) + activesupport (= 6.1.7.8) method_source rake (>= 12.2) thor (~> 1.0) @@ -86,11 +85,11 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.4.4) - abbrev + rbs (3.5.1) + logger regexp_parser (2.9.2) - rexml (3.2.8) - strscan (>= 3.0.9) + rexml (3.2.9) + strscan rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -122,9 +121,9 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-capybara (2.20.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-factory_bot (2.25.1) + rubocop-factory_bot (2.26.0) rubocop (~> 1.41) rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) @@ -136,12 +135,12 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.30.0) + rubocop-rspec (2.31.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.28.3) + rubocop-rspec_rails (2.29.0) rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -201,7 +200,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.30.0) + rubocop-rspec (~> 2.31.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 2d71c150..3f71b3ef 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -7,21 +7,20 @@ PATH GEM remote: https://rubygems.org/ specs: - abbrev (0.1.2) - actionpack (7.0.8.3) - actionview (= 7.0.8.3) - activesupport (= 7.0.8.3) + actionpack (7.0.8.4) + actionview (= 7.0.8.4) + activesupport (= 7.0.8.4) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8.3) - activesupport (= 7.0.8.3) + actionview (7.0.8.4) + activesupport (= 7.0.8.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (7.0.8.3) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -31,8 +30,8 @@ GEM rake thor (>= 0.14.0) ast (2.4.2) - builder (3.2.4) - concurrent-ruby (1.3.1) + builder (3.3.0) + concurrent-ruby (1.3.3) crass (1.0.6) csv (3.3.0) diff-lcs (1.5.1) @@ -59,7 +58,7 @@ GEM racc (~> 1.4) nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) - parallel (1.24.0) + parallel (1.25.1) parser (3.3.2.0) ast (~> 2.4.1) racc @@ -74,9 +73,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.3) - actionpack (= 7.0.8.3) - activesupport (= 7.0.8.3) + railties (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) method_source rake (>= 12.2) thor (~> 1.0) @@ -86,11 +85,11 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.4.4) - abbrev + rbs (3.5.1) + logger regexp_parser (2.9.2) - rexml (3.2.8) - strscan (>= 3.0.9) + rexml (3.2.9) + strscan rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -122,9 +121,9 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-capybara (2.20.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-factory_bot (2.25.1) + rubocop-factory_bot (2.26.0) rubocop (~> 1.41) rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) @@ -136,12 +135,12 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.30.0) + rubocop-rspec (2.31.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.28.3) + rubocop-rspec_rails (2.29.0) rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -201,7 +200,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.30.0) + rubocop-rspec (~> 2.31.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index a0c203f0..8f720b5e 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -7,10 +7,9 @@ PATH GEM remote: https://rubygems.org/ specs: - abbrev (0.1.2) - actionpack (7.1.3.3) - actionview (= 7.1.3.3) - activesupport (= 7.1.3.3) + actionpack (7.1.3.4) + actionview (= 7.1.3.4) + activesupport (= 7.1.3.4) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -18,13 +17,13 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actionview (7.1.3.3) - activesupport (= 7.1.3.3) + actionview (7.1.3.4) + activesupport (= 7.1.3.4) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activesupport (7.1.3.3) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -41,8 +40,8 @@ GEM ast (2.4.2) base64 (0.2.0) bigdecimal (3.1.8) - builder (3.2.4) - concurrent-ruby (1.3.1) + builder (3.3.0) + concurrent-ruby (1.3.3) connection_pool (2.4.1) crass (1.0.6) csv (3.3.0) @@ -75,7 +74,7 @@ GEM racc (~> 1.4) nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) - parallel (1.24.0) + parallel (1.25.1) parser (3.3.2.0) ast (~> 2.4.1) racc @@ -97,9 +96,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.3.3) - actionpack (= 7.1.3.3) - activesupport (= 7.1.3.3) + railties (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -110,15 +109,15 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.4.4) - abbrev + rbs (3.5.1) + logger rdoc (6.7.0) psych (>= 4.0.0) regexp_parser (2.9.2) reline (0.5.8) io-console (~> 0.5) - rexml (3.2.8) - strscan (>= 3.0.9) + rexml (3.2.9) + strscan rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -150,9 +149,9 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-capybara (2.20.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-factory_bot (2.25.1) + rubocop-factory_bot (2.26.0) rubocop (~> 1.41) rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) @@ -164,12 +163,12 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.30.0) + rubocop-rspec (2.31.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.28.3) + rubocop-rspec_rails (2.29.0) rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -231,7 +230,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.30.0) + rubocop-rspec (~> 2.31.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index 454b7e1f..e90ec610 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: 3769f1eee6a1ec4f6438155d67477db6d192577f + revision: e3ea4c74124f1de38897732f1ddb1f9a1d57e80d specs: actionpack (8.0.0.alpha) actionview (= 8.0.0.alpha) @@ -26,6 +26,7 @@ GIT connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger minitest (>= 5.1) tzinfo (~> 2.0, >= 2.0.5) railties (8.0.0.alpha) @@ -46,7 +47,6 @@ PATH GEM remote: https://rubygems.org/ specs: - abbrev (0.1.2) appraisal (2.5.0) bundler rake @@ -54,8 +54,8 @@ GEM ast (2.4.2) base64 (0.2.0) bigdecimal (3.1.8) - builder (3.2.4) - concurrent-ruby (1.3.1) + builder (3.3.0) + concurrent-ruby (1.3.3) connection_pool (2.4.1) crass (1.0.6) csv (3.3.0) @@ -87,7 +87,7 @@ GEM racc (~> 1.4) nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) - parallel (1.24.0) + parallel (1.25.1) parser (3.3.2.0) ast (~> 2.4.1) racc @@ -114,15 +114,15 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.4.4) - abbrev + rbs (3.5.1) + logger rdoc (6.7.0) psych (>= 4.0.0) regexp_parser (2.9.2) reline (0.5.8) io-console (~> 0.5) - rexml (3.2.8) - strscan (>= 3.0.9) + rexml (3.2.9) + strscan rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -154,9 +154,9 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-capybara (2.20.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-factory_bot (2.25.1) + rubocop-factory_bot (2.26.0) rubocop (~> 1.41) rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) @@ -168,12 +168,12 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.30.0) + rubocop-rspec (2.31.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.28.3) + rubocop-rspec_rails (2.29.0) rubocop (~> 1.40) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -236,7 +236,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.30.0) + rubocop-rspec (~> 2.31.0) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) From 87601f8ed76f43111ea3c715d54b469b652cb7c5 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Sun, 9 Jun 2024 23:12:51 -0400 Subject: [PATCH 109/126] Use ad-m/github-push-action to ensure GitHub action is triggered on push https://github.com/orgs/community/discussions/25702 --- .github/workflows/dependabot.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index 32e9df08..bd38a28d 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -5,7 +5,7 @@ on: types: [labeled] permissions: contents: write - + pull-requests: write jobs: build: if: contains(github.event.pull_request.labels.*.name, 'bundler') @@ -35,4 +35,7 @@ jobs: git config --global user.email "kpumuk@users.noreply.github.com" git add gemfiles/* git commit -am "Updated Appraisal gemfiles" - git push + - name: Push changes + uses: ad-m/github-push-action@master + with: + branch: ${{ github.head_ref }} From 312680d43b047b0fb9a3d72d3a5a26084e4a4f6c Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Mon, 10 Jun 2024 12:50:40 -0400 Subject: [PATCH 110/126] Added Rails 7.2 to the build matrix --- .github/workflows/tests.yml | 1 + Appraisals | 4 + gemfiles/rails_7.2.gemfile | 8 + gemfiles/rails_7.2.gemfile.lock | 267 ++++++++++++++++++++++++++++++++ 4 files changed, 280 insertions(+) create mode 100644 gemfiles/rails_7.2.gemfile create mode 100644 gemfiles/rails_7.2.gemfile.lock diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fdead472..85aaf816 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,6 +21,7 @@ jobs: - "6.1" - "7.0" - "7.1" + - "7.2" - "edge" include: - ruby-version: "3.3" diff --git a/Appraisals b/Appraisals index a4628cc1..bf1aca4d 100644 --- a/Appraisals +++ b/Appraisals @@ -16,6 +16,10 @@ appraise "rails-7.1" do gem "railties", "~> 7.1.2" end +appraise "rails-7.2" do + gem "railties", "~> 7.2.0.beta2" +end + appraise "rails-edge" do gem "railties", github: "rails" end diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile new file mode 100644 index 00000000..27a9bda2 --- /dev/null +++ b/gemfiles/rails_7.2.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "steep", "~> 1.6.0", platform: :mri_32 +gem "railties", "~> 7.2.0.beta2" + +gemspec path: "../" diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock new file mode 100644 index 00000000..da37551b --- /dev/null +++ b/gemfiles/rails_7.2.gemfile.lock @@ -0,0 +1,267 @@ +PATH + remote: .. + specs: + meta-tags (2.21.0) + actionpack (>= 6.0.0, < 8.0) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (7.2.0.beta2) + actionview (= 7.2.0.beta2) + activesupport (= 7.2.0.beta2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actionview (7.2.0.beta2) + activesupport (= 7.2.0.beta2) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activesupport (7.2.0.beta2) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0, >= 2.0.5) + appraisal (2.5.0) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + base64 (0.2.0) + bigdecimal (3.1.8) + builder (3.3.0) + concurrent-ruby (1.3.3) + connection_pool (2.4.1) + crass (1.0.6) + csv (3.3.0) + diff-lcs (1.5.1) + docile (1.4.0) + drb (2.2.1) + erubi (1.12.0) + ffi (1.17.0-aarch64-linux-gnu) + ffi (1.17.0-aarch64-linux-musl) + ffi (1.17.0-arm-linux-gnu) + ffi (1.17.0-arm-linux-musl) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86-linux-gnu) + ffi (1.17.0-x86-linux-musl) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) + ffi (1.17.0-x86_64-linux-musl) + fileutils (1.7.2) + i18n (1.14.5) + concurrent-ruby (~> 1.0) + io-console (0.7.2) + irb (1.13.1) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + json (2.7.2) + language_server-protocol (3.17.0.3) + lint_roller (1.1.0) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.0) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + minitest (5.23.1) + nokogiri (1.16.5-aarch64-linux) + racc (~> 1.4) + nokogiri (1.16.5-arm-linux) + racc (~> 1.4) + nokogiri (1.16.5-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.5-x86-linux) + racc (~> 1.4) + nokogiri (1.16.5-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.16.5-x86_64-linux) + racc (~> 1.4) + parallel (1.25.1) + parser (3.3.2.0) + ast (~> 2.4.1) + racc + psych (5.1.2) + stringio + racc (1.8.0) + rack (3.0.11) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.2.0.beta2) + actionpack (= 7.2.0.beta2) + activesupport (= 7.2.0.beta2) + irb (~> 1.13) + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rainbow (3.1.1) + rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) + ffi (~> 1.0) + rbs (3.5.1) + logger + rdoc (6.7.0) + psych (>= 4.0.0) + regexp_parser (2.9.2) + reline (0.5.8) + io-console (~> 0.5) + rexml (3.2.9) + strscan + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-html-matchers (0.10.0) + nokogiri (~> 1) + rspec (>= 3.0.0.a) + rspec-mocks (3.13.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + rspec_junit_formatter (0.6.0) + rspec-core (>= 2, < 4, != 2.12.0) + rubocop (1.63.5) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.3.0.2) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.31.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.26.0) + rubocop (~> 1.41) + rubocop-performance (1.21.0) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails (2.25.0) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.31.0) + rubocop (~> 1.40) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.29.0) + rubocop (~> 1.40) + ruby-progressbar (1.13.0) + securerandom (0.3.1) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.4) + standard (1.36.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.63.0) + standard-custom (~> 1.0.0) + standard-performance (~> 1.4) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.4.0) + lint_roller (~> 1.1) + rubocop-performance (~> 1.21.0) + steep (1.6.0) + activesupport (>= 5.1) + concurrent-ruby (>= 1.1.10) + csv (>= 3.0.9) + fileutils (>= 1.1.0) + json (>= 2.1.0) + language_server-protocol (>= 3.15, < 4.0) + listen (~> 3.0) + logger (>= 1.3.0) + parser (>= 3.1) + rainbow (>= 2.2.2, < 4.0) + rbs (>= 3.1.0) + securerandom (>= 0.1) + strscan (>= 1.0.0) + terminal-table (>= 2, < 4) + stringio (3.1.0) + strscan (3.1.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + thor (1.3.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.5.0) + useragent (0.16.10) + webrick (1.8.1) + zeitwerk (2.6.15) + +PLATFORMS + aarch64-linux + aarch64-linux-gnu + aarch64-linux-musl + arm-linux + arm-linux-gnu + arm-linux-musl + arm64-darwin + x86-linux + x86-linux-gnu + x86-linux-musl + x86_64-darwin + x86_64-linux + x86_64-linux-gnu + x86_64-linux-musl + +DEPENDENCIES + appraisal (~> 2.5.0) + meta-tags! + railties (~> 7.2.0.beta2) + rake (~> 13.0) + rspec (~> 3.13.0) + rspec-html-matchers (~> 0.10.0) + rspec_junit_formatter (~> 0.6.0) + rubocop-rails (~> 2.25.0) + rubocop-rake (~> 0.6.0) + rubocop-rspec (~> 2.31.0) + simplecov (~> 0.22.0) + standard (~> 1.31) + steep (~> 1.6.0) + +BUNDLED WITH + 2.5.7 From ccd1fa243e471aad4aff8dff43ce369a3f34f7ed Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Mon, 10 Jun 2024 12:51:32 -0400 Subject: [PATCH 111/126] Since we test against Rails main branch, we can declare Rails 8 as supported --- gemfiles/rails_6.0.gemfile.lock | 2 +- gemfiles/rails_6.1.gemfile.lock | 2 +- gemfiles/rails_7.0.gemfile.lock | 2 +- gemfiles/rails_7.1.gemfile.lock | 2 +- gemfiles/rails_7.2.gemfile.lock | 2 +- gemfiles/rails_edge.gemfile.lock | 4 ++-- meta-tags.gemspec | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 5f00b401..14b587f4 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: meta-tags (2.21.0) - actionpack (>= 6.0.0, < 8.0) + actionpack (>= 6.0.0, < 8.1) GEM remote: https://rubygems.org/ diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 5e78c332..9c4964d8 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: meta-tags (2.21.0) - actionpack (>= 6.0.0, < 8.0) + actionpack (>= 6.0.0, < 8.1) GEM remote: https://rubygems.org/ diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 3f71b3ef..c6d627e7 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: meta-tags (2.21.0) - actionpack (>= 6.0.0, < 8.0) + actionpack (>= 6.0.0, < 8.1) GEM remote: https://rubygems.org/ diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 8f720b5e..21efc1ce 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: meta-tags (2.21.0) - actionpack (>= 6.0.0, < 8.0) + actionpack (>= 6.0.0, < 8.1) GEM remote: https://rubygems.org/ diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index da37551b..1e182ff6 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -2,7 +2,7 @@ PATH remote: .. specs: meta-tags (2.21.0) - actionpack (>= 6.0.0, < 8.0) + actionpack (>= 6.0.0, < 8.1) GEM remote: https://rubygems.org/ diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index e90ec610..ddc4cbc9 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: e3ea4c74124f1de38897732f1ddb1f9a1d57e80d + revision: 51f81267f8e2769d847cc563967feffefe6e2beb specs: actionpack (8.0.0.alpha) actionview (= 8.0.0.alpha) @@ -42,7 +42,7 @@ PATH remote: .. specs: meta-tags (2.21.0) - actionpack (>= 6.0.0, < 8.0) + actionpack (>= 6.0.0, < 8.1) GEM remote: https://rubygems.org/ diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 86755339..daac7a59 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -24,10 +24,10 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_runtime_dependency "actionpack", ">= 6.0.0", "< 8.0" + spec.add_runtime_dependency "actionpack", ">= 6.0.0", "< 8.1" spec.add_development_dependency "appraisal", "~> 2.5.0" - spec.add_development_dependency "railties", ">= 3.2.0", "< 8.0" + spec.add_development_dependency "railties", ">= 3.2.0", "< 8.1" spec.add_development_dependency "rake", "~> 13.0" spec.add_development_dependency "rspec", "~> 3.13.0" spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0" From 085ed5c0774f780b2c6c92055303fa8369d4dda4 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Mon, 10 Jun 2024 12:59:35 -0400 Subject: [PATCH 112/126] Rails 7.2 requires Ruby 3.1 or later --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 85aaf816..38df7476 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,6 +28,8 @@ jobs: rails-version: "7.1" code-coverage: true exclude: + - ruby-version: "3.0" + rails-version: "7.2" - ruby-version: "3.0" rails-version: "edge" env: From 3189c6f4ac2ee97c0c4341ff841fec6a791e259b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 00:57:49 +0000 Subject: [PATCH 113/126] Update rubocop-rspec requirement from ~> 2.31.0 to ~> 3.0.1 Updates the requirements on [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.31.0...v3.0.1) --- updated-dependencies: - dependency-name: rubocop-rspec dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index daac7a59..94b8b92e 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| # Code style spec.add_development_dependency "rubocop-rails", "~> 2.25.0" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" - spec.add_development_dependency "rubocop-rspec", "~> 2.31.0" + spec.add_development_dependency "rubocop-rspec", "~> 3.0.1" spec.add_development_dependency "standard", "~> 1.31" # Format RSpec output for CircleCI spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0" From 4771001d0250b4fbda79e41b2c7d949224f7eccf Mon Sep 17 00:00:00 2001 From: Github Workflow <kpumuk@users.noreply.github.com> Date: Wed, 12 Jun 2024 00:59:01 +0000 Subject: [PATCH 114/126] Updated Appraisal gemfiles --- gemfiles/rails_6.0.gemfile.lock | 23 +++++++---------------- gemfiles/rails_6.1.gemfile.lock | 23 +++++++---------------- gemfiles/rails_7.0.gemfile.lock | 23 +++++++---------------- gemfiles/rails_7.1.gemfile.lock | 25 ++++++++----------------- gemfiles/rails_7.2.gemfile.lock | 27 +++++++++------------------ gemfiles/rails_edge.gemfile.lock | 27 +++++++++------------------ 6 files changed, 47 insertions(+), 101 deletions(-) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 14b587f4..c0603473 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -88,7 +88,7 @@ GEM rbs (3.5.1) logger regexp_parser (2.9.2) - rexml (3.2.9) + rexml (3.3.0) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -108,7 +108,7 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.63.5) + rubocop (1.64.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -121,10 +121,6 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-capybara (2.21.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.26.0) - rubocop (~> 1.41) rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) @@ -135,13 +131,8 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.31.0) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) - rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.29.0) - rubocop (~> 1.40) + rubocop-rspec (3.0.1) + rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) simplecov (0.22.0) @@ -150,10 +141,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.36.0) + standard (1.37.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.63.0) + rubocop (~> 1.64.0) standard-custom (~> 1.0.0) standard-performance (~> 1.4) standard-custom (1.0.2) @@ -201,7 +192,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.31.0) + rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 9c4964d8..908e6373 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -88,7 +88,7 @@ GEM rbs (3.5.1) logger regexp_parser (2.9.2) - rexml (3.2.9) + rexml (3.3.0) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -108,7 +108,7 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.63.5) + rubocop (1.64.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -121,10 +121,6 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-capybara (2.21.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.26.0) - rubocop (~> 1.41) rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) @@ -135,13 +131,8 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.31.0) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) - rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.29.0) - rubocop (~> 1.40) + rubocop-rspec (3.0.1) + rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) simplecov (0.22.0) @@ -150,10 +141,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.36.0) + standard (1.37.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.63.0) + rubocop (~> 1.64.0) standard-custom (~> 1.0.0) standard-performance (~> 1.4) standard-custom (1.0.2) @@ -200,7 +191,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.31.0) + rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index c6d627e7..f330c174 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -88,7 +88,7 @@ GEM rbs (3.5.1) logger regexp_parser (2.9.2) - rexml (3.2.9) + rexml (3.3.0) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -108,7 +108,7 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.63.5) + rubocop (1.64.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -121,10 +121,6 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-capybara (2.21.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.26.0) - rubocop (~> 1.41) rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) @@ -135,13 +131,8 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.31.0) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) - rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.29.0) - rubocop (~> 1.40) + rubocop-rspec (3.0.1) + rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) simplecov (0.22.0) @@ -150,10 +141,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.36.0) + standard (1.37.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.63.0) + rubocop (~> 1.64.0) standard-custom (~> 1.0.0) standard-performance (~> 1.4) standard-custom (1.0.2) @@ -200,7 +191,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.31.0) + rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 21efc1ce..af85a620 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -81,7 +81,7 @@ GEM psych (5.1.2) stringio racc (1.8.0) - rack (3.0.11) + rack (3.1.2) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -116,7 +116,7 @@ GEM regexp_parser (2.9.2) reline (0.5.8) io-console (~> 0.5) - rexml (3.2.9) + rexml (3.3.0) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -136,7 +136,7 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.63.5) + rubocop (1.64.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -149,10 +149,6 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-capybara (2.21.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.26.0) - rubocop (~> 1.41) rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) @@ -163,13 +159,8 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.31.0) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) - rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.29.0) - rubocop (~> 1.40) + rubocop-rspec (3.0.1) + rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) simplecov (0.22.0) @@ -178,10 +169,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.36.0) + standard (1.37.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.63.0) + rubocop (~> 1.64.0) standard-custom (~> 1.0.0) standard-performance (~> 1.4) standard-custom (1.0.2) @@ -230,7 +221,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.31.0) + rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index 1e182ff6..da3667e0 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -96,7 +96,7 @@ GEM psych (5.1.2) stringio racc (1.8.0) - rack (3.0.11) + rack (3.1.2) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -131,7 +131,7 @@ GEM regexp_parser (2.9.2) reline (0.5.8) io-console (~> 0.5) - rexml (3.2.9) + rexml (3.3.0) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -151,7 +151,7 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.63.5) + rubocop (1.64.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -164,10 +164,6 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-capybara (2.21.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.26.0) - rubocop (~> 1.41) rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) @@ -178,13 +174,8 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.31.0) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) - rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.29.0) - rubocop (~> 1.40) + rubocop-rspec (3.0.1) + rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) simplecov (0.22.0) @@ -193,10 +184,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.36.0) + standard (1.37.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.63.0) + rubocop (~> 1.64.0) standard-custom (~> 1.0.0) standard-performance (~> 1.4) standard-custom (1.0.2) @@ -258,10 +249,10 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.31.0) + rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) BUNDLED WITH - 2.5.7 + 2.4.19 diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index ddc4cbc9..0c8dd642 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: 51f81267f8e2769d847cc563967feffefe6e2beb + revision: 2ebb508cd8ee16c0bb280f91b93c01d939fcbf12 specs: actionpack (8.0.0.alpha) actionview (= 8.0.0.alpha) @@ -94,7 +94,7 @@ GEM psych (5.1.2) stringio racc (1.8.0) - rack (3.0.11) + rack (3.1.2) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -121,7 +121,7 @@ GEM regexp_parser (2.9.2) reline (0.5.8) io-console (~> 0.5) - rexml (3.2.9) + rexml (3.3.0) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -141,7 +141,7 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.63.5) + rubocop (1.64.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -154,10 +154,6 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-capybara (2.21.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.26.0) - rubocop (~> 1.41) rubocop-performance (1.21.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) @@ -168,13 +164,8 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.31.0) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) - rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.29.0) - rubocop (~> 1.40) + rubocop-rspec (3.0.1) + rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) simplecov (0.22.0) @@ -183,10 +174,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.36.0) + standard (1.37.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.63.0) + rubocop (~> 1.64.0) standard-custom (~> 1.0.0) standard-performance (~> 1.4) standard-custom (1.0.2) @@ -236,7 +227,7 @@ DEPENDENCIES rspec_junit_formatter (~> 0.6.0) rubocop-rails (~> 2.25.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.31.0) + rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) standard (~> 1.31) steep (~> 1.6.0) From 8df72424ff3b540e4611d3ce899ee659582f6aa0 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Tue, 11 Jun 2024 22:03:47 -0400 Subject: [PATCH 115/126] Trying to fix appraisal file updates after Dependabot --- .github/workflows/dependabot.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index bd38a28d..6e12006a 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -1,4 +1,4 @@ -name: StandardRB +name: Dependabot on: pull_request: @@ -34,8 +34,9 @@ jobs: git config --global user.name "Github Workflow" git config --global user.email "kpumuk@users.noreply.github.com" git add gemfiles/* - git commit -am "Updated Appraisal gemfiles" + git commit -m "Updated Appraisal gemfiles" - name: Push changes uses: ad-m/github-push-action@master with: branch: ${{ github.head_ref }} + force_with_lease: true From 54f2ba647fddff6153e69c7ef55b804f197501f5 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Tue, 11 Jun 2024 22:06:55 -0400 Subject: [PATCH 116/126] Renamed RSpec/FilePath to RSpec/SpecFilePathFormat --- .rubocop-rspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop-rspec.yml b/.rubocop-rspec.yml index 8798a2ca..6d13caa5 100644 --- a/.rubocop-rspec.yml +++ b/.rubocop-rspec.yml @@ -10,7 +10,7 @@ RSpec/NamedSubject: # Spec path should end with _spec (http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/FilePath) # example: meta_tags/view_helper*displayingdescription*_spec.rb. -RSpec/FilePath: +RSpec/SpecFilePathFormat: Enabled: false # The second argument to describe should be the method being tested. '#instance' or '.class'. (http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/DescribeMethod) From 472c45c3555677c4deef982fbd3483461f026dad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 00:31:35 +0000 Subject: [PATCH 117/126] Bump paambaati/codeclimate-action from 6 to 8 Bumps [paambaati/codeclimate-action](https://github.com/paambaati/codeclimate-action) from 6 to 8. - [Release notes](https://github.com/paambaati/codeclimate-action/releases) - [Changelog](https://github.com/paambaati/codeclimate-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/paambaati/codeclimate-action/compare/v6...v8) --- updated-dependencies: - dependency-name: paambaati/codeclimate-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 38df7476..35672210 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,7 +50,7 @@ jobs: run: | bundle exec rspec --format RspecJunitFormatter --out ${{github.workspace}}/rspec-results.xml --format documentation - - uses: paambaati/codeclimate-action@v6 + - uses: paambaati/codeclimate-action@v8 if: matrix.code-coverage env: CC_TEST_REPORTER_ID: ${{ vars.CC_TEST_REPORTER_ID }} From 5a9629c3d87f068f6e251c6843f827f913909211 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Fri, 12 Jul 2024 14:33:54 -0400 Subject: [PATCH 118/126] Updated dependencies --- Gemfile | 2 +- gemfiles/rails_6.0.gemfile | 2 +- gemfiles/rails_6.0.gemfile.lock | 32 +++++++-------- gemfiles/rails_6.1.gemfile | 2 +- gemfiles/rails_6.1.gemfile.lock | 32 +++++++-------- gemfiles/rails_7.0.gemfile | 2 +- gemfiles/rails_7.0.gemfile.lock | 32 +++++++-------- gemfiles/rails_7.1.gemfile | 2 +- gemfiles/rails_7.1.gemfile.lock | 40 +++++++++---------- gemfiles/rails_7.2.gemfile | 2 +- gemfiles/rails_7.2.gemfile.lock | 67 ++++++++++++++++---------------- gemfiles/rails_edge.gemfile | 2 +- gemfiles/rails_edge.gemfile.lock | 44 ++++++++++----------- 13 files changed, 131 insertions(+), 130 deletions(-) diff --git a/Gemfile b/Gemfile index 8d392249..6954c156 100644 --- a/Gemfile +++ b/Gemfile @@ -6,4 +6,4 @@ source "https://rubygems.org" gemspec # Ruby typings -gem "steep", "~> 1.6.0", platform: :mri_32 +gem "steep", "~> 1.7.1", platform: :mri_32 diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index e263ef75..af4a066e 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.6.0", platform: :mri_32 +gem "steep", "~> 1.7.1", platform: :mri_32 gem "railties", "~> 6.0.6" gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index c0603473..1fde9158 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -37,7 +37,7 @@ GEM csv (3.3.0) diff-lcs (1.5.1) docile (1.4.0) - erubi (1.12.0) + erubi (1.13.0) ffi (1.17.0-arm64-darwin) ffi (1.17.0-x86_64-linux-gnu) fileutils (1.7.2) @@ -54,13 +54,13 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.1.0) - minitest (5.23.1) - nokogiri (1.16.5-arm64-darwin) + minitest (5.24.1) + nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-linux) + nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) parallel (1.25.1) - parser (3.3.2.0) + parser (3.3.4.0) ast (~> 2.4.1) racc racc (1.8.0) @@ -85,10 +85,10 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.5.1) + rbs (3.5.2) logger regexp_parser (2.9.2) - rexml (3.3.0) + rexml (3.3.1) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -96,7 +96,7 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) @@ -121,17 +121,17 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-performance (1.21.0) + rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.0) + rubocop-rails (2.25.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.0.1) + rubocop-rspec (3.0.3) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -141,7 +141,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.37.0) + standard (1.39.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.64.0) @@ -153,7 +153,7 @@ GEM standard-performance (1.4.0) lint_roller (~> 1.1) rubocop-performance (~> 1.21.0) - steep (1.6.0) + steep (1.7.1) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -164,7 +164,7 @@ GEM logger (>= 1.3.0) parser (>= 3.1) rainbow (>= 2.2.2, < 4.0) - rbs (>= 3.1.0) + rbs (>= 3.5.0.pre) securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) @@ -176,7 +176,7 @@ GEM tzinfo (1.2.11) thread_safe (~> 0.1) unicode-display_width (2.5.0) - zeitwerk (2.6.15) + zeitwerk (2.6.16) PLATFORMS arm64-darwin @@ -195,7 +195,7 @@ DEPENDENCIES rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) standard (~> 1.31) - steep (~> 1.6.0) + steep (~> 1.7.1) BUNDLED WITH 2.4.19 diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index e159cbcc..6f010276 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.6.0", platform: :mri_32 +gem "steep", "~> 1.7.1", platform: :mri_32 gem "railties", "~> 6.1.7" gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 908e6373..c4b2e56a 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -37,7 +37,7 @@ GEM csv (3.3.0) diff-lcs (1.5.1) docile (1.4.0) - erubi (1.12.0) + erubi (1.13.0) ffi (1.17.0-arm64-darwin) ffi (1.17.0-x86_64-linux-gnu) fileutils (1.7.2) @@ -54,13 +54,13 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.1.0) - minitest (5.23.1) - nokogiri (1.16.5-arm64-darwin) + minitest (5.24.1) + nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-linux) + nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) parallel (1.25.1) - parser (3.3.2.0) + parser (3.3.4.0) ast (~> 2.4.1) racc racc (1.8.0) @@ -85,10 +85,10 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.5.1) + rbs (3.5.2) logger regexp_parser (2.9.2) - rexml (3.3.0) + rexml (3.3.1) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -96,7 +96,7 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) @@ -121,17 +121,17 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-performance (1.21.0) + rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.0) + rubocop-rails (2.25.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.0.1) + rubocop-rspec (3.0.3) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -141,7 +141,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.37.0) + standard (1.39.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.64.0) @@ -153,7 +153,7 @@ GEM standard-performance (1.4.0) lint_roller (~> 1.1) rubocop-performance (~> 1.21.0) - steep (1.6.0) + steep (1.7.1) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -164,7 +164,7 @@ GEM logger (>= 1.3.0) parser (>= 3.1) rainbow (>= 2.2.2, < 4.0) - rbs (>= 3.1.0) + rbs (>= 3.5.0.pre) securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) @@ -175,7 +175,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) - zeitwerk (2.6.15) + zeitwerk (2.6.16) PLATFORMS arm64-darwin @@ -194,7 +194,7 @@ DEPENDENCIES rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) standard (~> 1.31) - steep (~> 1.6.0) + steep (~> 1.7.1) BUNDLED WITH 2.4.19 diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index f0c76e04..e8b3ea33 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.6.0", platform: :mri_32 +gem "steep", "~> 1.7.1", platform: :mri_32 gem "railties", "~> 7.0.8" gemspec path: "../" diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index f330c174..2faaa701 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -36,7 +36,7 @@ GEM csv (3.3.0) diff-lcs (1.5.1) docile (1.4.0) - erubi (1.12.0) + erubi (1.13.0) ffi (1.17.0-arm64-darwin) ffi (1.17.0-x86_64-linux-gnu) fileutils (1.7.2) @@ -53,13 +53,13 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.1.0) - minitest (5.23.1) - nokogiri (1.16.5-arm64-darwin) + minitest (5.24.1) + nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-linux) + nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) parallel (1.25.1) - parser (3.3.2.0) + parser (3.3.4.0) ast (~> 2.4.1) racc racc (1.8.0) @@ -85,10 +85,10 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.5.1) + rbs (3.5.2) logger regexp_parser (2.9.2) - rexml (3.3.0) + rexml (3.3.1) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -96,7 +96,7 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) @@ -121,17 +121,17 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-performance (1.21.0) + rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.0) + rubocop-rails (2.25.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.0.1) + rubocop-rspec (3.0.3) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -141,7 +141,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.37.0) + standard (1.39.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.64.0) @@ -153,7 +153,7 @@ GEM standard-performance (1.4.0) lint_roller (~> 1.1) rubocop-performance (~> 1.21.0) - steep (1.6.0) + steep (1.7.1) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -164,7 +164,7 @@ GEM logger (>= 1.3.0) parser (>= 3.1) rainbow (>= 2.2.2, < 4.0) - rbs (>= 3.1.0) + rbs (>= 3.5.0.pre) securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) @@ -175,7 +175,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) - zeitwerk (2.6.15) + zeitwerk (2.6.16) PLATFORMS arm64-darwin @@ -194,7 +194,7 @@ DEPENDENCIES rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) standard (~> 1.31) - steep (~> 1.6.0) + steep (~> 1.7.1) BUNDLED WITH 2.4.19 diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index ae06faad..60570091 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.6.0", platform: :mri_32 +gem "steep", "~> 1.7.1", platform: :mri_32 gem "railties", "~> 7.1.2" gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index af85a620..02ab7c82 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -48,14 +48,14 @@ GEM diff-lcs (1.5.1) docile (1.4.0) drb (2.2.1) - erubi (1.12.0) + erubi (1.13.0) ffi (1.17.0-arm64-darwin) ffi (1.17.0-x86_64-linux-gnu) fileutils (1.7.2) i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.13.1) + irb (1.14.0) rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.7.2) @@ -68,20 +68,20 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.23.1) + minitest (5.24.1) mutex_m (0.2.0) - nokogiri (1.16.5-arm64-darwin) + nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-linux) + nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) parallel (1.25.1) - parser (3.3.2.0) + parser (3.3.4.0) ast (~> 2.4.1) racc psych (5.1.2) stringio racc (1.8.0) - rack (3.1.2) + rack (3.1.7) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -109,14 +109,14 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.5.1) + rbs (3.5.2) logger rdoc (6.7.0) psych (>= 4.0.0) regexp_parser (2.9.2) - reline (0.5.8) + reline (0.5.9) io-console (~> 0.5) - rexml (3.3.0) + rexml (3.3.1) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -124,7 +124,7 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) @@ -149,17 +149,17 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-performance (1.21.0) + rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.0) + rubocop-rails (2.25.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.0.1) + rubocop-rspec (3.0.3) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -169,7 +169,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.37.0) + standard (1.39.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.64.0) @@ -181,7 +181,7 @@ GEM standard-performance (1.4.0) lint_roller (~> 1.1) rubocop-performance (~> 1.21.0) - steep (1.6.0) + steep (1.7.1) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -192,11 +192,11 @@ GEM logger (>= 1.3.0) parser (>= 3.1) rainbow (>= 2.2.2, < 4.0) - rbs (>= 3.1.0) + rbs (>= 3.5.0.pre) securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - stringio (3.1.0) + stringio (3.1.1) strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -205,7 +205,7 @@ GEM concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) webrick (1.8.1) - zeitwerk (2.6.15) + zeitwerk (2.6.16) PLATFORMS arm64-darwin @@ -224,7 +224,7 @@ DEPENDENCIES rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) standard (~> 1.31) - steep (~> 1.6.0) + steep (~> 1.7.1) BUNDLED WITH 2.4.19 diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile index 27a9bda2..c622a7ff 100644 --- a/gemfiles/rails_7.2.gemfile +++ b/gemfiles/rails_7.2.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.6.0", platform: :mri_32 +gem "steep", "~> 1.7.1", platform: :mri_32 gem "railties", "~> 7.2.0.beta2" gemspec path: "../" diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index da3667e0..e84c7977 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -7,9 +7,9 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (7.2.0.beta2) - actionview (= 7.2.0.beta2) - activesupport (= 7.2.0.beta2) + actionpack (7.2.0.beta3) + actionview (= 7.2.0.beta3) + activesupport (= 7.2.0.beta3) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -18,19 +18,20 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actionview (7.2.0.beta2) - activesupport (= 7.2.0.beta2) + actionview (7.2.0.beta3) + activesupport (= 7.2.0.beta3) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activesupport (7.2.0.beta2) + activesupport (7.2.0.beta3) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) tzinfo (~> 2.0, >= 2.0.5) appraisal (2.5.0) @@ -48,7 +49,7 @@ GEM diff-lcs (1.5.1) docile (1.4.0) drb (2.2.1) - erubi (1.12.0) + erubi (1.13.0) ffi (1.17.0-aarch64-linux-gnu) ffi (1.17.0-aarch64-linux-musl) ffi (1.17.0-arm-linux-gnu) @@ -63,7 +64,7 @@ GEM i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.13.1) + irb (1.14.0) rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.7.2) @@ -76,27 +77,27 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.23.1) - nokogiri (1.16.5-aarch64-linux) + minitest (5.24.1) + nokogiri (1.16.6-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.5-arm-linux) + nokogiri (1.16.6-arm-linux) racc (~> 1.4) - nokogiri (1.16.5-arm64-darwin) + nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86-linux) + nokogiri (1.16.6-x86-linux) racc (~> 1.4) - nokogiri (1.16.5-x86_64-darwin) + nokogiri (1.16.6-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-linux) + nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) parallel (1.25.1) - parser (3.3.2.0) + parser (3.3.4.0) ast (~> 2.4.1) racc psych (5.1.2) stringio racc (1.8.0) - rack (3.1.2) + rack (3.1.7) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -111,9 +112,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.2.0.beta2) - actionpack (= 7.2.0.beta2) - activesupport (= 7.2.0.beta2) + railties (7.2.0.beta3) + actionpack (= 7.2.0.beta3) + activesupport (= 7.2.0.beta3) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -124,14 +125,14 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.5.1) + rbs (3.5.2) logger rdoc (6.7.0) psych (>= 4.0.0) regexp_parser (2.9.2) - reline (0.5.8) + reline (0.5.9) io-console (~> 0.5) - rexml (3.3.0) + rexml (3.3.1) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -139,7 +140,7 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) @@ -164,17 +165,17 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-performance (1.21.0) + rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.0) + rubocop-rails (2.25.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.0.1) + rubocop-rspec (3.0.3) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -184,7 +185,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.37.0) + standard (1.39.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.64.0) @@ -196,7 +197,7 @@ GEM standard-performance (1.4.0) lint_roller (~> 1.1) rubocop-performance (~> 1.21.0) - steep (1.6.0) + steep (1.7.1) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -207,11 +208,11 @@ GEM logger (>= 1.3.0) parser (>= 3.1) rainbow (>= 2.2.2, < 4.0) - rbs (>= 3.1.0) + rbs (>= 3.5.0.pre) securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - stringio (3.1.0) + stringio (3.1.1) strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -221,7 +222,7 @@ GEM unicode-display_width (2.5.0) useragent (0.16.10) webrick (1.8.1) - zeitwerk (2.6.15) + zeitwerk (2.6.16) PLATFORMS aarch64-linux @@ -252,7 +253,7 @@ DEPENDENCIES rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) standard (~> 1.31) - steep (~> 1.6.0) + steep (~> 1.7.1) BUNDLED WITH 2.4.19 diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile index c742c1b5..99afaadd 100644 --- a/gemfiles/rails_edge.gemfile +++ b/gemfiles/rails_edge.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "steep", "~> 1.6.0", platform: :mri_32 +gem "steep", "~> 1.7.1", platform: :mri_32 gem "railties", github: "rails" gemspec path: "../" diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index 0c8dd642..32576a84 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: 2ebb508cd8ee16c0bb280f91b93c01d939fcbf12 + revision: 4867559a10a342e7c27dacdf0ec42702455b29be specs: actionpack (8.0.0.alpha) actionview (= 8.0.0.alpha) @@ -26,7 +26,7 @@ GIT connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) - logger + logger (>= 1.4.2) minitest (>= 5.1) tzinfo (~> 2.0, >= 2.0.5) railties (8.0.0.alpha) @@ -62,14 +62,14 @@ GEM diff-lcs (1.5.1) docile (1.4.0) drb (2.2.1) - erubi (1.12.0) + erubi (1.13.0) ffi (1.17.0-arm64-darwin) ffi (1.17.0-x86_64-linux-gnu) fileutils (1.7.2) i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.13.1) + irb (1.14.0) rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.7.2) @@ -82,19 +82,19 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.23.1) - nokogiri (1.16.5-arm64-darwin) + minitest (5.24.1) + nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-linux) + nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) parallel (1.25.1) - parser (3.3.2.0) + parser (3.3.4.0) ast (~> 2.4.1) racc psych (5.1.2) stringio racc (1.8.0) - rack (3.1.2) + rack (3.1.7) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -114,14 +114,14 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.5.1) + rbs (3.5.2) logger rdoc (6.7.0) psych (>= 4.0.0) regexp_parser (2.9.2) - reline (0.5.8) + reline (0.5.9) io-console (~> 0.5) - rexml (3.3.0) + rexml (3.3.1) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -129,7 +129,7 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) @@ -154,17 +154,17 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.31.3) parser (>= 3.3.1.0) - rubocop-performance (1.21.0) + rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.0) + rubocop-rails (2.25.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.0.1) + rubocop-rspec (3.0.3) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -174,7 +174,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.37.0) + standard (1.39.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) rubocop (~> 1.64.0) @@ -186,7 +186,7 @@ GEM standard-performance (1.4.0) lint_roller (~> 1.1) rubocop-performance (~> 1.21.0) - steep (1.6.0) + steep (1.7.1) activesupport (>= 5.1) concurrent-ruby (>= 1.1.10) csv (>= 3.0.9) @@ -197,11 +197,11 @@ GEM logger (>= 1.3.0) parser (>= 3.1) rainbow (>= 2.2.2, < 4.0) - rbs (>= 3.1.0) + rbs (>= 3.5.0.pre) securerandom (>= 0.1) strscan (>= 1.0.0) terminal-table (>= 2, < 4) - stringio (3.1.0) + stringio (3.1.1) strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -211,7 +211,7 @@ GEM unicode-display_width (2.5.0) useragent (0.16.10) webrick (1.8.1) - zeitwerk (2.6.15) + zeitwerk (2.6.16) PLATFORMS arm64-darwin @@ -230,7 +230,7 @@ DEPENDENCIES rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) standard (~> 1.31) - steep (~> 1.6.0) + steep (~> 1.7.1) BUNDLED WITH 2.4.19 From 01e497932c2c5d14ad8bddfb67044048036b4889 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Mon, 15 Jul 2024 17:22:54 -0400 Subject: [PATCH 119/126] Bumped version to 2.22.0 --- CHANGELOG.md | 6 ++++++ gemfiles/rails_6.0.gemfile.lock | 2 +- gemfiles/rails_6.1.gemfile.lock | 2 +- gemfiles/rails_7.0.gemfile.lock | 2 +- gemfiles/rails_7.1.gemfile.lock | 2 +- gemfiles/rails_7.2.gemfile.lock | 2 +- gemfiles/rails_edge.gemfile.lock | 4 ++-- lib/meta_tags/version.rb | 2 +- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 333b7abc..c1c72b72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 2.22.0 (July 15, 2024) + +Changes: + +- Added support for Ruby on Rails 7.2 ([303](https://github.com/kpumuk/meta-tags/pull/303)) + ## 2.21.0 (April 11, 2024) Bugfixes: diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 1fde9158..1f2cf7ae 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - meta-tags (2.21.0) + meta-tags (2.22.0) actionpack (>= 6.0.0, < 8.1) GEM diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index c4b2e56a..33b7573e 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - meta-tags (2.21.0) + meta-tags (2.22.0) actionpack (>= 6.0.0, < 8.1) GEM diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 2faaa701..1c53edfc 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - meta-tags (2.21.0) + meta-tags (2.22.0) actionpack (>= 6.0.0, < 8.1) GEM diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 02ab7c82..3cd09a9e 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - meta-tags (2.21.0) + meta-tags (2.22.0) actionpack (>= 6.0.0, < 8.1) GEM diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index e84c7977..2654c759 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - meta-tags (2.21.0) + meta-tags (2.22.0) actionpack (>= 6.0.0, < 8.1) GEM diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index 32576a84..d9e4c14e 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails.git - revision: 4867559a10a342e7c27dacdf0ec42702455b29be + revision: 099776069c4be64be8be7e3fdb0232d7824a38a9 specs: actionpack (8.0.0.alpha) actionview (= 8.0.0.alpha) @@ -41,7 +41,7 @@ GIT PATH remote: .. specs: - meta-tags (2.21.0) + meta-tags (2.22.0) actionpack (>= 6.0.0, < 8.1) GEM diff --git a/lib/meta_tags/version.rb b/lib/meta_tags/version.rb index e4152529..1f13ccff 100644 --- a/lib/meta_tags/version.rb +++ b/lib/meta_tags/version.rb @@ -2,6 +2,6 @@ module MetaTags # Gem version. - VERSION = "2.21.0" + VERSION = "2.22.0" public_constant :VERSION end From 8ecd9dd1f8d4ee1f988a37ee9b4765b88659852a Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Mon, 15 Jul 2024 17:32:52 -0400 Subject: [PATCH 120/126] Updated certificate (expiration) --- certs/kpumuk.pem | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/certs/kpumuk.pem b/certs/kpumuk.pem index f773276e..78db27a8 100644 --- a/certs/kpumuk.pem +++ b/certs/kpumuk.pem @@ -1,7 +1,7 @@ -----BEGIN CERTIFICATE----- MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MQ8wDQYDVQQDDAZrcHVt dWsxFjAUBgoJkiaJk/IsZAEZFgZrcHVtdWsxFDASBgoJkiaJk/IsZAEZFgRpbmZv -MB4XDTIzMDcwNjEyMjY0MVoXDTI0MDcwNTEyMjY0MVowPzEPMA0GA1UEAwwGa3B1 +MB4XDTI0MDcxNTIxMzIyNFoXDTI1MDcxNTIxMzIyNFowPzEPMA0GA1UEAwwGa3B1 bXVrMRYwFAYKCZImiZPyLGQBGRYGa3B1bXVrMRQwEgYKCZImiZPyLGQBGRYEaW5m bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALw2YroZc+IT+rs8NuPu c13DelrxrpAgPEu1zuRb3l7WaHRNWA4TyS8Z6Aa1G2O+FdUZNMW1n7IwP/QMJ9Mz @@ -12,10 +12,10 @@ pJ3vGgO2sh5GvJFOPk1Vlur2nX9ZFznPEP1CEAQ+NFrmKRt355Z5sgOkAojSGnIL /1sCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFPa4 VFc1YOlV1u/7EGTwMCAk8YE9MB0GA1UdEQQWMBSBEmtwdW11a0BrcHVtdWsuaW5m bzAdBgNVHRIEFjAUgRJrcHVtdWtAa3B1bXVrLmluZm8wDQYJKoZIhvcNAQELBQAD -ggEBALwivjTzGErFzBtgPEQe7uO6DMysgm/OIF5jLFkvRiuFbuueHM2cUZZBx2Rd -2R5uQS4uiZ5KA+3SkgWQOFOzpFlo7ywS5264ULCcvfix6NQpb2aIDsZuzWGBIDbs -ixS+8wYslrzsOgUSn/RjF0sVB0dw4wv6G8YnVrR/Jf2SaO+Q2lYuKEOKfj52I+Yt -TdFiOjR+WwXSxs/XdSdFtqK2q/THbZdk+HkAe8guvXYtD/fzO2mBlk2AQ0hV1Pxu -ovz1LEphwrX/6v635mteXvl+OKWrNo1Q78sU364BgY5MvJMxFytmUrKMgO6RAiIM -N9+lhJiLa7+h0LrvPPDZRhV8ze0= +ggEBADXj54X1y7Pw0Wp5wdniZE13a8EwWC41BEIsSoBLkGQhZ2OOR+5tVUM9kCwG +kX6YdliORLuLevYXKiXFluiETwKTeAd6zUURy7eLlwQ1GvhE8wmGk0TQY11v8FMj +7AupDtulpP01gLDZwbysovu/3btfhrLVncJ2zIpB5sx68fDCOmOGSUbdgOCV+S+O +CyTFctYlJNXZgv2kl76TII7jbZikT/7hVOhCO48OdMQ/s26zabbJrcV2pJOLKKkP +BKX4xDo6SbsGmqjFkknT6WiiE94rQxGCb9JNiSyl3SncEw+Ysx6yVKYB5WAEy8s1 +M0VQvDzd77bxj3lx/P6ifll3yUs= -----END CERTIFICATE----- From 19b7df401010b0646508e9a4b9c94bcbf0e42765 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Tue, 20 Aug 2024 15:11:36 -0400 Subject: [PATCH 121/126] Use standardrb/standard-ruby-action@v1 action instead of custom rake task execution --- .github/workflows/standard.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/standard.yml b/.github/workflows/standard.yml index 60542103..c364055b 100644 --- a/.github/workflows/standard.yml +++ b/.github/workflows/standard.yml @@ -8,6 +8,9 @@ on: jobs: build: runs-on: ubuntu-latest + permissions: + checks: write + contents: read strategy: fail-fast: true matrix: @@ -20,12 +23,8 @@ jobs: name: StandardRB - Ruby ${{ matrix.ruby-version }} on Rails ${{ matrix.rails-version }} steps: - - uses: actions/checkout@v4 - - name: Set up Ruby ${{ matrix.ruby-version }} on Rails ${{ matrix.rails-version }} - uses: ruby/setup-ruby@v1 + - name: Run StandardRB + uses: standardrb/standard-ruby-action@v1 with: ruby-version: ${{ matrix.ruby-version }} - bundler-cache: true - - name: Run StandardRB - run: | - bundle exec standardrb + autofix: false From a0554956e6a9f46859aed613fe94808e06a0bf40 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Tue, 20 Aug 2024 15:15:59 -0400 Subject: [PATCH 122/126] Trying to avoid double pipeline run on MR --- .github/workflows/standard.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/standard.yml b/.github/workflows/standard.yml index c364055b..449731b5 100644 --- a/.github/workflows/standard.yml +++ b/.github/workflows/standard.yml @@ -2,8 +2,9 @@ name: StandardRB on: push: + branches: [ main ] pull_request: - types: [opened, reopened] + branches: [ main ] jobs: build: From 4b0291ef5c095a71026a4fd461683cc146d87e93 Mon Sep 17 00:00:00 2001 From: Dmytro Shteflyuk <kpumuk@kpumuk.info> Date: Tue, 20 Aug 2024 15:20:59 -0400 Subject: [PATCH 123/126] Bumped Bundler to 2.5.17 --- gemfiles/rails_6.0.gemfile.lock | 2 +- gemfiles/rails_6.1.gemfile.lock | 2 +- gemfiles/rails_7.0.gemfile.lock | 2 +- gemfiles/rails_7.1.gemfile.lock | 2 +- gemfiles/rails_7.2.gemfile.lock | 2 +- gemfiles/rails_edge.gemfile.lock | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 1f2cf7ae..bc12dc21 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -198,4 +198,4 @@ DEPENDENCIES steep (~> 1.7.1) BUNDLED WITH - 2.4.19 + 2.5.17 diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 33b7573e..84a07b9c 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -197,4 +197,4 @@ DEPENDENCIES steep (~> 1.7.1) BUNDLED WITH - 2.4.19 + 2.5.17 diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 1c53edfc..1cadb07a 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -197,4 +197,4 @@ DEPENDENCIES steep (~> 1.7.1) BUNDLED WITH - 2.4.19 + 2.5.17 diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 3cd09a9e..93ae02c6 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -227,4 +227,4 @@ DEPENDENCIES steep (~> 1.7.1) BUNDLED WITH - 2.4.19 + 2.5.17 diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index 2654c759..cb5009d3 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -256,4 +256,4 @@ DEPENDENCIES steep (~> 1.7.1) BUNDLED WITH - 2.4.19 + 2.5.17 diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index d9e4c14e..19a3d4ae 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -233,4 +233,4 @@ DEPENDENCIES steep (~> 1.7.1) BUNDLED WITH - 2.4.19 + 2.5.17 From d948596cdb763671a3c8e8f7a8a97cb67de649f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 00:45:43 +0000 Subject: [PATCH 124/126] Bump paambaati/codeclimate-action from 8 to 9 Bumps [paambaati/codeclimate-action](https://github.com/paambaati/codeclimate-action) from 8 to 9. - [Release notes](https://github.com/paambaati/codeclimate-action/releases) - [Changelog](https://github.com/paambaati/codeclimate-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/paambaati/codeclimate-action/compare/v8...v9) --- updated-dependencies: - dependency-name: paambaati/codeclimate-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 35672210..667685e5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,7 +50,7 @@ jobs: run: | bundle exec rspec --format RspecJunitFormatter --out ${{github.workspace}}/rspec-results.xml --format documentation - - uses: paambaati/codeclimate-action@v8 + - uses: paambaati/codeclimate-action@v9 if: matrix.code-coverage env: CC_TEST_REPORTER_ID: ${{ vars.CC_TEST_REPORTER_ID }} From 70bd994c8915ddb3ba21d5fbd325223e02f9f665 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 00:07:50 +0000 Subject: [PATCH 125/126] Update rubocop-rails requirement from ~> 2.25.0 to ~> 2.26.0 Updates the requirements on [rubocop-rails](https://github.com/rubocop/rubocop-rails) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.25.0...v2.26.0) --- updated-dependencies: - dependency-name: rubocop-rails dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> --- meta-tags.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-tags.gemspec b/meta-tags.gemspec index 94b8b92e..bc5792ec 100644 --- a/meta-tags.gemspec +++ b/meta-tags.gemspec @@ -33,7 +33,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0" spec.add_development_dependency "simplecov", "~> 0.22.0" # Code style - spec.add_development_dependency "rubocop-rails", "~> 2.25.0" + spec.add_development_dependency "rubocop-rails", "~> 2.26.0" spec.add_development_dependency "rubocop-rake", "~> 0.6.0" spec.add_development_dependency "rubocop-rspec", "~> 3.0.1" spec.add_development_dependency "standard", "~> 1.31" From 3079c824c1977c34219a91787d3172339cf82358 Mon Sep 17 00:00:00 2001 From: Github Workflow <kpumuk@users.noreply.github.com> Date: Mon, 26 Aug 2024 00:09:08 +0000 Subject: [PATCH 126/126] Updated Appraisal gemfiles --- gemfiles/rails_6.0.gemfile.lock | 44 +++++++++---------- gemfiles/rails_6.1.gemfile.lock | 44 +++++++++---------- gemfiles/rails_7.0.gemfile.lock | 44 +++++++++---------- gemfiles/rails_7.1.gemfile.lock | 62 +++++++++++++-------------- gemfiles/rails_7.2.gemfile.lock | 73 ++++++++++++++++---------------- gemfiles/rails_edge.gemfile.lock | 48 ++++++++++----------- 6 files changed, 158 insertions(+), 157 deletions(-) diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index bc12dc21..94d2054a 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -32,11 +32,11 @@ GEM thor (>= 0.14.0) ast (2.4.2) builder (3.3.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) crass (1.0.6) csv (3.3.0) diff-lcs (1.5.1) - docile (1.4.0) + docile (1.4.1) erubi (1.13.0) ffi (1.17.0-arm64-darwin) ffi (1.17.0-x86_64-linux-gnu) @@ -54,16 +54,16 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.1.0) - minitest (5.24.1) - nokogiri (1.16.6-arm64-darwin) + minitest (5.25.1) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.6-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - parallel (1.25.1) - parser (3.3.4.0) + parallel (1.26.3) + parser (3.3.4.2) ast (~> 2.4.1) racc - racc (1.8.0) + racc (1.8.1) rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) @@ -85,10 +85,10 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.5.2) + rbs (3.5.3) logger regexp_parser (2.9.2) - rexml (3.3.1) + rexml (3.3.6) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -96,7 +96,7 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.1) + rspec-expectations (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) @@ -108,30 +108,30 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.64.1) + rubocop (1.65.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) + regexp_parser (>= 2.4, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.1) parser (>= 3.3.1.0) rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.1) + rubocop-rails (2.26.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) + rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.0.3) + rubocop-rspec (3.0.4) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -141,10 +141,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.39.1) + standard (1.40.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.64.0) + rubocop (~> 1.65.0) standard-custom (~> 1.0.0) standard-performance (~> 1.4) standard-custom (1.0.2) @@ -176,7 +176,7 @@ GEM tzinfo (1.2.11) thread_safe (~> 0.1) unicode-display_width (2.5.0) - zeitwerk (2.6.16) + zeitwerk (2.6.17) PLATFORMS arm64-darwin @@ -190,7 +190,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.25.0) + rubocop-rails (~> 2.26.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) @@ -198,4 +198,4 @@ DEPENDENCIES steep (~> 1.7.1) BUNDLED WITH - 2.5.17 + 2.4.19 diff --git a/gemfiles/rails_6.1.gemfile.lock b/gemfiles/rails_6.1.gemfile.lock index 84a07b9c..7e0d21bf 100644 --- a/gemfiles/rails_6.1.gemfile.lock +++ b/gemfiles/rails_6.1.gemfile.lock @@ -32,11 +32,11 @@ GEM thor (>= 0.14.0) ast (2.4.2) builder (3.3.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) crass (1.0.6) csv (3.3.0) diff-lcs (1.5.1) - docile (1.4.0) + docile (1.4.1) erubi (1.13.0) ffi (1.17.0-arm64-darwin) ffi (1.17.0-x86_64-linux-gnu) @@ -54,16 +54,16 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.1.0) - minitest (5.24.1) - nokogiri (1.16.6-arm64-darwin) + minitest (5.25.1) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.6-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - parallel (1.25.1) - parser (3.3.4.0) + parallel (1.26.3) + parser (3.3.4.2) ast (~> 2.4.1) racc - racc (1.8.0) + racc (1.8.1) rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) @@ -85,10 +85,10 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.5.2) + rbs (3.5.3) logger regexp_parser (2.9.2) - rexml (3.3.1) + rexml (3.3.6) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -96,7 +96,7 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.1) + rspec-expectations (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) @@ -108,30 +108,30 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.64.1) + rubocop (1.65.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) + regexp_parser (>= 2.4, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.1) parser (>= 3.3.1.0) rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.1) + rubocop-rails (2.26.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) + rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.0.3) + rubocop-rspec (3.0.4) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -141,10 +141,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.39.1) + standard (1.40.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.64.0) + rubocop (~> 1.65.0) standard-custom (~> 1.0.0) standard-performance (~> 1.4) standard-custom (1.0.2) @@ -175,7 +175,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) - zeitwerk (2.6.16) + zeitwerk (2.6.17) PLATFORMS arm64-darwin @@ -189,7 +189,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.25.0) + rubocop-rails (~> 2.26.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) @@ -197,4 +197,4 @@ DEPENDENCIES steep (~> 1.7.1) BUNDLED WITH - 2.5.17 + 2.4.19 diff --git a/gemfiles/rails_7.0.gemfile.lock b/gemfiles/rails_7.0.gemfile.lock index 1cadb07a..ad74526d 100644 --- a/gemfiles/rails_7.0.gemfile.lock +++ b/gemfiles/rails_7.0.gemfile.lock @@ -31,11 +31,11 @@ GEM thor (>= 0.14.0) ast (2.4.2) builder (3.3.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) crass (1.0.6) csv (3.3.0) diff-lcs (1.5.1) - docile (1.4.0) + docile (1.4.1) erubi (1.13.0) ffi (1.17.0-arm64-darwin) ffi (1.17.0-x86_64-linux-gnu) @@ -53,16 +53,16 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.1.0) - minitest (5.24.1) - nokogiri (1.16.6-arm64-darwin) + minitest (5.25.1) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.6-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - parallel (1.25.1) - parser (3.3.4.0) + parallel (1.26.3) + parser (3.3.4.2) ast (~> 2.4.1) racc - racc (1.8.0) + racc (1.8.1) rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) @@ -85,10 +85,10 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.5.2) + rbs (3.5.3) logger regexp_parser (2.9.2) - rexml (3.3.1) + rexml (3.3.6) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -96,7 +96,7 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.1) + rspec-expectations (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) @@ -108,30 +108,30 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.64.1) + rubocop (1.65.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) + regexp_parser (>= 2.4, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.1) parser (>= 3.3.1.0) rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.1) + rubocop-rails (2.26.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) + rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.0.3) + rubocop-rspec (3.0.4) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -141,10 +141,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.39.1) + standard (1.40.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.64.0) + rubocop (~> 1.65.0) standard-custom (~> 1.0.0) standard-performance (~> 1.4) standard-custom (1.0.2) @@ -175,7 +175,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) - zeitwerk (2.6.16) + zeitwerk (2.6.17) PLATFORMS arm64-darwin @@ -189,7 +189,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.25.0) + rubocop-rails (~> 2.26.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) @@ -197,4 +197,4 @@ DEPENDENCIES steep (~> 1.7.1) BUNDLED WITH - 2.5.17 + 2.4.19 diff --git a/gemfiles/rails_7.1.gemfile.lock b/gemfiles/rails_7.1.gemfile.lock index 93ae02c6..1d71fd90 100644 --- a/gemfiles/rails_7.1.gemfile.lock +++ b/gemfiles/rails_7.1.gemfile.lock @@ -7,9 +7,9 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (7.1.3.4) - actionview (= 7.1.3.4) - activesupport (= 7.1.3.4) + actionpack (7.1.4) + actionview (= 7.1.4) + activesupport (= 7.1.4) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -17,13 +17,13 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actionview (7.1.3.4) - activesupport (= 7.1.3.4) + actionview (7.1.4) + activesupport (= 7.1.4) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activesupport (7.1.3.4) + activesupport (7.1.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -41,12 +41,12 @@ GEM base64 (0.2.0) bigdecimal (3.1.8) builder (3.3.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) crass (1.0.6) csv (3.3.0) diff-lcs (1.5.1) - docile (1.4.0) + docile (1.4.1) drb (2.2.1) erubi (1.13.0) ffi (1.17.0-arm64-darwin) @@ -68,19 +68,19 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.24.1) + minitest (5.25.1) mutex_m (0.2.0) - nokogiri (1.16.6-arm64-darwin) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.6-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - parallel (1.25.1) - parser (3.3.4.0) + parallel (1.26.3) + parser (3.3.4.2) ast (~> 2.4.1) racc psych (5.1.2) stringio - racc (1.8.0) + racc (1.8.1) rack (3.1.7) rack-session (2.0.0) rack (>= 3.0.0) @@ -96,9 +96,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) + railties (7.1.4) + actionpack (= 7.1.4) + activesupport (= 7.1.4) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -109,14 +109,14 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.5.2) + rbs (3.5.3) logger rdoc (6.7.0) psych (>= 4.0.0) regexp_parser (2.9.2) reline (0.5.9) io-console (~> 0.5) - rexml (3.3.1) + rexml (3.3.6) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -124,7 +124,7 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.1) + rspec-expectations (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) @@ -136,30 +136,30 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.64.1) + rubocop (1.65.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) + regexp_parser (>= 2.4, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.1) parser (>= 3.3.1.0) rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.1) + rubocop-rails (2.26.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) + rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.0.3) + rubocop-rspec (3.0.4) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -169,10 +169,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.39.1) + standard (1.40.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.64.0) + rubocop (~> 1.65.0) standard-custom (~> 1.0.0) standard-performance (~> 1.4) standard-custom (1.0.2) @@ -205,7 +205,7 @@ GEM concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) webrick (1.8.1) - zeitwerk (2.6.16) + zeitwerk (2.6.17) PLATFORMS arm64-darwin @@ -219,7 +219,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.25.0) + rubocop-rails (~> 2.26.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) @@ -227,4 +227,4 @@ DEPENDENCIES steep (~> 1.7.1) BUNDLED WITH - 2.5.17 + 2.4.19 diff --git a/gemfiles/rails_7.2.gemfile.lock b/gemfiles/rails_7.2.gemfile.lock index cb5009d3..90482a52 100644 --- a/gemfiles/rails_7.2.gemfile.lock +++ b/gemfiles/rails_7.2.gemfile.lock @@ -7,24 +7,24 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (7.2.0.beta3) - actionview (= 7.2.0.beta3) - activesupport (= 7.2.0.beta3) + actionpack (7.2.1) + actionview (= 7.2.1) + activesupport (= 7.2.1) nokogiri (>= 1.8.5) racc - rack (>= 2.2.4) + rack (>= 2.2.4, < 3.2) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actionview (7.2.0.beta3) - activesupport (= 7.2.0.beta3) + actionview (7.2.1) + activesupport (= 7.2.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activesupport (7.2.0.beta3) + activesupport (7.2.1) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) @@ -33,6 +33,7 @@ GEM i18n (>= 1.6, < 2) logger (>= 1.4.2) minitest (>= 5.1) + securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) appraisal (2.5.0) bundler @@ -42,12 +43,12 @@ GEM base64 (0.2.0) bigdecimal (3.1.8) builder (3.3.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) crass (1.0.6) csv (3.3.0) diff-lcs (1.5.1) - docile (1.4.0) + docile (1.4.1) drb (2.2.1) erubi (1.13.0) ffi (1.17.0-aarch64-linux-gnu) @@ -77,26 +78,26 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.24.1) - nokogiri (1.16.6-aarch64-linux) + minitest (5.25.1) + nokogiri (1.16.7-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.6-arm-linux) + nokogiri (1.16.7-arm-linux) racc (~> 1.4) - nokogiri (1.16.6-arm64-darwin) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.6-x86-linux) + nokogiri (1.16.7-x86-linux) racc (~> 1.4) - nokogiri (1.16.6-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.6-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - parallel (1.25.1) - parser (3.3.4.0) + parallel (1.26.3) + parser (3.3.4.2) ast (~> 2.4.1) racc psych (5.1.2) stringio - racc (1.8.0) + racc (1.8.1) rack (3.1.7) rack-session (2.0.0) rack (>= 3.0.0) @@ -112,9 +113,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.2.0.beta3) - actionpack (= 7.2.0.beta3) - activesupport (= 7.2.0.beta3) + railties (7.2.1) + actionpack (= 7.2.1) + activesupport (= 7.2.1) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -125,14 +126,14 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.5.2) + rbs (3.5.3) logger rdoc (6.7.0) psych (>= 4.0.0) regexp_parser (2.9.2) reline (0.5.9) io-console (~> 0.5) - rexml (3.3.1) + rexml (3.3.6) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -140,7 +141,7 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.1) + rspec-expectations (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) @@ -152,30 +153,30 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.64.1) + rubocop (1.65.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) + regexp_parser (>= 2.4, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.1) parser (>= 3.3.1.0) rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.1) + rubocop-rails (2.26.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) + rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.0.3) + rubocop-rspec (3.0.4) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -185,10 +186,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.39.1) + standard (1.40.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.64.0) + rubocop (~> 1.65.0) standard-custom (~> 1.0.0) standard-performance (~> 1.4) standard-custom (1.0.2) @@ -222,7 +223,7 @@ GEM unicode-display_width (2.5.0) useragent (0.16.10) webrick (1.8.1) - zeitwerk (2.6.16) + zeitwerk (2.6.17) PLATFORMS aarch64-linux @@ -248,7 +249,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.25.0) + rubocop-rails (~> 2.26.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) @@ -256,4 +257,4 @@ DEPENDENCIES steep (~> 1.7.1) BUNDLED WITH - 2.5.17 + 2.4.19 diff --git a/gemfiles/rails_edge.gemfile.lock b/gemfiles/rails_edge.gemfile.lock index 19a3d4ae..ff795c29 100644 --- a/gemfiles/rails_edge.gemfile.lock +++ b/gemfiles/rails_edge.gemfile.lock @@ -1,12 +1,11 @@ GIT remote: https://github.com/rails/rails.git - revision: 099776069c4be64be8be7e3fdb0232d7824a38a9 + revision: c6e3336cfdec5ae9c7fb98b03d0196aa56ab30f9 specs: actionpack (8.0.0.alpha) actionview (= 8.0.0.alpha) activesupport (= 8.0.0.alpha) nokogiri (>= 1.8.5) - racc rack (>= 2.2.4) rack-session (>= 1.0.1) rack-test (>= 0.6.3) @@ -28,6 +27,7 @@ GIT i18n (>= 1.6, < 2) logger (>= 1.4.2) minitest (>= 5.1) + securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) railties (8.0.0.alpha) actionpack (= 8.0.0.alpha) @@ -55,12 +55,12 @@ GEM base64 (0.2.0) bigdecimal (3.1.8) builder (3.3.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) crass (1.0.6) csv (3.3.0) diff-lcs (1.5.1) - docile (1.4.0) + docile (1.4.1) drb (2.2.1) erubi (1.13.0) ffi (1.17.0-arm64-darwin) @@ -82,18 +82,18 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.24.1) - nokogiri (1.16.6-arm64-darwin) + minitest (5.25.1) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.6-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - parallel (1.25.1) - parser (3.3.4.0) + parallel (1.26.3) + parser (3.3.4.2) ast (~> 2.4.1) racc psych (5.1.2) stringio - racc (1.8.0) + racc (1.8.1) rack (3.1.7) rack-session (2.0.0) rack (>= 3.0.0) @@ -114,14 +114,14 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (3.5.2) + rbs (3.5.3) logger rdoc (6.7.0) psych (>= 4.0.0) regexp_parser (2.9.2) reline (0.5.9) io-console (~> 0.5) - rexml (3.3.1) + rexml (3.3.6) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -129,7 +129,7 @@ GEM rspec-mocks (~> 3.13.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.1) + rspec-expectations (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) @@ -141,30 +141,30 @@ GEM rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.64.1) + rubocop (1.65.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) + regexp_parser (>= 2.4, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.1) parser (>= 3.3.1.0) rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.1) + rubocop-rails (2.26.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) + rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.0.3) + rubocop-rspec (3.0.4) rubocop (~> 1.61) ruby-progressbar (1.13.0) securerandom (0.3.1) @@ -174,10 +174,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - standard (1.39.1) + standard (1.40.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.64.0) + rubocop (~> 1.65.0) standard-custom (~> 1.0.0) standard-performance (~> 1.4) standard-custom (1.0.2) @@ -211,7 +211,7 @@ GEM unicode-display_width (2.5.0) useragent (0.16.10) webrick (1.8.1) - zeitwerk (2.6.16) + zeitwerk (2.6.17) PLATFORMS arm64-darwin @@ -225,7 +225,7 @@ DEPENDENCIES rspec (~> 3.13.0) rspec-html-matchers (~> 0.10.0) rspec_junit_formatter (~> 0.6.0) - rubocop-rails (~> 2.25.0) + rubocop-rails (~> 2.26.0) rubocop-rake (~> 0.6.0) rubocop-rspec (~> 3.0.1) simplecov (~> 0.22.0) @@ -233,4 +233,4 @@ DEPENDENCIES steep (~> 1.7.1) BUNDLED WITH - 2.5.17 + 2.4.19