activerecord-simple_index_name 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e50274a424bd7bbeeed9d7513b5765f942f7c96be03a8f02e1c1500d019138c
-  data.tar.gz: 4e5159fb7eb1b34b764bb11912095700e7499a065d0e591764c070f8b344a375
+  metadata.gz: cfe687f13f57f5ccc76c31edbd72d16148dfcee0943df043a733e32656e3f759
+  data.tar.gz: fd6ce85a38b133f2c74aeea9ac131bf191fb52fa0e877470b04ac32c5347d798
 SHA512:
-  metadata.gz: cd4e7cd63434a6bc7b31d999f3ab4f6a4c838573ec2afafeec2cb6387d0275efd207e46e51a32758e100f35451ba3c754e28427ea81726b831b17acb286957ca
-  data.tar.gz: 409675660eac35364d4310794e413425bae3f7103390031c9fead0a5b02a59dd0b9a24941fb714398847ac52f8c88b961f1999d1d88db114418a2753f34ec35d
+  metadata.gz: 056a3d0d3427acf88c7200e88a0e4b2b89d9373cdc49a10a06098d823787f7b0dea5fb9a41f2547c3e249c0727b323c8d297d376cca869d1e168e7391ef6f7c8
+  data.tar.gz: f6b065227d6181d283965717afc31a5b91e4cd882bd69c13106f3148c305711bb46c0cddb85c30d6223c3531a2ad99fd08625a9a3c9ea87b70c9e0260991cd95

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+# c.f. https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+version: 2
+
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
+    assignees:
+      - sue445

data/.github/workflows/pages.yml

@@ -0,0 +1,62 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy static content to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches:
+      - master
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  # Single deploy job since we're just deploying
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ruby
+          bundler-cache: true
+
+      - run: bundle exec yard
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v2
+        with:
+          # Upload entire repository
+          path: './doc'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@main
+
+      - name: Slack Notification (not success)
+        uses: lazy-actions/slatify@master
+        if: "! success()"
+        continue-on-error: true
+        with:
+          job_name: "*pages*"
+          type: ${{ job.status }}
+          icon_emoji: ":octocat:"
+          url: ${{ secrets.SLACK_WEBHOOK }}
+          token: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/test.yml

@@ -16,94 +16,106 @@ jobs:
   test:
     runs-on: ubuntu-latest
 
-    container: ${{ matrix.ruby }}
-
     strategy:
       fail-fast: false
 
       matrix:
         ruby:
-          - ruby:2.3
-          - ruby:2.4
-          - ruby:2.5
-          - ruby:2.6
-          - ruby:2.7
-          - ruby:3.0
-          - rubylang/ruby:master-nightly-bionic
+          - "2.3"
+          - "2.4"
+          - "2.5"
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
         gemfile:
           - rails_5_0
           - rails_5_1
           - rails_5_2
           - rails_6_0
           - rails_6_1
-        include:
-          - ruby: rubylang/ruby:master-nightly-bionic
-            allow_failures: "true"
+          - rails_7_0
+          - rails_7_1
 
         exclude:
           # Rails 6.0+ requires Ruby 2.5+
-          - ruby:    ruby:2.3
+          - ruby:    "2.3"
             gemfile: rails_6_0
-          - ruby:    ruby:2.4
+          - ruby:    "2.4"
             gemfile: rails_6_0
-          - ruby:    ruby:2.3
+          - ruby:    "2.3"
             gemfile: rails_6_1
-          - ruby:    ruby:2.4
+          - ruby:    "2.4"
             gemfile: rails_6_1
 
+          # Rails 7.0+ requires Ruby 2.7+
+          - ruby:    "2.3"
+            gemfile: rails_7_0
+          - ruby:    "2.4"
+            gemfile: rails_7_0
+          - ruby:    "2.5"
+            gemfile: rails_7_0
+          - ruby:    "2.6"
+            gemfile: rails_7_0
+          - ruby:    "2.3"
+            gemfile: rails_7_1
+          - ruby:    "2.4"
+            gemfile: rails_7_1
+          - ruby:    "2.5"
+            gemfile: rails_7_1
+          - ruby:    "2.6"
+            gemfile: rails_7_1
+
           # Rails 5.x doesn't work on Ruby 3.0+
-          - ruby:    ruby:3.0
+          - ruby:    "3.0"
+            gemfile: rails_5_0
+          - ruby:    "3.0"
+            gemfile: rails_5_1
+          - ruby:    "3.0"
+            gemfile: rails_5_2
+          - ruby:    "3.1"
             gemfile: rails_5_0
-          - ruby:    ruby:3.0
+          - ruby:    "3.1"
             gemfile: rails_5_1
-          - ruby:    ruby:3.0
+          - ruby:    "3.1"
+            gemfile: rails_5_2
+          - ruby:    "3.2"
+            gemfile: rails_5_0
+          - ruby:    "3.2"
+            gemfile: rails_5_1
+          - ruby:    "3.2"
             gemfile: rails_5_2
 
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
 
     steps:
