memories 0.2.6 → 0.2.7

data/lib/memories/base.rb

@@ -125,6 +125,17 @@ module Memories
         }.inject(false) {|b, sum| sum || b})
     end 
   end
+
+  # Returns a list of attachments it should not version
+  def attachments_to_forget
+    return [] unless self.class.remember_attachments?
+    (self.database.get(self.id)["_attachments"] || {}).keys.reject do |a| 
+      a.match(VERSION_REGEX) || 
+        (self.class.remember_attachments.map { |attachment_name_pattern|
+          a.match attachment_name_pattern
+        }.inject(false) {|b, sum| sum || b})
+    end 
+  end
   
   # Revert the document to a specific version and save. 
   # You can provide either a complete revision number ("1-u54abz3948302sjjej3jej300rj", or "rev-1-u54abz3948302sjjej3jej300rj")
@@ -132,11 +143,13 @@ module Memories
   #   my_doc.revert_to! 3 # ==> would revert your document "my_doc" to version 3. 
   def revert_to!(version)
     revert version, :hard
+    self
   end
 
   # Same as #revert_to!, except that it doesn't save.
   def revert_to(version)
     revert version
+    self
   end
 
   # Same as #rollback!, but doesn't save.
@@ -261,7 +274,7 @@ module Memories
       end
 
       self["_attachments"].keys.select {|a| !a.match(VERSION_REGEX)}.each do |attachment|
-        self.delete_attachment(attachment) unless versioned_attachments['known_attachments'].include?(attachment)
+        self.delete_attachment(attachment) if !versioned_attachments['known_attachments'].include?(attachment) and !attachments_to_forget.include?(attachment)
       end
     end
   end

data/lib/memories/versions_proxy.rb

@@ -2,6 +2,7 @@ module Memories
   class VersionsProxy
     def initialize(doc)
       @doc = doc
+      @versions = {}
     end
 
     def count
@@ -22,15 +23,14 @@ module Memories
       return [] if range.first > @doc.current_version
       current_version = range.last >= @doc.current_version ? @doc.dup : nil
       last = range.last >= @doc.current_version ? @doc.current_version - 1 : range.last
-      versions = (range.first..last).to_a.map {|i| @doc.revert_to(i); @doc.dup}
+      versions = (range.first..last).to_a.map {|i| version_num i}
       versions << current_version if current_version 
       versions
     end
 
     def version_num(num)
-      return nil if !num.kind_of?(Fixnum) or num > @doc.current_version or num < 1
-      @doc.revert_to(num)
-      @doc.dup
+      return nil if !num.kind_of?(Fixnum) or num >= @doc.current_version or num < 1
+      @versions[num] ||= @doc.revert_to(num).dup
     end
 
     def version_id(id)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memories
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Matt Parker
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-24 00:00:00 -05:00
+date: 2010-12-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency