gizzard 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab2fd2bacd07d67c5fb0e8212bcff33b651bb3e7777215a9843baf5a7be0d589
-  data.tar.gz: 7a5ed063eaa28b8acd5d9e0a79938ffaa71e1462fdc21dd6ccf78547f93e8d03
+  metadata.gz: 7835d4c05720dfbe30c00af4019b823ce0e5098c4151ced2744147272bbddd87
+  data.tar.gz: 6735ab05f95da9f5ac49846f33856fba7d7efb3a34803a344e5ec3c78097b94a
 SHA512:
-  metadata.gz: 3eef2a837fbf4141c4dd422d18826feedd0b9f0e1fd2b3a0fa4bea7ea879af10d56af0347c7a6505d6fcbe3a1569899d4e866197a1ca42f2c6c91dca14494338
-  data.tar.gz: d8a0657863f48522c18bf0a37a567e46239cf64a9cb5d70f0e72e1d9c9c3f496cc4ff5f70cf78abbbcb2671b20e1c09b3ad887a372dcebf1fa97dfe850a27bfa
+  metadata.gz: 316d1946ed962e152b33aae18b72188d4b4ae04495d5da3184db902143a95dd93534ff401ddb4cbd71b78bf7711c08cb7b3511dee29d1f6ca8b8fcf88cce1ed5
+  data.tar.gz: 30ee2722af67585d7888257bcb04aae0dd8850077e1c8104b1734db3080d1003e32da7b52aa7aac9758c53290aaf79394fc73e30fd2ae25aa6d2a86629a60143

data/.github/workflows/main.yml

@@ -0,0 +1,88 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+      - main
+
+  pull_request:
+    branches:
+      - main
+
+env:
+  RAILS_ENV: test
+  DB_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }}
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby:
+          - 2.6
+          - 2.7
+          - 3.0
+          - 3.1
+        gemfile:
+          - activerecord52
+          - activerecord61
+          - activerecord70
+        exclude: # https://github.com/sue445/activerecord-compatible_legacy_migration/blob/master/.github/workflows/test.yml
+          - ruby: 2.6
+            gemfile: activerecord70
+          - ruby: 3.0
+            gemfile: activerecord52
+          - ruby: 3.1
+            gemfile: activerecord52
+
+    services:
+      mysql:
+        image: mysql:5.7
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_ROOT_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }}
+          MYSQL_DATABASE: ${{ env.DB_NAME }}
+        options: >-
+          --health-cmd "mysqladmin ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+
+    env:
+      BUNDLE_GEMFILE: /home/runner/work/gizzard/gizzard/gemfiles/${{ matrix.gemfile }}.gemfile
+      DB_HOST: 127.0.0.1
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: set MySQL sql_mode
+        run: |
+          mysql --ssl-mode=DISABLE --protocol=tcp --host 127.0.0.1 --user=root --password=${{ env.DB_PASSWORD }} mysql <<SQL
+          SET GLOBAL sql_mode = 'NO_ENGINE_SUBSTITUTION';
+          SET GLOBAL character_set_server = 'utf8mb4';
+          SET GLOBAL innodb_file_per_table = 1;
+          SET GLOBAL innodb_large_prefix = ON;
+          SQL
+
+      - name: set ENV
+        run: |
+          echo "DB_PORT=${{ job.services.mysql.ports[3306] }}" >> $GITHUB_ENV
+
+      - name: Setup DB
+        run: |
+          ./scripts/setup.sh
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+
+      - name: Run tests
+        run: bundle exec rspec
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}

data/.gitignore

@@ -12,3 +12,5 @@
 
 vendor/
 Gemfile.lock
+
+gemfiles/*.gemfile.lock

data/Appraisals

@@ -0,0 +1,13 @@
+appraise 'activerecord52' do
+  gem 'activerecord', '~> 5.2'
+end
+
+appraise 'activerecord61' do
+  gem 'activerecord', '~> 6.1'
+end
+
+if RUBY_VERSION >= '2.7.0'
+  appraise 'activerecord70' do
+    gem 'activerecord', '~> 7.0'
+  end
+end

data/README.md

@@ -1,5 +1,7 @@
 # Gizzard
 
+[![Build Status](https://github.com/taka0125/gizzard/workflows/Ruby/badge.svg?branch=main)](https://github.com/taka0125/gizzard/actions)
+
 Often use snippet for ActiveRecord.
 
 ## Installation
@@ -31,6 +33,15 @@ class ApplicationRecord < ActiveRecord::Base
 end
 ```
 
+## Run Test
+
+```
+$ bundle install
+$ docker-compose up -d
+$ ./scripts/setup.sh
+$ bundle exec rspec
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/docker-compose.yml

@@ -0,0 +1,25 @@
+version: '3.9'
+
+x-mysql: &mysql
+  image: mysql:5.7
+  container_name: gizzard_mysql57
+  environment:
+    MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-5y8m2jzTamDS6M85ateGrA6pihhyCm}
+  platform: linux/x86_64
+  ports:
+    - 127.0.0.1:${DB_PORT:-33306}:3306
+  volumes:
+    - mysql:/var/lib/mysql
+  command: >
+    mysqld 
+      --sql-mode=NO_ENGINE_SUBSTITUTION
+      --character-set-server=utf8mb4
+      --innodb-file-per-table=1
+      --innodb-large-prefix
+
+services:
+  mysql:
+    <<: *mysql
+
+volumes:
+  mysql:

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/activerecord52.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.2"
+
+gemspec path: "../"

data/gemfiles/activerecord61.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.1"
+
+gemspec path: "../"

data/gemfiles/activerecord70.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.0"
+
+gemspec path: "../"

data/gizzard.gemspec

@@ -25,6 +25,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activerecord", ">= 5.2"
   spec.add_dependency "activesupport", ">= 5.2"
 
+  spec.add_development_dependency "ridgepole"
+  spec.add_development_dependency "database_cleaner-active_record"
+  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "psych", "~> 3.1"
+  spec.add_development_dependency "standalone_activerecord_boot_loader"
+  spec.add_development_dependency "appraisal"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/gizzard/base.rb

@@ -3,6 +3,14 @@ module Gizzard
     extend ActiveSupport::Concern
 
     class_methods do
+      def preload_associations(records:, associations:, scope: nil)
+        if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new(7)
+          ActiveRecord::Associations::Preloader.new(records: records, associations: associations, scope: scope).call
+        else
+          ActiveRecord::Associations::Preloader.new.preload(records, associations, scope)
+        end
+      end
+
       def delete_all_by_id(batch_size: 1000)
         ids = pluck(:id)
         ids.sort!

data/lib/gizzard/mysql.rb

@@ -3,6 +3,8 @@ module Gizzard
     extend ActiveSupport::Concern
 
     included do
+      include Base
+
       scope :filtered_by, -> (column, value) do
         v = value.respond_to?(:strip) ? value.strip : value
         v.present? ? where(column => value) : all
@@ -76,7 +78,7 @@ module Gizzard
 
         c = connection
         joins <<-SQL
-        #{join} #{c.quote_table_name(join_table_name)} #{index_hint} (#{Array(indexes).join(', ')}) ON #{c.quote_table_name(table_name)}.#{c.quote_column_name(relation.association_primary_key)} = #{c.quote_table_name(join_table_name)}.#{c.quote_column_name(relation.foreign_key)}
+        #{join} #{c.quote_table_name(join_table_name)} #{index_hint}(#{Array(indexes).join(', ')}) ON #{c.quote_table_name(table_name)}.#{c.quote_column_name(relation.association_primary_key)} = #{c.quote_table_name(join_table_name)}.#{c.quote_column_name(relation.foreign_key)}
         SQL
       end
     end

data/lib/gizzard/version.rb

@@ -1,3 +1,3 @@
 module Gizzard
-  VERSION = "0.5.0"
+  VERSION = "0.7.0"
 end

data/scripts/setup.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+set -ex
+
+CURRENT=$(cd $(dirname $0);pwd)
+DOCKER_MYSQL_PORT=$(docker port gizzard_mysql57 3306 2>/dev/null | cut -f 2 -d ':')
+DOCKER_MYSQL_PORT=${DOCKER_MYSQL_PORT:-3306}
+
+export DB_HOST=${DB_HOST:-127.0.0.1}
+export DB_PORT=${DB_PORT:-${DOCKER_MYSQL_PORT}}
+export DB_NAME=${DB_NAME:-gizzard_test}
+export DB_USER=${DB_USER:-root}
+export DB_PASSWORD=${DB_PASSWORD:-5y8m2jzTamDS6M85ateGrA6pihhyCm}
+
+mysql \
+  -u ${DB_USER} \
+  -h ${DB_HOST} \
+  -p${DB_PASSWORD} \
+  --port ${DB_PORT} \
+  -e "CREATE DATABASE IF NOT EXISTS ${DB_NAME}"
+
+bundle exec ridgepole \
+  -c ${CURRENT}/../spec/dummy/config/database.yml \
+  --apply \
+  -f ${CURRENT}/../spec/dummy/db/Schemafile \
+  -E test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gizzard
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Takahiro Ooishi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,90 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: ridgepole
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner-active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: standalone_activerecord_boot_loader
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,20 +171,28 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
+- gemfiles/.bundle/config
+- gemfiles/activerecord52.gemfile
+- gemfiles/activerecord61.gemfile
+- gemfiles/activerecord70.gemfile
 - gizzard.gemspec
 - lib/gizzard.rb
 - lib/gizzard/base.rb
 - lib/gizzard/mysql.rb
 - lib/gizzard/version.rb
+- scripts/setup.sh
 homepage: https://github.com/taka0125/gizzard
 licenses: []
 metadata: {}
@@ -119,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Often use snippet for ActiveRecord.