ar-octopus 0.4.0 → 0.5.0

data/spec/support/database_connection.rb

@@ -0,0 +1,2 @@
+ActiveRecord::Base.establish_connection(:adapter => "mysql", :database => "octopus_shard_1", :username => "root", :password => "")
+ActiveRecord::Base.logger = Logger.new(File.open('database.log', 'a'))

data/spec/{database_models.rb → support/database_models.rb}

@@ -1,5 +1,15 @@
+# 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;
+
 #The user class is just sharded, not replicated
 class User < ActiveRecord::Base
+  if Octopus.rails32? || Octopus.rails31?
+    scope :thiago, {:conditions => {:name => "Thiago"}}
+  else
+    named_scope :thiago, {:conditions => {:name => "Thiago"}}
+  end
+
   def awesome_queries
     Octopus.using(:canada) do
       User.create(:name => "teste")
@@ -21,7 +31,7 @@ end
 
 #This class sets its own connection
 class CustomConnection < ActiveRecord::Base
-  octopus_establish_connection(:adapter => "mysql2", :database => "octopus_shard2", :username => "root", :password => "")
+  octopus_establish_connection(:adapter => "mysql", :database => "octopus_shard_2", :username => "root", :password => "")
 end
 
 #This items belongs to a client
@@ -73,5 +83,20 @@ end
 
 
 class Bacon < ActiveRecord::Base
-  octopus_set_table_name "yummy"
+  set_table_name "yummy"
+end
+
+class Cheese < ActiveRecord::Base
+  set_table_name { "yummy" }
+end
+
+if Octopus.rails32?
+  class Ham < ActiveRecord::Base
+    self.table_name = "yummy"
+  end
+end
+
+#This class sets its own connection
+class Advert < ActiveRecord::Base
+  establish_connection(:adapter => "postgresql", :database => "octopus_shard_1", :username => ENV["POSTGRES_USER"] || "postgres", :password => "")
 end

data/spec/support/octopus_helper.rb

@@ -0,0 +1,50 @@
+module OctopusHelper
+  def self.clean_all_shards(shards)
+    if shards.nil?
+      shards = BlankModel.using(:master).connection.instance_variable_get(:@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|
+        BlankModel.using(shard_symbol).connection.execute("DELETE FROM #{tables}")
+      end
+    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
+
+    ActiveRecord::Base.send(:class_variable_set, '@@connection_proxy', nil)
+  end
+
+  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)
+      yield
+    ensure
+      ActiveRecord::Migrator.run(: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()
+    end
+  end
+
+  def self.set_octopus_env(env)
+    Octopus.instance_variable_set(:@config, nil)
+    Octopus.stub!(:env).and_return(env)
+  end
+end

data/spec/tasks/octopus.rake_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+require "rake"
+
+describe "octopus.rake" do
+  before do
+    load File.expand_path("../../../lib/tasks/octopus.rake", __FILE__)
+    Rake::Task.define_task(:environment)
+  end
+
+  describe "octopus:copy_schema_versions" do
+    class SchemaMigration < ActiveRecord::Base; end
+
+    before do
+      Rake::Task["octopus:copy_schema_versions"].reenable
+
+      path = File.expand_path("../../migrations", __FILE__)
+      if Octopus.rails31? || Octopus.rails32?
+        ActiveRecord::Migrator.migrations_paths = [path]
+      else
+        ActiveRecord::Migrator.stub(:migrations_path => path)
+      end
+    end
+
+    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
+
+      ActiveRecord::Base.connection.shard_names.each do |shard_name|
+        Octopus.using(shard_name) { ActiveRecord::Migrator.get_all_versions }.should == [1, 2, 3]
+      end
+    end
+  end
+end

metadata

@@ -1,182 +1,184 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ar-octopus
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Thiago Pradi
 - Mike Perham
+- Gabriel Sobrinho
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-03 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2013-05-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 0
-        - 6
-        version: 3.0.6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
   type: :runtime
-  requirement: *id001
-  name: activerecord
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 0
-        - 6
-        version: 3.0.6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
   type: :runtime
-  requirement: *id002
-  name: actionpack
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 62196421
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 19
-        version: 2.0.0.beta.19
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
   type: :development
-  requirement: *id003
-  name: rspec
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :development
-  requirement: *id004
-  name: mysql2
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
-        version: 0.9.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
   type: :development
-  requirement: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+- !ruby/object:Gem::Dependency
   name: pg
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :development
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
-        version: 1.3.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
   type: :development
-  requirement: *id006
-  name: sqlite3-ruby
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id007
-  name: jeweler
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.8
   type: :development
-  requirement: *id008
-  name: actionpack
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
-  type: :runtime
-  requirement: *id009
-  name: activerecord
-description: This gem allows you to use sharded databases with ActiveRecord. this also provides a interface for replication and for running migrations with multiples shards.
-email: tchandy@gmail.com
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.8
+description: This gem allows you to use sharded databases with ActiveRecord. This
+  also provides a interface for replication and for running migrations with multiples
+  shards.
+email:
+- tchandy@gmail.com
+- mperham@gmail.com
+- gabriel.sobrinho@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.mkdn
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
 - .rspec
+- .travis.yml
+- Appraisals
 - Gemfile
-- Gemfile.lock
 - README.mkdn
 - Rakefile
 - TODO.txt
 - ar-octopus.gemspec
 - init.rb
+- lib/ar-octopus.rb
 - lib/octopus.rb
 - lib/octopus/association.rb
 - lib/octopus/association_collection.rb
@@ -187,10 +189,17 @@ files:
 - lib/octopus/proxy.rb
 - lib/octopus/rails2/association.rb
 - lib/octopus/rails2/persistence.rb
+- lib/octopus/rails2/scope.rb
+- lib/octopus/rails3.1/singular_association.rb
+- lib/octopus/rails3.2/persistence.rb
+- lib/octopus/rails3/abstract_adapter.rb
 - lib/octopus/rails3/arel.rb
-- lib/octopus/rails3/association.rb
+- lib/octopus/rails3/log_subscriber.rb
 - lib/octopus/rails3/persistence.rb
+- lib/octopus/railtie.rb
 - lib/octopus/scope_proxy.rb
+- lib/octopus/version.rb
+- lib/tasks/octopus.rake
 - rails/init.rb
 - sample_app/.gitignore
 - sample_app/.rspec
@@ -258,12 +267,11 @@ files:
 - sample_app/test/test_helper.rb
 - sample_app/vendor/plugins/.gitkeep
 - spec/config/shards.yml
-- spec/database_connection.rb
-- spec/database_models.rb
 - spec/migrations/10_create_users_using_replication.rb
 - spec/migrations/11_add_field_in_all_slaves.rb
 - spec/migrations/12_create_users_using_block.rb
 - spec/migrations/13_create_users_using_block_and_using.rb
+- spec/migrations/14_create_users_on_shards_of_a_group_with_versions.rb
 - spec/migrations/1_create_users_on_master.rb
 - spec/migrations/2_create_users_on_canada.rb
 - spec/migrations/3_create_users_on_both_shards.rb
@@ -274,58 +282,65 @@ files:
 - spec/migrations/8_raise_exception_with_invalid_group_name.rb
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
 - spec/octopus/association_spec.rb
-- spec/octopus/controller_spec.rb
+- spec/octopus/log_subscriber_spec.rb
 - spec/octopus/logger_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb
 - spec/octopus/proxy_spec.rb
-- spec/octopus/replication_specs.rb
+- spec/octopus/replication_spec.rb
 - spec/octopus/scope_proxy_spec.rb
 - spec/octopus/sharded_spec.rb
-- spec/octopus_helper.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: http://github.com/tchandy/octopus
+- spec/support/active_record/connection_adapters/modify_config_adapter.rb
+- spec/support/database_connection.rb
+- spec/support/database_models.rb
+- spec/support/octopus_helper.rb
+- spec/tasks/octopus.rake_spec.rb
+homepage: https://github.com/tchandy/octopus
 licenses: []
+post_install_message: ! 'Important: If you are upgrading from < Octopus 0.5.0 you
+  need to run:
+
+  $ rake octopus:copy_schema_versions
 
-post_install_message: 
-rdoc_options: []
 
-require_paths: 
+  Octopus now stores schema version information in each shard and migrations will
+  not work properly unless this task is invoked.'
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1814625454077145936
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1814625454077145936
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Easy Database Sharding for ActiveRecord
-test_files: 
-- spec/database_connection.rb
-- spec/database_models.rb
+test_files:
+- spec/config/shards.yml
 - spec/migrations/10_create_users_using_replication.rb
 - spec/migrations/11_add_field_in_all_slaves.rb
 - spec/migrations/12_create_users_using_block.rb
 - spec/migrations/13_create_users_using_block_and_using.rb
+- spec/migrations/14_create_users_on_shards_of_a_group_with_versions.rb
 - spec/migrations/1_create_users_on_master.rb
 - spec/migrations/2_create_users_on_canada.rb
 - spec/migrations/3_create_users_on_both_shards.rb
@@ -336,14 +351,18 @@ test_files:
 - spec/migrations/8_raise_exception_with_invalid_group_name.rb
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
 - spec/octopus/association_spec.rb
-- spec/octopus/controller_spec.rb
+- spec/octopus/log_subscriber_spec.rb
 - spec/octopus/logger_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb
 - spec/octopus/proxy_spec.rb
-- spec/octopus/replication_specs.rb
+- spec/octopus/replication_spec.rb
 - spec/octopus/scope_proxy_spec.rb
 - spec/octopus/sharded_spec.rb
-- spec/octopus_helper.rb
 - spec/spec_helper.rb
+- spec/support/active_record/connection_adapters/modify_config_adapter.rb
+- spec/support/database_connection.rb
+- spec/support/database_models.rb
+- spec/support/octopus_helper.rb
+- spec/tasks/octopus.rake_spec.rb