activerecord-turntable 1.0.0 → 1.0.1

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+gemfile:
+  - gemfiles/rails3_0.gemfile
+  - gemfiles/rails3_1.gemfile
+  - gemfiles/rails3_2.gemfile
+before_script:
+  - bundle exec rake turntable:db:reset
+script: bundle exec rake spec
+

data/README.rdoc

@@ -1,4 +1,4 @@
-= ActiveRecord::Turntable
+= ActiveRecord::Turntable {<img src="https://secure.travis-ci.org/drecom/activerecord-turntable.png" />}[http://travis-ci.org/drecom/activerecord-turntable]
 
 ActiveRecord::Turntable is a database sharding extension for ActiveRecord.
 
@@ -26,10 +26,10 @@ generator creates Rails.root/config/turntable.yml
 
 == ActiveRecord::Turntable terms
 
-*Shard
-*Cluster - a cluster of shards.
-*Master - default ActiveRecord::Base's connection
-*Sequencer - a module that creates global sequence number
+* Shard
+* Cluster - a cluster of shards.
+* Master - default ActiveRecord::Base's connection
+* Sequencer - a module that creates global sequence number
 
 == Example
 
@@ -57,6 +57,8 @@ example turntable.yml:
       clusters:
         user_cluster: # <-- cluster name
           algorithm: range # <-- only range or range_bsearch sharding is supported currently.
+          seq:
+            connection: user_seq_1
           shards:
             - connection: user_shard_1 # <-- shard name
               less_than: 100           # <-- shard range(like mysql partitioning)
@@ -267,7 +269,9 @@ To use turntable's ConnectionManagement middleware, add below line to your initi
 == Thanks to
 ConnectionProxy, Distributed Migration implementation is inspired by Octopus and DataFabric.
 
-== LICENSE
+== License
+activerecord-turntable is released under the MIT license:
+
 Copyright (c) 2012 Drecom Co.,Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining

data/Rakefile

@@ -24,7 +24,11 @@ namespace :turntable do
     task :create => :load_config do
       database_configs = [ActiveRecord::Base.configurations[RAILS_ENV]] + ActiveRecord::Base.configurations[RAILS_ENV]["shards"].values + ActiveRecord::Base.configurations[RAILS_ENV]["seq"].values
       database_configs.each do |dbconf|
-        %x{ echo "CREATE DATABASE #{dbconf["database"]}" | mysql -u #{dbconf["username"]} -p#{dbconf["password"]} -h #{dbconf["host"]} }
+        command = "mysql "
+        command << "-u #{dbconf["username"]} " if dbconf["username"]
+        command << "-p#{dbconf["password"]} " if dbconf["password"]
+        command << "-h #{dbconf["host"]}" if dbconf["host"]
+        %x{ echo "CREATE DATABASE #{dbconf["database"]}" | #{command} }
       end
     end
 
@@ -33,7 +37,7 @@ namespace :turntable do
       ActiveRecord::Base.establish_connection RAILS_ENV
       require 'active_record/turntable'
       ActiveRecord::Base.send(:include, ActiveRecord::Turntable)
-      ActiveRecord::ConnectionAdapters::SchemaStatements.send(:include, Turntable::Migration::SchemaStatementsExt)
+      ActiveRecord::ConnectionAdapters::SchemaStatements.send(:include, ActiveRecord::Turntable::Migration::SchemaStatementsExt)
       database_configs = [ActiveRecord::Base.configurations[RAILS_ENV]] + ActiveRecord::Base.configurations[RAILS_ENV]["shards"].values + ActiveRecord::Base.configurations[RAILS_ENV]["seq"].values
 
       database_configs.each do |dbconf|
@@ -92,7 +96,11 @@ namespace :turntable do
     task :drop => :load_config do
       database_configs = [ActiveRecord::Base.configurations[RAILS_ENV]] + ActiveRecord::Base.configurations[RAILS_ENV]["shards"].values + ActiveRecord::Base.configurations[RAILS_ENV]["seq"].values
       database_configs.each do |dbconf|
-        %x{ echo "DROP DATABASE #{dbconf["database"]}" | mysql -u #{dbconf["username"]} -p#{dbconf["password"]} -h #{dbconf["host"]} }
+        command = "mysql "
+        command << "-u #{dbconf["username"]} " if dbconf["username"]
+        command << "-p#{dbconf["password"]} " if dbconf["password"]
+        command << "-h #{dbconf["host"]}" if dbconf["host"]
+        %x{ echo "DROP DATABASE #{dbconf["database"]}" | #{command} }
       end
     end
 

data/gemfiles/rails3_0.gemfile

@@ -0,0 +1,22 @@
+source :rubygems
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+
+gem 'activerecord', "~> 3.0.0"
+gem 'activesupport', "~> 3.0.0"
+gem "sql_tree", "=0.2.0"
+gem "bsearch", "~>1.5"
+gem "httpclient"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development, :test do
+  gem "rake", "~>0.9.2"
+  gem "rspec"
+  gem "rr"
+  gem "mysql2", "< 0.3"
+  gem "fabrication"
+  gem "faker"
+  gem "activerecord-import"
+end

data/gemfiles/rails3_1.gemfile

@@ -0,0 +1,22 @@
+source :rubygems
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+
+gem 'activerecord', "~> 3.1.0"
+gem 'activesupport', "~> 3.1.0"
+gem "sql_tree", "=0.2.0"
+gem "bsearch", "~>1.5"
+gem "httpclient"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development, :test do
+  gem "rake", "~>0.9.2"
+  gem "rspec"
+  gem "rr"
+  gem "mysql2"
+  gem "fabrication"
+  gem "faker"
+  gem "activerecord-import"
+end

data/gemfiles/rails3_2.gemfile

@@ -0,0 +1,22 @@
+source :rubygems
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+
+gem 'activerecord', "~> 3.2.0"
+gem 'activesupport', "~> 3.2.0"
+gem "sql_tree", "=0.2.0"
+gem "bsearch", "~>1.5"
+gem "httpclient"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development, :test do
+  gem "rake", "~>0.9.2"
+  gem "rspec"
+  gem "rr"
+  gem "mysql2"
+  gem "fabrication"
+  gem "faker"
+  gem "activerecord-import"
+end

data/lib/active_record/turntable/base.rb

@@ -77,7 +77,7 @@ module ActiveRecord::Turntable
           raise "Please install the #{config['adapter']} adapter: `gem install activerecord-#{config['adapter']}-adapter` (#{e})"
         end
         adapter_method = "#{config['adapter']}_connection"
-        ActiveRecord::Base::ConnectionSpecification.new(config, adapter_method)
+        ActiveRecord::Base::ConnectionSpecification.new(config.symbolize_keys, adapter_method)
       end
 
       def clear_all_connections!

data/lib/active_record/turntable/shard.rb

@@ -41,7 +41,7 @@ module ActiveRecord::Turntable
         raise "Please install the #{config['adapter']} adapter: `gem install activerecord-#{config['adapter']}-adapter` (#{e})"
       end
       adapter_method = "#{config['adapter']}_connection"
-      ActiveRecord::Base::ConnectionSpecification.new(config, adapter_method)
+      ActiveRecord::Base::ConnectionSpecification.new(config.symbolize_keys, adapter_method)
     end
   end
 end

data/lib/active_record/turntable/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Turntable
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/generators/templates/turntable.yml

@@ -6,6 +6,8 @@ development:
   clusters:
     user_cluster:
       algorithm: range
+      seq:
+        connection: user_seq_1
       shards:
         - connection: user_shard_1
           less_than: 100
@@ -18,6 +20,8 @@ test:
   clusters:
     user_cluster:
       algorithm: range
+      seq:
+        connection: user_seq_1
       shards:
         - connection: user_shard_1
           less_than: 20000
@@ -30,6 +34,8 @@ production:
   clusters:
     user_cluster:
       algorithm: range
+      seq:
+        connection: user_seq_1
       shards:
         - connection: user_shard_1
           less_than: 20000

data/spec/active_record/turntable/active_record_ext/clever_load_spec.rb

@@ -34,8 +34,14 @@ describe ActiveRecord::Turntable::ActiveRecordExt::CleverLoad do
       end
 
       it "should target loaded" do
-        @users.each do |user|
-          user.association(:user_status).loaded?.should be_true
+        if ActiveRecord::VERSION::STRING < "3.1"
+          @users.each do |user|
+            user.loaded_user_status?.should be_true
+          end
+        else
+          @users.each do |user|
+            user.association(:user_status).loaded?.should be_true
+          end
         end
       end
 
@@ -60,8 +66,14 @@ describe ActiveRecord::Turntable::ActiveRecordExt::CleverLoad do
       end
 
       it "should target loaded" do
-        @user_statuses.each do |user_status|
-          user_status.association(:user).loaded?.should be_true
+        if ActiveRecord::VERSION::STRING < "3.1"
+          @user_statuses.each do |user_status|
+            user_status.loaded_user?.should be_true
+          end
+        else
+          @user_statuses.each do |user_status|
+            user_status.association(:user).loaded?.should be_true
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70194215920340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70194215920340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70194215919380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70194215919380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sql_tree
-  requirement: &70194215918260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70194215918260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bsearch
-  requirement: &70194215917060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70194215917060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70194215920960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194215920960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70194215919200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70194215919200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70194215671500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194215671500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70194215671020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194215671020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70194215670540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194215670540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &70194215670060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194215670060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70194215669580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194215669580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
-  requirement: &70194215669100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194215669100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70194215668620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +213,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194215668620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70194215668140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +229,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194215668140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70194215667620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,7 +245,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194215667620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: AcviveRecord Sharding plugin
 email: 
 executables: []
@@ -187,12 +262,16 @@ files:
 - .document
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - activerecord-turntable.gemspec
+- gemfiles/rails3_0.gemfile
+- gemfiles/rails3_1.gemfile
+- gemfiles/rails3_2.gemfile
 - lib/active_record/turntable.rb
 - lib/active_record/turntable/active_record_ext.rb
 - lib/active_record/turntable/active_record_ext/.gitkeep
@@ -334,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: activerecord-turntable
-rubygems_version: 1.8.16
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ActiveRecord Sharding plugin
@@ -364,4 +443,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/test_models.rb
 - spec/turntable_helper.rb
-has_rdoc: