activerecord-turntable 1.1.2 → 2.0.0.rc1

data/spec/config/turntable.yml

@@ -3,7 +3,8 @@ test:
     user_cluster:
       algorithm: range_bsearch
       seq:
-        connection: user_seq_1
+        user_seq:
+          connection: turntable_user_seq_test
       shards:
         - connection: user_shard_1
           less_than: 20000
@@ -15,3 +16,19 @@ test:
           less_than: 80000
         - connection: user_shard_3
           less_than: 10000000
+    event_cluster:
+      algorithm: range_bsearch
+      seq:
+        user_seq:
+          connection: turntable_user_seq_test
+      shards:
+        - connection: user_shard_4
+          less_than: 20000
+        - connection: user_shard_5
+          less_than: 40000
+        - connection: user_shard_4
+          less_than: 60000
+        - connection: user_shard_5
+          less_than: 80000
+        - connection: user_shard_6
+          less_than: 10000000

data/spec/fabricators/turntable_fabricator.rb

@@ -1,5 +1,4 @@
 # load models
-require File.expand_path(File.join(File.dirname(File.dirname(__FILE__)),'./test_models'))
 
 # Fabrication
 Fabricator(:user_status) do
@@ -11,4 +10,3 @@ Fabricator(:user) do
   nickname { Faker::Name.name }
   user_status { Fabricator(:user_status) }
 end
-

data/spec/models/card.rb

@@ -0,0 +1,3 @@
+class Card < ActiveRecord::Base
+  belongs_to :cards_user
+end

data/spec/models/cards_user.rb

@@ -0,0 +1,10 @@
+class CardsUser < ActiveRecord::Base
+  turntable :user_cluster, :user_id
+  sequencer :user_seq
+
+  belongs_to :user
+  belongs_to :card
+  has_many :cards_users_histories
+  has_many :events_users_histories
+  has_many :events_users_histories_with_foreign_shard_key, class_name: "EventsUsersHistory", foreign_shard_key: :user_id
+end

data/spec/models/cards_users_histories.rb

@@ -0,0 +1,7 @@
+class CardsUsersHistory < ActiveRecord::Base
+  turntable :user_cluster, :user_id
+  sequencer :user_seq
+
+  belongs_to :user
+  belongs_to :cards_user
+end

data/spec/models/events_users_history.rb

@@ -0,0 +1,7 @@
+class EventsUsersHistory < ActiveRecord::Base
+  turntable :event_cluster, :events_user_id
+  sequencer :user_seq
+
+  belongs_to :user
+  belongs_to :cards_user
+end

data/spec/models/user.rb

@@ -0,0 +1,7 @@
+class User < ActiveRecord::Base
+  # shard by surrogate_key
+  turntable :user_cluster, :id
+  sequencer :user_seq
+  has_one  :user_status
+  has_many :cards_users
+end

data/spec/models/user_status.rb

@@ -0,0 +1,6 @@
+class UserStatus < ActiveRecord::Base
+  # shard by other key
+  turntable :user_cluster, :user_id
+  sequencer :user_seq
+  belongs_to :user
+end

data/spec/spec_helper.rb

@@ -2,9 +2,11 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rubygems'
 require 'bundler/setup'
+require 'rspec/its'
+require 'rspec/collection_matchers'
+require 'webmock/rspec'
 
 require 'activerecord-turntable'
-require 'turntable_helper'
 
 require 'coveralls'
 Coveralls.wear!
@@ -13,14 +15,18 @@ MIGRATIONS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), 'migrations
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
+ActiveRecord::Base.configurations = YAML.load_file(File.join(File.dirname(__FILE__), 'config/database.yml'))
+ActiveRecord::Base.establish_connection(:test)
+
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  config.filter_run :focus => true
-  config.run_all_when_everything_filtered = true
+  include TurntableHelper
 
-  config.mock_framework = :rr
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
 
   config.before(:each) do
