vidibus-versioning 0.1.1 → 0.1.2

data/lib/vidibus/versioning/_version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Versioning
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/vidibus/versioning/mongoid.rb

@@ -13,6 +13,7 @@ module Vidibus
         field :version_updated_at, :type => Time
 
         after_initialize :original_attributes
+        after_initialize :set_version_updated_at, :unless => :version_updated_at
         before_update :reset_version_cache
 
         mattr_accessor :versioned_attributes, :unversioned_attributes, :versioning_options
@@ -24,11 +25,7 @@ module Vidibus
         # If no versioned attributes have been defined on class level,
         # all attributes will be returned except the unversioned ones.
         def versioned_attributes
-          if self.class.versioned_attributes.any?
-            attributes.only(self.class.versioned_attributes)
-          else
-            attributes.except(self.class.unversioned_attributes)
-          end
+          filter_versioned_attributes(attributes)
         end
       end
 
@@ -130,11 +127,6 @@ module Vidibus
         version_obj and version_obj.new_record?
       end
 
-      # Returns the time when versioned attributes have been updated.
-      def version_updated_at
-        read_attribute(:version_updated_at) || updated_at
-      end
-
       protected
 
       # Applies version on self. Returns nil
@@ -170,10 +162,21 @@ module Vidibus
         # TODO: Setting the following line will cause DelayedJob to loop endlessly. The same should happen if an embedded document is defined as versioned_attribute!
         # original_attributes.merge(version_obj.versioned_attributes).merge(version_cache.wanted_attributes.stringify_keys!)
 
-        Hash[*self.class.fields.keys.zip([]).flatten].             # ensure nil fields are included as well
-          merge(version_obj.versioned_attributes).                 # add version's attributes
-          merge(version_cache.wanted_attributes.stringify_keys!).  # add options provided with #version call
-          except(self.class.unversioned_attributes)                # remove unversioned attributes; they may have changed
+        a = Hash[*self.class.fields.keys.zip([]).flatten].        # ensure nil fields are included as well
+            merge(version_obj.versioned_attributes)               # add version's attributes
+        filter_versioned_attributes(a).                           # take versioned attributes only
+          merge(version_cache.wanted_attributes.stringify_keys!)  # add options provided with #version call
+      end
+
+      # Returns versioned attributes from input by
+      # including defined attributes only or
+      # removing unversioned ones.
+      def filter_versioned_attributes(input)
+        if self.class.versioned_attributes.any?
+          input.only(self.class.versioned_attributes)
+        else
+          input.except(self.class.unversioned_attributes)
+        end
       end
 
       # Sets instance variables used for versioning.
@@ -224,7 +227,7 @@ module Vidibus
             obj
           else
             editing_time = self.class.versioning_options[:editing_time]
-            if !editing_time or version_updated_at <= (Time.now-editing_time.to_i) or version_updated_at > Time.now # allow future versions
+            if !editing_time or version_updated_at <= (Time.now-editing_time.to_i) or updated_at > Time.now # allow future versions
               versions.build(:created_at => updated_at_was)
             end
           end
@@ -290,6 +293,10 @@ module Vidibus
         @original_attributes = versioned_attributes
         @version_cache = nil
       end
+
+      def set_version_updated_at
+        self.version_updated_at ||= updated_at || Time.now
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-versioning
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Andre Pankratz