mover 0.1.1 → 0.2.0

data/spec/mover_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe Mover do
+  
+  describe :move_to do
+  
+    before(:each) do
+      [ 1, 0, 1 ].each { |v| $db.migrate(v) }
+      @articles = create_records(Article)
+      @comments = create_records(Comment)
+      @articles[0].move_to(ArticleArchive)
+      Article.move_to(ArticleArchive, [ 'id = ?', 2 ])
+    end
+  
+    describe 'move records' do
+    
+      it "should move both articles and their associations" do
+        Article.count.should == 3
+        Comment.count.should == 3
+        ArticleArchive.count.should == 2
+        CommentArchive.count.should == 2
+        Article.find_by_id(1).nil?.should == true
+        Comment.find_by_id(2).nil?.should == true
+        ArticleArchive.find_by_id(1).nil?.should == false
+        CommentArchive.find_by_id(2).nil?.should == false
+        comments = ArticleArchive.find_by_id(1).comments
+        comments.length.should == 1
+        comments.first.id.should == 1
+        comments = ArticleArchive.find_by_id(2).comments
+        comments.length.should == 1
+        comments.first.id.should == 2
+      end
+      
+      it "should assign moved_at" do
+        ArticleArchive.find_by_id(1).moved_at.utc.to_s.should == Time.now.utc.to_s
+      end
+    end
+  
+    describe 'move records back' do
+    
+      before(:each) do
+        ArticleArchive.find(1).move_to(Article)
+        ArticleArchive.move_to(Article, [ 'id = ?', 2 ])
+      end
+    
+      it "should move both articles and their associations" do
+        Article.count.should == 5
+        Comment.count.should == 5
+        ArticleArchive.count.should == 0
+        CommentArchive.count.should == 0
+        Article.find_by_id(1).nil?.should == false
+        Comment.find_by_id(2).nil?.should == false
+        ArticleArchive.find_by_id(1).nil?.should == true
+        CommentArchive.find_by_id(2).nil?.should == true
+        comments = Article.find_by_id(1).comments
+        comments.length.should == 1
+        comments.first.id.should == 1
+        comments = Article.find_by_id(2).comments
+        comments.length.should == 1
+        comments.first.id.should == 2
+      end
+    end
+  end
+  
+  describe :reserve_id do
+    it "should return an id" do
+      Article.reserve_id.class.should == Fixnum
+    end
+    
+    it "should delete the record" do
+      id = Article.reserve_id
+      Article.find_by_id(id).should == nil
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -24,7 +24,7 @@ def connection
   ActiveRecord::Base.connection
 end
 
-def create_records(klass=Article, values={})
+def create_records(klass, values={})
   klass.delete_all
   (1..5).collect do |x|
     klass.column_names.each do |column|
@@ -37,12 +37,4 @@ def create_records(klass=Article, values={})
     values[:id] = x
     klass.create(values)
   end
-end
-
-def migrate_with_state(version)
-  @old_article_columns = columns("articles")
-  @old_archive_columns = columns("articles_archive")
-  $db.migrate(version)
-  @new_article_columns = columns("articles")
-  @new_archive_columns = columns("articles_archive")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mover
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -07:00
+date: 2010-04-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,26 +32,20 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - init.rb
-- lib/mover/migrator.rb
-- lib/mover/record.rb
-- lib/mover/table.rb
 - lib/mover.rb
-- log/development.log
 - MIT-LICENSE
 - rails/init.rb
 - Rakefile
 - README.markdown
 - require.rb
 - spec/config/database.yml.example
-- spec/db/migrate/001_create_articles.rb
-- spec/db/migrate/002_add_permalink.rb
-- spec/db/migrate/003_remove_magic_columns.rb
+- spec/db/migrate/001_create_fixtures.rb
 - spec/fixtures/article.rb
+- spec/fixtures/article_archive.rb
 - spec/fixtures/comment.rb
+- spec/fixtures/comment_archive.rb
 - spec/log/test.log
-- spec/mover/migrator_spec.rb
-- spec/mover/record_spec.rb
-- spec/mover/table_spec.rb
+- spec/mover_spec.rb
 - spec/Rakefile
 - spec/spec_helper.rb
 has_rdoc: true

data/lib/mover/migrator.rb

