ar-octopus 0.0.3 → 0.0.4

data/Rakefile

@@ -28,7 +28,7 @@ begin
     gem.homepage = "http://github.com/tchandy/octopus"
     gem.authors = ["Thiago Pradi", "Mike Perham", "Amit Agarwal"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.version = "0.0.3"
+    gem.version = "0.0.4"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -62,7 +62,7 @@ Rake::RDocTask.new do |rdoc|
 end
 
 namespace :db do
-  desc 'Build the MySQL test databases'
+  desc 'Build the databases for tests'
   task :build_databases do
     mysql_user = ENV['MYSQL_USER'] || "root"
     postgres_user = ENV['POSTGRES_USER'] || "postgres"
@@ -73,7 +73,7 @@ namespace :db do
     %x( createdb -E UTF8 -U #{postgres_user} octopus_shard1 )
   end
 
-  desc 'Drop the MySQL test databases'
+  desc 'Drop the tests databases'
   task :drop_databases do
     mysql_user = ENV['MYSQL_USER'] || "root"
     postgres_user = ENV['POSTGRES_USER'] || "postgres"
@@ -84,7 +84,7 @@ namespace :db do
     %x( dropdb -U #{postgres_user} octopus_shard1 )
   end
 
-  desc 'Create tables on mysql databases'
+  desc 'Create tables on tests databases'
   task :create_tables do
     Dir.chdir(File.expand_path(File.dirname(__FILE__) + "/spec"))
     require "database_connection"
@@ -151,7 +151,7 @@ namespace :db do
     end
   end
   
-  desc 'Prepare the MySQL test databases'
+  desc 'Prepare the test databases'
   task :prepare => [:drop_databases, :build_databases, :create_tables]
 end
 

data/ar-octopus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-octopus}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Pradi", "Mike Perham", "Amit Agarwal"]
-  s.date = %q{2010-06-22}
+  s.date = %q{2010-06-23}
   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.}
   s.email = %q{tchandy@gmail.com}
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/octopus/migration.rb",
      "lib/octopus/model.rb",
      "lib/octopus/proxy.rb",
+     "rails/init.rb",
      "spec/config/shards.yml",
      "spec/database_connection.rb",
      "spec/database_models.rb",
@@ -53,6 +54,7 @@ Gem::Specification.new do |s|
      "spec/octopus/model_spec.rb",
      "spec/octopus/octopus_spec.rb",
      "spec/octopus/proxy_spec.rb",
+     "spec/octopus_helper.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
@@ -81,6 +83,7 @@ Gem::Specification.new do |s|
      "spec/octopus/model_spec.rb",
      "spec/octopus/octopus_spec.rb",
      "spec/octopus/proxy_spec.rb",
+     "spec/octopus_helper.rb",
      "spec/spec_helper.rb"
   ]
 

data/lib/octopus/model.rb

@@ -1,6 +1,7 @@
 module Octopus::Model  
   def self.extended(base) 
     base.send(:include, InstanceMethods)
+    base.hijack_connection()
   end
 
   module InstanceMethods

data/rails/init.rb

@@ -0,0 +1 @@
+require "octopus"

data/spec/database_connection.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'active_record'
-require 'logger'
 require "pg"
 
 ActiveRecord::Base.establish_connection(:adapter => "mysql", :database => "octopus_shard1", :username => "root", :password => "")

data/spec/octopus_helper.rb

@@ -0,0 +1,31 @@
+def clean_all_shards()
+  ActiveRecord::Base.using(:master).connection.shards.keys.each do |shard_symbol|
+    ['schema_migrations', 'users', 'clients', 'cats', 'items', 'keyboards', 'computers', 'permissions_roles', 'roles', 'permissions', 'assignments', 'projects', 'programmers'].each do |tables|
+      ActiveRecord::Base.using(shard_symbol).connection.execute("DELETE FROM #{tables};") 
+    end
+  end
+end
+
+def clean_connection_proxy()
+  Thread.current[:connection_proxy] = nil  
+end
+
+def migrating_to_version(version, &block)
+  begin
+    ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT, version)
+    yield
+  ensure
+    ActiveRecord::Migrator.run(:down, MIGRATIONS_ROOT, version)
+  end
+end
+
+def using_enviroment(enviroment, &block)
+  begin
+    Octopus.instance_variable_set(:@env, enviroment.to_s)
+    clean_connection_proxy()
+    yield
+  ensure
+    Octopus.instance_variable_set(:@env, 'production')
+    clean_connection_proxy()
+  end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require "spec/database_connection"
 require "action_pack"
 require "action_controller"
 require 'octopus'
+require "octopus_helper"
 
 Spec::Runner.configure do |config|  
   config.mock_with :rspec
@@ -18,36 +19,4 @@ Spec::Runner.configure do |config|
   config.after(:each) do
     clean_all_shards()
   end
-end
-
-def clean_all_shards()
-  ActiveRecord::Base.using(:master).connection.shards.keys.each do |shard_symbol|
-    ['schema_migrations', 'users', 'clients', 'cats', 'items', 'keyboards', 'computers', 'permissions_roles', 'roles', 'permissions', 'assignments', 'projects', 'programmers'].each do |tables|
-      ActiveRecord::Base.using(shard_symbol).connection.execute("DELETE FROM #{tables};") 
-    end
-  end
-end
-
-def migrating_to_version(version, &block)
-  begin
-    ActiveRecord::Migrator.run(:up, MIGRATIONS_ROOT, version)
-    yield
-  ensure
-    ActiveRecord::Migrator.run(:down, MIGRATIONS_ROOT, version)
-  end
-end
-
-def clean_connection_proxy()
-  Thread.current[:connection_proxy] = nil  
-end
-
-def using_enviroment(enviroment, &block)
-  begin
-    Octopus.instance_variable_set(:@env, enviroment.to_s)
-    clean_connection_proxy()
-    yield
-  ensure
-    Octopus.instance_variable_set(:@env, 'production')
-    clean_connection_proxy()
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 -03:00
+date: 2010-06-23 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ files:
 - lib/octopus/migration.rb
 - lib/octopus/model.rb
 - lib/octopus/proxy.rb
+- rails/init.rb
 - spec/config/shards.yml
 - spec/database_connection.rb
 - spec/database_models.rb
@@ -82,6 +83,7 @@ files:
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb
 - spec/octopus/proxy_spec.rb
+- spec/octopus_helper.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -138,4 +140,5 @@ test_files:
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb
 - spec/octopus/proxy_spec.rb
+- spec/octopus_helper.rb
 - spec/spec_helper.rb