secondbase 0.5.0 → 0.6.0

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# CHANGELOG
+
+## 0.6
+
+ * This version of the gem ONLY SUPPORTS Rails 3.x.  For 2.x support, check out the branch 'rails_2_3' (or version .5 of the gem)
+ * patched has_and_belongs_to_many associations, for secondbase models, so that ActiveRecord understands that the join table is in the secondbase.
+ * patched ActiveRecord::TestFixtures so that transactional fixture support is respected for the SecondBase.
+ * reorganized monkey patches to make it easier to work in fixes for different versions of rails.

data/Gemfile

@@ -7,7 +7,7 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
+  gem "bundler", ">= 1.0.0"
+  gem "jeweler", "~> 1.8.2"
   gem "activerecord", "~> 3.0.0"
 end

data/Gemfile.lock

@@ -16,11 +16,15 @@ GEM
     builder (2.1.2)
     git (1.2.5)
     i18n (0.4.1)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
+      rdoc
+    json (1.7.5)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
     shoulda (2.11.1)
     tzinfo (0.3.23)
 
@@ -29,6 +33,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 3.0.0)
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.1)
+  bundler (>= 1.0.0)
+  jeweler (~> 1.8.2)
   shoulda

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/secondbase.rb

@@ -1,9 +1,10 @@
 require 'active_record'
+require 'secondbase/active_record/patches'
 
 module SecondBase
   CONNECTION_PREFIX = 'secondbase'
   
-  require 'secondbase/railtie' if Rails::VERSION::MAJOR == 3
+  require 'secondbase/railtie'
   require 'secondbase/rake_method_chain'
   
   def self.do

data/lib/secondbase/active_record/associations/has_and_belongs_to_many_association.rb

@@ -0,0 +1,66 @@
+module ActiveRecord
+  # = Active Record Has And Belongs To Many Association
+  module Associations
+    class HasAndBelongsToManyAssociation < AssociationCollection 
+      
+      # determines the appropriate engine for the join table's parent klass
+      def arel_engine
+        Arel::Sql::Engine.new(@reflection.klass.engine)
+      end
+      
+      # This method is entirely replicated, except for line 25.  We simply
+      # need to pass in the appropriate engine to Arel.  
+      def insert_record(record, force = true, validate = true)
+        if record.new_record?
+          if force
+            record.save!
+          else
+            return false unless record.save(:validate => validate)
+          end
+        end
+
+        if @reflection.options[:insert_sql]
+          @owner.connection.insert(interpolate_and_sanitize_sql(@reflection.options[:insert_sql], record))
+        else
+          relation   = Arel::Table.new(@reflection.options[:join_table], arel_engine)
+          timestamps = record_timestamp_columns(record)
+          timezone   = record.send(:current_time_from_proper_timezone) if timestamps.any?
+
+          attributes = Hash[columns.map do |column|
+            name = column.name
+            value = case name.to_s
+              when @reflection.primary_key_name.to_s
+                @owner.id
+              when @reflection.association_foreign_key.to_s
+                record.id
+              when *timestamps
+                timezone
+              else
+                @owner.send(:quote_value, record[name], column) if record.has_attribute?(name)
+            end
+            [relation[name], value] unless value.nil?
+          end]
+
+          relation.insert(attributes)
+        end
+
+        return true
+      end
+      
+      # This method is entirely replicated, except for line 57.  We simply
+      # need to pass in the appropriate engine to Arel.
+      def delete_records(records)
+        if sql = @reflection.options[:delete_sql]
+          records.each { |record| @owner.connection.delete(interpolate_and_sanitize_sql(sql, record)) }
+        else
+
+          relation = Arel::Table.new(@reflection.options[:join_table], arel_engine)
+          
+          relation.where(relation[@reflection.primary_key_name].eq(@owner.id).
+            and(relation[@reflection.association_foreign_key].in(records.map { |x| x.id }.compact))
+          ).delete
+        end
+      end
+    end
+  end
+end

data/lib/secondbase/active_record/base.rb

@@ -0,0 +1,13 @@
+module ActiveRecord
+  class Base
+    
+    # Arel is concerned with "engines".  Normally the engine defaults to the primary
+    # connection (ActiveRecord::Base).  This will let us easily override the engine 
+    # when dealing with Seoncdbase models (deep in ActiveRecord code).
+    # Since SecondBase::Base inherits from ActiveRecord::Base, this will pass the
+    # right engine around.
+    def self.engine
+      self
+    end
+  end
+end

data/lib/secondbase/{fixtures.rb → active_record/fixtures.rb}

@@ -1,5 +1,3 @@
-require 'secondbase/model'
-
 ###########################
 # Monkey patch Fixtures
 # Fixtures needs to load fixtures into the database defined by the parent class!
@@ -7,7 +5,7 @@ require 'secondbase/model'
 # I feel like the concepts here could be incorporated directly into Fixtures. 
 # I mean, they shouldn't be so presumptions to think that every model lives in the 
 # same database....
-class Fixtures
+class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash)
   def self.create_fixtures(fixtures_directory, table_names, class_names = {})
     table_names = [table_names].flatten.map { |n| n.to_s }
     table_names.each { |n| class_names[n.tr('/', '_').to_sym] = n.classify if n.include?('/') }

data/lib/secondbase/active_record/patches.rb

@@ -0,0 +1,13 @@
+####################
+## ActiveRecord patches for all versions of rails
+require 'secondbase/active_record/base'
+
+
+####################
+## ActiveRecord patches for specific versions of rails
+if Rails.env.test?
+  require 'secondbase/active_record/fixtures'
+  require 'secondbase/active_record/test_fixtures' 
+end
+
+require 'secondbase/active_record/associations/has_and_belongs_to_many_association' 

data/lib/secondbase/active_record/test_fixtures.rb

@@ -0,0 +1,32 @@
+## ActiveRecord::TestFixtures
+## Monkey patch active record's test_fixtures module to manage
+## transactions for the SecondBase
+module ActiveRecord
+  module TestFixtures
+    alias_method :original_setup_fixtures, :setup_fixtures
+    alias_method :original_teardown_fixtures, :teardown_fixtures
+    
+    def setup_fixtures
+      original_setup_fixtures
+      # start tx for secondbase, if required
+      # Load fixtures once and begin transaction.
+      if run_in_transaction?
+        SecondBase::Base.connection.increment_open_transactions
+        SecondBase::Base.connection.transaction_joinable = false
+        SecondBase::Base.connection.begin_db_transaction
+      end
+    end
+    
+    def teardown_fixtures
+      original_teardown_fixtures
+      
+      # Rollback secondbase changes if a transaction is active.
+      if run_in_transaction? && SecondBase::Base.connection.open_transactions != 0
+        SecondBase::Base.connection.rollback_db_transaction
+        SecondBase::Base.connection.decrement_open_transactions
+      end
+      
+      SecondBase::Base.clear_active_connections!
+    end
+  end
+end

data/lib/secondbase/model.rb

@@ -2,10 +2,9 @@
 #
 # NOTE: By extending this model, you assume that the underlying table will be located in your Second (Data)base
 module SecondBase
-  require 'active_record'
   
   class Base < ActiveRecord::Base
-    establish_connection ActiveRecord::Base.configurations[CONNECTION_PREFIX][Rails.env]
+    establish_connection ActiveRecord::Base.configurations[SecondBase::CONNECTION_PREFIX][Rails.env]
   
     self.abstract_class = true
   end

data/secondbase.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{secondbase}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["karledurante"]
-  s.date = %q{2011-12-22}
+  s.date = %q{2012-08-31}
   s.description = %q{Secondbase provides support to Rails to create a homogeneous environment 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 = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -28,7 +29,11 @@ Gem::Specification.new do |s|
     "lib/generators/secondbase/migration_generator.rb",
     "lib/generators/secondbase/templates/migration.rb",
     "lib/secondbase.rb",
-    "lib/secondbase/fixtures.rb",
+    "lib/secondbase/active_record/associations/has_and_belongs_to_many_association.rb",
+    "lib/secondbase/active_record/base.rb",
+    "lib/secondbase/active_record/fixtures.rb",
+    "lib/secondbase/active_record/patches.rb",
+    "lib/secondbase/active_record/test_fixtures.rb",
     "lib/secondbase/model.rb",
     "lib/secondbase/railtie.rb",
     "lib/secondbase/rake_method_chain.rb",
@@ -45,31 +50,27 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.4.2}
   s.summary = %q{Allow Rails manage second database in your projects}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_secondbase.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.2"])
       s.add_development_dependency(%q<activerecord>, ["~> 3.0.0"])
       s.add_development_dependency(%q<activerecord>, ["~> 3.0.0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.2"])
       s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
       s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.2"])
     s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
     s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: secondbase
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - karledurante
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-22 00:00:00 -05:00
+date: 2012-08-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,14 +30,14 @@ dependencies:
         - 0
         version: "0"
   requirement: *id001
-  prerelease: false
+  type: :development
   name: shoulda
 - !ruby/object:Gem::Dependency 
-  type: :development
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
@@ -46,26 +46,26 @@ dependencies:
         - 0
         version: 1.0.0
   requirement: *id002
-  prerelease: false
+  type: :development
   name: bundler
 - !ruby/object:Gem::Dependency 
-  type: :development
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 51
         segments: 
         - 1
-        - 5
-        - 1
-        version: 1.5.1
+        - 8
+        - 2
+        version: 1.8.2
   requirement: *id003
-  prerelease: false
+  type: :development
   name: jeweler
 - !ruby/object:Gem::Dependency 
-  type: :development
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,10 +78,10 @@ dependencies:
         - 0
         version: 3.0.0
   requirement: *id004
-  prerelease: false
+  type: :development
   name: activerecord
 - !ruby/object:Gem::Dependency 
-  type: :development
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,7 +94,7 @@ dependencies:
         - 0
         version: 3.0.0
   requirement: *id005
-  prerelease: false
+  type: :development
   name: activerecord
 description: Secondbase provides support to Rails to create a homogeneous environment 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
@@ -107,6 +107,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -117,7 +118,11 @@ files:
 - lib/generators/secondbase/migration_generator.rb
 - lib/generators/secondbase/templates/migration.rb
 - lib/secondbase.rb
-- lib/secondbase/fixtures.rb
+- lib/secondbase/active_record/associations/has_and_belongs_to_many_association.rb
+- lib/secondbase/active_record/base.rb
+- lib/secondbase/active_record/fixtures.rb
+- lib/secondbase/active_record/patches.rb
+- lib/secondbase/active_record/test_fixtures.rb
 - lib/secondbase/model.rb
 - lib/secondbase/railtie.rb
 - lib/secondbase/rake_method_chain.rb
@@ -162,6 +167,5 @@ rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Allow Rails manage second database in your projects
-test_files: 
-- test/helper.rb
-- test/test_secondbase.rb
+test_files: []
+