@@ -1,44 +0,0 @@
-module Mover
-  module Migrator
-    
-    def method_missing_with_mover(method, *arguments, &block)
-      args = Marshal.load(Marshal.dump(arguments))
-      method_missing_without_mover(method, *arguments, &block)
-      
-      supported = [
-        :add_column, :add_timestamps, :change_column,
-        :change_column_default, :change_table,
-        :drop_table, :remove_column, :remove_columns,
-        :remove_timestamps, :rename_column, :rename_table
-      ]
-      
-      # Don't change these columns
-      %w(moved_at move_id).each do |column|
-        return if args.include?(column) || args.include?(column.intern)
-      end
-      
-      if !args.empty? && supported.include?(method)
-        connection = ActiveRecord::Base.connection
-        table_name = ActiveRecord::Migrator.proper_table_name(args[0])
-        # Find model
-        klass = Object.subclasses_of(ActiveRecord::Base).detect do |klass|
-          if klass.respond_to?(:movable_types)
-            klass.table_name.to_s == table_name
-          end
-        end
-        # Run migration on movable table
-        if klass
-          klass.movable_types.each do |type|
-            args[0] = [ table_name, type ].join('_')
-            if method == :rename_table
-              args[1] = [ args[1].to_s, type ].join('_')
-            end
-            if connection.table_exists?(args[0])
-              connection.send(method, *args, &block)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/mover/record.rb

@@ -1,114 +0,0 @@
-module Mover
-  module Base
-    module Record
-      module ClassMethods
-        
-        def move_from(type, conditions)
-          klass = movable_class(type)
-          if klass
-            if klass.column_names.include?('move_id')
-              klass.find_each(:conditions => conditions) do |record|
-                record.move_from
-              end
-            else
-              execute_move(klass, self, conditions)
-            end
-          end
-        end
-        
-        def move_to(type, conditions)
-          if movable_class(type).column_names.include?('move_id')
-            self.find_each(:conditions => conditions) do |record|
-              record.move_to(type)
-            end
-          else
-            execute_move(self, movable_class(type), conditions)
-          end
-        end
-        
-        private
-        
-        def execute_move(from_class, to_class, conditions, &block)
-          add_conditions! where = '', conditions
-          insert = from_class.column_names & to_class.column_names
-          insert.collect! { |col| connection.quote_column_name(col) }
-          select = insert.clone
-          yield(insert, select) if block_given?
-          if to_class.column_names.include?('moved_at')
-            insert << connection.quote_column_name('moved_at')
-            select << connection.quote(Time.now)
-          end
-          connection.execute(<<-SQL)
-            INSERT INTO #{to_class.table_name} (#{insert.join(', ')})
-            SELECT #{select.join(', ')}
-            FROM #{from_class.table_name}
-            #{where}
-          SQL
-          connection.execute("DELETE FROM #{from_class.table_name} #{where}")
-        end
-        
-        def movable_class(type)
-          eval(self.name + type.to_s.classify)
-        rescue
-          raise "#{self.table_name.classify} needs an `is_movable :#{type}` definition"
-        end
-      end
-    
-      module InstanceMethods
-        
-        def move_from
-          return unless self.respond_to?(:moved_from_class)
-          # Move associations
-          moved_from_class.reflect_on_all_associations.each do |association|
-            if move_association?(association)
-              klass = association.klass.send(:movable_class, self.class.movable_type)
-              klass.find_each(:conditions => [ 'move_id = ?', self.move_id ]) do |record|
-                record.move_from
-              end
-            end
-          end
-          # Move record
-          conditions = "#{self.class.primary_key} = #{id}"
-          moved_from_class.send(:execute_move, self.class, moved_from_class, conditions)
-        end
-        
-        def move_to(type)
-          return if self.respond_to?(:moved_from_class)
-          klass = self.class.send :movable_class, type
-          if klass
-            # Create movable_id
-            if !self.movable_id && klass.column_names.include?('move_id')
-              self.movable_id = Digest::MD5.hexdigest("#{self.class.name}#{self.id}")
-            end
-            # Move associations
-            self.class.reflect_on_all_associations.each do |association|
-              if move_association?(association)
-                self.send(association.name).each do |record|
-                  record.movable_id = self.movable_id
-                  record.move_to(type)
-                end
-              end
-            end
-            # Move record
-            me = self
-            conditions = "#{self.class.primary_key} = #{id}"
-            self.class.send(:execute_move, self.class, klass, conditions) do |insert, select|
-              if me.movable_id
-                insert << connection.quote_column_name('move_id')
-                select << connection.quote(self.movable_id)
-              end
-            end
-            self.movable_id = nil
-          end
-        end
-        
-        private
-        
-        def move_association?(association)
-          association.klass.respond_to?(:movable_types) &&
-          association.macro.to_s =~ /^has/
-        end
-      end
-    end
-  end
-end

data/lib/mover/table.rb