+    Dir[File.join(File.dirname(File.dirname(__FILE__)), 'spec/models/*.rb')].each { |f| require f }
   end
 end

data/spec/support/matchers/be_saved_to.rb

@@ -0,0 +1,6 @@
+RSpec::Matchers.define :be_saved_to do |shard|
+  match do |actual|
+    persisted_actual = actual.with_shard(shard) { actual.class.find(actual.id) }
+    persisted_actual && actual == persisted_actual
+  end
+end

data/spec/support/turntable_helper.rb

@@ -0,0 +1,29 @@
+require 'active_record'
+
+module TurntableHelper
+  def reload_turntable!(config_file_name = nil)
+    ActiveRecord::Base.send(:include, ActiveRecord::Turntable)
+    ActiveRecord::Base.turntable_config_file = config_file_name
+    ActiveRecord::Turntable::Config.load!(ActiveRecord::Base.turntable_config_file, :test)
+  end
+
+  def establish_connection_to(env = :test)
+    silence_warnings {
+      Object.const_set('RAILS_ENV', env.to_s)
+      Object.const_set('Rails', Object.new)
+      allow(Rails).to receive(:env) { ActiveSupport::StringInquirer.new(RAILS_ENV) }
+      ActiveRecord::Base.logger = Logger.new("/dev/null")
+    }
+    ActiveRecord::Base.establish_connection(env)
+  end
+
+  def truncate_shard
+    ActiveRecord::Base.descendants.each do |klass|
+      klass.delete_all
+    end
+  end
+
+  def migrate(version)
+    ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT, version)
+  end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - gussan
+- sue445
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sql_tree
   requirement: !ruby/object:Gem::Requirement
@@ -80,22 +81,64 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord-import
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: barrage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +152,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rr
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +180,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +222,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-import
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -234,13 +291,13 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ActiveRecord Sharding plugin
+description: ActiveRecord sharding extension
 email: 
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 - CHANGELOG.md
 files:
 - ".coveralls.yml"
@@ -252,20 +309,28 @@ files:
 - Gemfile
 - Guardfile
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - activerecord-turntable.gemspec
-- gemfiles/rails3_0.gemfile
-- gemfiles/rails3_1.gemfile
-- gemfiles/rails3_2.gemfile
+- gemfiles/rails4_0.gemfile
+- gemfiles/rails4_1.gemfile
 - lib/active_record/turntable.rb
 - lib/active_record/turntable/active_record_ext.rb
 - lib/active_record/turntable/active_record_ext/.gitkeep
 - lib/active_record/turntable/active_record_ext/abstract_adapter.rb
+- lib/active_record/turntable/active_record_ext/activerecord_import_ext.rb
+- lib/active_record/turntable/active_record_ext/acts_as_archive_extension.rb
+- lib/active_record/turntable/active_record_ext/association.rb
+- lib/active_record/turntable/active_record_ext/association_preloader.rb
 - lib/active_record/turntable/active_record_ext/clever_load.rb
+- lib/active_record/turntable/active_record_ext/connection_handler_extension.rb
+- lib/active_record/turntable/active_record_ext/database_tasks.rb
 - lib/active_record/turntable/active_record_ext/fixtures.rb
+- lib/active_record/turntable/active_record_ext/locking_optimistic.rb
 - lib/active_record/turntable/active_record_ext/log_subscriber.rb
+- lib/active_record/turntable/active_record_ext/migration_proxy.rb
 - lib/active_record/turntable/active_record_ext/persistence.rb
+- lib/active_record/turntable/active_record_ext/relation.rb
 - lib/active_record/turntable/active_record_ext/schema_dumper.rb
 - lib/active_record/turntable/active_record_ext/sequencer.rb
 - lib/active_record/turntable/active_record_ext/transactions.rb
@@ -276,7 +341,6 @@ files:
 - lib/active_record/turntable/algorithm/range_bsearch_algorithm.rb
 - lib/active_record/turntable/base.rb
 - lib/active_record/turntable/cluster.rb