-      - uses: actions/checkout@v2
-
-      - run: apt-get update && apt-get install -y libsqlite3-dev
+      - uses: actions/checkout@v4
 
-      - name: Cache vendor/bundle
-        uses: actions/cache@v1
-        id: cache_gem
+      - uses: ruby/setup-ruby@v1
         with:
-          path: vendor/bundle
-          key: v1-gem-${{ runner.os }}-${{ matrix.ruby }}-${{ matrix.gemfile }}-${{ github.sha }}
-          restore-keys: |
-            v1-gem-${{ runner.os }}-${{ matrix.ruby }}-${{ matrix.gemfile }}-
-        continue-on-error: ${{ matrix.allow_failures == 'true' }}
-
-      - name: bundle update
-        run: |
-          set -xe
-          bundle config path vendor/bundle
-          bundle update --jobs $(nproc) --retry 3
-        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          cache-version: ${{ matrix.gemfile }}
+
+      - run: bundle update --jobs $(nproc) --retry 3
 
       - name: Setup Code Climate Test Reporter
         uses: aktions/codeclimate-test-reporter@v1
         with:
           codeclimate-test-reporter-id: ${{ secrets.CC_TEST_REPORTER_ID }}
           command: before-build
-        if: matrix.ruby >= 'ruby:2.4'
         continue-on-error: true
 
-      - name: Run test
-        run: |
-          set -xe
-          bundle exec rspec
-        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+      - run: bundle exec rspec
 
       - name: Teardown Code Climate Test Reporter
         uses: aktions/codeclimate-test-reporter@v1
         with:
           codeclimate-test-reporter-id: ${{ secrets.CC_TEST_REPORTER_ID }}
           command: after-build
-        if: matrix.ruby >= 'ruby:2.4' && always()
+        if: always()
         continue-on-error: true
 
       - name: Slack Notification (not success)

data/.yardopts

@@ -0,0 +1,2 @@
+--markup markdown
+--no-private

data/CHANGELOG.md

@@ -1,7 +1,13 @@
 # Change Log
 
 ## Unreleased
