mover 0.1.0 → 0.1.1

data/spec/mover/migrator_spec.rb

@@ -3,6 +3,7 @@ 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

data/spec/mover/record_spec.rb

@@ -3,6 +3,7 @@ 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
@@ -14,40 +15,40 @@ describe Mover::Base::Record do
         @articles = create_records
         @comments = create_records(Comment)
         @articles[0..1].each do |a|
-          a.move_to(:archived)
+          a.move_to(:archive)
         end
       end
   
       it "should move some records to the archive table" do
         Article.count.should == 3
-        ArchivedArticle.count.should == 2
+        ArticleArchive.count.should == 2
       end
   
       it "should preserve record attributes" do
         2.times do |x|
           original = @articles[x]
-          copy = ArchivedArticle.find(original.id)
+          copy = ArticleArchive.find(original.id)
           record_match?(original, copy)
         end
       end
     
       it "should move associated records" do
         Comment.count.should == 3
-        ArchivedComment.count.should == 2
+        CommentArchive.count.should == 2
       end
     
       it "should preserve associated record attributes" do
         2.times do |x|
           original = @comments[x]
-          copy = ArchivedComment.find(original.id)
+          copy = CommentArchive.find(original.id)
           record_match?(original, copy)
         end
       end
     
       it "should populate move_id" do
         (1..2).each do |x|
-          article = ArchivedArticle.find(x)
-          comment = ArchivedComment.find(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
@@ -56,8 +57,8 @@ describe Mover::Base::Record do
     
       it "should populate moved_at" do
         (1..2).each do |x|
-          article = ArchivedArticle.find(x)
-          comment = ArchivedComment.find(x)
+          article = ArticleArchive.find(x)
+          comment = CommentArchive.find(x)
           comment.moved_at.nil?.should == false
           comment.moved_at.should == article.moved_at
         end
@@ -70,10 +71,10 @@ describe Mover::Base::Record do
         articles = create_records
         create_records(Comment)
         articles[0..1].each do |a|
-          a.move_to(:archived)
+          a.move_to(:archive)
         end
-        @articles = ArchivedArticle.find(1, 2)
-        @comments = ArchivedComment.find(1, 2)
+        @articles = ArticleArchive.find(1, 2)
+        @comments = CommentArchive.find(1, 2)
         @articles.each do |article|
           article.move_from
         end
@@ -81,7 +82,7 @@ describe Mover::Base::Record do
     
       it "should move records back to the original table" do
         Article.count.should == 5
-        ArchivedArticle.count.should == 0
+        ArticleArchive.count.should == 0
       end
   
       it "should preserve record attributes" do
@@ -94,7 +95,7 @@ describe Mover::Base::Record do
     
       it "should move associated records" do
         Comment.count.should == 5
-        ArchivedComment.count.should == 0
+        CommentArchive.count.should == 0
       end
     
       it "should preserve associated record attributes" do
@@ -113,19 +114,19 @@ describe Mover::Base::Record do
       before(:all) do
         create_records
         create_records(Comment)
-        Article.move_to(:archived, [ 'id = ? OR id = ?', 1, 2 ])
-        Article.move_to(:drafted, [ 'id = ? OR id = ?', 3, 4 ])
+        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
-        ArchivedArticle.count.should == 2
-        DraftedArticle.count.should == 2
+        ArticleArchive.count.should == 2
+        ArticleDraft.count.should == 2
       end
       
       it "should move associated records" do
         Comment.count.should == 3
-        ArchivedComment.count.should == 2
+        CommentArchive.count.should == 2
       end
     end
     
@@ -134,21 +135,21 @@ describe Mover::Base::Record do
       before(:all) do
         create_records
         create_records(Comment)
-        Article.move_to(:archived, [ 'id = ? OR id = ?', 1, 2 ])
-        Article.move_to(:drafted, [ 'id = ? OR id = ?', 3, 4 ])
-        Article.move_from(:archived, [ 'id = ? OR id = ?', 1, 2 ])
-        Article.move_from(:drafted, [ 'id = ? OR id = ?', 3, 4 ])
+        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
-        ArchivedArticle.count.should == 0
-        DraftedArticle.count.should == 0
+        ArticleArchive.count.should == 0
+        ArticleDraft.count.should == 0
       end
       
       it "should move associated records" do
         Comment.count.should == 5
-        ArchivedComment.count.should == 0
+        CommentArchive.count.should == 0
       end
     end
   end

data/spec/mover/table_spec.rb

@@ -3,6 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 describe Mover::Base::Table do
 
   before(:all) do
+    $db.migrate(1)
     $db.migrate(0)
     $db.migrate(1)
   end
@@ -11,11 +12,11 @@ describe Mover::Base::Table do
 
     before(:all) do
       @article_columns = connection.columns("articles").collect(&:name)
-      @archive_columns = connection.columns("archived_articles").collect(&:name)
+      @archive_columns = connection.columns("articles_archive").collect(&:name)
     end
 
     it "should create an archive table" do
-      connection.table_exists?("archived_articles").should == true
+      connection.table_exists?("articles_archive").should == true
     end
 
     it "should create an archive table with the same structure as the original table" do
@@ -27,18 +28,18 @@ describe Mover::Base::Table do
     describe 'with options' do
       
       before(:all) do
-        Article.drop_movable_table(:archived)
+        Article.drop_movable_table(:archive)
         Article.create_movable_table(
-          :archived,
+          :archive,
           :columns => %w(id read),
           :indexes => %w(read)
         )
-        @archive_columns = connection.columns("archived_articles").collect(&:name)
+        @archive_columns = connection.columns("articles_archive").collect(&:name)
       end
       
       after(:all) do
-        Article.drop_movable_table(:archived)
-        Article.create_movable_table(:archived)
+        Article.drop_movable_table(:archive)
+        Article.create_movable_table(:archive)
       end
       
       it "should create the correct columns" do
@@ -49,7 +50,7 @@ describe Mover::Base::Table do
       end
       
       it "should create archive indexes" do
-        indexes = Article.send(:indexed_columns, 'archived_articles')
+        indexes = Article.send(:indexed_columns, 'articles_archive')
         indexes.to_set.should == [ "read" ].to_set
       end
     end
@@ -57,7 +58,7 @@ describe Mover::Base::Table do
     describe 'without options' do
       
       it "should create archive indexes" do
-        indexes = Article.send(:indexed_columns, 'archived_articles')
+        indexes = Article.send(:indexed_columns, 'articles_archive')
         indexes.to_set.should == [ "id", "title" ].to_set
       end
     end
@@ -66,12 +67,12 @@ describe Mover::Base::Table do
   describe :drop_movable_table do
     
     it "should drop the table" do
-      Article.drop_movable_table(:archived)
+      Article.drop_movable_table(:archive)
       output = connection.execute(<<-SQL)
         SELECT COUNT(*)
         FROM information_schema.tables 
         WHERE table_schema = '#{Article.configurations['test']['database']}' 
-        AND table_name = 'archived_articles';
+        AND table_name = 'articles_archive';
       SQL
       output.fetch_row.should == ['0']
     end

data/spec/spec_helper.rb

@@ -41,8 +41,8 @@ end
 
 def migrate_with_state(version)
   @old_article_columns = columns("articles")
-  @old_archive_columns = columns("archived_articles")
+  @old_archive_columns = columns("articles_archive")
   $db.migrate(version)
   @new_article_columns = columns("articles")
-  @new_archive_columns = columns("archived_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.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Winton Welsh