genki-dm-has-versions 0.0.1 → 0.0.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "dm-has-versions"
-GEM_VERSION = "0.0.1"
+GEM_VERSION = "0.0.2"
 AUTHOR = "Genki Takiuchi"
 EMAIL = "genki@s21g.com"
 HOMEPAGE = "http://blog.s21g.com/genki"

data/lib/dm-has-versions/has/versions.rb

@@ -2,7 +2,9 @@ module DataMapper
   module Has
     module Versions
       def has_versions(options = {})
-        ignore = options[:ignore]
+        ignores = [options[:ignore]].flatten.compact.map do |ignore|
+          properties[ignore.to_s.intern]
+        end
 
         class << self; self end.class_eval do
           define_method :const_missing do |name|
@@ -36,7 +38,8 @@ module DataMapper
         end
 
         self.after :update do |result|
-          if result && dirty_attributes.except(*ignore).present?
+          if result && dirty_attributes.except(*ignores).present?
+            return result if pending_version_attributes.empty?
             attributes = self.attributes.merge(pending_version_attributes)
             original_key = "#{self.class.storage_name.singular}_id"
             attributes[original_key.intern] = self.id
@@ -72,7 +75,27 @@ module DataMapper
         def versions
           version = self.class.const_get("Version")
           original_key = "#{self.class.storage_name.singular}_id".intern
-          version.all(original_key => self.id)
+          version.all(original_key => self.id, :order => [:id.asc])
+        end
+
+        def version
+          versions.size
+        end
+
+        def revert_to(version)
+          if target = versions.first(:offset => version)
+            transaction do
+              self.properties.each do |property|
+                next if property.key?
+                name = property.name
+                self.attribute_set(name, target.attribute_get(name))
+              end
+              pending_version_attributes.clear
+              return false unless save
+              versions.all(:id.gte => target.id).destroy!
+            end
+          end
+          !!target
         end
       end
     end

data/spec/dm-has-versions_spec.rb

@@ -34,5 +34,39 @@ describe "dm-has-versions" do
       @story.update_attributes :title => 'test-3'
       @story.versions.size.should == 2
     end
+
+    it "should not generate versions on update of ignoring properties" do
+      @story.versions.should be_empty
+      @story.update_attributes :updated_at => Time.now
+      @story.versions.should be_empty
+    end
+
+    describe "destory and revert of versions" do
+      before do
+        @story.update_attributes :title => 'test-2'
+        @story.update_attributes :title => 'test-3'
+        @story.update_attributes :title => 'test-4'
+      end
+
+      it "should be tested on 3 versions" do
+        @story.versions.count.should == 3
+        @story.version.should == 3
+      end
+
+      it "should emptyfy by calling destroy!" do
+        @story.versions.destroy!
+        @story.versions.should be_empty
+      end
+
+      it "should revert stories" do
+        @story.title.should == "test-4"
+        @story.revert_to(2).should be_true
+        @story.title.should == "test-3"
+        @story.versions.should be_present
+        @story.revert_to(0).should be_true
+        @story.version.should == 0
+        @story.title.should == "test-1"
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-dm-has-versions
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Genki Takiuchi