Working on the archive option of docs

Author: Nigel Rausch

app/models/doc.rb

@@ -18,22 +18,24 @@ class Doc < ActiveRecord::Base
   # * nil if none found
   #
   def self.retrieve id, options={}
-    validate_options(options, [:rev])
-    case id
-    when Symbol
-      if id == :all
-        docs = self.find(id)
+    with_scope(:find=>{:conditions=>{:archived_at=>nil}}) do
+      validate_options(options, [:rev])
+      case id
+      when Symbol
+        if id == :all
+          docs = self.find(id)
+        else
+          docs = [self.find(id)]
+        end
       else
-        docs = [self.find(id)]
+        docs = self.find_all_by_id(id)
       end
-    else
-      docs = self.find_all_by_id(id)
-    end
-    unless docs.empty?
-      res = (id.is_a?(Array) or id == :all) ? docs.map {|doc| doc.retrieve} : docs.first.retrieve(options[:rev]||0)
-      #     a = docs.map {|doc| doc.retrieve} #: docs.first.retrieve(options[:rev]||0)
+      unless docs.empty?
+        res = (id.is_a?(Array) or id == :all) ? docs.map {|doc| doc.retrieve} : docs.first.retrieve(options[:rev]||0)
+        #     a = docs.map {|doc| doc.retrieve} #: docs.first.retrieve(options[:rev]||0)
+      end
+      return res
     end
-    return res
   end
 
   # Stores or updates a document into the database
@@ -130,6 +132,7 @@ def self.remove id, options=nil
 
   def remove # :nodoc:
     stores.update_all({:rev=>rev}, {:rev=>0})
+    update_attribute(:archived_at, Time.now)
   end
 
   def retrieve(revision=0) # :nodoc:

db/migrate/20081122110526_add_archived_at_to_doc.rb

@@ -0,0 +1,9 @@
+class AddArchivedAtToDoc < ActiveRecord::Migration
+  def self.up
+    add_column :docs, :archived_at, :datetime
+  end
+
+  def self.down
+    remove_column :docs, :archived_at
+  end
+end

db/schema.rb

@@ -9,12 +9,13 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20081115093653) do
+ActiveRecord::Schema.define(:version => 20081122110526) do
 
   create_table "docs", :force => true do |t|
     t.integer  "rev"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.datetime "archived_at"
   end
 
   create_table "fields", :force => true do |t|

test/unit/doc_test.rb

@@ -52,6 +52,13 @@ def test_retrieve_when_id_does_not_exist
     assert_nil Doc.retrieve([id,id+1])
   end
 
+  def test_retrieve_when_id_is_archived
+    id = Doc.last.id
+    Doc.remove id
+
+    assert_nil Doc.retrieve( id)
+  end
+
 
   # Update
   def test_update
@@ -236,6 +243,7 @@ def test_remove
       assert_equal [doc.id], ret
       doc.stores.each {|item| assert item.rev != 0}
       assert_equal store_1.rev, Store.find(store_1.id).rev
+      assert(!doc.reload.archived_at.nil?)
     end
   end