ar-octopus 0.9.0 → 0.9.1

data/spec/octopus/load_balancing/round_robin_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Octopus::LoadBalancing::RoundRobin do
+  it "raises an error when no shards are given" do
+    expect do
+      Octopus::LoadBalancing::RoundRobin.new([])
+    end.to raise_error Octopus::Exception
+  end
+
+  it "does not raise an error if slaves given" do
+    expect do
+      Octopus::LoadBalancing::RoundRobin.new([:stub])
+    end.to_not raise_error Octopus::Exception
+  end
+end

data/spec/octopus/log_subscriber_spec.rb

@@ -9,7 +9,7 @@ describe Octopus::LogSubscriber, :shards => [:canada] do
   end
 
   after :each do
-    ActiveRecord::Base.logger = nil
+    ActiveRecord::Base.logger = Logger.new(File.open('database.log', 'a'))
   end
 
   it 'should add to the default logger the shard name the query was sent to' do

data/spec/octopus/model_spec.rb

@@ -90,7 +90,7 @@ describe Octopus::Model do
         Octopus.using(:canada) do
           fail 'Some Exception'
         end
-      end.to raise_error
+      end.to raise_error(RuntimeError)
 
       expect(ActiveRecord::Base.connection.current_shard).to eq(:master)
     end
@@ -103,7 +103,7 @@ describe Octopus::Model do
           Octopus.using(:canada) do
             fail 'Some Exception'
           end
-        end.to raise_error
+        end.to raise_error(RuntimeError)
 
         expect(ActiveRecord::Base.connection.current_shard).to eq(:brazil)
         Octopus.config[:master_shard] = nil
@@ -476,6 +476,34 @@ describe Octopus::Model do
       expect(User.using(:master).count).to eq(1)
     end
 
+    describe "#finder methods" do
+      before(:each) do
+        @user1 = User.using(:brazil).create!(:name => 'User1')
+        @user2 = User.using(:brazil).create!(:name => 'User2')
+        @user3 = User.using(:brazil).create!(:name => 'User3')
+      end
+
+      it "#find_each should work" do
+        result_array = []
+
+        User.using(:brazil).where("name is not NULL").find_each do |user|
+          result_array << user
+        end
+
+        expect(result_array).to eq([@user1, @user2, @user3])
+      end
+
+      it "#find_in_batches, should work" do
+        result_array = []
+
+        User.using(:brazil).where("name is not NULL").find_in_batches(batch_size: 1) do |user|
+          result_array << user
+        end
+
+        expect(result_array).to eq([[@user1], [@user2], [@user3]])
+      end
+    end
+
     describe 'deleting a record' do
       before(:each) do
         @user = User.using(:brazil).create!(:name => 'User1')
@@ -665,20 +693,21 @@ describe Octopus::Model do
     it 'should work correctly when using validations' do
       @key = Keyboard.create!(:name => 'Key')
       expect { Keyboard.using(:brazil).create!(:name => 'Key') }.not_to raise_error
-      expect { Keyboard.create!(:name => 'Key') }.to raise_error
+      expect { Keyboard.create!(:name => 'Key') }.to raise_error(ActiveRecord::RecordInvalid)
     end
 
     it 'should work correctly when using validations with using syntax' do
       @key = Keyboard.using(:brazil).create!(:name => 'Key')
       expect { Keyboard.create!(:name => 'Key') }.not_to raise_error
-      expect { Keyboard.using(:brazil).create!(:name => 'Key') }.to raise_error
+      expect { Keyboard.using(:brazil).create!(:name => 'Key') }
+        .to raise_error(ActiveRecord::RecordInvalid)
     end
   end
 
   describe '#replicated_model method' do
     it 'should be replicated' do
       OctopusHelper.using_environment :production_replicated do
-        expect(ActiveRecord::Base.connection_proxy.instance_variable_get(:@replicated)).to be true
+        expect(ActiveRecord::Base.connection_proxy.replicated).to be true
       end
     end
 