-- lib/active_record/turntable/compatible.rb
 - lib/active_record/turntable/config.rb
 - lib/active_record/turntable/connection_proxy.rb
 - lib/active_record/turntable/connection_proxy/mixable.rb
@@ -292,6 +356,7 @@ files:
 - lib/active_record/turntable/mixer/fader/select_shards_merge_result.rb
 - lib/active_record/turntable/mixer/fader/specified_shard.rb
 - lib/active_record/turntable/mixer/fader/update_shards_merge_result.rb
+- lib/active_record/turntable/plugin.rb
 - lib/active_record/turntable/pool_proxy.rb
 - lib/active_record/turntable/rack.rb
 - lib/active_record/turntable/rack/connection_management.rb
@@ -301,6 +366,7 @@ files:
 - lib/active_record/turntable/seq_shard.rb
 - lib/active_record/turntable/sequencer.rb
 - lib/active_record/turntable/sequencer/api.rb
+- lib/active_record/turntable/sequencer/barrage.rb
 - lib/active_record/turntable/sequencer/mysql.rb
 - lib/active_record/turntable/shard.rb
 - lib/active_record/turntable/sql_tree_patch.rb
@@ -308,55 +374,14 @@ files:
 - lib/activerecord-turntable.rb
 - lib/generators/active_record/turntable/install_generator.rb
 - lib/generators/templates/turntable.yml
-- sample_app/.gitignore
-- sample_app/Gemfile
-- sample_app/README.rdoc
-- sample_app/Rakefile
-- sample_app/app/assets/images/rails.png
-- sample_app/app/assets/javascripts/application.js
-- sample_app/app/assets/stylesheets/application.css
-- sample_app/app/controllers/application_controller.rb
-- sample_app/app/helpers/application_helper.rb
-- sample_app/app/mailers/.gitkeep
-- sample_app/app/models/.gitkeep
-- sample_app/app/models/user.rb
-- sample_app/app/views/layouts/application.html.erb
-- sample_app/config.ru
-- sample_app/config/application.rb
-- sample_app/config/boot.rb
-- sample_app/config/database.yml
-- sample_app/config/environment.rb
-- sample_app/config/environments/development.rb
-- sample_app/config/environments/production.rb
-- sample_app/config/environments/test.rb
-- sample_app/config/initializers/backtrace_silencers.rb
-- sample_app/config/initializers/inflections.rb
-- sample_app/config/initializers/mime_types.rb
-- sample_app/config/initializers/secret_token.rb
-- sample_app/config/initializers/session_store.rb
-- sample_app/config/initializers/wrap_parameters.rb
-- sample_app/config/locales/en.yml
-- sample_app/config/routes.rb
-- sample_app/config/turntable.yml
-- sample_app/db/migrate/20120316073058_create_users.rb
-- sample_app/db/seeds.rb
-- sample_app/lib/assets/.gitkeep
-- sample_app/lib/tasks/.gitkeep
-- sample_app/log/.gitkeep
-- sample_app/public/404.html
-- sample_app/public/422.html
-- sample_app/public/500.html
-- sample_app/public/favicon.ico
-- sample_app/public/index.html
-- sample_app/public/robots.txt
-- sample_app/script/rails
-- sample_app/vendor/assets/javascripts/.gitkeep
-- sample_app/vendor/assets/stylesheets/.gitkeep
-- sample_app/vendor/plugins/.gitkeep
 - script/performance/algorithm
+- spec/active_record/turntable/active_record_ext/association_preloader_spec.rb
+- spec/active_record/turntable/active_record_ext/association_spec.rb
 - spec/active_record/turntable/active_record_ext/clever_load_spec.rb
+- spec/active_record/turntable/active_record_ext/locking_optimistic_spec.rb
 - spec/active_record/turntable/active_record_ext/persistence_spec.rb
 - spec/active_record/turntable/algorithm/range_algorithm_spec.rb
