octoball 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb7caa27776a9d9ab8f6136f4a82544be12783a5efb1802e9a2a0b4dfb7f2c61
-  data.tar.gz: 818225f81822a0b77d4a5bc18ffdd6a11373ae47c6142a22ef8f7de23f61dc4f
+  metadata.gz: 79b000766e9d706b1d98717665279bfd6fd7302b6f0e55dd675658cbd5477674
+  data.tar.gz: f083a86147e3c7942fbbf042b2f82358576d9b5d2e696e2b4a872a2595eb252f
 SHA512:
-  metadata.gz: a8210244af4c7d1cbd92693f89bb68c6a3ed978457d51bbfa9e1d4fb5a6b6ec498649d01d0eb70eb1ba9ae0ea350f0914b05756b275381a6244011fb95f6226a
-  data.tar.gz: d19f93c68c99e8a0524f13a876f7c742715e7e8303c6d742cd4565837e13b511909312958a716bac1eb4ae22cc22b26b61ffd38c75b18831d5de8594ab9f475d
+  metadata.gz: 0c24fa278965d1202d0905f8b37b3d42845789b6e1fe6145426c7a1760c88fec3cb380ce080d5d401b7f951c879055da557d33e3575a2cc06796d517d45dd5af
+  data.tar.gz: 7d5e45681650dcbe9aa640242a0c0c86a290e82ca095698f91a56866e527ffcbe113f91a1e764a52a5c720f6c12d210f62900091e7203cbbf9f9d3848886bc8a

data/lib/octoball/association.rb

@@ -6,7 +6,7 @@ class Octoball
   end
 
   module ShardedCollectionAssociation
-    [:reader, :writer, :ids_reader, :ids_writer, :create, :create!,
+    [: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)
@@ -26,6 +26,20 @@ class Octoball
     end
   end
 
+  module ShardedCollectionProxyCreate
+    def create(klass, association)
+      shard = association.owner.current_shard
+      return super unless shard
+      return RelationProxy.new(super, shard) if shard == ActiveRecord::Base.current_shard
+      ret = nil
+      ActiveRecord::Base.connected_to(shard: shard, role: Octoball.current_role) do
+        ret = RelationProxy.new(super, shard)
+        nil # return nil to avoid loading relation
+      end
+      ret
+    end
+  end
+
   module ShardedCollectionProxy
     [:any?, :build, :count, :create, :create!, :concat, :delete, :delete_all,
      :destroy, :destroy_all, :empty?, :find, :first, :include?, :last, :length,
@@ -43,7 +57,7 @@ class Octoball
   end
 
   module ShardedSingularAssociation
-    [:reader, :writer, :create, :create!, :build].each do |method|
+    [:reload, :writer, :create, :create!, :build].each do |method|
       class_eval <<-"END", __FILE__, __LINE__ + 1
         def #{method}(*args, &block)
           return super if !owner.current_shard || owner.current_shard == ActiveRecord::Base.current_shard
@@ -59,6 +73,7 @@ class Octoball
   ::ActiveRecord::Relation.prepend(RelationCurrentShard)
   ::ActiveRecord::QueryMethods::WhereChain.prepend(RelationCurrentShard)
   ::ActiveRecord::Associations::CollectionAssociation.prepend(ShardedCollectionAssociation)
+  ::ActiveRecord::Associations::CollectionProxy.singleton_class.prepend(ShardedCollectionProxyCreate)
   ::ActiveRecord::Associations::CollectionProxy.prepend(ShardedCollectionProxy)
   ::ActiveRecord::Associations::SingularAssociation.prepend(ShardedSingularAssociation)
 end

data/lib/octoball/version.rb

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

data/spec/octoball/association_shard_tracking_spec.rb

@@ -676,7 +676,7 @@ describe Octoball::ShardedSingularAssociation, :shards => [:brazil, :master, :ca
 
       it 'empty?' do
         expect(@brazil_client.items.empty?).to be false
-        c = Client.create!(:name => 'Client1')
+        c = Client.using(:master).create!(:name => 'Client1')
         expect(c.items.empty?).to be true
       end
 
@@ -893,7 +893,7 @@ describe Octoball::ShardedSingularAssociation, :shards => [:brazil, :master, :ca
 
       it 'empty?' do
         expect(@brazil_client.comments.empty?).to be false
-        c = Client.create!(:name => 'Client1')
+        c = Client.using(:master).create!(:name => 'Client1')
         expect(c.comments.empty?).to be true
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoball
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tomoki Sekiyama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord