octoball 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0795c1883b68bebf799c031723b21cf2866a36dc7eb265050bd2109ec804d9ff'
-  data.tar.gz: a5511fa201eeb07e95531ae16d900e2cb8aea2eba7f58aeefcf7b6ee69879d5e
+  metadata.gz: bb7caa27776a9d9ab8f6136f4a82544be12783a5efb1802e9a2a0b4dfb7f2c61
+  data.tar.gz: 818225f81822a0b77d4a5bc18ffdd6a11373ae47c6142a22ef8f7de23f61dc4f
 SHA512:
-  metadata.gz: 3c8453ca9237450c52106bcfae8211f812b008ca7b2de066931980916e7d1beb7af4e7e7e97a878b0db5b32fad3cd6ac9c059319605f3a76be30bffc4091c3ed
-  data.tar.gz: 736553145f161faa71d32ab6000f3bd1fa4697b315002c64e4683e04236007a90ae21e39ef91964cf172a1451acbffbd37844800e1ca8b1e909c06b140aef776
+  metadata.gz: a8210244af4c7d1cbd92693f89bb68c6a3ed978457d51bbfa9e1d4fb5a6b6ec498649d01d0eb70eb1ba9ae0ea350f0914b05756b275381a6244011fb95f6226a
+  data.tar.gz: d19f93c68c99e8a0524f13a876f7c742715e7e8303c6d742cd4565837e13b511909312958a716bac1eb4ae22cc22b26b61ffd38c75b18831d5de8594ab9f475d

data/lib/octoball/association.rb

@@ -12,11 +12,14 @@ class Octoball
         def #{method}(*args, &block)
           shard = owner.current_shard
           return super if !shard || shard == ActiveRecord::Base.current_shard
+          ret = nil
           ActiveRecord::Base.connected_to(shard: shard, role: Octoball.current_role) do
             ret = super
             return ret unless ret.is_a?(::ActiveRecord::Relation) || ret.is_a?(::ActiveRecord::QueryMethods::WhereChain)
-            RelationProxy.new(ret, shard)
+            ret = RelationProxy.new(ret, shard)
+            nil # return nil to avoid loading relation
           end
+          ret
         end
         ruby2_keywords(:#{method}) if respond_to?(:ruby2_keywords, true)
       END

data/lib/octoball/relation_proxy.rb

@@ -62,7 +62,7 @@ class Octoball
           if mblock
             ret = #{connected_to} { @rel.to_a }.#{method}(*margs, &mblock)
           else
-            #{connected_to} { ret = @rel.#{method}(*margs, &mblock); nil } # return nil avoid loading relation
+            #{connected_to} { ret = @rel.#{method}(*margs, &mblock); nil } # return nil to avoid loading relation
           end
           #{postamble}
         EOS

data/lib/octoball/version.rb

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

metadata

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