ar-octopus 0.8.1 → 0.10.2

data/spec/octopus/sharded_spec.rb

@@ -1,13 +1,13 @@
-require "spec_helper"
+require 'spec_helper'
 
-describe "when the database is not entire sharded" do
+describe 'when the database is not entire sharded' do
   before(:each) do
-    Octopus.stub(:env).and_return("not_entire_sharded")
-    OctopusHelper.clean_connection_proxy()
+    allow(Octopus).to receive(:env).and_return('not_entire_sharded')
+    OctopusHelper.clean_connection_proxy
   end
 
-  it "should not send all queries to the specified slave" do
-    pending()
+  it 'should not send all queries to the specified slave' do
+    skip
     # User.create!(:name => "Thiago")
     #
     # using_environment :not_entire_sharded do
@@ -19,15 +19,15 @@ describe "when the database is not entire sharded" do
     # User.count.should == 2
   end
 
-  it "should pick the shard based on current_shard when you have a sharded model" do
-    Cat.create!(:name => "Thiago")
+  it 'should pick the shard based on current_shard when you have a sharded model' do
+    Cat.create!(:name => 'Thiago')
 
     OctopusHelper.using_environment :not_entire_sharded do
       Octopus.using(:russia) do
-        Cat.create!(:name => "Thiago")
+        Cat.create!(:name => 'Thiago')
       end
     end
 
-    Cat.count.should == 1
+    expect(Cat.count).to eq(1)
   end
 end

data/spec/spec_helper.rb

@@ -1,16 +1,18 @@
-require "rubygems"
-require "pry"
-require "bundler/setup"
-require "octopus"
+require 'rubygems'
+require 'pry'
+require 'bundler/setup'
+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}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  config.before(:each) do
+  config.before(:each) do |example|
     OctopusHelper.clean_all_shards(example.metadata[:shards])
   end
 end

data/spec/support/active_record/connection_adapters/modify_config_adapter.rb

@@ -4,14 +4,12 @@ module ActiveRecord
       ConnectionAdapters::ModifyConfigAdapter.new(config)
     end
   end
-  
+
   module ConnectionAdapters
     class ModifyConfigAdapter < AbstractAdapter
-      
       def initialize(config)
         config.replace(config.symbolize_keys)
       end
-      
     end
   end
 end

data/spec/support/database_connection.rb

@@ -1,4 +1,4 @@
-require "logger"
+require 'logger'
 
-ActiveRecord::Base.establish_connection(:adapter => "mysql2", :database => "octopus_shard_1", :username => "root", :password => "")
+ActiveRecord::Base.establish_connection(:adapter => 'mysql2', :database => 'octopus_shard_1', :username => "#{ENV['MYSQL_USER'] || 'root'}", :password => '')
 ActiveRecord::Base.logger = Logger.new(File.open('database.log', 'a'))

data/spec/support/database_models.rb

@@ -1,36 +1,37 @@
 # Rails 3.1 needs to do some introspection around the base class, which requires
 # the model be a descendent of ActiveRecord::Base.
-class BlankModel < ActiveRecord::Base; end;
+class BlankModel < ActiveRecord::Base; end
 
-#The user class is just sharded, not replicated
+# The user class is just sharded, not replicated
 class User < ActiveRecord::Base
-  scope :thiago, lambda { where(:name => 'Thiago') }
+  scope :thiago, -> { where(:name => 'Thiago') }
 
   def awesome_queries
     Octopus.using(:canada) do
-      User.create(:name => "teste")
+      User.create(:name => 'teste')
     end
   end
 end
 
-#The client class isn't replicated
+# The client class isn't replicated
 class Client < ActiveRecord::Base
   has_many :items
   has_many :comments, :as => :commentable
 end
 
-#This class is replicated
+# This class is replicated
 class Cat < ActiveRecord::Base
-  replicated_model()
-  #sharded_model()
+  replicated_model
+  # sharded_model()
 end
 
-#This class sets its own connection
+# This class sets its own connection
 class CustomConnection < ActiveRecord::Base
-  octopus_establish_connection(:adapter => "mysql2", :database => "octopus_shard_2", :username => "root", :password => "")
+  self.table_name = 'custom'
+  octopus_establish_connection(:adapter => 'mysql2', :database => 'octopus_shard_2', :username => "#{ENV['MYSQL_USER'] || 'root'}", :password => '')
 end
 
-#This items belongs to a client
+# This items belongs to a client
 class Item < ActiveRecord::Base
   belongs_to :client
   has_many :parts
@@ -75,24 +76,24 @@ end
 
 class Comment < ActiveRecord::Base
   belongs_to :commentable, :polymorphic => true
+  scope :open, -> { where(open: true) }
 end
 
-
 class Bacon < ActiveRecord::Base
   self.table_name = 'yummy'
 end
 
 class Cheese < ActiveRecord::Base
-  self.table_name = 'yummy' 
+  self.table_name = 'yummy'
 end
 
 class Ham < ActiveRecord::Base
   self.table_name = 'yummy'
 end
 
-#This class sets its own connection
+# This class sets its own connection
 class Advert < ActiveRecord::Base
-  establish_connection(:adapter => "postgresql", :database => "octopus_shard_1", :username => ENV["POSTGRES_USER"] || "postgres", :password => "")
+  establish_connection(:adapter => 'postgresql', :database => 'octopus_shard_1', :username => ENV['POSTGRES_USER'] || 'postgres', :password => '')
 end
 
 class MmorpgPlayer < ActiveRecord::Base
@@ -102,9 +103,9 @@ end
 
 class Weapon < ActiveRecord::Base
   belongs_to :mmorpg_player, :inverse_of => :weapons
-  validates  :hand, :uniqueness => { :scope => :mmorpg_player_id }
+  validates :hand, :uniqueness => { :scope => :mmorpg_player_id }
   validates_presence_of :mmorpg_player
-  has_many   :skills
+  has_many :skills
 end
 
 class Skill < ActiveRecord::Base

data/spec/support/octopus_helper.rb

@@ -1,55 +1,62 @@
 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|
-      ['schema_migrations', 'users', 'clients', 'cats', 'items', 'keyboards', 'computers', 'permissions_roles', 'roles', 'permissions', 'assignments', 'projects', 'programmers', "yummy", 'adverts'].each do |tables|
+      %w(schema_migrations users clients cats items keyboards computers permissions_roles roles permissions assignments projects programmers yummy adverts).each do |tables|
         BlankModel.using(shard_symbol).connection.execute("DELETE FROM #{tables}")
       end
-
       if shard_symbol == 'alone_shard'
-        ['mmorpg_players', 'weapons', 'skills'].each do |table|
+        %w(mmorpg_players weapons skills).each do |table|
           BlankModel.using(shard_symbol).connection.execute("DELETE FROM #{table}")
         end
       end
+      BlankModel.using(:master).connection.shards[shard_symbol].disconnect if Octopus.atleast_rails50?
     end
   end
 
-  def self.clean_connection_proxy()
-    Thread.current["octopus.current_model"] = nil
-    Thread.current["octopus.current_shard"] = nil
-    Thread.current["octopus.current_group"] = nil
-    Thread.current["octopus.block"] = nil
-    Thread.current["octopus.last_current_shard"] = nil
+  def self.clean_connection_proxy
+    Thread.current['octopus.current_model'] = nil
+    Thread.current['octopus.current_shard'] = nil
+    Thread.current['octopus.current_group'] = nil
+    Thread.current['octopus.current_slave_group'] = nil
+    Thread.current['octopus.block'] = nil
 
-    ActiveRecord::Base.send(:class_variable_set, '@@connection_proxy', nil)
+    ActiveRecord::Base.class_variable_set(:@@connection_proxy, nil)
   end
 
-  def self.migrating_to_version(version, &block)
+  def self.migrating_to_version(version, &_block)
     migrations_root = File.expand_path(File.join(File.dirname(__FILE__), '..', 'migrations'))
-
+    
     begin
-      ActiveRecord::Migrator.run(:up, migrations_root, version)
+      migrate_to_version(:up, migrations_root, version)
       yield
     ensure
-      ActiveRecord::Migrator.run(:down, migrations_root, version)
+      migrate_to_version(:down, migrations_root, version)
     end
   end
-
-  def self.using_environment(environment, &block)
-    begin
-      set_octopus_env(environment.to_s)
-      clean_connection_proxy()
-      yield
-    ensure
-      set_octopus_env('octopus')
-      clean_connection_proxy()
+  
+  def self.migrate_to_version(direction, root, version)
+    if Octopus.atleast_rails52?
+      migrations = ActiveRecord::MigrationContext.new(root).migrations.select {|mig| version == mig.version }
+      ActiveRecord::Migrator.new(direction, migrations, version).run
+    else 
+      ActiveRecord::Migrator.run(direction, root, version)
     end
   end
 
-  def self.set_octopus_env(env)
+  def self.using_environment(environment, &_block)
+    self.octopus_env = environment.to_s
+    clean_connection_proxy
+    yield
+  ensure
+    self.octopus_env = 'octopus'
+    clean_connection_proxy
+  end
+
+  def self.octopus_env=(env)
     Octopus.instance_variable_set(:@config, nil)
     Octopus.stub(:env).and_return(env)
   end

data/spec/support/query_count.rb

@@ -1,6 +1,5 @@
 module ActiveRecord
   class QueryCounter
-
     attr_accessor :query_count
 
     def initialize
@@ -11,9 +10,8 @@ module ActiveRecord
       lambda(&method(:callback))
     end
 
-    def callback(name, start, finish, message_id, values)
+    def callback(_name, _start, _finish, _message_id, values)
       @query_count += 1 unless %w(CACHE SCHEMA).include?(values[:name])
     end
-
   end
 end

data/spec/support/shared_contexts.rb

@@ -1,4 +1,4 @@
-shared_context "with query cache enabled" do
+shared_context 'with query cache enabled' do
   let!(:counter) { ActiveRecord::QueryCounter.new }
 
   before(:each) do
@@ -6,12 +6,12 @@ shared_context "with query cache enabled" do
     counter.query_count = 0
   end
 
-  after(:each) do 
+  after(:each) do
     ActiveRecord::Base.connection.disable_query_cache!
   end
 
   around(:each) do |example|
-    active_support_subscribed(counter.to_proc, 'sql.active_record') do 
+    active_support_subscribed(counter.to_proc, 'sql.active_record') do
       example.run
     end
   end

data/spec/tasks/octopus.rake_spec.rb

@@ -1,31 +1,31 @@
-require "spec_helper"
-require "rake"
+require 'spec_helper'
+require 'rake'
 
-describe "octopus.rake" do
+describe 'octopus.rake' do
   before do
-    load File.expand_path("../../../lib/tasks/octopus.rake", __FILE__)
+    load File.expand_path('../../../lib/tasks/octopus.rake', __FILE__)
     Rake::Task.define_task(:environment)
   end
 
-  describe "octopus:copy_schema_versions" do
+  describe 'octopus:copy_schema_versions' do
     class SchemaMigration < ActiveRecord::Base; end
 
     before do
-      Rake::Task["octopus:copy_schema_versions"].reenable
+      Rake::Task['octopus:copy_schema_versions'].reenable
 
-      path = File.expand_path("../../migrations", __FILE__)
+      path = File.expand_path('../../migrations', __FILE__)
       ActiveRecord::Migrator.migrations_paths = [path]
     end
 
-    it "assumes each shard migrated to the current master version" do
+    it 'assumes each shard migrated to the current master version' do
       SchemaMigration.create(:version => 1)
       SchemaMigration.create(:version => 2)
       SchemaMigration.create(:version => 3)
 
-      Rake::Task["octopus:copy_schema_versions"].invoke
+      Rake::Task['octopus:copy_schema_versions'].invoke
 
       ActiveRecord::Base.connection.shard_names.each do |shard_name|
-        Octopus.using(shard_name) { ActiveRecord::Migrator.get_all_versions }.should == [1, 2, 3]
+        expect(Octopus.using(shard_name) { ActiveRecord::SchemaMigration.all.pluck(:version).map(&:to_i).sort }).to eq([1, 2, 3])
       end
     end
   end