secondbase 0.3.3 → 0.4.0

data/README.rdoc

@@ -1,10 +1,10 @@
 = secondbase
 
-SecondBase adds a second database to your application.  While Rails enables you to establish connections to as many external databases as you like, Rails can only manage a single database with it's migration and testing tasks.
+Secondbase adds a second database to your application.  While Rails enables you to establish connections to as many external databases as you like, Rails can only manage a single database with it's migration and testing tasks.
 
 Secondbase enables Rails to work with, and manage, a second database (almost) transparently.  As a developer, you should not even realize a second database is in play.  Core rake tasks such as db:create, db:migrate, and test will continue to work seamlessly with both databases without you, the developer, having to run any extra rake tasks.
 
-== Contributing to secondbase
+== Contributing to Secondbase
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
@@ -17,24 +17,22 @@ Secondbase enables Rails to work with, and manage, a second database (almost) tr
 == System Requirements
 Secondbase now supports Rails 2.x and Rails 3.x.
 
-== Known Issues
-The custom migration generator does not work in Rails 2.x.  The work around for the time being is to use the normal migration generator provided in Rails 2.x, and then move the migration to db/migrate/secondbase:
-
-  ./script/generate migration CreateWidgetsTable
-  mv db/migrate/20101203211338_create_widgets_table.rb db/migrate/secondbase
-
 == Installation
 Modify your Gemfile to include Secondbase:
   
-  gem 'secondbase', '0.3.0'
+  gem 'secondbase', '0.4.0'
 
 Run `bundle install`.  You thought it would be harder?  If you're using Rails 2.x, then yes, a little bit harder.  You must also add this to your Rakefile:
 
-  require 'secondbase/tasks'
+  require 'secondbase/tasks' if defined?(Secondbase)
 
+PLEASE NOTE that if you are using bundler with Rails 2.x, then you simply need to add this to your Rakefile:
+
+  require 'secondbase/tasks'
+  
 == Usage
 === Database
-Configure your database.yml to define your secondbase:
+Configure your database.yml to define your Secondbase:
 
   # Your normal rails definitions...
   development:
@@ -62,9 +60,13 @@ Configure your database.yml to define your secondbase:
 
 === Migrations
 SecondBase comes with a generator to assist in managing your migrations
- 
+
+Rails 3.x:
   rails generator secondbase:migration CreateWidgetsTable
 
+Rails 2.x:
+  script/generate secondbase_migration CreateWidgetsTable
+    
 The generator will organize your second (data)base migrations alongside of your primary database.  The above command will generate the file:
 
   db/migrate/secondbase/20101203211338_create_widgets_table.rb
@@ -99,6 +101,13 @@ SecondBase offers a base model that you can simply extend:
     # you're Widget model is now pointing to your second (data)base table 'widgets'
   end
 
+ActiveRecord associations will still work between your Firstbase and Secondbase models!
+
+  # Notice how normal this all looks...
+  class User < ActiveRecord::Base
+    has_many :widgets
+  end
+
 === Rake Tasks & Custom Classes
 If you need to write rake tasks, or some other code that does not extend ActiveRecord, you can simply establish a connection to your second (data)base:
 
@@ -115,15 +124,15 @@ Tests can still be run using `rake test` or `rake test:units`, etc.  However, if
   
 This is patch to fixtures that will identify the fixtures which belong to models that extend SecondBase::Base.  The patch will then ensure that the table descendants of SecondBase::Base get loaded into your second test (data)base.
 
-At this time, there is not support for anything other than fixtures (i.e. factories).  If you have the time to update this gem to be test object compatible, by all means...
+At this time, I can verify that Secondbase works with Fixtures and Machinist.  Conceivably, other test factories should work (like Factory Girl), but there is currently no support for this.  If you have the time to update this gem to be test object compatible, by all means...
 
 == TODO
-- Migration generator needs support for attribute generation (similar to rails generate migration).  For example:
-  `rails generate secondbase_migration AddTitleBodyToPost title:string body:text published:boolean`
+- Migration generator in Rails 3.x needs support for attribute generation (similar to rails generate migration).  For example:
+  `rails generate secondbase:migration AddTitleBodyToPost title:string body:text published:boolean`
 
 - rake db:fixtures:load is currently broken.  Like many other things I have fixed, it assumes you only one a single database and attempts to load all fixtures into it.  I don't believe we can get away with alias chaining this one, I think (like the Fixtures class), we'll have to freedom patch it.
 
-- secondbase should provide support for testing objects other then fixtures
+- secondbase needs to be tested with other factory frameworks (other then Fixtures and Machinist)
 
 - TESTS!!  Not 100% sure how to test the rake tasks, but I can definitely write tests for the classes and generators. I did this in my spare time, sorry...
 

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/lib/secondbase/tasks.rb

@@ -1,4 +1,5 @@
 require 'secondbase'
+
 ####################################
 #                                  
 # SecondBase database managment tasks  
@@ -60,14 +61,14 @@ namespace :db do
       # in a dual db mode, it could be confusing to have two schemas.
       
       # reset connection to secondbase...