+- spec/active_record/turntable/algorithm/range_bsearch_algorithm_spec.rb
 - spec/active_record/turntable/algorithm_spec.rb
 - spec/active_record/turntable/base_spec.rb
 - spec/active_record/turntable/cluster_spec.rb
@@ -365,7 +390,12 @@ files:
 - spec/active_record/turntable/finder_spec.rb
 - spec/active_record/turntable/mixer/fader_spec.rb
 - spec/active_record/turntable/mixer_spec.rb
+- spec/active_record/turntable/rack/query_cache_spec.rb
+- spec/active_record/turntable/sequencer/api_spec.rb
+- spec/active_record/turntable/sequencer/barrage_spec.rb
+- spec/active_record/turntable/sequencer/mysql_spec.rb
 - spec/active_record/turntable/shard_spec.rb
+- spec/active_record/turntable/transaction_spec.rb
 - spec/active_record/turntable_spec.rb
 - spec/config/database.yml
 - spec/config/turntable.yml
@@ -376,9 +406,15 @@ files:
 - spec/migrations/002_create_user_statuses.rb
 - spec/migrations/003_create_cards.rb
 - spec/migrations/004_create_cards_users.rb
+- spec/models/card.rb
+- spec/models/cards_user.rb
+- spec/models/cards_users_histories.rb
+- spec/models/events_users_history.rb
+- spec/models/user.rb
+- spec/models/user_status.rb
 - spec/spec_helper.rb
-- spec/test_models.rb
-- spec/turntable_helper.rb
+- spec/support/matchers/be_saved_to.rb
+- spec/support/turntable_helper.rb
 homepage: https://github.com/drecom/activerecord-turntable
 licenses:
 - MIT
@@ -394,19 +430,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: activerecord-turntable
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: ActiveRecord Sharding plugin
+summary: ActiveRecord sharding extension
 test_files:
+- spec/active_record/turntable/active_record_ext/association_preloader_spec.rb
+- spec/active_record/turntable/active_record_ext/association_spec.rb
 - spec/active_record/turntable/active_record_ext/clever_load_spec.rb
+- spec/active_record/turntable/active_record_ext/locking_optimistic_spec.rb
 - spec/active_record/turntable/active_record_ext/persistence_spec.rb
 - spec/active_record/turntable/algorithm/range_algorithm_spec.rb
+- spec/active_record/turntable/algorithm/range_bsearch_algorithm_spec.rb
 - spec/active_record/turntable/algorithm_spec.rb
 - spec/active_record/turntable/base_spec.rb
 - spec/active_record/turntable/cluster_spec.rb
@@ -415,7 +455,12 @@ test_files:
 - spec/active_record/turntable/finder_spec.rb
 - spec/active_record/turntable/mixer/fader_spec.rb
 - spec/active_record/turntable/mixer_spec.rb
+- spec/active_record/turntable/rack/query_cache_spec.rb
+- spec/active_record/turntable/sequencer/api_spec.rb
+- spec/active_record/turntable/sequencer/barrage_spec.rb
+- spec/active_record/turntable/sequencer/mysql_spec.rb
 - spec/active_record/turntable/shard_spec.rb
+- spec/active_record/turntable/transaction_spec.rb
 - spec/active_record/turntable_spec.rb
 - spec/config/database.yml
 - spec/config/turntable.yml
@@ -426,7 +471,12 @@ test_files:
 - spec/migrations/002_create_user_statuses.rb
 - spec/migrations/003_create_cards.rb
 - spec/migrations/004_create_cards_users.rb
+- spec/models/card.rb
+- spec/models/cards_user.rb
+- spec/models/cards_users_histories.rb
+- spec/models/events_users_history.rb
+- spec/models/user.rb
+- spec/models/user_status.rb
 - spec/spec_helper.rb
-- spec/test_models.rb
-- spec/turntable_helper.rb
-has_rdoc: 
+- spec/support/matchers/be_saved_to.rb
+- spec/support/turntable_helper.rb