octoball 0.1.3 → 0.1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79b000766e9d706b1d98717665279bfd6fd7302b6f0e55dd675658cbd5477674
-  data.tar.gz: f083a86147e3c7942fbbf042b2f82358576d9b5d2e696e2b4a872a2595eb252f
+  metadata.gz: 973c85322876fbc5cbe08b6500c6baa749d62c24cfa3903b33844de8db585250
+  data.tar.gz: 0a14fdace9ea1b64c14a6473d1b1064333058cf21e9ce52ebc267ec6b7a9a943
 SHA512:
-  metadata.gz: 0c24fa278965d1202d0905f8b37b3d42845789b6e1fe6145426c7a1760c88fec3cb380ce080d5d401b7f951c879055da557d33e3575a2cc06796d517d45dd5af
-  data.tar.gz: 7d5e45681650dcbe9aa640242a0c0c86a290e82ca095698f91a56866e527ffcbe113f91a1e764a52a5c720f6c12d210f62900091e7203cbbf9f9d3848886bc8a
+  metadata.gz: 8a7d59a53be55e87dc67295f4116bad650ca0c9583bc23cdad34369d39d3aa173fd0f86b328c7aa989ab498f06627c996e9235e0b9e1ec35e5d1039b0d595412
+  data.tar.gz: faa9f389bb5277d3e094c7f9146aea3688ddeb639b489655c3f4ffce726c958e2c4b47dcd984dd33ea327d17bcb0d6eec4316cd778c82ead1287fe49cc2f9d11

data/.github/Gemfile

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

data/.github/workflows/rspec.yml

@@ -0,0 +1,38 @@
+name: rspec
+on: push
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:5
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+        options: >-
+          --health-cmd "mysqladmin ping"
+          --health-interval 5s
+          --health-timeout 3s
+    strategy:
+      fail-fast: true
+      matrix:
+        ruby: ["2.7","3.0","3.1","3.2"]
+    env:
+      BUNDLE_GEMFILE: .github/Gemfile
+      MYSQL_HOST: 127.0.0.1
+      RAILS_ENV: test
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Install rake
+        run: gem install rake
+      - name: Setup database
+        run: bundle exec rake db:prepare
+      - name: run rspec
+        run: bundle exec rspec

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/connection_handling.rb

@@ -4,13 +4,15 @@ class Octoball
   module ConnectionHandlingAvoidAutoLoadProxy
     private
 
-    def swap_connection_handler(handler, &blk)
-      old_handler, ActiveRecord::Base.connection_handler = ActiveRecord::Base.connection_handler, handler
-      return_value = yield
-      return_value.load if !return_value.respond_to?(:ar_relation) && return_value.is_a?(ActiveRecord::Relation)
-      return_value
-    ensure
-      ActiveRecord::Base.connection_handler = old_handler
+    if ActiveRecord.gem_version < Gem::Version.new('7.1.0')
+      def swap_connection_handler(handler, &blk)
+        old_handler, ActiveRecord::Base.connection_handler = ActiveRecord::Base.connection_handler, handler
+        return_value = yield
+        return_value.load if !return_value.respond_to?(:ar_relation) && return_value.is_a?(ActiveRecord::Relation)
+        return_value
+      ensure
+        ActiveRecord::Base.connection_handler = old_handler
+      end
     end
   end
 

data/lib/octoball/log_subscriber.rb

@@ -12,7 +12,11 @@ class Octoball
     private
 
     def debug(progname = nil, &block)
-      conn = current_shard ? color("[Shard: #{current_shard}]", ActiveSupport::LogSubscriber::GREEN, true) : ''
+      if ActiveRecord.gem_version >= Gem::Version.new('7.1.0')
+        conn = current_shard ? color("[Shard: #{current_shard}]", ActiveSupport::LogSubscriber::GREEN, bold: true) : ''
+      else
+        conn = current_shard ? color("[Shard: #{current_shard}]", ActiveSupport::LogSubscriber::GREEN, true) : ''
+      end
       super(conn + progname.to_s, &block)
     end
   end

data/lib/octoball/using_shard.rb

@@ -0,0 +1,17 @@
+class Octoball
+  def self.using(shard, &block)
+    ActiveRecord::Base.connected_to(role: current_role, shard: shard&.to_sym, &block)
+  end
+
+  def self.current_role
+    ActiveRecord::Base.current_role || ActiveRecord::Base.writing_role
+  end
+
+  module UsingShard
+    def using(shard)
+      Octoball::RelationProxy.new(all, shard&.to_sym)
+    end
+  end
+
+  ::ActiveRecord::Base.singleton_class.prepend(UsingShard)
+end

data/lib/octoball/version.rb

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

data/lib/octoball.rb

@@ -2,29 +2,15 @@
 
 require 'active_record'
 require 'octoball/version'
-require 'octoball/relation_proxy'
-require 'octoball/connection_adapters'
-require 'octoball/connection_handling'
-require 'octoball/current_shard_tracker'
-require 'octoball/association'
-require 'octoball/association_shard_check'
-require 'octoball/persistence'
-require 'octoball/log_subscriber'
 
-class Octoball
-  def self.using(shard, &block)
-    ActiveRecord::Base.connected_to(role: current_role, shard: shard&.to_sym, &block)
-  end
-
-  def self.current_role
-    ActiveRecord::Base.current_role || ActiveRecord::Base.writing_role
-  end
-
-  module UsingShard
-    def using(shard)
-      Octoball::RelationProxy.new(all, shard&.to_sym)
-    end
-  end
-
-  ::ActiveRecord::Base.singleton_class.prepend(UsingShard)
+ActiveSupport.on_load(:active_record) do
+  require 'octoball/relation_proxy'
+  require 'octoball/connection_adapters'
+  require 'octoball/connection_handling'
+  require 'octoball/current_shard_tracker'
+  require 'octoball/association_shard_check'
+  require 'octoball/persistence'
+  require 'octoball/association'
+  require 'octoball/log_subscriber'
+  require 'octoball/using_shard'
 end

data/spec/octoball/model_spec.rb

@@ -123,7 +123,7 @@ describe Octoball do
 
     it 'should clean #current_shard from proxy when using execute' do
       User.using(:canada).connection.execute('select * from users limit 1;')
-      expect(User.connection.current_shard).to eq(:default)
+      expect(User.connection.current_shard).to eq(:master)
     end
 
     it 'should allow scoping dynamically' do
@@ -264,7 +264,7 @@ describe Octoball do
 
   describe 'AR basic methods' do
     it 'connects_to' do
-      expect(CustomConnection.connection.current_database).to eq('octoball_shard_2')
+      expect(CustomConnection.connection.current_database).to eq('octoball_shard_3')
     end
 
     it 'reuses parent model connection' do
@@ -590,7 +590,7 @@ describe Octoball do
   describe 'custom connection' do
     context 'by default' do
       it 'with plain call should use custom connection' do
-        expect(CustomConnection.connection.current_database).to eq('octoball_shard_2')
+        expect(CustomConnection.connection.current_database).to eq('octoball_shard_3')
       end
 
       it 'should use model-specific shard' do
@@ -618,7 +618,7 @@ describe Octoball do
         CustomConnection.create(:value => 'custom value')
 
         # This is what Rails, Sidekiq etc call--this normally handles all connection pools in the app
-        expect { ActiveRecord::Base.clear_active_connections! }
+        expect { ActiveRecord::Base.connection_handler.clear_active_connections! }
           .to change { CustomConnection.connection_pool.active_connection? }
 
         expect(CustomConnection.connection_pool.active_connection?).to be_falsey

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

data/spec/octoball/scope_proxy_spec.rb

@@ -39,19 +39,19 @@ describe Octoball do
     end
 
     it 'allows multiple selection by string' do
-      expect(@evan.select('id, name').first.id).to be_a(Fixnum)
+      expect(@evan.select('id, name').first.id).to be_a(Integer)
     end
 
     it 'allows multiple selection by array' do
-      expect(@evan.select(%w(id name)).first.id).to be_a(Fixnum)
+      expect(@evan.select(%w(id name)).first.id).to be_a(Integer)
     end
 
     it 'allows multiple selection by symbol' do
-      expect(@evan.select(:id, :name).first.id).to be_a(Fixnum)
+      expect(@evan.select(:id, :name).first.id).to be_a(Integer)
     end
 
     it 'allows multiple selection by string and symbol' do
-      expect(@evan.select(:id, 'name').first.id).to be_a(Fixnum)
+      expect(@evan.select(:id, 'name').first.id).to be_a(Integer)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoball
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6.1
 platform: ruby
 authors:
 - Tomoki Sekiyama
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -116,7 +116,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".github/Gemfile"
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - Gemfile
 - README.md
@@ -130,6 +131,7 @@ files:
 - lib/octoball/log_subscriber.rb
 - lib/octoball/persistence.rb
 - lib/octoball/relation_proxy.rb
+- lib/octoball/using_shard.rb
 - lib/octoball/version.rb
 - octoball.gemspec
 - spec/migration/1_test_tables.rb
@@ -152,7 +154,7 @@ homepage: https://github.com/aktsk/octoball
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -167,8 +169,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Octopus-like Database Sharding Helper for ActiveRecord 6.1+
 test_files: []

data/.circleci/config.yml

@@ -1,46 +0,0 @@
-version: 2.1
-
-executors:
-  ruby:
-    parameters:
-      version:
-        type: string
-    docker:
-    - image: circleci/ruby:<< parameters.version >>
-    - image: circleci/mysql:5
-    environment:
-    - RAILS_ENV: test
-    - MYSQL_HOST: 127.0.0.1
-
-jobs:
-  rspec:
-    parameters:
-      version:
-        type: string
-    executor:
-      name: ruby
-      version: << parameters.version >>
-    steps:
-    - checkout
-    - run:
-        name: bundle install
-        command: |
-          gem update bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs=4 --retry=3
-    - run:
-        name: Setup databases
-        command: bundle exec rake db:prepare
-    - run:
-        name: Run tests
-        command: bundle exec rspec
-
-workflows:
-  version: 2
-  rspecs:
-    jobs:
-    - rspec:
-        matrix:
-          parameters:
-            version:
-            - "2.7"