octoball 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 825cfa3ec263110a928737f918d0576459a50aa67b1f1553ab194248e0c0d41c
-  data.tar.gz: c20b43133b0afd7c324b4cd57a54204d7c716f85acb7aa55a950be80e2bcec02
+  metadata.gz: edf38b936ff98ea6c1ca5ceef00f67c33c0cf79f66cd4541999d5071b4364629
+  data.tar.gz: b6b385dbc74bdb498f94b6d61bf529cc9d89f2d2ac21b4e411db61504ae6c8b2
 SHA512:
-  metadata.gz: 0002bc390d5982cb4a968ecdd91d12234a4d495553e906c0765efc09c29111b72fd136b15bd8fbd8a3b30b8b0f6d25fb9e6b41c5138ee777e791773a5117fcc6
-  data.tar.gz: 37efcbe5015be915ae7263a03f6da3443f03b6de711389ec59c76ada5fb0ea3a786c072c358a9f27573df1741ae978ef723930bb8ea4503fa80563669b13880e
+  metadata.gz: a6bea44ca7cfb357ad35f6090f0efed3434da75924895cbab125268b4900bd7e5d7c00414c8cb256b6ecddbd6f6e42cc2bb7a06443942e506a9793e6490c2f0c
+  data.tar.gz: ab20e4a63e2744a85c75f9b9625677cd37bfd216e66f33b23de98ae8fc9a89cfd862264e5ba3ec4393e77a89e0c52cf3d756c60b1230ca15ea5d80504b469d59

data/.github/workflows/rspec.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       mysql:
-        image: mysql:5
+        image: mysql:8
         ports:
           - 3306:3306
         env:
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ruby: ["3.2", "3.3", "3.4"]
+        ruby: ["3.2", "3.3", "3.4", "4.0"]
         rails: ["7.2", "8.0", "8.1"]
     env:
       BUNDLE_GEMFILE: .github/gemfiles/rails_${{ matrix.rails }}.gemfile
@@ -25,7 +25,7 @@ jobs:
       RAILS_ENV: test
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:

data/lib/octoball/association.rb

@@ -15,7 +15,7 @@ class Octoball
     [:writer, :ids_reader, :ids_writer, :create, :create!,
      :build, :include?, :load_target, :reload, :size, :select].each do |method|
       class_eval <<-"END", __FILE__, __LINE__ + 1
-        def #{method}(*args, &block)
+        def #{method}(...)
           shard = owner.current_shard
           return super if !shard || shard == ActiveRecord::Base.current_shard
           ret = nil
@@ -27,7 +27,6 @@ class Octoball
           end
           ret
         end
-        ruby2_keywords(:#{method}) if respond_to?(:ruby2_keywords, true)
       END
     end
   end
@@ -51,13 +50,12 @@ class Octoball
      :destroy, :destroy_all, :empty?, :find, :first, :include?, :last, :length,
      :many?, :pluck, :replace, :select, :size, :sum, :to_a, :uniq].each do |method|
       class_eval <<-"END", __FILE__, __LINE__ + 1
-        def #{method}(*args, &block)
+        def #{method}(...)
           return super if !@association.owner.current_shard || @association.owner.current_shard == ActiveRecord::Base.current_shard
           ActiveRecord::Base.connected_to(shard: @association.owner.current_shard, role: Octoball.current_role) do
             super
           end
         end
-        ruby2_keywords(:#{method}) if respond_to?(:ruby2_keywords, true)
       END
     end
   end
@@ -65,13 +63,12 @@ class Octoball
   module ShardedSingularAssociation
     [:reload, :writer, :create, :create!, :build].each do |method|
       class_eval <<-"END", __FILE__, __LINE__ + 1
-        def #{method}(*args, &block)
+        def #{method}(...)
           return super if !owner.current_shard || owner.current_shard == ActiveRecord::Base.current_shard
           ActiveRecord::Base.connected_to(shard: owner.current_shard, role: Octoball.current_role) do
             super
           end
         end
-        ruby2_keywords(:#{method}) if respond_to?(:ruby2_keywords, true)
       END
     end
   end

data/lib/octoball/current_shard_tracker.rb

@@ -17,7 +17,7 @@ class Octoball
     module ClassMethods
       private
 
-      def instantiate_instance_of(klass, attributes, column_types = {}, &block)
+      def instantiate_instance_of(...)
         result = super
         result.instance_variable_set(:@current_shard, current_shard)
         result

data/lib/octoball/log_subscriber.rb

@@ -11,9 +11,9 @@ class Octoball
 
     private
 
-    def debug(progname = nil, &block)
+    def debug(progname = nil, &)
       conn = current_shard ? color("[Shard: #{current_shard}]", ActiveSupport::LogSubscriber::GREEN, bold: true) : ''
-      super(conn + progname.to_s, &block)
+      super(conn + progname.to_s, &)
     end
   end
 end

data/lib/octoball/persistence.rb

@@ -7,13 +7,12 @@ class Octoball
     [:update_columns, :increment!, :reload, :_delete_row, :_touch_row, :_update_row, :_create_record,
      :transaction, :with_transaction_returning_status].each do |method|
       class_eval <<-"END", __FILE__, __LINE__ + 1
-        def #{method}(*args, &block)
+        def #{method}(...)
           return super if !current_shard || current_shard == ActiveRecord::Base.current_shard
           ActiveRecord::Base.connected_to(shard: current_shard, role: Octoball.current_role) do
             super
           end
         end
-        ruby2_keywords(:#{method}) if respond_to?(:ruby2_keywords, true)
       END
     end
 

data/lib/octoball/relation_proxy.rb

@@ -33,26 +33,25 @@ class Octoball
     end + [:each, :map, :index_by]
     ENUM_WITH_BLOCK_METHODS = [:find, :select, :none?, :any?, :one?, :many?, :sum]
 
-    def method_missing(method, *args, &block)
+    def method_missing(method, ...)
       # raise NoMethodError unless the method is defined in @rel
-      return @rel.public_send(method, *args, &block) unless @rel.respond_to?(method)
+      return @rel.public_send(method, ...) unless @rel.respond_to?(method)
 
       preamble = <<-EOS
-        def #{method}(*margs, &mblock)
-          return @rel.#{method}(*margs, &mblock) unless @current_shard
+        def #{method}(*, **, &mblock)
+          return @rel.#{method}(*, **, &mblock) unless @current_shard
       EOS
       postamble = <<-EOS
           return ret unless ret.is_a?(::ActiveRecord::Relation) || ret.is_a?(::ActiveRecord::QueryMethods::WhereChain) || ret.is_a?(::Enumerator)
           ::Octoball::RelationProxy.new(ret, @current_shard)
         end
-        ruby2_keywords(:#{method}) if respond_to?(:ruby2_keywords, true)
       EOS
       connected_to = '::ActiveRecord::Base.connected_to(role: ::Octoball.current_role, shard: @current_shard)'
 
       if ENUM_METHODS.include?(method)
         ::Octoball::RelationProxy.class_eval <<-EOS, __FILE__, __LINE__ - 1
           #{preamble}
-          ret = #{connected_to} { @rel.to_a }.#{method}(*margs, &mblock)
+          ret = #{connected_to} { @rel.to_a }.#{method}(*, **, &mblock)
           #{postamble}
         EOS
       elsif ENUM_WITH_BLOCK_METHODS.include?(method)
@@ -60,9 +59,9 @@ class Octoball
           #{preamble}
           ret = nil
           if mblock
-            ret = #{connected_to} { @rel.to_a }.#{method}(*margs, &mblock)
+            ret = #{connected_to} { @rel.to_a }.#{method}(*, **, &mblock)
           else
-            #{connected_to} { ret = @rel.#{method}(*margs, &mblock); nil } # return nil to avoid loading relation
+            #{connected_to} { ret = @rel.#{method}(*, **, &mblock); nil } # return nil to avoid loading relation
           end
           #{postamble}
         EOS
@@ -70,14 +69,13 @@ class Octoball
         ::Octoball::RelationProxy.class_eval <<-EOS, __FILE__, __LINE__ - 1
           #{preamble}
           ret = nil
-          #{connected_to} { ret = @rel.#{method}(*margs, &mblock); nil } # return nil to avoid loading relation
+          #{connected_to} { ret = @rel.#{method}(*, **, &mblock); nil } # return nil to avoid loading relation
           #{postamble}
         EOS
       end
 
-      public_send(method, *args, &block)
+      public_send(method, ...)
     end
-    ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
 
     def inspect
       return @rel.inspect unless @current_shard

data/lib/octoball/using_shard.rb

@@ -1,6 +1,6 @@
 class Octoball
-  def self.using(shard, &block)
-    ActiveRecord::Base.connected_to(role: current_role, shard: shard&.to_sym, &block)
+  def self.using(shard, &)
+    ActiveRecord::Base.connected_to(role: current_role, shard: shard&.to_sym, &)
   end
 
   def self.current_role

data/lib/octoball/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Octoball
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octoball
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Tomoki Sekiyama
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0.dev
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Octopus-like Database Sharding Helper for ActiveRecord 6.1+
 test_files: []