Time to 7.0.0.beta2 (#214)

* Time to 7.0.0.beta2

* Update yarn packages

* Update github action

.github/workflows/pr-build.yml

@@ -4,6 +4,8 @@ on:
     types: [opened, synchronize, reopened]
   push:
     branches: [main, develop]
+  schedule:
+    - cron:  '0 0 * * 0'
 jobs:
   pr-build:
     runs-on: ${{ matrix.os }}
@@ -18,7 +20,7 @@ jobs:
       postgres:
         image: postgres:latest
         env:
-          POSTGRES_DB: dummy_test
+          POSTGRES_DB: wallaby_dummy_test
           POSTGRES_USER: ${{ env.POSTGRES_USER }}
           POSTGRES_PASSWORD: ${{ env.POSTGRES_PASSWORD }}
         ports:
@@ -31,7 +33,7 @@ jobs:
       mysql:
         image: mysql:latest
         env:
-          MYSQL_DATABASE: dummy_test
+          MYSQL_DATABASE: wallaby_dummy_test
           MYSQL_ROOT_PASSWORD: ${{ env.MYSQL_ROOT_PASSWORD }}
         ports:
           - 3306:3306
@@ -44,18 +46,11 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         # NOTE: check the versions that Ruby supports at https://www.ruby-lang.org/en/downloads/branches/
-        ruby: ['3.1', '3.0', '2.7', '2.6']
+        ruby: ['3.2', '3.1', '3.0', '2.7']
         # NOTE: check the versions that Rails supports at https://guides.rubyonrails.org/maintenance_policy.html
-        rails: ['7.0', '6.1', '6.0', '5.2']
-        exclude:
-          - ruby: '3.2'
-            rails: '5.2'
-          - ruby: '3.1'
-            rails: '5.2'
-          - ruby: '3.0'
-            rails: '5.2'
-          - ruby: '2.6'
-            rails: '7.0'
+        rails: ['7.1', '7.0', '6.1', '6.0']
+        # NOTE: .keep
+        exclude: []
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
@@ -74,8 +69,8 @@ jobs:
 
       - name: Rspec
         run: |
-          if [ "$GITHUB_BASE_REF" = "main" ]; then curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter; fi
-          if [ "$GITHUB_BASE_REF" = "main" ]; then chmod +x ./cc-test-reporter; fi
-          if [ "$GITHUB_BASE_REF" = "main" ]; then ./cc-test-reporter before-build; fi
+          if [[ "$GITHUB_BASE_REF" != @(main|develop) ]]; then curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter; fi
+          if [[ "$GITHUB_BASE_REF" != @(main|develop) ]]; then chmod +x ./cc-test-reporter; fi
+          if [[ "$GITHUB_BASE_REF" != @(main|develop) ]]; then ./cc-test-reporter before-build; fi
           bundle exec rake --trace db:test:prepare spec
-          if [ "$GITHUB_BASE_REF" = "main" ]; then ./cc-test-reporter after-build -r ${{ env.CC_TEST_REPORTER_ID }}; fi
+          if [[ "$GITHUB_BASE_REF" != @(main|develop) ]]; then ./cc-test-reporter after-build -r ${{ env.CC_TEST_REPORTER_ID }}; fi

CHANGELOG.md

@@ -16,9 +16,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Data audit (use papertrail) (maybe..)
 - Batch data action (maybe..)
 
+## [7.0.0.beta2](https://github.com/wallaby-rails/wallaby-core/releases/tag/7.0.0.beta2) -
+
+## [7.0.0.beta1](https://github.com/wallaby-rails/wallaby-core/releases/tag/7.0.0.beta1) - 2023-09-22
+
+- chore: update keyword syntax to support Ruby 3.0 ([#210](https://github.com/wallaby-rails/wallaby/pull/210))
+- feat: extract pages into templates for better overwriting ([#209](https://github.com/wallaby-rails/wallaby/pull/209))
+- chore: pdate rubocop to run on changed files ([#207](https://github.com/wallaby-rails/wallaby/pull/207))
+- feat: use esbuild and scss-bundle to bundle js and scss ([#206](https://github.com/wallaby-rails/wallaby/pull/206))
+- chore: setup github action ([#205](https://github.com/wallaby-rails/wallaby/pull/205))
+- chore: change wallaby:install to call wallaby:engine:install and implement wallaby:engine:partials ([#196](https://github.com/wallaby-rails/wallaby/pull/196))
+- chore: remove type_renderer and update activestorage partial ([#195](https://github.com/wallaby-rails/wallaby/pull/195))
+- chore: use max_text_length helper method ([#194](https://github.com/wallaby-rails/wallaby/pull/194))
+- chore: detect turbolinks instead of configuration ([#193](https://github.com/wallaby-rails/wallaby/pull/193))
+- chore: upgrade to latest wallaby-core & wallaby-active_record ([#192](https://github.com/wallaby-rails/wallaby/pull/192))
+
 ## [6.1.3](https://github.com/wallaby-rails/wallaby-core/releases/tag/6.1.3) - 2020-04-19
 
-- chore: bump to use wallaby-active_record 0.2.6 ([#186](https://github.com/wallaby-rails/wallaby/pull/186))
+- chore: bump to use wallaby-active_record 0.2.6 ([#188](https://github.com/wallaby-rails/wallaby/pull/188))
 
 ## [6.1.2](https://github.com/wallaby-rails/wallaby-core/releases/tag/6.1.2) - 2020-04-12
 

gemfiles/Gemfile.rails-6.0

@@ -16,13 +16,12 @@ gemspec path: '../'
 target_branch = !ENV['GITHUB_BASE_REF']&.empty? && ENV['GITHUB_BASE_REF']
 target_branch ||= !ENV['GITHUB_REF_NAME']&.empty? && ENV['GITHUB_REF_NAME']
 
+gem 'rails', '~> 6.0.0'
 gem 'wallaby-core', git: 'https://github.com/wallaby-rails/wallaby-core.git', branch: target_branch
 gem 'wallaby-active_record', git: 'https://github.com/wallaby-rails/wallaby-active_record.git', branch: target_branch
 gem 'wallaby-cop', git: 'https://github.com/wallaby-rails/wallaby-cop.git', branch: 'main'
 gem 'simple_blog_theme', git: 'https://github.com/tian-im/simple_blog_theme.git', branch: 'main'
 
-gem 'rails', '~> 6.0.0'
-
 gem 'cancancan'
 gem 'devise'
 gem 'mysql2'
@@ -31,7 +30,7 @@ gem 'pundit'
 gem 'sqlite3'
 
 # @see https://stackoverflow.com/a/71192990
-gem 'psych', '< 4' if RUBY_VERSION.match?(/3\.[12]/)
+gem 'psych', '< 4'
 
 # @see https://stackoverflow.com/a/70500221
 gem 'net-smtp', require: false

gemfiles/Gemfile.rails-6.1

@@ -16,6 +16,7 @@ gemspec path: '../'
 target_branch = !ENV['GITHUB_BASE_REF']&.empty? && ENV['GITHUB_BASE_REF']
 target_branch ||= !ENV['GITHUB_REF_NAME']&.empty? && ENV['GITHUB_REF_NAME']
 
+gem 'rails', '~> 6.1.0'
 gem 'wallaby-core', git: 'https://github.com/wallaby-rails/wallaby-core.git', branch: target_branch
 gem 'wallaby-active_record', git: 'https://github.com/wallaby-rails/wallaby-active_record.git', branch: target_branch
 gem 'wallaby-cop', git: 'https://github.com/wallaby-rails/wallaby-cop.git', branch: 'main'
@@ -31,7 +32,7 @@ gem 'pundit'
 gem 'sqlite3'
 
 # @see https://stackoverflow.com/a/71192990
-gem 'psych', '< 4' if RUBY_VERSION.match?(/3\.[12]/)
+gem 'psych', '< 4'
 
 # @see https://stackoverflow.com/a/70500221
 gem 'net-smtp', require: false

gemfiles/Gemfile.rails-7.0

@@ -16,23 +16,19 @@ gemspec path: '../'
 target_branch = !ENV['GITHUB_BASE_REF']&.empty? && ENV['GITHUB_BASE_REF']
 target_branch ||= !ENV['GITHUB_REF_NAME']&.empty? && ENV['GITHUB_REF_NAME']
 
+gem 'rails', '~> 7.0.0'
 gem 'wallaby-core', git: 'https://github.com/wallaby-rails/wallaby-core.git', branch: target_branch
 gem 'wallaby-active_record', git: 'https://github.com/wallaby-rails/wallaby-active_record.git', branch: target_branch
 gem 'wallaby-cop', git: 'https://github.com/wallaby-rails/wallaby-cop.git', branch: 'main'
 gem 'simple_blog_theme', git: 'https://github.com/tian-im/simple_blog_theme.git', branch: 'main'
 
-gem 'rails', '~> 7.0.0'
-
 gem 'cancancan'
 gem 'devise'
 gem 'mysql2'
 gem 'pg'
 gem 'pundit'
 gem 'sqlite3'
 
-# @see https://stackoverflow.com/a/71192990
-gem 'psych', '< 4' if RUBY_VERSION.match?(/3\.[12]/)
-
 group :test do
   gem 'database_cleaner'
   gem 'rails-controller-testing'

gemfiles/Gemfile.rails-7.1

@@ -0,0 +1,41 @@
+source 'https://rubygems.org'
+
+# Declare your gem's dependencies in wallaby.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec path: '../'
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+
+# To use a debugger
+# gem 'byebug', group: [:development, :test]
+
+target_branch = !ENV['GITHUB_BASE_REF']&.empty? && ENV['GITHUB_BASE_REF']
+target_branch ||= !ENV['GITHUB_REF_NAME']&.empty? && ENV['GITHUB_REF_NAME']
+
+gem 'rails', '~> 7.1.0'
+gem 'wallaby-core', git: 'https://github.com/wallaby-rails/wallaby-core.git', branch: target_branch
+gem 'wallaby-active_record', git: 'https://github.com/wallaby-rails/wallaby-active_record.git', branch: target_branch
+gem 'wallaby-cop', git: 'https://github.com/wallaby-rails/wallaby-cop.git', branch: 'main'
+gem 'simple_blog_theme', git: 'https://github.com/tian-im/simple_blog_theme.git', branch: 'main'
+
+gem 'cancancan'
+gem 'devise'
+gem 'mysql2'
+gem 'pg'
+gem 'pundit'
+gem 'sqlite3'
+
+# @see https://stackoverflow.com/a/71192990
+gem 'psych', '< 4'
+
+group :test do
+  gem 'database_cleaner'
+  gem 'rails-controller-testing'
+  gem 'rspec-rails'
+  gem 'simplecov'
+  gem 'webmock'
+end

lib/wallaby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wallaby
-  VERSION = '7.0.0.beta1' # :nodoc:
+  VERSION = '7.0.0.beta2' # :nodoc:
 end

spec/dummy/config/environments/test.rb

@@ -44,4 +44,7 @@
   config.cache_store = :null_store
   # config.logger = Logger.new(STDOUT)
   # config.log_level = :info
+
+  # Store files locally.
+  config.active_storage.service = :local if defined? ActiveStorage
 end

wallaby.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'wallaby-core'
 
   # This will determine wallaby-core's version
-  s.add_dependency 'wallaby-active_record', '0.3.0.beta1'
+  s.add_dependency 'wallaby-active_record', '0.3.0.beta2'
 
   # assets gems
   s.add_dependency 'jbuilder'