octoball 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79b000766e9d706b1d98717665279bfd6fd7302b6f0e55dd675658cbd5477674
-  data.tar.gz: f083a86147e3c7942fbbf042b2f82358576d9b5d2e696e2b4a872a2595eb252f
+  metadata.gz: 260d7c95bac1ba724636272cfa7ecf444124b868b2c7a3cea4d6966e0ac947a9
+  data.tar.gz: 5036fc1b1f6f5f0d7b24c734951ad6cbff0fd48eabc529a3f5390e55f2ad50d2
 SHA512:
-  metadata.gz: 0c24fa278965d1202d0905f8b37b3d42845789b6e1fe6145426c7a1760c88fec3cb380ce080d5d401b7f951c879055da557d33e3575a2cc06796d517d45dd5af
-  data.tar.gz: 7d5e45681650dcbe9aa640242a0c0c86a290e82ca095698f91a56866e527ffcbe113f91a1e764a52a5c720f6c12d210f62900091e7203cbbf9f9d3848886bc8a
+  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/lib/octoball/association.rb

@@ -5,6 +5,12 @@ class Octoball
     attr_accessor :current_shard
   end
 
+  module RelationProxyIsARelation
+    def ===(other)
+      other.is_a?(self)
+    end
+  end
+
   module ShardedCollectionAssociation
     [:writer, :ids_reader, :ids_writer, :create, :create!,
      :build, :include?, :load_target, :reload, :size, :select].each do |method|
@@ -71,6 +77,7 @@ 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)

data/lib/octoball/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Octoball
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 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.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tomoki Sekiyama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-31 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+