diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8786e28..97b4367 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,12 +13,10 @@ jobs: strategy: matrix: ruby: - - '2.6.10' - - '2.7.8' - - '3.0.7' - - '3.1.5' - - '3.2.4' - - '3.3.1' + - "3.1.7" + - "3.2.9" + - "3.3.10" + - "3.4.7" steps: - name: Checkout code uses: actions/checkout@v4 @@ -41,7 +39,7 @@ jobs: - name: Install Ruby and gems uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3.1 + ruby-version: 3.4.7 bundler-cache: true - name: Run Rubocop diff --git a/.rubocop.yml b/.rubocop.yml index 90496b9..5386606 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,4 +1,4 @@ -require: +plugins: - rubocop-performance - rubocop-rails - rubocop-rake @@ -9,7 +9,7 @@ inherit_gem: rubocop-shopify: rubocop.yml AllCops: - TargetRubyVersion: 3.3 + TargetRubyVersion: 3.4 NewCops: enable Layout/EmptyLinesAroundAccessModifier: @@ -37,9 +37,6 @@ RSpec/NestedGroups: RSpec/ExampleLength: Max: 10 -RSpec/ContextWording: - Enabled: false - RSpec/MultipleExpectations: Enabled: false @@ -48,9 +45,3 @@ Rails/ApplicationRecord: Rails/Date: Enabled: false - -RSpec/FilePath: - Enabled: false - -RSpec/SpecFilePathFormat: - Enabled: false diff --git a/README.md b/README.md index 8faa464..b5cb5fc 100644 --- a/README.md +++ b/README.md @@ -166,7 +166,6 @@ and push the `.gem` file to [rubygems.org](https://rubygems.org). Bug reports and pull requests are welcome on GitHub at https://github.com/lassoid/tiny_filter. - ## License The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT). diff --git a/spec/tiny_filter/generators/filter_generator_spec.rb b/spec/tiny_filter/generators/filter_generator_spec.rb index 5c60087..0625ff7 100644 --- a/spec/tiny_filter/generators/filter_generator_spec.rb +++ b/spec/tiny_filter/generators/filter_generator_spec.rb @@ -20,7 +20,7 @@ def expected_file_content(model_name, keys = []) # frozen_string_literal: true class #{class_from_model_name(model_name)}Filter < ::ApplicationFilter - #{keys.any? ? expected_filter_body(keys) : nil} + #{expected_filter_body(keys) if keys.any?} end CONTENT end diff --git a/tiny_filter.gemspec b/tiny_filter.gemspec index 9c55b18..f692f9e 100644 --- a/tiny_filter.gemspec +++ b/tiny_filter.gemspec @@ -37,11 +37,12 @@ Gem::Specification.new do |spec| spec.add_development_dependency "rake" spec.add_development_dependency "rspec" spec.add_development_dependency "rubocop" + spec.add_development_dependency "rubocop-factory_bot" spec.add_development_dependency "rubocop-performance" spec.add_development_dependency "rubocop-rails" spec.add_development_dependency "rubocop-rake" spec.add_development_dependency "rubocop-rspec" spec.add_development_dependency "rubocop-shopify" spec.add_development_dependency "sequel" - spec.add_development_dependency "sqlite3", "~> 1.4" # AR doesn't support 2+ + spec.add_development_dependency "sqlite3" end