gizzard 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8bb051ec47485a5252ebd7aa6b6d0f00a5fce77ccc985f3dba400ce3b4564b6
-  data.tar.gz: 319d1ac24f2da5174c7ed75a141d1f34909afac0b0ea5b8d0aafb233315c54a3
+  metadata.gz: cb2568fde715eb73945c6b19987ea08b3e2c72f34a6e4b5c5ab6dc8758d3f228
+  data.tar.gz: 3522cc6db511d5038947be77b59f6cb91c001df133690455424297ac68bd2b6c
 SHA512:
-  metadata.gz: 6af2539ed91ffc9aa2528d6b1d301ad41972a7fb969d5074b0e7f3368fdd8cd2148b2b25b875768d108eac7151b82c03660eea961bfc8219017e3e690ee7a3d1
-  data.tar.gz: 69d5665693686af4f7a765f1e90142e4ba49d8bd39391381bfeed8501fa8cf455d3a7e7cfb6378044e48244f0617c65e92674bb725f98400bc8ccbe958c10ee1
+  metadata.gz: d33ca160e6cf2499cab2eb47d122eb9200c1d255531b76ada7dfd91f79966f3cc0709fbd877bf69ad38c68435294d63d16012ecd341d6888f30b8226fa65cf28
+  data.tar.gz: 55c1901b302755e81bc945337b9dec1f3d1ef92d3faeecd6f967fc679c9dbf30718ca10bd3772782ca03326b42e9823e84ecc576f5cab6d285426c91b5d27f56

data/README.md

@@ -35,11 +35,9 @@ end
 
 ## Run Test
 
-```
-$ bundle install
-$ docker-compose up -d
-$ ./scripts/setup.sh
-$ bundle exec rspec
+```bash
+$ make setup
+$ make ruby/rspec
 ```
 
 ## Development

data/lib/gizzard/mysql.rb

@@ -7,7 +7,7 @@ module Gizzard
 
       scope :filtered_by, -> (column, value) do
         v = value.respond_to?(:strip) ? value.strip : value
-        v.present? ? where(column => value) : all
+        v.present? ? where(column => v) : all
       end
 
       scope :forward_matching_by, -> (column, value) { where("`#{table_name}`.`#{column}` LIKE ?", "#{sanitize_sql_like(value)}%") }
@@ -64,7 +64,7 @@ module Gizzard
                when :left_outer_join
                  'LEFT OUTER JOIN'
                else
-                 raise
+                 raise "Invalid join_type = #{join_type}"
                end
 
         index_hint = case hint
@@ -73,7 +73,7 @@ module Gizzard
                      when :force
                        'FORCE INDEX'
                      else
-                       raise
+                       raise "Invalid hint = #{hint}"
                      end
 
         c = connection

data/lib/gizzard/version.rb

@@ -1,3 +1,3 @@
 module Gizzard
-  VERSION = "0.8.0"
+  VERSION = "0.9.1"
 end

data/sig/gizzard.rbs

@@ -0,0 +1,45 @@
+# TypeProf 0.21.8
+
+# Classes
+module Gizzard
+  VERSION: String
+
+  class Error < StandardError
+  end
+
+  module Base
+    extend ActiveSupport::Concern
+    extend ActiveRecord::Core::ClassMethods
+
+    module ClassMethods
+      def preload_associations: (records: untyped, associations: untyped, ?scope: nil) -> nil
+      def delete_all_by_id: (?batch_size: Integer) -> untyped
+      def less_than_id: (Integer id) -> ActiveRecord::Relation
+      def greater_than_id: (Integer id) -> ActiveRecord::Relation
+      def less_than: (String | Symbol key, untyped value) -> ActiveRecord::Relation
+      def less_than_equal: (String | Symbol key, untyped value) -> ActiveRecord::Relation
+      def greater_than: (String | Symbol key, untyped value) -> ActiveRecord::Relation
+      def greater_than_equal: (String | Symbol key, untyped value) -> ActiveRecord::Relation
+    end
+  end
+
+  module Mysql
+    include Base
+    extend Base::ClassMethods
+
+    module ClassMethods
+      def lock_in_share: -> ActiveRecord::Relation
+      def order_by_field: (String | Symbol column, [untyped] values) -> ActiveRecord::Relation
+      def order_by_id_field: ([untyped] ids) -> ActiveRecord::Relation
+      def use_index: (String | [String]  indexes) -> ActiveRecord::Relation
+      def force_index: (String | [String] indexes) -> ActiveRecord::Relation
+      def joins_with_use_index: (String | Symbol relation_name, String | [String] indexes) -> ActiveRecord::Relation
+      def joins_with_force_index: (String | Symbol relation_name, String | [String] indexes) -> ActiveRecord::Relation
+      def left_outer_joins_with_use_index: (String | Symbol relation_name, String | [String] indexes) -> ActiveRecord::Relation
+      def left_outer_joins_with_force_index: (String | Symbol relation_name, String | [String] indexes) -> ActiveRecord::Relation
+    end
+
+    def to_id: -> Integer
+    def lock_in_share!: -> untyped
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gizzard
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Takahiro Ooishi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2023-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -164,6 +164,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: typeprof
+  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: steep
+  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'
 description: Often use snippet for ActiveRecord.
 email:
 - taka0125@gmail.com
@@ -171,30 +199,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/main.yml"
-- ".github/workflows/release.yml"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Appraisals
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
-- docker-compose.yml
-- gemfiles/.bundle/config
-- gemfiles/activerecord6.0.gemfile
-- gemfiles/activerecord6.1.gemfile
-- gemfiles/activerecord7.0.gemfile
-- gemfiles/activerecord7.1.gemfile
-- gizzard.gemspec
 - lib/gizzard.rb
 - lib/gizzard/base.rb
 - lib/gizzard/mysql.rb
 - lib/gizzard/version.rb
-- scripts/setup.sh
+- sig/gizzard.rbs
 homepage: https://github.com/taka0125/gizzard
 licenses: []
 metadata: {}
@@ -213,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Often use snippet for ActiveRecord.

data/.github/workflows/main.yml

@@ -1,78 +0,0 @@
-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:
-          - '3.0'
-          - '3.1'
-        activerecord:
-          - '6.0'
-          - '6.1'
-          - '7.0'
-          - '7.1'
-    services:
-      mysql:
-        image: mysql:8
-        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: gemfiles/activerecord${{ matrix.activerecord }}.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
-          cache-version: 1
-
-      - name: set MySQL sql_mode
-        run: |
-          mysql --ssl-mode=DISABLE --get-server-public-key --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 = 'latin1';
-          SET GLOBAL innodb_file_per_table = 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/.github/workflows/release.yml

@@ -1,33 +0,0 @@
-name: Release gem
-
-on:
-  workflow_dispatch:
-    inputs:
-      rubygems-otp-code:
-        description: RubyGems OTP code
-        required: true
-
-permissions:
-  contents: write
-
-jobs:
-  release-gem:
-    runs-on: ubuntu-latest
-    env:
-      GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
-      GEM_HOST_OTP_CODE: ${{ github.event.inputs.rubygems-otp-code }}
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0 # bundle exec rake release で git tag を見るため、tagをfetchするようにしている
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.1.1
-      - name: Bundle install
-        run: bundle install
-      - name: Setup git config # bundle exec rake release でgit tagが打たれていない場合、タグを打ってpushしてくれるため用意している
-        run: |
-          git config --global user.email "taka0125@gmail.com"
-          git config --global user.name "Takahiro Ooishi"
-      - name: Release gem
-        run: bundle exec rake release

data/.gitignore

@@ -1,16 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
-
-vendor/
-Gemfile.lock
-
-gemfiles/*.gemfile.lock

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.3
-before_install: gem install bundler -v 2.0.1

data/Appraisals

@@ -1,21 +0,0 @@
-appraise 'activerecord5.2' do
-  gem 'activerecord', '~> 5.2.0'
-end
-
-appraise 'activerecord6.0' do
-  gem 'activerecord', '~> 6.0.0'
-end
-
-appraise 'activerecord6.1' do
-  gem 'activerecord', '~> 6.1.0'
-end
-
-if RUBY_VERSION >= '2.7.0'
-  appraise 'activerecord7.0' do
-    gem 'activerecord', '~> 7.0.0'
-  end
-
-  appraise 'activerecord7.1' do
-    gem 'activerecord', '~> 7.1.0'
-  end
-end

data/Gemfile

@@ -1,4 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in gizzard.gemspec
-gemspec

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "gizzard"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/docker-compose.yml

@@ -1,25 +0,0 @@
-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

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

data/gemfiles/activerecord6.0.gemfile

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

data/gemfiles/activerecord6.1.gemfile

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

data/gemfiles/activerecord7.0.gemfile

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

data/gemfiles/activerecord7.1.gemfile

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

data/gizzard.gemspec

@@ -1,37 +0,0 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "gizzard/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "gizzard"
-  spec.version       = Gizzard::VERSION
-  spec.authors       = ["Takahiro Ooishi"]
-  spec.email         = ["taka0125@gmail.com"]
-
-  spec.summary       = %q{Often use snippet for ActiveRecord.}
-  spec.description   = %q{Often use snippet for ActiveRecord.}
-  spec.homepage      = "https://github.com/taka0125/gizzard"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  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", ">= 0.3"
-  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"
-end

data/scripts/setup.sh

@@ -1,25 +0,0 @@
-#!/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