octoball 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0669e5023c27ce0b1ec2e5116331e8b9f6e5fa405e9f9ac87ea198ecc10023e4'
-  data.tar.gz: 0b222767e80de3ad53e689d0ffda6e7fe87b4ce551e3bcd2eacc6beb79b98abe
+  metadata.gz: 260d7c95bac1ba724636272cfa7ecf444124b868b2c7a3cea4d6966e0ac947a9
+  data.tar.gz: 5036fc1b1f6f5f0d7b24c734951ad6cbff0fd48eabc529a3f5390e55f2ad50d2
 SHA512:
-  metadata.gz: 9282d81935c2c736cd9d9abec4b9a5a42b595aabb64326bd77a4f74027fb12e04855bf8f7197f9abc83f24488eac3e9a64e4689ab6a275da7764999a252f812c
-  data.tar.gz: 0c00b0f6ee82aaa84278b0343b8a264f999e34eabe7d7fe96c99d6845bd56496745c5e39479a34033b8dd01fd87ab036859faeaf510e2d2a54b34ef7288f9df1
+  metadata.gz: 1d954e47f0a2603425d29e82669b9388d4f49abf7def04e268548554ee5ab52181a2b192a5ccfd34b288a67b34fd6cf8cac4d75b8304c918970f7523f3177285
+  data.tar.gz: 7b294deea783c80324d5694afd87984017411677f593d042fa9b78a35e5dba5d12584209bb36d45190c3e63d748e1a4f5096e6a6e992ef9ebfa71e7968a41c4d

data/.circleci/Gemfile

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+if RUBY_VERSION < '3.0'
+  gem 'activerecord', '~> 6.1.0'
+  gem 'activesupport', '~> 6.1.0'
+end
+
+gemspec :path => '../'

data/.circleci/config.yml

@@ -26,8 +26,9 @@ jobs:
         name: bundle install
         command: |
           gem update bundler
+          bundle config --local path ../vendor/bundle
+          bundle install --gemfile .circleci/Gemfile --jobs=4 --retry=3
           bundle config --local path vendor/bundle
-          bundle install --jobs=4 --retry=3
     - run:
         name: Setup databases
         command: bundle exec rake db:prepare
@@ -44,3 +45,4 @@ workflows:
           parameters:
             version:
             - "2.7"
+            - "3.0"

data/README.md

@@ -45,13 +45,6 @@ Currently, its implementation is focusing on horizontal database sharding. Howev
 gem "octoball"
 ```
 
-Until first release:
-```
-# Bundle edge Rails
-gem 'rails', github: 'rails/rails'
-gem 'octoball', git: 'git@github.com:aktsk/octoball'
-```
-
 Define the database connections in `config/database.yml`, e.g.:
 ```
 default: &default

data/lib/octoball/association.rb

@@ -5,24 +5,47 @@ class Octoball
     attr_accessor :current_shard
   end
 
+  module RelationProxyIsARelation
+    def ===(other)
+      other.is_a?(self)
+    end
+  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)
           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
     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,
@@ -40,7 +63,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
@@ -54,8 +77,10 @@ class Octoball
   end
 
   ::ActiveRecord::Relation.prepend(RelationCurrentShard)
+  ::ActiveRecord::Relation.singleton_class.prepend(RelationProxyIsARelation)
   ::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/current_shard_tracker.rb

@@ -19,7 +19,7 @@ class Octoball
 
       def instantiate_instance_of(klass, attributes, column_types = {}, &block)
         result = super
-        result.instance_variable_set(:@current_shard, connection.current_shard)
+        result.instance_variable_set(:@current_shard, current_shard)
         result
       end
     end

data/lib/octoball/persistence.rb

@@ -21,7 +21,7 @@ class Octoball
 
     def init_internals
       super
-      @current_shard = self.class.connection.current_shard
+      @current_shard = self.class.current_shard
     end
   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.0'
+  VERSION = '0.1.4'
 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
 

data/spec/octoball/relation_proxy_spec.rb

@@ -52,6 +52,20 @@ describe Octoball::RelationProxy do
       end
     end
 
+    context 'when a relation is used in where clause' do
+      it 'specifies the scope without a shard' do
+        client = Client.where(id: @client.id)
+        items = Item.using(:canada).where(client: client)
+        expect(items.to_a).to eq(@client.items.to_a)
+      end
+
+      it 'specifies the scope with a shard' do
+        client = Client.using(:canada).where(id: @client.id)
+        items = Item.using(:canada).where(client: client)
+        expect(items.to_a).to eq(@client.items.to_a)
+      end
+    end
+
     context 'when comparing to other Relation objects' do
       before :each do
         @relation.reset

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoball
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Tomoki Sekiyama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -116,6 +116,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/Gemfile"
 - ".circleci/config.yml"
 - ".gitignore"
 - Gemfile
@@ -167,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Octopus-like Database Sharding Helper for ActiveRecord 6.1+