@@ -1,82 +0,0 @@
-module Mover
-  module Base
-    module Table
-      
-      def create_movable_table(type, options={})
-        movable_table = [ table_name, type ].join('_')
-        columns =
-          if options[:columns]
-            options[:columns].collect { |c| "`#{c}`" }.join(', ')
-          else
-            '*'
-          end
-        engine = options[:engine]
-        engine ||=
-          if connection.class.to_s.include?('Mysql')
-            "ENGINE=InnoDB"
-          end
-        if table_exists? and !connection.table_exists?(movable_table)
-          # Create table
-          connection.execute(<<-SQL)
-            CREATE TABLE #{movable_table} #{engine}
-            AS SELECT #{columns}
-            FROM #{table_name}
-            WHERE false;
-          SQL
-          # Create indexes
-          options[:indexes] ||= indexed_columns(table_name)
-          options[:indexes].each do |column|
-            connection.add_index(movable_table, column)
-          end
-        end
-      end
-    
-      def drop_movable_table(*types)
-        types.each do |type|
-          connection.execute("DROP TABLE IF EXISTS #{[ table_name, type ].join('_')}")
-        end
-      end
-      
-      private
-      
-      def indexed_columns(table_name)
-        # MySQL
-        if connection.class.to_s.include?('Mysql')
-          index_query = "SHOW INDEX FROM #{table_name}"
-          indexes = connection.select_all(index_query).collect do |r|
-            r["Column_name"]
-          end
-        # PostgreSQL
-        # http://stackoverflow.com/questions/2204058/show-which-columns-an-index-is-on-in-postgresql/2213199
-        elsif connection.class.to_s.include?('PostgreSQL')
-          index_query = <<-SQL
-            select
-              t.relname as table_name,
-              i.relname as index_name,
-              a.attname as column_name
-            from
-              pg_class t,
-              pg_class i,
-              pg_index ix,
-              pg_attribute a
-            where
-              t.oid = ix.indrelid
-              and i.oid = ix.indexrelid
-              and a.attrelid = t.oid
-              and a.attnum = ANY(ix.indkey)
-              and t.relkind = 'r'
-              and t.relname = '#{table_name}'
-            order by
-              t.relname,
-              i.relname
-          SQL
-          indexes = connection.select_all(index_query).collect do |r|
-            r["column_name"]
-          end
-        else
-          raise 'Mover does not support this database adapter'
-        end
-      end
-    end
-  end
-end

data/log/development.log

@@ -1,6 +0,0 @@
-  SQL (0.2ms)   SET SQL_AUTO_IS_NULL=0
-  User Load (59.6ms)   SELECT * FROM `users` ORDER BY users.id DESC LIMIT 1
-  User Columns (21.6ms)   SHOW FIELDS FROM `users`
-  SQL (0.3ms)   SET SQL_AUTO_IS_NULL=0
-  SQL (0.3ms)   SHOW TABLES
-  User Columns (13.0ms)   SHOW FIELDS FROM `users`

data/spec/db/migrate/001_create_articles.rb

@@ -1,34 +0,0 @@
-class CreateArticles < ActiveRecord::Migration
-  def self.up
-    create_table :articles do |t|
-      t.string :title
-      t.string :body
-      t.boolean :read
-    end
-    add_index :articles, :title
-    
-    Article.create_movable_table(:archive)
-    add_column :articles_archive, :move_id, :string
-    add_column :articles_archive, :moved_at, :datetime
-    
-    Article.create_movable_table(:draft)
-    
-    create_table :comments do |t|
-      t.string :title
-      t.string :body
-      t.boolean :read
-      t.integer :article_id
-    end
-    
-    Comment.create_movable_table(:archive)
-    add_column :comments_archive, :move_id, :string
-    add_column :comments_archive, :moved_at, :datetime
-  end
-
-  def self.down
-    drop_table :articles
-    drop_table :comments
-    Article.drop_movable_table(:archive)
-    Comment.drop_movable_table(:archive)
-  end
-end

data/spec/db/migrate/002_add_permalink.rb

@@ -1,9 +0,0 @@
-class AddPermalink < ActiveRecord::Migration
-  def self.up
-    add_column :articles, :permalink, :string
-  end
-
-  def self.down
-    remove_column :articles, :permalink
-  end
-end

data/spec/db/migrate/003_remove_magic_columns.rb

@@ -1,9 +0,0 @@
-class RemoveMagicColumns < ActiveRecord::Migration
-  def self.up
-    remove_column :articles, :move_id
-    remove_column :articles, :moved_at
-  end
-
-  def self.down
-  end
-end

data/spec/mover/migrator_spec.rb

