also_migrate 0.3.4 → 0.3.5

data/README.md

@@ -10,13 +10,14 @@ Requirements
 gem install also_migrate
 </pre>
 
-Define the model
-----------------
+Configure
+---------
 
 <pre>
-class Article &lt; ActiveRecord::Base
-  also_migrate(
-    :article_archives,
+AlsoMigrate.configuration = [
+  {
+    :source => 'articles',
+    :destination => 'article_archives',
     :add => [
       # Parameters to ActiveRecord::ConnectionAdapters::SchemaStatements#add_column
       [ 'deleted_at', :datetime, {} ]
@@ -24,12 +25,18 @@ class Article &lt; ActiveRecord::Base
     :subtract => 'restored_at',
     :ignore => 'deleted_at',
     :indexes => 'id'
-  )
-end
+  },
+  {
+    :source => 'users',
+    :destination => [ 'banned_users', 'deleted_users' ]
+  }
+]
 </pre>
 
 Options:
 
+* <code>source</code> Database schema source table
+* <code>destination</code> Database schema destination table (can also be an array of tables)
 * <code>add</code> Create columns that the original table doesn't have (defaults to none)
 * <code>subtract</code> Exclude columns from the original table (defaults to none)
 * <code>ignore</code> Ignore migrations that apply to certain columns (defaults to none)

data/config/gemsets.yml

@@ -1,4 +1,4 @@
 also_migrate:
-  active_wrapper: =0.4.2
+  active_wrapper: =0.4.4
   rake: >=0.8.7
   rspec: ~>1.0

data/config/gemspec.yml

@@ -1,5 +1,5 @@
 name: also_migrate
-version: 0.3.4
+version: 0.3.5
 authors:
   - Winton Welsh
 email: mail@wintoni.us

data/lib/also_migrate.rb

@@ -2,16 +2,14 @@ require File.dirname(__FILE__) + '/also_migrate/gems'
 
 $:.unshift File.dirname(__FILE__)
 
-require 'also_migrate/base'
 require 'also_migrate/migration'
 require 'also_migrate/migrator'
 
 module AlsoMigrate
   class <<self
-    attr_accessor :classes
+    attr_accessor :configuration
   end
 end
 
-ActiveRecord::Base.send(:include, AlsoMigrate::Base)
 ActiveRecord::Migrator.send(:include, AlsoMigrate::Migrator)
 ActiveRecord::Migration.send(:include, AlsoMigrate::Migration)

data/lib/also_migrate/migration.rb

@@ -31,35 +31,27 @@ module AlsoMigrate
           table_name = ActiveRecord::Migrator.proper_table_name(args[0])
           
           # Find models
-          if ::AlsoMigrate.classes
-            ::AlsoMigrate.classes.uniq.each do |klass|
-              if klass.also_migrate_config
-                klass.also_migrate_config.each do |config|
-                  options = config[:options]
-                  tables = config[:tables]
-                  
-                  next unless config[:table_name] == table_name
-              
-                  # Don't change ignored columns
-                  options[:ignore].each do |column|
-                    next if args.include?(column) || args.include?(column.intern)
-                  end
+          (::AlsoMigrate.configuration || []).each do |config|
+            next unless config[:source].to_s == table_name
+        
+            # Don't change ignored columns
+            [ config[:ignore] ].flatten.compact.each do |column|
+              next if args.include?(column) || args.include?(column.intern)
+            end
 
-                  # Run migration
-                  config[:tables].each do |table|
-                    if method == :create_table
-                      ActiveRecord::Migrator::AlsoMigrate.create_tables(klass)
-                    elsif method == :add_index && !options[:indexes].nil?
-                      next
-                    elsif connection.table_exists?(table)
-                      args[0] = table
-                      args[1] = table if method == :rename_table
-                      begin
-                        connection.send(method, *args, &block)
-                      rescue Exception => e
-                        puts "(also_migrate warning) #{e.message}"
-                      end
-                    end
+            # Run migration
+            if method == :create_table
+              ActiveRecord::Migrator::AlsoMigrate.create_tables(config)
+            elsif method == :add_index && !config[:indexes].nil?
+              next
+            else
+              [ config[:destination] ].flatten.compact.each do |table|
+                if connection.table_exists?(table)
+                  args[0] = table
+                  begin
+                    connection.send(method, *args, &block)
+                  rescue Exception => e
+                    puts "(also_migrate warning) #{e.message}"
                   end
                 end
               end

data/lib/also_migrate/migrator.rb

@@ -14,12 +14,8 @@ module AlsoMigrate
     module InstanceMethods
       
       def migrate_with_also_migrate
-        if ::AlsoMigrate.classes
-          ::AlsoMigrate.classes.uniq.each do |klass|
-            if klass.respond_to?(:also_migrate_config)
-              AlsoMigrate.create_tables(klass)
-            end
-          end
+        (::AlsoMigrate.configuration || []).each do |config|
+          AlsoMigrate.create_tables(config)
         end
       rescue Exception => e
         puts "AlsoMigrate error: #{e.message}"
@@ -35,58 +31,61 @@ module AlsoMigrate
             ActiveRecord::Base.connection
           end
         
-          def create_tables(klass)
-            config = klass.also_migrate_config
-            return unless config
-            old_table = klass.table_name
-            config.each do |config|
-              options = config[:options]
-              config[:tables].each do |new_table|
-                if !connection.table_exists?(new_table) && connection.table_exists?(old_table)
-                  columns = connection.columns(old_table).collect(&:name)
-                  columns -= options[:subtract].collect(&:to_s)
-                  columns.collect! { |col| connection.quote_column_name(col) }
-                  indexes = options[:indexes]
-                  if indexes
-                    engine =
-                      if connection.class.to_s.include?('Mysql')
-                        'ENGINE=' + connection.select_one(<<-SQL)['Engine']
-                          SHOW TABLE STATUS
-                          WHERE Name = '#{old_table}'
-                        SQL
-                      end
+          def create_tables(config)
+            [ config[:destination] ].flatten.compact.each do |new_table|
+              if !connection.table_exists?(new_table) && connection.table_exists?(config[:source])
+                columns = connection.columns(config[:source]).collect(&:name)
+                columns -= [ config[:subtract] ].flatten.compact.collect(&:to_s)
+                columns.collect! { |col| connection.quote_column_name(col) }
+                if config[:indexes]
+                  engine =
+                    if connection.class.to_s.include?('Mysql')
+                      'ENGINE=' + connection.select_one(<<-SQL)['Engine']
+                        SHOW TABLE STATUS
+                        WHERE Name = '#{config[:source]}'
+                      SQL
+                    end
+                  connection.execute(<<-SQL)
+                    CREATE TABLE #{new_table} #{engine}
+                    AS SELECT #{columns.join(',')}
+                    FROM #{config[:source]}
+                    WHERE false;
+                  SQL
+                  [ config[:indexes] ].flatten.compact.each do |column|
+                    connection.add_index(new_table, column)
+                  end
+                else
+                  if connection.class.to_s.include?('SQLite')
+                    col_string = connection.columns(old_table).collect {|c|
+                      "#{c.name} #{c.sql_type}"
+                    }.join(', ')
                     connection.execute(<<-SQL)
-                      CREATE TABLE #{new_table} #{engine}
-                      AS SELECT #{columns.join(',')}
-                      FROM #{old_table}
-                      WHERE false;
+                      CREATE TABLE #{new_table}
+                      (#{col_string})
                     SQL
-                    indexes.each do |column|
-                      connection.add_index(new_table, column)
-                    end
                   else
                     connection.execute(<<-SQL)
                       CREATE TABLE #{new_table}
-                      LIKE #{old_table};
+                      LIKE #{config[:source]};
                     SQL
                   end
                 end
-                if connection.table_exists?(new_table)
-                  if options[:add] || options[:subtract]
-                    columns = connection.columns(new_table).collect(&:name)
-                  end
-                  if options[:add]
-                    options[:add].each do |column|
-                      unless columns.include?(column[0])
-                        connection.add_column(*([ new_table ] + column))
-                      end
+              end
+              if connection.table_exists?(new_table)
+                if config[:add] || config[:subtract]
+                  columns = connection.columns(new_table).collect(&:name)
+                end
+                if config[:add]
+                  config[:add].each do |column|
+                    unless columns.include?(column[0])
+                      connection.add_column(*([ new_table ] + column))
                     end
                   end
-                  if options[:subtract]
-                    options[:subtract].each do |column|
-                      if columns.include?(column)
-                        connection.remove_column(new_table, column)
-                      end
+                end
+                if config[:subtract]
+                  [ config[:subtract] ].flatten.compact.each do |column|
+                    if columns.include?(column)
+                      connection.remove_column(new_table, column)
                     end
                   end
                 end

data/rails/init.rb

@@ -1,5 +1 @@
-require File.expand_path(File.dirname(__FILE__) + '/../lib/also_migrate')
-
-unless $override_rails_rake_task == false
-  $rails_rake_task = false
-end
+require File.expand_path(File.dirname(__FILE__) + '/../lib/also_migrate')

data/spec/Rakefile

@@ -1,13 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/../lib/also_migrate/gems')
 
-AlsoMigrate::Gems.require(:spec_rake)
+AlsoMigrate::Gems.activate(:active_wrapper)
 
 require 'active_wrapper/tasks'
 
 #begin
   ActiveWrapper::Tasks.new(
     :base => File.dirname(__FILE__),
-    :env => 'test'
+    :env => ENV['ENV'] || 'test'
   )
 # rescue Exception
 # end

data/spec/also_migrate_spec.rb

@@ -10,15 +10,16 @@ describe AlsoMigrate do
           reset_fixture
         
           if description == "table doesn't exist yet"
-            Article.also_migrate(
-              :article_archives,
+            AlsoMigrate.configuration << {
+              :source => :articles,
+              :destination => :article_archives,
               :add => [
                 [ 'deleted_at', :datetime ]
               ],
               :subtract => 'restored_at',
               :ignore => 'body',
               :indexes => 'id'
-            )
+            }
           end
         
           $db.migrate(1)
@@ -26,15 +27,16 @@ describe AlsoMigrate do
           $db.migrate(1)
         
           if description == "table already exists"
-            Article.also_migrate(
-              :article_archives,
+            AlsoMigrate.configuration << {
+              :source => :articles,
+              :destination => :article_archives,
               :add => [
                 [ 'deleted_at', :datetime ]
               ],
               :subtract => %w(restored_at),
               :ignore => %w(body),
               :indexes => %w(id)
-            )
+            }
             $db.migrate(1)
           end
         end
@@ -78,14 +80,20 @@ describe AlsoMigrate do
           reset_fixture
           
           if description == "table doesn't exist yet"
-            Article.also_migrate :article_archives
+            AlsoMigrate.configuration << {
+              :source => :articles,
+              :destination => :article_archives
+            }
           end
       
           $db.migrate(0)
           $db.migrate(1)
       
           if description == "table already exists"
-            Article.also_migrate :article_archives
+            AlsoMigrate.configuration << {
+              :source => :articles,
+              :destination => :article_archives
+            }
             $db.migrate(1)
           end
         end
@@ -102,8 +110,14 @@ describe AlsoMigrate do
           reset_fixture
           
           if description == "table doesn't exist yet"
-            Article.also_migrate :article_archives
-            Comment.also_migrate :comment_archives
+            AlsoMigrate.configuration << {
+              :source => :articles,
+              :destination => :article_archives
+            }
+            AlsoMigrate.configuration << {
+              :source => :comments,
+              :destination => :comment_archives
+            }
           end
       
           $db.migrate(0)
@@ -112,8 +126,14 @@ describe AlsoMigrate do
           $db.migrate(3)
       
           if description == "table already exists"
-            Article.also_migrate :article_archives
-            Comment.also_migrate :comment_archives
+            AlsoMigrate.configuration << {
+              :source => :articles,
+              :destination => :article_archives
+            }
+            AlsoMigrate.configuration << {
+              :source => :comments,
+              :destination => :comment_archives
+            }
             $db.migrate(3)
           end
         end
@@ -132,19 +152,23 @@ describe AlsoMigrate do
           before(:each) do
             reset_fixture
           
-            Article.also_migrate :article_archives
+            AlsoMigrate.configuration << {
+              :source => :articles,
+              :destination => :article_archives
+            }
       
             $db.migrate(0)
             $db.migrate(1)
           
-            Article.also_migrate_config = nil
-            Article.also_migrate(
-              :article_archives,
+            AlsoMigrate.configuration = []
+            AlsoMigrate.configuration << {
+              :source => :articles,
+              :destination => :article_archives,
               :add => [
                 [ 'deleted_at', :datetime ]
               ],
               :subtract => 'restored_at'
-            )
+            }
           end
         
           it "should add and remove fields" do

data/spec/spec_helper.rb

@@ -8,8 +8,6 @@ AlsoMigrate::Gems.activate :active_wrapper, :rspec
 require 'active_wrapper'
 
 require "#{$root}/lib/also_migrate"
-require "#{$root}/spec/fixtures/article"
-require "#{$root}/spec/fixtures/comment"
 require 'pp'
 
 Spec::Runner.configure do |config|
@@ -84,13 +82,7 @@ def migrate_with_state(version)
 end
 
 def reset_fixture
-  if Article.respond_to?(:also_migrate_config)
-    Article.also_migrate_config = nil
-  end
-  
-  if Comment.respond_to?(:also_migrate_config)
-    Comment.also_migrate_config = nil
-  end
+  AlsoMigrate.configuration = []
   
   if connection.table_exists?('article_archives')
     connection.execute('DROP TABLE article_archives')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Winton Welsh
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 -08:00
+date: 2011-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,6 @@ files:
 - config/gemspec.yml
 - init.rb
 - lib/also_migrate.rb
-- lib/also_migrate/base.rb
 - lib/also_migrate/gems.rb
 - lib/also_migrate/migration.rb
 - lib/also_migrate/migrator.rb
@@ -76,8 +75,6 @@ files:
 - spec/db/migrate/001_create_articles.rb
 - spec/db/migrate/002_add_permalink.rb
 - spec/db/migrate/003_create_comments.rb
-- spec/fixtures/article.rb
-- spec/fixtures/comment.rb
 - spec/fixtures/gemsets.yml
 - spec/fixtures/gemspec.yml
 - spec/spec_helper.rb
@@ -121,8 +118,6 @@ test_files:
 - spec/db/migrate/001_create_articles.rb
 - spec/db/migrate/002_add_permalink.rb
 - spec/db/migrate/003_create_comments.rb
-- spec/fixtures/article.rb
-- spec/fixtures/comment.rb
 - spec/fixtures/gemsets.yml
 - spec/fixtures/gemspec.yml
 - spec/spec_helper.rb

data/lib/also_migrate/base.rb

@@ -1,35 +0,0 @@
-module AlsoMigrate
-  module Base
-    
-    def self.included(base)
-      unless base.respond_to?(:also_migrate)
-        base.extend ClassMethods
-      end
-    end
-    
-    module ClassMethods
-      
-      def also_migrate(*args)
-        options = args.extract_options!
-        @also_migrate_config ||= []
-        @also_migrate_config << {
-          :table_name => self.table_name,
-          :tables => args.collect(&:to_s),
-          :options => {
-            :add => options[:add] ? options[:add] : [],
-            :subtract => [ options[:subtract] ].flatten.compact,
-            :ignore => [ options[:ignore] ].flatten.compact,
-            :indexes => options[:indexes] ? [ options[:indexes] ].flatten : nil
-          }
-        }
-        self.class_eval do
-          class <<self
-            attr_accessor :also_migrate_config
-          end
-        end
-        ::AlsoMigrate.classes ||= []
-        ::AlsoMigrate.classes << self
-      end
-    end
-  end
-end

data/spec/fixtures/article.rb

@@ -1,2 +0,0 @@
-class Article < ActiveRecord::Base
-end

data/spec/fixtures/comment.rb

@@ -1,2 +0,0 @@
-class Comment < ActiveRecord::Base
-end