data/spec/octopus/octopus_spec.rb

@@ -37,7 +37,7 @@ describe Octopus, :shards => [] do
     end
 
     it 'should permit users to configure shards on initializer files, instead of on a yml file.' do
-      expect { User.using(:crazy_shard).create!(:name => 'Joaquim') }.to raise_error
+      expect { User.using(:crazy_shard).create!(:name => 'Joaquim') }.to raise_error(RuntimeError)
 
       Octopus.setup do |config|
         config.shards = { :crazy_shard => { :adapter => 'mysql2', :database => 'octopus_shard_5', :username => 'root', :password => '' } }

data/spec/octopus/proxy_spec.rb

@@ -6,10 +6,10 @@ describe Octopus::Proxy do
   describe 'creating a new instance', :shards => [] do
     it 'should initialize all shards and groups' do
       # FIXME: Don't test implementation details
-      expect(proxy.instance_variable_get(:@shards)).to include('canada', 'brazil', 'master', 'sqlite_shard', 'russia', 'alone_shard',
+      expect(proxy.shards).to include('canada', 'brazil', 'master', 'sqlite_shard', 'russia', 'alone_shard',
                                                                'aug2009', 'postgresql_shard', 'aug2010', 'aug2011')
 
-      expect(proxy.instance_variable_get(:@shards)).to include('protocol_shard')
+      expect(proxy.shards).to include('protocol_shard')
 
       expect(proxy.has_group?('country_shards')).to be true
       expect(proxy.shards_for_group('country_shards')).to include(:canada, :brazil, :russia)
@@ -23,23 +23,17 @@ describe Octopus::Proxy do
     end
 
     it 'should initialize replicated attribute as false' do
-      expect(proxy.instance_variable_get(:@replicated)).to be_falsey
+      expect(proxy.replicated).to be_falsey
     end
 
-    it 'should work with thiking sphinx' do
-      config = proxy.instance_variable_get(:@config)
+    it 'should work with thinking sphinx' do
+      config = proxy.config
       expect(config[:adapter]).to eq('mysql2')
       expect(config[:database]).to eq('octopus_shard_1')
       expect(config[:username]).to eq('root')
     end
 
-    it 'should create a set with all adapters, to ensure that is needed to clean the table name.' do
-      adapters = proxy.instance_variable_get(:@adapters)
-      expect(adapters).to be_kind_of(Set)
-      expect(adapters.to_a).to match_array(%w(sqlite3 mysql2 postgresql))
-    end
-
-    unless Octopus.rails5?
+    unless Octopus.rails50? || Octopus.rails51?
       it 'should respond correctly to respond_to?(:pk_and_sequence_for)' do
         expect(proxy.respond_to?(:pk_and_sequence_for)).to be true
       end
@@ -63,22 +57,6 @@ describe Octopus::Proxy do
       end
     end
 
-    describe '#should_clean_table_name?' do
-      it 'should return true when you have a environment with multiple database types' do
-        expect(proxy.should_clean_table_name?).to be true
-      end
-
-      context 'when using a environment with a single table name' do
-        before(:each) do
-          OctopusHelper.octopus_env = 'production_replicated'
-        end
-
-        it 'should return false' do
-          expect(proxy.should_clean_table_name?).to be false
-        end
-      end
-    end
-
     describe 'should raise error if you have duplicated shard names' do
       before(:each) do
         OctopusHelper.octopus_env = 'production_raise_error'
@@ -95,11 +73,11 @@ describe Octopus::Proxy do
       end
 
       it 'should initialize just the master shard' do
-        expect(proxy.instance_variable_get(:@shards).keys).to eq(['master'])
+        expect(proxy.shards.keys).to eq(['master'])
       end
 
       it 'should not initialize replication' do
-        expect(proxy.instance_variable_get(:@replicated)).to be_nil
+        expect(proxy.replicated).to be_nil
       end
     end
   end
@@ -110,11 +88,11 @@ describe Octopus::Proxy do
     end
 
     it 'should have the replicated attribute as true' do
-      expect(proxy.instance_variable_get(:@replicated)).to be true
+      expect(proxy.replicated).to be true
     end
 
     it 'should initialize the list of shards' do
-      expect(proxy.instance_variable_get(:@slaves_list)).to eq(%w(slave1 slave2 slave3 slave4))
+      expect(proxy.slaves_list).to eq(%w(slave1 slave2 slave3 slave4))
     end
   end
 
@@ -137,7 +115,7 @@ describe Octopus::Proxy do
       Octopus.instance_variable_set(:@environments, nil)
       Octopus.config
 
-      expect(proxy.instance_variable_get(:@replicated)).to be true
+      expect(proxy.replicated).to be true
       expect(Octopus.environments).to eq(%w(staging production))
     end
 
@@ -147,7 +125,7 @@ describe Octopus::Proxy do
       Octopus.instance_variable_set(:@environments, nil)
       Octopus.config
 
-      expect(proxy.instance_variable_get(:@shards).keys.to_set).to eq(Set.new(%w(slave1 slave2 master)))
+      expect(proxy.shards.keys.to_set).to eq(Set.new(%w(slave1 slave2 master)))
     end
 
     it 'should initialize correctly the shard octopus_shard value for logging' do
@@ -156,7 +134,7 @@ describe Octopus::Proxy do
       Octopus.instance_variable_set(:@environments, nil)
       Octopus.config
 
-      expect(proxy.instance_variable_get(:@shards)['slave1'].spec.config).to have_key :octopus_shard
+      expect(proxy.shards['slave1'].spec.config).to have_key :octopus_shard
     end
 
     it 'should initialize correctly the shards for the production environment' do
@@ -165,7 +143,7 @@ describe Octopus::Proxy do
       Octopus.instance_variable_set(:@environments, nil)
       Octopus.config
 
-      expect(proxy.instance_variable_get(:@shards).keys.to_set).to eq(Set.new(%w(slave3 slave4 master)))
+      expect(proxy.shards.keys.to_set).to eq(Set.new(%w(slave3 slave4 master)))
     end
 
     describe 'using the master connection', :shards => [:russia, :master]  do
@@ -234,12 +212,12 @@ describe Octopus::Proxy do
 
     describe 'should return the connection based on shard_name' do
       it 'when current_shard is empty' do
-        expect(proxy.select_connection).to eq(proxy.instance_variable_get(:@shards)[:master].connection)
+        expect(proxy.select_connection).to eq(proxy.shards[:master].connection)
       end
 
       it 'when current_shard is a single shard' do
         proxy.current_shard = :canada
-        expect(proxy.select_connection).to eq(proxy.instance_variable_get(:@shards)[:canada].connection)
+        expect(proxy.select_connection).to eq(proxy.shards[:canada].connection)
       end
     end
   end

data/spec/octopus/relation_proxy_spec.rb

@@ -38,6 +38,10 @@ describe Octopus::RelationProxy do
       end
     end
 
+    it "can deliver methods in ActiveRecord::Batches correctly" do
+      expect { @relation.find_each(&:inspect) }.not_to raise_error
+    end
+
     context 'under Rails 4' do
       it 'is an Octopus::RelationProxy' do
         expect{@relation.ar_relation}.not_to raise_error

data/spec/octopus/replication_spec.rb

@@ -42,7 +42,11 @@ describe 'when the database is replicated' do
           expect(Cat.find(cat3.id).id).to eq(cat3.id)
           expect(Cat.find(cat3.id).id).to eq(cat3.id)
 
-          expect(counter.query_count).to eq(14)
+          # Rails 5.1 count the cached queries as regular queries.
+          # TODO: How we can verify if the queries are using cache on Rails 5.1? - @thiagopradi
+          expected_records = Octopus.rails51? ? 19 : 14
+
+          expect(counter.query_count).to eq(expected_records)
         end
       end
     end

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ require 'octopus'
 
 Octopus.instance_variable_set(:@directory, File.dirname(__FILE__))
 
+BaseOctopusMigrationClass = (Octopus.rails4? ? ActiveRecord::Migration : ActiveRecord::Migration[ActiveRecord::VERSION::STRING[0..2]])
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/spec/support/octopus_helper.rb

@@ -1,7 +1,7 @@
 module OctopusHelper
   def self.clean_all_shards(shards)
     if shards.nil?
-      shards = BlankModel.using(:master).connection.instance_variable_get(:@shards).keys
+      shards = BlankModel.using(:master).connection.shards.keys
     end
 
     shards.each do |shard_symbol|
@@ -23,7 +23,6 @@ module OctopusHelper
     Thread.current['octopus.current_group'] = nil
     Thread.current['octopus.current_slave_group'] = nil
     Thread.current['octopus.block'] = nil
-    Thread.current['octopus.last_current_shard'] = nil
 
     ActiveRecord::Base.class_variable_set(:@@connection_proxy, nil)
   end

data/spec/tasks/octopus.rake_spec.rb

@@ -24,10 +24,8 @@ describe 'octopus.rake' do
 
       Rake::Task['octopus:copy_schema_versions'].invoke
 
-      # Skip SQLite shard for now - not sure why this test is failing.
-      # TODO - Verify this test in the future.
-      ActiveRecord::Base.connection.shard_names.reject { |sh_name| sh_name == 'sqlite_shard' }.each do |shard_name|
-        expect(Octopus.using(shard_name) { ActiveRecord::Migrator.get_all_versions }).to eq([1, 2, 3])
+      ActiveRecord::Base.connection.shard_names.each do |shard_name|
+        expect(Octopus.using(shard_name) { ActiveRecord::SchemaMigration.all.pluck(:version).map(&:to_i).sort }).to eq([1, 2, 3])
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-octopus
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Thiago Pradi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2017-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -167,7 +167,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".ruby-version"
 - ".travis.yml"
 - Appraisals
 - Gemfile
@@ -179,7 +178,7 @@ files:
 - gemfiles/rails41.gemfile
 - gemfiles/rails42.gemfile
 - gemfiles/rails5.gemfile
-- init.rb
+- gemfiles/rails51.gemfile
 - lib/ar-octopus.rb
 - lib/octopus.rb
 - lib/octopus/abstract_adapter.rb
@@ -197,6 +196,7 @@ files:
 - lib/octopus/model.rb
 - lib/octopus/persistence.rb
 - lib/octopus/proxy.rb
+- lib/octopus/proxy_config.rb
 - lib/octopus/railtie.rb
 - lib/octopus/relation_proxy.rb
 - lib/octopus/scope_proxy.rb
@@ -207,7 +207,6 @@ files:
 - lib/octopus/slave_group.rb
 - lib/octopus/version.rb
 - lib/tasks/octopus.rake
-- rails/init.rb
 - sample_app/.gitignore
 - sample_app/.rspec
 - sample_app/Gemfile
@@ -301,6 +300,7 @@ files:
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
 - spec/octopus/association_shard_tracking_spec.rb
 - spec/octopus/collection_proxy_spec.rb
+- spec/octopus/load_balancing/round_robin_spec.rb
 - spec/octopus/log_subscriber_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb
@@ -344,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easy Database Sharding for ActiveRecord
@@ -367,6 +367,7 @@ test_files:
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
 - spec/octopus/association_shard_tracking_spec.rb
 - spec/octopus/collection_proxy_spec.rb
+- spec/octopus/load_balancing/round_robin_spec.rb
 - spec/octopus/log_subscriber_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb

data/.ruby-version

@@ -1 +0,0 @@
-2.1.5

data/init.rb

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), 'rails', 'init')

data/rails/init.rb

@@ -1 +0,0 @@
-require 'octopus'