dekiru 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0f03d8577117755bdd83832d5385e841f9b9062ed9280ff113126678fe246b4
-  data.tar.gz: 6b1b4051c93f6fbacdf95feb0d5f89daafaf4b86ee8c871d8d35dd4c86e9aea7
+  metadata.gz: 69be6523ac8efcf2cfd2d1ffe1f076af877e66cf71a49ee8bd657764d6bed300
+  data.tar.gz: 2084793dd23ab85c1ad750f86957f99c914ff479e1fc0715e0bd8c16a2808032
 SHA512:
-  metadata.gz: 15bd327a6571a4d56c7f0ea1fb3931c517496b02003f709a7185e052abb42fc66e5555eec0ba8fa3824cc4f64b4ab3e234517d5615f8287e97e6c6b30aa21a53
-  data.tar.gz: adc18f216af47e11d68daaeb86304a6e0d00351a019bdc516ce14afa89b6e69338248c6c7a29aef7c610cf1ab69945dae7653e107c662f50f57ae9a80f2c6c9f
+  metadata.gz: 7c1f0b0d3d2035149fdc21d07402a586bfe354920622ecbdf083cc48210be8c0811a1fe436d453e6f1475c64982c2dbb20af7893e49924a41c1028cb125e411e
+  data.tar.gz: d1abc1daa96ca6c3c3ecf936bb46101387926bca31cd628e0286ee508d627b83e140b67ac4883f064422b054b6b71457e431366cf664eeb06ab23c8b94b792ef

data/.github/workflows/rspec.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.0", "3.1", "3.2"]
+        ruby: ["3.1", "3.2", "3.3"]
     steps:
       - uses: actions/checkout@v4
 

data/dekiru.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Dekiru::VERSION
 
-  gem.required_ruby_version = '>= 3.0.0'
+  gem.required_ruby_version = '>= 3.1.0'
 
-  gem.add_dependency 'rails', '>= 6.1'
+  gem.add_dependency 'rails', '>= 7.0'
   gem.add_dependency 'ruby-progressbar'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/lib/dekiru/tasks/db.rake

@@ -2,13 +2,13 @@ namespace :db do
   namespace :migrate do
     desc 'Check migrate conflict'
     task check_conflict: :environment do
-      migrations_status =
-        if ActiveRecord::Base.connection.respond_to?(:migration_context)
-          ActiveRecord::Base.connection.migration_context.current_version.zero? ? [] : ActiveRecord::Base.connection.migration_context.migrations_status
-        else
-          paths = ActiveRecord::Tasks::DatabaseTasks.migrations_paths
-          ActiveRecord::Migrator.migrations_status(paths)
-        end
+      migration_context =
+          if ActiveRecord::Base.connection_pool.respond_to?(:migration_context)
+            ActiveRecord::Base.connection_pool.migration_context
+          else
+            ActiveRecord::Base.connection.migration_context
+          end
+      migrations_status = migration_context.current_version.zero? ? [] : migration_context.migrations_status
 
       if migrations_status.map(&:third).any? { |name| name.include?('NO FILE') }
         abort 'Migration conflict!'

data/lib/dekiru/version.rb

@@ -1,3 +1,3 @@
 module Dekiru
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/dekiru.rb

@@ -1,7 +1,6 @@
 require 'dekiru/version'
 require 'dekiru/railtie' if defined?(::Rails)
 require 'dekiru/helper'
-require 'dekiru/validators/existence'
 require 'dekiru/data_migration_operator'
 require 'dekiru/mail_security_interceptor'
 require 'dekiru/camelize_hash'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dekiru
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Akihiro Matsumura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-19 00:00:00.000000000 Z
+date: 2024-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,6 @@ files:
 - lib/dekiru/railtie.rb
 - lib/dekiru/task_with_logger.rb
 - lib/dekiru/tasks/db.rake
-- lib/dekiru/validators/existence.rb
 - lib/dekiru/version.rb
 - lib/generators/maintenance_script/USAGE
 - lib/generators/maintenance_script/maintenance_script_generator.rb
@@ -147,7 +146,6 @@ files:
 - spec/dekiru/camelize_hash_spec.rb
 - spec/dekiru/data_migration_operator_spec.rb
 - spec/dekiru/mail_security_interceptor_spec.rb
-- spec/dekiru/validators/existence_spec.rb
 - spec/spec_helper.rb
 - spec/supports/action_mailer.rb
 - spec/supports/mock_active_record.rb
@@ -165,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -180,7 +178,6 @@ test_files:
 - spec/dekiru/camelize_hash_spec.rb
 - spec/dekiru/data_migration_operator_spec.rb
 - spec/dekiru/mail_security_interceptor_spec.rb
-- spec/dekiru/validators/existence_spec.rb
 - spec/spec_helper.rb
 - spec/supports/action_mailer.rb
 - spec/supports/mock_active_record.rb

data/lib/dekiru/validators/existence.rb

@@ -1,27 +0,0 @@
-#   class Post < ActiveRecord::Base
-#     belongs_to :company
-#     belongs_to :user
-#     validates :user_id, presence: true, existence: { in: -> { company.users } }
-#   end
-
-module ActiveModel
-  module Validations
-    class ExistenceValidator < EachValidator
-      def validate_each(record, attribute, value)
-        ActiveSupport::Deprecation.warn('`ExistenceValidator` is deprecated and will be removed in v0.5. Please use `inclusion: { in: xx }` instead.')
-
-        unless exists?(record, value)
-          record.errors.add(attribute, :existence, **options.except(:in).merge!(value: value))
-        end
-      end
-
-      def exists?(record, value)
-        unless options[:in].respond_to?(:call)
-          raise ArgumentError, '`in` option should be proc'
-        end
-        collection = record.instance_exec(&options[:in])
-        collection.exists?(value)
-      end
-    end
-  end
-end

data/spec/dekiru/validators/existence_spec.rb

@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-describe ActiveModel::Validations::ExistenceValidator do
-  let(:user_class) do
-    Class.new do
-      def self.exists?(id)
-        %w[valid_id].member?(id)
-      end
-    end
-  end
-  let(:model_class) do
-    _options = options
-
-    Struct.new(:user_id, :users) do
-      include ActiveModel::Validations
-
-      def self.name
-        'DummyModel'
-      end
-
-      validates :user_id, existence: _options
-    end
-  end
-
-  describe 'validate' do
-    subject(:valid?) do
-      model_class.new(user_id, user_class).valid?
-    end
-
-    context 'with exists id' do
-      let(:user_id) { 'valid_id' }
-      let(:options) { { in: -> { users } } }
-
-      it { is_expected.to eq true }
-    end
-
-    context 'with exists not id' do
-      let(:user_id) { 'invalid_id' }
-      let(:options) { { in: -> { users } } }
-
-      it { is_expected.to eq false }
-    end
-
-    context 'with invalid option' do
-      let(:user_id) { 'valid_id' }
-      let(:options) { { in: user_class } }
-
-      it { expect { valid? }.to raise_error(ArgumentError) }
-    end
-  end
-end