@@ -1,34 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
-
-describe Mover::Migrator do
-  
-  before(:each) do
-    $db.migrate(1)
-    $db.migrate(0)
-    $db.migrate(1)
-  end
-  
-  describe :method_missing_with_mover do
-    
-    it 'should migrate both tables up' do
-      migrate_with_state(2)
-      (@new_article_columns - @old_article_columns).should == [ 'permalink' ]
-      (@new_archive_columns - @old_archive_columns).should == [ 'permalink' ]
-    end
-    
-    it 'should migrate both tables down' do
-      $db.migrate(2)
-      migrate_with_state(1)
-      (@old_article_columns - @new_article_columns).should == [ 'permalink' ]
-      (@old_archive_columns - @new_archive_columns).should == [ 'permalink' ]
-    end
-    
-    it "should not touch the archive's move_id or moved_at column" do
-      connection.add_column(:articles, :move_id, :integer)
-      connection.add_column(:articles, :moved_at, :datetime)
-      migrate_with_state(3)
-      (@old_article_columns - @new_article_columns).should == [ 'move_id', 'moved_at' ]
-      (@old_archive_columns - @new_archive_columns).should == []
-    end
-  end
-end

data/spec/mover/record_spec.rb

@@ -1,156 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
-
-describe Mover::Base::Record do
-  
-  before(:all) do
-    $db.migrate(1)
-    $db.migrate(0)
-    $db.migrate(1)
-  end
-  
-  describe :InstanceMethods do
-    describe :move_to do
-  
-      before(:all) do
-        @articles = create_records
-        @comments = create_records(Comment)
-        @articles[0..1].each do |a|
-          a.move_to(:archive)
-        end
-      end
-  
-      it "should move some records to the archive table" do
-        Article.count.should == 3
-        ArticleArchive.count.should == 2
-      end
-  
-      it "should preserve record attributes" do
-        2.times do |x|
-          original = @articles[x]
-          copy = ArticleArchive.find(original.id)
-          record_match?(original, copy)
-        end
-      end
-    
-      it "should move associated records" do
-        Comment.count.should == 3
-        CommentArchive.count.should == 2
-      end
-    
-      it "should preserve associated record attributes" do
-        2.times do |x|
-          original = @comments[x]
-          copy = CommentArchive.find(original.id)
-          record_match?(original, copy)
-        end
-      end
-    
-      it "should populate move_id" do
-        (1..2).each do |x|
-          article = ArticleArchive.find(x)
-          comment = CommentArchive.find(x)
-          comment.move_id.nil?.should == false
-          comment.move_id.length.should == 32
-          comment.move_id.should == article.move_id
-        end
-      end
-    
-      it "should populate moved_at" do
-        (1..2).each do |x|
-          article = ArticleArchive.find(x)
-          comment = CommentArchive.find(x)
-          comment.moved_at.nil?.should == false
-          comment.moved_at.should == article.moved_at
-        end
-      end
-    end
-  
-    describe :move_from do
-    
-      before(:all) do
-        articles = create_records
-        create_records(Comment)
-        articles[0..1].each do |a|
-          a.move_to(:archive)
-        end
-        @articles = ArticleArchive.find(1, 2)
-        @comments = CommentArchive.find(1, 2)
-        @articles.each do |article|
-          article.move_from
-        end
-      end
-    
-      it "should move records back to the original table" do
-        Article.count.should == 5
-        ArticleArchive.count.should == 0
-      end
-  
-      it "should preserve record attributes" do
-        2.times do |x|
-          original = @articles[x]
-          copy = Article.find(original.id)
-          record_match?(original, copy)
-        end
-      end
-    
-      it "should move associated records" do
-        Comment.count.should == 5
-        CommentArchive.count.should == 0
-      end
-    
-      it "should preserve associated record attributes" do
-        2.times do |x|
-          original = @comments[x]
-          copy = Comment.find(original.id)
-          record_match?(original, copy)
-        end
-      end
-    end
-  end
-  
-  describe :ClassMethods do
-    describe :move_to do
-  
-      before(:all) do
-        create_records
-        create_records(Comment)
-        Article.move_to(:archive, [ 'id = ? OR id = ?', 1, 2 ])
-        Article.move_to(:draft, [ 'id = ? OR id = ?', 3, 4 ])
-      end
-      
-      it "should move the records" do
-        Article.count.should == 1
-        ArticleArchive.count.should == 2
-        ArticleDraft.count.should == 2
-      end
-      
-      it "should move associated records" do
-        Comment.count.should == 3
-        CommentArchive.count.should == 2
-      end
-    end
-    
-    describe :move_from do
-  
-      before(:all) do
-        create_records
-        create_records(Comment)
-        Article.move_to(:archive, [ 'id = ? OR id = ?', 1, 2 ])
-        Article.move_to(:draft, [ 'id = ? OR id = ?', 3, 4 ])
-        Article.move_from(:archive, [ 'id = ? OR id = ?', 1, 2 ])
-        Article.move_from(:draft, [ 'id = ? OR id = ?', 3, 4 ])
-      end
-      
-      it "should move the records" do
-        Article.count.should == 5
-        ArticleArchive.count.should == 0
-        ArticleDraft.count.should == 0
-      end
-      
-      it "should move associated records" do
-        Comment.count.should == 5
-        CommentArchive.count.should == 0
-      end
-    end
-  end
-end