ar-octopus 0.3.4 → 0.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (35) hide show
  1. data/Gemfile +7 -7
  2. data/Gemfile.lock +40 -43
  3. data/README.mkdn +7 -1
  4. data/Rakefile +24 -22
  5. data/TODO.txt +0 -1
  6. data/ar-octopus.gemspec +155 -148
  7. data/lib/octopus.rb +17 -4
  8. data/lib/octopus/logger.rb +14 -0
  9. data/lib/octopus/model.rb +19 -5
  10. data/lib/octopus/proxy.rb +27 -12
  11. data/lib/octopus/rails3/arel.rb +13 -0
  12. data/lib/octopus/scope_proxy.rb +3 -3
  13. data/sample_app/Gemfile +2 -2
  14. data/sample_app/Gemfile.lock +95 -79
  15. data/sample_app/config/shards.yml +1 -1
  16. data/sample_app/features/migrate.feature +2 -1
  17. data/sample_app/features/step_definitions/seeds_steps.rb +1 -3
  18. data/sample_app/features/support/env.rb +8 -0
  19. data/spec/config/shards.yml +12 -14
  20. data/spec/database_connection.rb +1 -1
  21. data/spec/database_models.rb +7 -2
  22. data/spec/migrations/5_create_users_on_multiples_groups.rb +2 -2
  23. data/spec/octopus/association_spec.rb +1 -1
  24. data/spec/octopus/controller_spec.rb +2 -2
  25. data/spec/octopus/logger_spec.rb +19 -0
  26. data/spec/octopus/model_spec.rb +67 -37
  27. data/spec/octopus/octopus_spec.rb +38 -9
  28. data/spec/octopus/proxy_spec.rb +56 -26
  29. data/spec/octopus/replication_specs.rb +13 -0
  30. data/spec/octopus/scope_proxy_spec.rb +1 -1
  31. data/spec/octopus/sharded_spec.rb +1 -1
  32. data/spec/octopus_helper.rb +5 -4
  33. data/spec/spec_helper.rb +1 -5
  34. metadata +74 -41
  35. data/.gitignore +0 -5
data/Gemfile CHANGED
@@ -1,13 +1,13 @@
1
1
  source :rubygems
2
2
 
3
- gem 'activerecord', '3.0.0'
4
- gem 'actionpack', '3.0.0'
3
+ gem 'activerecord', '3.0.6'
4
+ gem 'actionpack', '3.0.6'
5
5
 
6
6
  group :test do
7
7
  gem "rake", ">= 0.8.7"
8
- gem "jeweler", ">= 1.4"
9
- gem "rspec", "2.0.0.beta.19"
10
- gem "mysql", ">= 2.8.1"
11
- gem "pg", ">= 0.9.0"
12
- gem "sqlite3-ruby", ">= 1.3.1"
8
+ gem "jeweler", ">= 1.4"
9
+ gem "rspec"
10
+ gem "mysql2"
11
+ gem "pg", ">= 0.9.0"
12
+ gem "sqlite3-ruby", ">= 1.3.1"
13
13
  end
data/Gemfile.lock CHANGED
@@ -2,70 +2,67 @@ GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
4
  abstract (1.0.0)
5
- actionpack (3.0.0)
6
- activemodel (= 3.0.0)
7
- activesupport (= 3.0.0)
5
+ actionpack (3.0.6)
6
+ activemodel (= 3.0.6)
7
+ activesupport (= 3.0.6)
8
8
  builder (~> 2.1.2)
9
9
  erubis (~> 2.6.6)
10
- i18n (~> 0.4.1)
10
+ i18n (~> 0.5.0)
11
11
  rack (~> 1.2.1)
12
- rack-mount (~> 0.6.12)
13
- rack-test (~> 0.5.4)
12
+ rack-mount (~> 0.6.14)
13
+ rack-test (~> 0.5.7)
14
14
  tzinfo (~> 0.3.23)
15
- activemodel (3.0.0)
16
- activesupport (= 3.0.0)
15
+ activemodel (3.0.6)
16
+ activesupport (= 3.0.6)
17
17
  builder (~> 2.1.2)