-[full changelog](http://github.com/sue445/activerecord-simple_index_name/compare/v1.0.1...master)
+[full changelog](http://github.com/sue445/activerecord-simple_index_name/compare/v1.1.0...master)
+
+## v1.1.0
+[full changelog](http://github.com/sue445/activerecord-simple_index_name/compare/v1.0.1...v1.1.0)
+
+* Support activerecord 7.1
+  * https://github.com/sue445/activerecord-simple_index_name/pull/88
 
 ## v1.0.1
 [full changelog](http://github.com/sue445/activerecord-simple_index_name/compare/v1.0.0...v1.0.1)

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in activerecord-simple_index_name.gemspec
 gemspec
+
+eval_gemfile "./gemfiles/common.gemfile"

data/activerecord-simple_index_name.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/master/CHANGELOG.md"
+  spec.metadata["documentation_uri"] = "https://sue445.github.io/activerecord-simple_index_name/"
   spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -28,11 +29,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", ">= 5.0.0"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "coveralls_reborn"
   spec.add_development_dependency "rails"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rspec-power_assert"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "yard"
 end

data/gemfiles/common.gemfile

@@ -0,0 +1,4 @@
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.6.0")
+  # minitest v5.16.0+ requires ruby 2.6.0+
+  gem "minitest", "< 5.16.0"
+end

data/gemfiles/rails_5_0.gemfile

@@ -4,3 +4,5 @@ gem "rails", "~> 5.0.0"
 gem "sqlite3", "~> 1.3.6"
 
 gemspec path: '../'
+
+eval_gemfile "./common.gemfile"

data/gemfiles/rails_5_1.gemfile

@@ -4,3 +4,5 @@ gem "rails", "~> 5.1.0"
 gem "sqlite3", "~> 1.3.6"
 
 gemspec path: '../'
+
+eval_gemfile "./common.gemfile"

data/gemfiles/rails_5_2.gemfile

@@ -4,3 +4,5 @@ gem "rails", "~> 5.2.0"
 gem "sqlite3", "~> 1.3.6"
 
 gemspec path: '../'
+
+eval_gemfile "./common.gemfile"

data/gemfiles/rails_6_0.gemfile

@@ -6,3 +6,5 @@ gem "rails", "~> 6.0.0"
 gem "sqlite3", "~> 1.4"
 
 gemspec path: '../'
+
+eval_gemfile "./common.gemfile"

data/gemfiles/rails_6_1.gemfile

@@ -6,3 +6,5 @@ gem "rails", "~> 6.1.0"
 gem "sqlite3", "~> 1.4"
 
 gemspec path: '../'
+
+eval_gemfile "./common.gemfile"

data/gemfiles/rails_7_0.gemfile

@@ -0,0 +1,12 @@
+source "https://rubygems.org"
+
+# NOTE: Ruby 3.1 + Rails 7.0.0 doesn't work
+# c.f. https://gist.github.com/yahonda/2776d8d7b6ea7045359f38c10449937b
+gem "rails", "~> 7.0.1"
+
+# c.f. https://github.com/rails/rails/blob/v7.0.0/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L13
+gem "sqlite3", "~> 1.4"
+
+gemspec path: '../'
+
+eval_gemfile "./common.gemfile"

data/gemfiles/rails_7_1.gemfile

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 7.1.0"
+
+# c.f. https://github.com/rails/rails/blob/v7.1.0/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L14
+gem "sqlite3", "~> 1.4"
+
+gemspec path: '../'
+
+eval_gemfile "./common.gemfile"

data/lib/active_record/simple_index_name/active_record_ext.rb

@@ -1,25 +1,5 @@
-module ActiveRecord
-  module SimpleIndexName
-    module ActiveRecordExt
-      def index_name(table_name, options)
-        if ActiveRecord::SimpleIndexName.current_shorten? && Hash === options && options[:column]
-          Array.wrap(options[:column]) * "_and_"
-        else
-          super
-        end
-      end
-
-      def rename_index(table_name, old_name, new_name)
-        if ActiveRecord::SimpleIndexName.current_shorten? && old_name == new_name
-          # nop
-        else
-          super
-        end
-      end
-    end
-  end
-end
-
-ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
-  prepend ActiveRecord::SimpleIndexName::ActiveRecordExt
+if ActiveRecord.version >= Gem::Version.create("7.1.0")
+  require "active_record/simple_index_name/active_record_ext_7_1"
+else
+  require "active_record/simple_index_name/active_record_ext_7_0"
 end

data/lib/active_record/simple_index_name/active_record_ext_7_0.rb

@@ -0,0 +1,25 @@
+module ActiveRecord
+  module SimpleIndexName
+    module ActiveRecordExt_7_0
+      def index_name(table_name, options)
+        if ActiveRecord::SimpleIndexName.current_shorten? && Hash === options && options[:column]
+          Array.wrap(options[:column]) * "_and_"
+        else
+          super
+        end
+      end
+
+      def rename_index(table_name, old_name, new_name)
+        if ActiveRecord::SimpleIndexName.current_shorten? && old_name == new_name
+          # nop
+        else
+          super
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
+  prepend ActiveRecord::SimpleIndexName::ActiveRecordExt_7_0
+end

data/lib/active_record/simple_index_name/active_record_ext_7_1.rb

@@ -0,0 +1,41 @@
+module ActiveRecord
+  module SimpleIndexName
+    module ActiveRecordExt_7_1
+      module SchemaStatements
+        def generate_index_name(table_name, column)
+          if ActiveRecord::SimpleIndexName.current_shorten?
+            Array.wrap(column) * "_and_"
+          else
+            super
+          end
+        end
+
+        def rename_index(table_name, old_name, new_name)
+          if ActiveRecord::SimpleIndexName.current_shorten? && old_name == new_name
+            # nop
+          else
+            super
+          end
+        end
+      end
+
+      module V7_0
+        def legacy_index_name(table_name, options)
+          if ActiveRecord::SimpleIndexName.current_shorten? && Hash === options && options[:column]
+            Array.wrap(options[:column]) * "_and_"
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::ConnectionAdapters::SchemaStatements.class_eval do
+  prepend ActiveRecord::SimpleIndexName::ActiveRecordExt_7_1::SchemaStatements
+end
+
+ActiveRecord::Migration::Compatibility::V7_0.class_eval do
+  prepend ActiveRecord::SimpleIndexName::ActiveRecordExt_7_1::V7_0
+end

data/lib/active_record/simple_index_name/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module SimpleIndexName
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-simple_index_name
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - sue445
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2023-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-power_assert
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -158,9 +158,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/pages.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -169,13 +172,18 @@ files:
 - activerecord-simple_index_name.gemspec
 - bin/console
 - bin/setup
+- gemfiles/common.gemfile
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
 - gemfiles/rails_6_0.gemfile
 - gemfiles/rails_6_1.gemfile
+- gemfiles/rails_7_0.gemfile
+- gemfiles/rails_7_1.gemfile
 - lib/active_record/simple_index_name.rb
 - lib/active_record/simple_index_name/active_record_ext.rb
+- lib/active_record/simple_index_name/active_record_ext_7_0.rb
+- lib/active_record/simple_index_name/active_record_ext_7_1.rb
 - lib/active_record/simple_index_name/configuration.rb
 - lib/active_record/simple_index_name/disable_shorten.rb
 - lib/active_record/simple_index_name/enable_shorten.rb
@@ -190,6 +198,7 @@ metadata:
   homepage_uri: https://github.com/sue445/activerecord-simple_index_name
   source_code_uri: https://github.com/sue445/activerecord-simple_index_name
   changelog_uri: https://github.com/sue445/activerecord-simple_index_name/blob/master/CHANGELOG.md
+  documentation_uri: https://sue445.github.io/activerecord-simple_index_name/
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -206,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Shorten index name