genki-dm-has-versions 0.0.2 → 0.1.0

data/Rakefile

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

data/lib/dm-has-versions.rb

@@ -8,7 +8,7 @@ if defined?(Merb::Plugins)
   
   Merb::BootLoader.before_app_loads do
     # require code that must be loaded before the application
-    require 'dm-has-version/has/versions'
+    require 'dm-has-versions/has/versions'
     DataMapper::Model.append_extensions DataMapper::Has::Versions
   end
   

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

@@ -1,6 +1,8 @@
 module DataMapper
   module Has
     module Versions
+      class RevertError < StandardError; end
+
       def has_versions(options = {})
         ignores = [options[:ignore]].flatten.compact.map do |ignore|
           properties[ignore.to_s.intern]
@@ -38,13 +40,18 @@ module DataMapper
         end
 
         self.after :update do |result|
-          if result && dirty_attributes.except(*ignores).present?
-            return result if pending_version_attributes.empty?
+          if result && !dirty_attributes.except(*ignores).empty?
+            break 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
-            self.class::Version.create(attributes.except(:id))
+            version, latest = self.version, self.latest?
+            transaction do
+              self.revert_to!(version) unless latest
+              self.class::Version.create(attributes.except(:id))
+            end
             self.pending_version_attributes.clear
+            @version = nil
           end
 
           result
@@ -78,25 +85,44 @@ module DataMapper
           version.all(original_key => self.id, :order => [:id.asc])
         end
 
+        def latest?
+          version == versions.size
+        end
+
         def version
-          versions.size
+          @version ||= versions.size
         end
 
-        def revert_to(version)
+        def version=(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!
+            self.properties.each do |property|
+              next if property.key?
+              name = property.name
+              self.attribute_set(name, target.attribute_get(name))
             end
+            @version = version
           end
           !!target
         end
+
+        def revert_to!(version)
+          self.version = version
+          pending_version_attributes.clear
+          raise RevertError unless save
+          target_id = versions[version].id
+          versions.all(:id.gte => target_id).destroy!
+        end
+
+        def revert_to(version)
+          transaction{revert_to!(version)}
+          true
+        rescue RevertError
+          false
+        end
+
+        def revert
+          revert_to(version) or raise RevertError
+        end
       end
     end
   end

data/spec/dm-has-versions_spec.rb

@@ -67,6 +67,25 @@ describe "dm-has-versions" do
         @story.version.should == 0
         @story.title.should == "test-1"
       end
+
+      it "should be set version" do
+        @story.title.should == "test-4"
+        @story.version.should == 3
+        @story.dirty_attributes[Story.title].should be_nil
+        @story.version = 1
+        @story.version.should == 1
+        @story.title.should == "test-2"
+        @story.dirty_attributes[Story.title].should_not be_nil
+      end
+
+      it "should revert to current version" do
+        @story.version = 1
+        @story.should_not be_latest
+        @story.save
+        @story.should be_latest
+        @story.title.should == "test-2"
+        @story.dirty_attributes[Story.title].should be_nil
+      end
     end
   end
 end

data/spec/fixture/app/models/story.rb

@@ -5,5 +5,6 @@ class Story
   property :title, String
   property :updated_at, DateTime
 
+  has n, :comments
   has_versions :ignore => [:updated_at]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-dm-has-versions
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Genki Takiuchi
@@ -45,6 +45,7 @@ files:
 - spec/fixture
 - spec/fixture/app
 - spec/fixture/app/models
+- spec/fixture/app/models/comment.rb
 - spec/fixture/app/models/story.rb
 - spec/merb_test.log
 - spec/spec_helper.rb