18
- i18n (~> 0.4.1)
19
- activerecord (3.0.0)
20
- activemodel (= 3.0.0)
21
- activesupport (= 3.0.0)
22
- arel (~> 1.0.0)
18
+ i18n (~> 0.5.0)
19
+ activerecord (3.0.6)
20
+ activemodel (= 3.0.6)
21
+ activesupport (= 3.0.6)
22
+ arel (~> 2.0.2)
23
23
  tzinfo (~> 0.3.23)
24
- activesupport (3.0.0)
25
- arel (1.0.1)
26
- activesupport (~> 3.0.0)
24
+ activesupport (3.0.6)
25
+ arel (2.0.9)
27
26
  builder (2.1.2)
28
27
  diff-lcs (1.1.2)
29
28
  erubis (2.6.6)
30
29
  abstract (>= 1.0.0)
31
- gemcutter (0.6.1)
32
30
  git (1.2.5)
33
- i18n (0.4.1)
34
- jeweler (1.4.0)
35
- gemcutter (>= 0.1.0)
31
+ i18n (0.5.0)
32
+ jeweler (1.5.2)
33
+ bundler (~> 1.0.0)
36
34
  git (>= 1.2.5)
37
- rubyforge (>= 2.0.0)
38
- json_pure (1.4.6)
39
- mysql (2.8.1)
40
- pg (0.9.0)
41
- rack (1.2.1)
42
- rack-mount (0.6.13)
35
+ rake
36
+ mysql2 (0.2.6)
37
+ pg (0.10.1)
38
+ rack (1.2.2)
39
+ rack-mount (0.6.14)
43
40
  rack (>= 1.0.0)
44
- rack-test (0.5.4)
41
+ rack-test (0.5.7)
45
42
  rack (>= 1.0)
46
43
  rake (0.8.7)
47
- rspec (2.0.0.beta.19)
48
- rspec-core (= 2.0.0.beta.19)
49
- rspec-expectations (= 2.0.0.beta.19)
50
- rspec-mocks (= 2.0.0.beta.19)
51
- rspec-core (2.0.0.beta.19)
52
- rspec-expectations (2.0.0.beta.19)
53
- diff-lcs (>= 1.1.2)
54
- rspec-mocks (2.0.0.beta.19)
55
- rubyforge (2.0.4)
56
- json_pure (>= 1.1.7)
57
- sqlite3-ruby (1.3.1)
58
- tzinfo (0.3.23)
44
+ rspec (2.5.0)
45
+ rspec-core (~> 2.5.0)
46
+ rspec-expectations (~> 2.5.0)
47
+ rspec-mocks (~> 2.5.0)
48
+ rspec-core (2.5.1)
49
+ rspec-expectations (2.5.0)
50
+ diff-lcs (~> 1.1.2)
51
+ rspec-mocks (2.5.0)
52
+ sqlite3 (1.3.3)
53
+ sqlite3-ruby (1.3.3)
54
+ sqlite3 (>= 1.3.3)
55
+ tzinfo (0.3.26)
59
56
 
60
57
  PLATFORMS
61
58
  ruby
62
59
 
63
60
  DEPENDENCIES
64
- actionpack (= 3.0.0)
65
- activerecord (= 3.0.0)
61
+ actionpack (= 3.0.6)
62
+ activerecord (= 3.0.6)
66
63
  jeweler (>= 1.4)
67
- mysql (>= 2.8.1)
64
+ mysql2
68
65
  pg (>= 0.9.0)
69
66
  rake (>= 0.8.7)
70
- rspec (= 2.0.0.beta.19)
67
+ rspec
71
68
  sqlite3-ruby (>= 1.3.1)
data/README.mkdn CHANGED
@@ -134,7 +134,10 @@ If you want to set a custom connection to a specific model, use this syntax:
134
134
  class CustomConnection < ActiveRecord::Base
135
135
  octopus_establish_connection(:adapter => "mysql", :database => "octopus_shard2")
136
136
  end
137
-
137
+
138
+ ## Set table names
139
+ If you want to use specific table names, please visit: <a href="https://github.com/tchandy/octopus/wiki/Table-names"> this link</a>
140
+
138
141
  ## Contributing with Octopus
139
142
  Contributors are welcome! To run the test suite, you need mysql, postgresql and sqlite3 installed. This is what you need to setup your Octopus development environment:
140
143
 
@@ -155,6 +158,9 @@ If you are having issues running the octopus spec suite, verify your database us
155
158
  ## Contributors:
156
159
  - <a href="https://github.com/tchandy/octopus/contributors">All Contributors</a>
157
160
 
161
+ ## Mailing List:
162
+ - <a href="http://groups.google.com/group/octopus-activerecord/">Octopus Mailing List</a>
163
+
158
164
  ## Thanks
159
165
 
160
166
  This project is sponsored by the <a href="http://www.rubysoc.org">Ruby Summer of Code</a>,
data/Rakefile CHANGED
@@ -31,13 +31,13 @@ begin
31
31
  gem.homepage = "http://github.com/tchandy/octopus"
32
32
  gem.authors = ["Thiago Pradi", "Mike Perham"]
33
33
  gem.add_development_dependency "rspec", ">= 2.0.0.beta.19"
34
- gem.add_development_dependency "mysql", ">= 2.8.1"
34
+ gem.add_development_dependency "mysql2"
35
35
  gem.add_development_dependency "pg", ">= 0.9.0"
36
36
  gem.add_development_dependency "sqlite3-ruby", ">= 1.3.1"
37
37
  gem.add_development_dependency "jeweler", ">= 1.4"
38
38
  gem.add_development_dependency "actionpack", ">= 2.3"
39
39
  gem.add_dependency('activerecord', '>= 2.3')
40
- gem.version = "0.3.4"
40
+ gem.version = "0.4.0"
41
41
  end
42
42
  Jeweler::GemcutterTasks.new
43
43
  rescue LoadError
@@ -53,8 +53,6 @@ end
53
53
  RSpec::Core::RakeTask.new(:rcov) do |spec|
54
54
  end
55
55
 
56
- task :spec => :check_dependencies
57
-
58
56
  task :default => :spec
59
57
 
60
58
 
@@ -66,7 +64,7 @@ namespace :db do
66
64
  (1..5).each do |idx|
67
65
  %x( echo "create DATABASE octopus_shard#{idx} DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci " | mysql --user=#{mysql_user})
68
66
  end
69
-
67
+
70
68
  %x( createdb -E UTF8 -U #{postgres_user} octopus_shard1 )
71
69
  end
72
70
 
@@ -77,9 +75,9 @@ namespace :db do
77
75
  (1..5).each do |idx|
78
76
  %x( mysqladmin --user=#{mysql_user} -f drop octopus_shard#{idx} )
79
77
  end
80
-
78
+
81
79
  %x( dropdb -U #{postgres_user} octopus_shard1 )
82
- %x(rm /tmp/database.sqlite3)
80
+ %x(rm -f /tmp/database.sqlite3)
83
81
  end
84
82
 
85
83
  desc 'Create tables on tests databases'
@@ -89,75 +87,79 @@ namespace :db do
89
87
  require "octopus"
90
88
  [:master, :brazil, :canada, :russia, :alone_shard, :postgresql_shard, :sqlite_shard].each do |shard_symbol|
91
89
  ActiveRecord::Base.using(shard_symbol).connection.initialize_schema_migrations_table()
92
-
90
+
93
91
  ActiveRecord::Base.using(shard_symbol).connection.create_table(:users) do |u|
94
92
  u.string :name
95
93
  u.integer :number
96
94
  u.boolean :admin
97
95
  end
98
-
96
+
99
97
  ActiveRecord::Base.using(shard_symbol).connection.create_table(:clients) do |u|
100
98
  u.string :country
101
99
  u.string :name
102
100
  end
103
-
101
+
104
102
  ActiveRecord::Base.using(shard_symbol).connection.create_table(:cats) do |u|
105
103
  u.string :name
106
104
  end
107
-
105
+
108
106
  ActiveRecord::Base.using(shard_symbol).connection.create_table(:items) do |u|
109
107
  u.string :name
110
108
  u.integer :client_id
111
109
  end
112
-
110
+
113
111
  ActiveRecord::Base.using(shard_symbol).connection.create_table(:computers) do |u|
114
112
  u.string :name
115
113
  end
116
-
114
+
117
115
  ActiveRecord::Base.using(shard_symbol).connection.create_table(:keyboards) do |u|
118
116
  u.string :name
119
117
  u.integer :computer_id
120
118
  end
121
-
119
+
122
120
  ActiveRecord::Base.using(shard_symbol).connection.create_table(:roles) do |u|
123
121
  u.string :name
124
122
  end
125
-
123
+
126
124
  ActiveRecord::Base.using(shard_symbol).connection.create_table(:permissions) do |u|
127
125
  u.string :name
128
126
  end
129
-
127
+
130
128
  ActiveRecord::Base.using(shard_symbol).connection.create_table(:permissions_roles, :id => false) do |u|
131
129
  u.integer :role_id
132
130
  u.integer :permission_id
133
131
  end
134
-
132
+
135
133
  ActiveRecord::Base.using(shard_symbol).connection.create_table(:assignments) do |u|
136
134
  u.integer :programmer_id
137
135
  u.integer :project_id
138
136
  end
139
-
137
+
140
138
  ActiveRecord::Base.using(shard_symbol).connection.create_table(:programmers) do |u|
141
139
  u.string :name
142
140
  end
143
-
141
+
144
142
  ActiveRecord::Base.using(shard_symbol).connection.create_table(:projects) do |u|
145
143
  u.string :name
146
144
  end
147
-
145
+
148
146
  ActiveRecord::Base.using(shard_symbol).connection.create_table(:comments) do |u|
149
147
  u.string :name
150
148
  u.string :commentable_type
151
149
  u.integer :commentable_id
152
150
  end
153
-
151
+
154
152
  ActiveRecord::Base.using(shard_symbol).connection.create_table(:parts) do |u|
155
153
  u.string :name
156
154
  u.integer :item_id
157
155
  end
156
+
157
+ ActiveRecord::Base.using(shard_symbol).connection.create_table(:yummy) do |u|
158
+ u.string :name
159
+ end
158
160
  end
159
161
  end
160
-
162
+
161
163
  desc 'Prepare the test databases'
162
164
  task :prepare => [:drop_databases, :build_databases, :create_tables]
163
165
  end
data/TODO.txt CHANGED
@@ -5,4 +5,3 @@
5
5
  - Basic algorithm to do load balancing between slaves server (handling servers down)
6
6
  - Support replication + sharding
7
7
  - Wiki about validation
8
- - Show where the query is sent in the log
data/ar-octopus.gemspec CHANGED
@@ -1,185 +1,190 @@
1
1
  # Generated by jeweler
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
- # Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
3
+ # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{ar-octopus}
8
- s.version = "0.3.4"
8
+ s.version = "0.4.0"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Thiago Pradi", "Mike Perham"]
12
- s.date = %q{2011-01-09}
12
+ s.date = %q{2011-07-03}
13
13
  s.description = %q{This gem allows you to use sharded databases with ActiveRecord. this also provides a interface for replication and for running migrations with multiples shards.}
14
14
  s.email = %q{tchandy@gmail.com}
15
15
  s.extra_rdoc_files = [
16
16
  "README.mkdn"
17
17
  ]
18
18
  s.files = [
19
- ".gitignore",
20
- ".rspec",
21
- "Gemfile",
22
- "Gemfile.lock",
23
- "README.mkdn",
24
- "Rakefile",
25
- "TODO.txt",
26
- "ar-octopus.gemspec",
27
- "init.rb",
28
- "lib/octopus.rb",
29
- "lib/octopus/association.rb",
30
- "lib/octopus/association_collection.rb",
31
- "lib/octopus/has_and_belongs_to_many_association.rb",
32
- "lib/octopus/migration.rb",
33
- "lib/octopus/model.rb",
34
- "lib/octopus/proxy.rb",
35
- "lib/octopus/rails2/association.rb",
36
- "lib/octopus/rails2/persistence.rb",
37
- "lib/octopus/rails3/association.rb",
38
- "lib/octopus/rails3/persistence.rb",
39
- "lib/octopus/scope_proxy.rb",
40
- "rails/init.rb",
41
- "sample_app/.gitignore",
42
- "sample_app/.rspec",
43
- "sample_app/Gemfile",
44
- "sample_app/Gemfile.lock",
45
- "sample_app/README",
46
- "sample_app/Rakefile",
47
- "sample_app/app/controllers/application_controller.rb",
48
- "sample_app/app/helpers/application_helper.rb",
49
- "sample_app/app/models/item.rb",
50
- "sample_app/app/models/user.rb",
51
- "sample_app/app/views/layouts/application.html.erb",
52
- "sample_app/autotest/discover.rb",
53
- "sample_app/config.ru",
54
- "sample_app/config/application.rb",
55
- "sample_app/config/boot.rb",
56
- "sample_app/config/cucumber.yml",
57
- "sample_app/config/database.yml",
58
- "sample_app/config/environment.rb",
59
- "sample_app/config/environments/development.rb",
60
- "sample_app/config/environments/production.rb",
61
- "sample_app/config/environments/test.rb",
62
- "sample_app/config/initializers/backtrace_silencers.rb",
63
- "sample_app/config/initializers/inflections.rb",
64
- "sample_app/config/initializers/mime_types.rb",
65
- "sample_app/config/initializers/secret_token.rb",
66
- "sample_app/config/initializers/session_store.rb",
67
- "sample_app/config/locales/en.yml",
68
- "sample_app/config/routes.rb",
69
- "sample_app/config/shards.yml",
70
- "sample_app/db/migrate/20100720172715_create_users.rb",
71
- "sample_app/db/migrate/20100720172730_create_items.rb",
72
- "sample_app/db/migrate/20100720210335_create_sample_users.rb",
73
- "sample_app/db/schema.rb",
74
- "sample_app/db/seeds.rb",
75
- "sample_app/doc/README_FOR_APP",
76
- "sample_app/features/migrate.feature",
77
- "sample_app/features/seed.feature",
78
- "sample_app/features/step_definitions/seeds_steps.rb",
79
- "sample_app/features/step_definitions/web_steps.rb",
80
- "sample_app/features/support/env.rb",
81
- "sample_app/features/support/paths.rb",
82
- "sample_app/lib/tasks/.gitkeep",
83
- "sample_app/lib/tasks/cucumber.rake",
84
- "sample_app/public/404.html",
85
- "sample_app/public/422.html",
86
- "sample_app/public/500.html",
87
- "sample_app/public/favicon.ico",
88
- "sample_app/public/images/rails.png",
89
- "sample_app/public/index.html",
90
- "sample_app/public/javascripts/application.js",
91
- "sample_app/public/javascripts/controls.js",
92
- "sample_app/public/javascripts/dragdrop.js",
93
- "sample_app/public/javascripts/effects.js",
94
- "sample_app/public/javascripts/prototype.js",
95
- "sample_app/public/javascripts/rails.js",
96
- "sample_app/public/robots.txt",
97
- "sample_app/public/stylesheets/.gitkeep",
98
- "sample_app/script/cucumber",
99
- "sample_app/script/rails",
100
- "sample_app/spec/models/item_spec.rb",
101
- "sample_app/spec/models/user_spec.rb",
102
- "sample_app/spec/spec_helper.rb",
103
- "sample_app/test/performance/browsing_test.rb",
104
- "sample_app/test/test_helper.rb",
105
- "sample_app/vendor/plugins/.gitkeep",
106
- "spec/config/shards.yml",
107
- "spec/database_connection.rb",
108
- "spec/database_models.rb",
109
- "spec/migrations/10_create_users_using_replication.rb",
110
- "spec/migrations/11_add_field_in_all_slaves.rb",
111
- "spec/migrations/12_create_users_using_block.rb",
112
- "spec/migrations/13_create_users_using_block_and_using.rb",
113
- "spec/migrations/1_create_users_on_master.rb",
114
- "spec/migrations/2_create_users_on_canada.rb",
115
- "spec/migrations/3_create_users_on_both_shards.rb",
116
- "spec/migrations/4_create_users_on_shards_of_a_group.rb",
117
- "spec/migrations/5_create_users_on_multiples_groups.rb",
118
- "spec/migrations/6_raise_exception_with_invalid_shard_name.rb",
119
- "spec/migrations/7_raise_exception_with_invalid_multiple_shard_names.rb",
120
- "spec/migrations/8_raise_exception_with_invalid_group_name.rb",
121
- "spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb",
122
- "spec/octopus/association_spec.rb",
123
- "spec/octopus/controller_spec.rb",
124
- "spec/octopus/migration_spec.rb",
125
- "spec/octopus/model_spec.rb",
126
- "spec/octopus/octopus_spec.rb",
127
- "spec/octopus/proxy_spec.rb",
128
- "spec/octopus/replication_specs.rb",
129
- "spec/octopus/scope_proxy_spec.rb",
130
- "spec/octopus/sharded_spec.rb",
131
- "spec/octopus_helper.rb",
132
- "spec/spec_helper.rb"
19
+ ".rspec",
20
+ "Gemfile",
21
+ "Gemfile.lock",
22
+ "README.mkdn",
23
+ "Rakefile",
24
+ "TODO.txt",
25
+ "ar-octopus.gemspec",
26
+ "init.rb",
27
+ "lib/octopus.rb",
28
+ "lib/octopus/association.rb",
29
+ "lib/octopus/association_collection.rb",
30
+ "lib/octopus/has_and_belongs_to_many_association.rb",
31
+ "lib/octopus/logger.rb",
32
+ "lib/octopus/migration.rb",
33
+ "lib/octopus/model.rb",
34
+ "lib/octopus/proxy.rb",
35
+ "lib/octopus/rails2/association.rb",
36
+ "lib/octopus/rails2/persistence.rb",
37
+ "lib/octopus/rails3/arel.rb",
38
+ "lib/octopus/rails3/association.rb",
39
+ "lib/octopus/rails3/persistence.rb",
40
+ "lib/octopus/scope_proxy.rb",
41
+ "rails/init.rb",
42
+ "sample_app/.gitignore",
43
+ "sample_app/.rspec",
44
+ "sample_app/Gemfile",
45
+ "sample_app/Gemfile.lock",
46
+ "sample_app/README",
47
+ "sample_app/Rakefile",
48
+ "sample_app/app/controllers/application_controller.rb",
49
+ "sample_app/app/helpers/application_helper.rb",
50
+ "sample_app/app/models/item.rb",
51
+ "sample_app/app/models/user.rb",
52
+ "sample_app/app/views/layouts/application.html.erb",
53
+ "sample_app/autotest/discover.rb",
54
+ "sample_app/config.ru",
55
+ "sample_app/config/application.rb",
56
+ "sample_app/config/boot.rb",
57
+ "sample_app/config/cucumber.yml",
58
+ "sample_app/config/database.yml",
59
+ "sample_app/config/environment.rb",
60
+ "sample_app/config/environments/development.rb",
61
+ "sample_app/config/environments/production.rb",
62
+ "sample_app/config/environments/test.rb",
63
+ "sample_app/config/initializers/backtrace_silencers.rb",
64
+ "sample_app/config/initializers/inflections.rb",
65
+ "sample_app/config/initializers/mime_types.rb",
66
+ "sample_app/config/initializers/secret_token.rb",
67
+ "sample_app/config/initializers/session_store.rb",
68
+ "sample_app/config/locales/en.yml",
69
+ "sample_app/config/routes.rb",
70
+ "sample_app/config/shards.yml",
71
+ "sample_app/db/migrate/20100720172715_create_users.rb",
72
+ "sample_app/db/migrate/20100720172730_create_items.rb",
73
+ "sample_app/db/migrate/20100720210335_create_sample_users.rb",
74
+ "sample_app/db/schema.rb",
75
+ "sample_app/db/seeds.rb",
76
+ "sample_app/doc/README_FOR_APP",
77
+ "sample_app/features/migrate.feature",
78
+ "sample_app/features/seed.feature",
79
+ "sample_app/features/step_definitions/seeds_steps.rb",
80
+ "sample_app/features/step_definitions/web_steps.rb",
81
+ "sample_app/features/support/env.rb",
82
+ "sample_app/features/support/paths.rb",
83
+ "sample_app/lib/tasks/.gitkeep",
84
+ "sample_app/lib/tasks/cucumber.rake",
85
+ "sample_app/public/404.html",
86
+ "sample_app/public/422.html",
87
+ "sample_app/public/500.html",
88
+ "sample_app/public/favicon.ico",
89
+ "sample_app/public/images/rails.png",
90
+ "sample_app/public/index.html",
91
+ "sample_app/public/javascripts/application.js",
92
+ "sample_app/public/javascripts/controls.js",
93
+ "sample_app/public/javascripts/dragdrop.js",
94
+ "sample_app/public/javascripts/effects.js",
95
+ "sample_app/public/javascripts/prototype.js",
96
+ "sample_app/public/javascripts/rails.js",
97
+ "sample_app/public/robots.txt",
98
+ "sample_app/public/stylesheets/.gitkeep",
99
+ "sample_app/script/cucumber",
100
+ "sample_app/script/rails",
101
+ "sample_app/spec/models/item_spec.rb",
102
+ "sample_app/spec/models/user_spec.rb",
103
+ "sample_app/spec/spec_helper.rb",
104
+ "sample_app/test/performance/browsing_test.rb",
105
+ "sample_app/test/test_helper.rb",
106
+ "sample_app/vendor/plugins/.gitkeep",
107
+ "spec/config/shards.yml",
108
+ "spec/database_connection.rb",
109
+ "spec/database_models.rb",
110
+ "spec/migrations/10_create_users_using_replication.rb",
111
+ "spec/migrations/11_add_field_in_all_slaves.rb",
112
+ "spec/migrations/12_create_users_using_block.rb",
113
+ "spec/migrations/13_create_users_using_block_and_using.rb",
114
+ "spec/migrations/1_create_users_on_master.rb",
115
+ "spec/migrations/2_create_users_on_canada.rb",
116
+ "spec/migrations/3_create_users_on_both_shards.rb",
117
+ "spec/migrations/4_create_users_on_shards_of_a_group.rb",
118
+ "spec/migrations/5_create_users_on_multiples_groups.rb",
119
+ "spec/migrations/6_raise_exception_with_invalid_shard_name.rb",
120
+ "spec/migrations/7_raise_exception_with_invalid_multiple_shard_names.rb",
121
+ "spec/migrations/8_raise_exception_with_invalid_group_name.rb",
122
+ "spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb",
123
+ "spec/octopus/association_spec.rb",
124
+ "spec/octopus/controller_spec.rb",
125
+ "spec/octopus/logger_spec.rb",
126
+ "spec/octopus/migration_spec.rb",
127
+ "spec/octopus/model_spec.rb",
128
+ "spec/octopus/octopus_spec.rb",
129
+ "spec/octopus/proxy_spec.rb",
130
+ "spec/octopus/replication_specs.rb",
131
+ "spec/octopus/scope_proxy_spec.rb",
132
+ "spec/octopus/sharded_spec.rb",
133
+ "spec/octopus_helper.rb",
134
+ "spec/spec_helper.rb"
133
135
  ]
134
136
  s.homepage = %q{http://github.com/tchandy/octopus}
135
- s.rdoc_options = ["--charset=UTF-8"]
136
137
  s.require_paths = ["lib"]
137
- s.rubygems_version = %q{1.3.7}
138
+ s.rubygems_version = %q{1.4.2}
138
139
  s.summary = %q{Easy Database Sharding for ActiveRecord}
139
140
  s.test_files = [
140
141
  "spec/database_connection.rb",
141
- "spec/database_models.rb",
142
- "spec/migrations/10_create_users_using_replication.rb",
143
- "spec/migrations/11_add_field_in_all_slaves.rb",
144
- "spec/migrations/12_create_users_using_block.rb",
145
- "spec/migrations/13_create_users_using_block_and_using.rb",
146
- "spec/migrations/1_create_users_on_master.rb",
147
- "spec/migrations/2_create_users_on_canada.rb",
148
- "spec/migrations/3_create_users_on_both_shards.rb",
149
- "spec/migrations/4_create_users_on_shards_of_a_group.rb",
150
- "spec/migrations/5_create_users_on_multiples_groups.rb",
151
- "spec/migrations/6_raise_exception_with_invalid_shard_name.rb",
152
- "spec/migrations/7_raise_exception_with_invalid_multiple_shard_names.rb",
153
- "spec/migrations/8_raise_exception_with_invalid_group_name.rb",
154
- "spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb",
155
- "spec/octopus/association_spec.rb",
156
- "spec/octopus/controller_spec.rb",
157
- "spec/octopus/migration_spec.rb",
158
- "spec/octopus/model_spec.rb",
159
- "spec/octopus/octopus_spec.rb",
160
- "spec/octopus/proxy_spec.rb",
161
- "spec/octopus/replication_specs.rb",
162
- "spec/octopus/scope_proxy_spec.rb",
163
- "spec/octopus/sharded_spec.rb",
164
- "spec/octopus_helper.rb",
165
- "spec/spec_helper.rb"
142
+ "spec/database_models.rb",
143
+ "spec/migrations/10_create_users_using_replication.rb",
144
+ "spec/migrations/11_add_field_in_all_slaves.rb",
145
+ "spec/migrations/12_create_users_using_block.rb",
146
+ "spec/migrations/13_create_users_using_block_and_using.rb",
147
+ "spec/migrations/1_create_users_on_master.rb",
148
+ "spec/migrations/2_create_users_on_canada.rb",
149
+ "spec/migrations/3_create_users_on_both_shards.rb",
150
+ "spec/migrations/4_create_users_on_shards_of_a_group.rb",
151
+ "spec/migrations/5_create_users_on_multiples_groups.rb",
152
+ "spec/migrations/6_raise_exception_with_invalid_shard_name.rb",
153
+ "spec/migrations/7_raise_exception_with_invalid_multiple_shard_names.rb",
154
+ "spec/migrations/8_raise_exception_with_invalid_group_name.rb",
155
+ "spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb",
156
+ "spec/octopus/association_spec.rb",
157
+ "spec/octopus/controller_spec.rb",
158
+ "spec/octopus/logger_spec.rb",
159
+ "spec/octopus/migration_spec.rb",
160
+ "spec/octopus/model_spec.rb",
161
+ "spec/octopus/octopus_spec.rb",
162
+ "spec/octopus/proxy_spec.rb",
163
+ "spec/octopus/replication_specs.rb",
164
+ "spec/octopus/scope_proxy_spec.rb",
165
+ "spec/octopus/sharded_spec.rb",
166
+ "spec/octopus_helper.rb",
167
+ "spec/spec_helper.rb"
166
168
  ]
167
169
 
168
170
  if s.respond_to? :specification_version then
169
- current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
170
171
  s.specification_version = 3
171
172
 
172
173
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
174
+ s.add_runtime_dependency(%q<activerecord>, ["= 3.0.6"])
175
+ s.add_runtime_dependency(%q<actionpack>, ["= 3.0.6"])
173
176
  s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
174
- s.add_development_dependency(%q<mysql>, [">= 2.8.1"])
177
+ s.add_development_dependency(%q<mysql2>, [">= 0"])
175
178
  s.add_development_dependency(%q<pg>, [">= 0.9.0"])
176
179
  s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
177
180
  s.add_development_dependency(%q<jeweler>, [">= 1.4"])
178
181
  s.add_development_dependency(%q<actionpack>, [">= 2.3"])
179
182
  s.add_runtime_dependency(%q<activerecord>, [">= 2.3"])
180
183
  else
184
+ s.add_dependency(%q<activerecord>, ["= 3.0.6"])
185
+ s.add_dependency(%q<actionpack>, ["= 3.0.6"])
181
186
  s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
182
- s.add_dependency(%q<mysql>, [">= 2.8.1"])
187
+ s.add_dependency(%q<mysql2>, [">= 0"])
183
188
  s.add_dependency(%q<pg>, [">= 0.9.0"])
184
189
  s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
185
190
  s.add_dependency(%q<jeweler>, [">= 1.4"])
@@ -187,8 +192,10 @@ Gem::Specification.new do |s|
187
192
  s.add_dependency(%q<activerecord>, [">= 2.3"])
188
193
  end
189
194
  else
195
+ s.add_dependency(%q<activerecord>, ["= 3.0.6"])
196
+ s.add_dependency(%q<actionpack>, ["= 3.0.6"])
190
197
  s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
191
- s.add_dependency(%q<mysql>, [">= 2.8.1"])
198
+ s.add_dependency(%q<mysql2>, [">= 0"])
192
199
  s.add_dependency(%q<pg>, [">= 0.9.0"])
193
200
  s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
194
201
  s.add_dependency(%q<jeweler>, [">= 1.4"])