-      use_secondbase(Rails.env)
+      SecondBase::has_runner(Rails.env)
       
       # run secondbase migrations...
       ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
       ActiveRecord::Migrator.migrate("db/migrate/#{SecondBase::CONNECTION_PREFIX}/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
       
       # reset connection back to firstbase...
-      use_firstbase(Rails.env)
+      FirstBase::has_runner(Rails.env)
     end
     
     namespace :up do
@@ -77,12 +78,12 @@ namespace :db do
         raise "VERSION is required" unless version
         
         # reset connection to secondbase...
-        use_secondbase(Rails.env)
+        SecondBase::has_runner(Rails.env)
         
         ActiveRecord::Migrator.run(:up, "db/migrate/#{SecondBase::CONNECTION_PREFIX}/", version)
         
         # reset connection back to firstbase...
-        use_firstbase(Rails.env)
+        FirstBase::has_runner(Rails.env)
       end
     end
     
@@ -93,12 +94,12 @@ namespace :db do
         raise "VERSION is required" unless version
         
         # reset connection to secondbase...
-        use_secondbase(Rails.env)
+        SecondBase::has_runner(Rails.env)
         
         ActiveRecord::Migrator.run(:down, "db/migrate/#{SecondBase::CONNECTION_PREFIX}/", version)
         
         # reset connection back to firstbase...
-        use_firstbase(Rails.env)
+        FirstBase::has_runner(Rails.env)
       end
     end
   end
@@ -119,14 +120,20 @@ namespace :db do
       task :secondbase do
         Rake::Task['environment'].invoke
         
-        # we want to dump the development (second)database....
-        use_secondbase('development')
+        SecondBase::has_runner(Rails.env)
+        
+        # dump the current env's db, be sure to add the schema information!!!
+        dump_file = "#{RAILS_ROOT}/db/#{SecondBase::CONNECTION_PREFIX}_#{RAILS_ENV}_structure.sql"
         
-        File.open("#{RAILS_ROOT}/db/#{SecondBase::CONNECTION_PREFIX}_#{RAILS_ENV}_structure.sql", "w+") do |f| 
+        File.open(dump_file, "w+") do |f| 
           f << ActiveRecord::Base.connection.structure_dump
         end
         
-        use_firstbase(Rails.env)
+        if ActiveRecord::Base.connection.supports_migrations?
+          File.open(dump_file, "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
+        end
+        
+        FirstBase::has_runner(Rails.env)
       end 
     end
   end
@@ -143,11 +150,11 @@ namespace :db do
       task :secondbase do
         Rake::Task['environment'].invoke    
         
-        use_secondbase('test')
+        SecondBase::has_runner('test')
         
         ActiveRecord::Base.connection.recreate_database(secondbase_config('test')["database"], secondbase_config('test')) 
         
-        use_firstbase(Rails.env)
+        FirstBase::has_runner(Rails.env)
       end
     end
 
@@ -160,13 +167,15 @@ namespace :db do
         `rake db:test:purge:secondbase`
 
         # now lets clone the structure for secondbase
-        use_secondbase('test')
+        SecondBase::has_runner('test')
+        
         ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0') if secondbase_config(RAILS_ENV)['adapter'][/mysql/]
+        
         IO.readlines("#{RAILS_ROOT}/db/#{SecondBase::CONNECTION_PREFIX}_#{RAILS_ENV}_structure.sql").join.split("\n\n").each do |table|
           ActiveRecord::Base.connection.execute(table)
         end
         
-        use_firstbase(Rails.env)
+        FirstBase::has_runner(Rails.env)
       end
     end
   end
@@ -177,18 +186,6 @@ end
 ####################################
 # 
 # Some helper methods to run back and forth between first and second base.
-def use_firstbase(env)
-  ActiveRecord::Base.establish_connection(firstbase_config(env))
-end
-
-def use_secondbase(env)
-  ActiveRecord::Base.establish_connection(secondbase_config(env))
-end
-
 def secondbase_config(env)
   ActiveRecord::Base.configurations[SecondBase::CONNECTION_PREFIX][env]
-end
-
-def firstbase_config(env)
-  ActiveRecord::Base.configurations[env]
 end

data/secondbase.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{secondbase}
-  s.version = "0.3.3"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["karledurante"]
-  s.date = %q{2011-01-28}
+  s.date = %q{2011-03-03}
   s.description = %q{Secondbase provides support to Rails to create a homogeneous for a dual database project.  Using the rake tasks already familiar to you, this gem enables Rails to work with two primary databases, instead of just one.}
   s.email = %q{kdurante@customink.com}
   s.extra_rdoc_files = [
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/karledurante/secondbase}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Allow Rails manage second database in your projects}
   s.test_files = [
     "test/helper.rb",
@@ -51,7 +51,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: secondbase
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - karledurante
@@ -15,13 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 -05:00
+date: 2011-03-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  name: shoulda
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,10 +30,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: shoulda
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: bundler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,10 +46,10 @@ dependencies:
         - 0
         version: 1.0.0
   requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: bundler
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: jeweler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,10 +62,10 @@ dependencies:
         - 1
         version: 1.5.1
   requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: jeweler
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: activerecord
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,10 +78,10 @@ dependencies:
         - 0
         version: 3.0.0
   requirement: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
   name: activerecord
+- !ruby/object:Gem::Dependency 
+  type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -96,6 +94,8 @@ dependencies:
         - 0
         version: 3.0.0
   requirement: *id005
+  prerelease: false
+  name: activerecord
 description: Secondbase provides support to Rails to create a homogeneous for a dual database project.  Using the rake tasks already familiar to you, this gem enables Rails to work with two primary databases, instead of just one.
 email: kdurante@customink.com
 executables: []
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Allow Rails manage second database in your projects