mover 0.1.0 → 0.1.1

data/README.markdown

@@ -18,24 +18,24 @@ Create the movable table
 Migration:
 
 <pre>
-class CreateArchivedArticles < ActiveRecord::Migration
+class CreateArticlesArchive < ActiveRecord::Migration
   def self.up
     Article.create_movable_table(
-      :archived,
+      :archive,
       :columns => %w(id title body created_at),
       :indexes => %w(id created_at)
     )
-    add_column :archived_articles, :move_id, :string
-    add_column :archived_articles, :moved_at, :datetime
+    add_column :articles_archive, :move_id, :string
+    add_column :articles_archive, :moved_at, :datetime
   end
 
   def self.down
-    Article.drop_movable_table(:archived)
+    Article.drop_movable_table(:archive)
   end
 end
 </pre>
 
-The first parameter names your movable table. In this example, the table is named <code>archived_articles</code>.
+The first parameter names your movable table. In this example, the table is named <code>articles_archive</code>.
 
 Options:
 
@@ -51,7 +51,7 @@ Define the model
 
 <pre>
 class Article < ActiveRecord::Base
-  is_movable :archived
+  is_movable :archive
 end
 </pre>
 
@@ -61,8 +61,8 @@ Moving records
 --------------
 
 <pre>
-Article.last.move_to(:archived)
-Article.move_to(:archived, [ "created_at > ?", Date.today ])
+Article.last.move_to(:archive)
+Article.move_to(:archive, [ "created_at > ?", Date.today ])
 </pre>
 
 Associations move if they are movable and if all movable tables have a <code>move_id</code> column (see <a href="#magic_columns">magic columns</a>).
@@ -71,11 +71,11 @@ Restoring records
 -----------------
 
 <pre>
-Article.move_from(:archived, [ "created_at > ?", Date.today ])
-ArchivedArticle.last.move_from
+Article.move_from(:archive, [ "created_at > ?", Date.today ])
+ArticleArchive.last.move_from
 </pre>
 
-You can access the movable table by prepending its name to the original class name. In this example, you would use <code>ArchivedArticle</code>.
+You can access the movable table by prepending its name to the original class name. In this example, you would use <code>ArticleArchive</code>.
 
 <a name="magic_columns"></a>
 

data/lib/mover/migrator.rb

@@ -4,6 +4,7 @@ module Mover
     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,
@@ -28,9 +29,9 @@ module Mover
         # Run migration on movable table
         if klass
           klass.movable_types.each do |type|
-            args[0] = [ type, table_name ].join('_')
+            args[0] = [ table_name, type ].join('_')
             if method == :rename_table
-              args[1] = [ type, args[1].to_s ].join('_')
+              args[1] = [ args[1].to_s, type ].join('_')
             end
             if connection.table_exists?(args[0])
               connection.send(method, *args, &block)

data/lib/mover/record.rb

@@ -48,7 +48,7 @@ module Mover
         end
         
         def movable_class(type)
-          eval(type.to_s.classify + self.table_name.classify)
+          eval(self.name + type.to_s.classify)
         rescue
           raise "#{self.table_name.classify} needs an `is_movable :#{type}` definition"
         end

data/lib/mover/table.rb

@@ -3,7 +3,7 @@ module Mover
     module Table
       
       def create_movable_table(type, options={})
-        movable_table = [ type, table_name ].join('_')
+        movable_table = [ table_name, type ].join('_')
         columns =
           if options[:columns]
             options[:columns].collect { |c| "`#{c}`" }.join(', ')
@@ -33,7 +33,7 @@ module Mover
     
       def drop_movable_table(*types)
         types.each do |type|
-          connection.execute("DROP TABLE IF EXISTS #{[ type, table_name ].join('_')}")
+          connection.execute("DROP TABLE IF EXISTS #{[ table_name, type ].join('_')}")
         end
       end
       

data/lib/mover.rb

@@ -23,17 +23,17 @@ module Mover
         
         types.each do |type|
           eval <<-RUBY
-            class ::#{type.to_s.classify}#{self.table_name.classify} < ActiveRecord::Base
+            class ::#{self.name}#{type.to_s.classify} < ActiveRecord::Base
               include Mover::Base::Record::InstanceMethods
               
-              self.table_name = "#{type}_#{self.table_name}"
+              self.table_name = "#{self.table_name}_#{type}"
               
               def self.movable_type
                 #{type.inspect}
               end
               
               def moved_from_class
-                #{self.table_name.classify}
+                #{self.name}
               end
             end
           RUBY

data/require.rb

@@ -17,7 +17,7 @@ Require do
     name 'mover'
     homepage "http://github.com/winton/#{name}"
     summary "Move ActiveRecord records across tables like it ain't no thang"
-    version '0.1.0'
+    version '0.1.1'
   end
   
   bin { require 'lib/mover' }

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

@@ -7,11 +7,11 @@ class CreateArticles < ActiveRecord::Migration
     end
     add_index :articles, :title
     
-    Article.create_movable_table(:archived)
-    add_column :archived_articles, :move_id, :string
-    add_column :archived_articles, :moved_at, :datetime
+    Article.create_movable_table(:archive)
+    add_column :articles_archive, :move_id, :string
+    add_column :articles_archive, :moved_at, :datetime
     
-    Article.create_movable_table(:drafted)
+    Article.create_movable_table(:draft)
     
     create_table :comments do |t|
       t.string :title
@@ -20,15 +20,15 @@ class CreateArticles < ActiveRecord::Migration
       t.integer :article_id
     end
     
-    Comment.create_movable_table(:archived)
-    add_column :archived_comments, :move_id, :string
-    add_column :archived_comments, :moved_at, :datetime
+    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(:archived)
-    Comment.drop_movable_table(:archived)
+    Article.drop_movable_table(:archive)
+    Comment.drop_movable_table(:archive)
   end
 end

data/spec/fixtures/article.rb

@@ -1,4 +1,4 @@
 class Article < ActiveRecord::Base
   has_many :comments
-  is_movable :archived, :drafted
+  is_movable :archive, :draft
 end

data/spec/fixtures/comment.rb

@@ -1,4 +1,4 @@
 class Comment < ActiveRecord::Base
   belongs_to :article
-  is_movable :archived
+  is_movable :archive
 end