versioned 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/version.rb

@@ -31,6 +31,6 @@ class Version
   def find_related(*args)
     options = args.extract_options!
     params = options.merge(:versioned_id => versioned_id, :versioned_type => versioned_type)
-    self.class.find(args.first, params)
+    self.class.first(params)
   end
 end

data/lib/versioned.rb

@@ -12,13 +12,9 @@ module Versioned
   module LockingInstanceMethods
     private
       #new? isn't working
-      def is_new_document?
-        (read_attribute(self.version_lock_key).blank? && changes[self.version_lock_key.to_s].blank?) ||
-        (changes[self.version_lock_key.to_s] && changes[self.version_lock_key.to_s].first.blank?)
-      end
       def prep_lock_version
         old = read_attribute(self.version_lock_key)
-        if !is_new_document? || old.blank?
+        if !new? || old.blank?
           v = (Time.now.to_f * 1000).ceil.to_s
           write_attribute self.version_lock_key, v
         end
@@ -28,7 +24,9 @@ module Versioned
 
       def save_to_collection(options = {})
         current_version = prep_lock_version
-        if is_new_document?
+        old_new = new?
+        @new = false
+        if old_new
           collection.insert(to_mongo, :safe => true)
         else
           selector = { :_id => read_attribute(:_id), self.version_lock_key => current_version }
@@ -80,7 +78,7 @@ module Versioned
           else
             conditions = condition
           end
-          find(:all, 
+          all( 
             :number => conditions,
             :order => "number #{(from_number > to_number) ? 'DESC' : 'ASC'}"
           )

data/test/revert_test.rb

@@ -17,9 +17,12 @@ class RevertTest < Test::Unit::TestCase
     end
 
     should 'do nothing for a non-existent version' do
-      attributes = @user.attributes
+      attributes = @user.attributes.clone
       @user.revert_to!(nil)
-      assert_equal attributes, @user.attributes
+
+      attributes.each do |k,v|
+        assert_equal @user[k].to_s, v.to_s #dates aren't comparing well
+      end
     end
 
     should 'return the new version number' do

data/versioned.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{versioned}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["twoism", "toastyapps", "jacqui", "mrkurt"]
-  s.date = %q{2010-01-21}
+  s.date = %q{2010-02-17}
   s.description = %q{Versioning for MongoMapper}
   s.email = %q{signalstatic@gmail.com}
   s.extra_rdoc_files = [
@@ -41,16 +41,16 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Versioning for MongoMapper}
   s.test_files = [
-    "test/between_test.rb",
-     "test/changes_test.rb",
+    "test/test_helper.rb",
+     "test/between_test.rb",
      "test/comparable_test.rb",
+     "test/revert_test.rb",
      "test/creation_test.rb",
      "test/latest_changes_test.rb",
-     "test/lock_test.rb",
-     "test/revert_test.rb",
-     "test/schema.rb",
      "test/specified_version_key_test.rb",
-     "test/test_helper.rb"
+     "test/schema.rb",
+     "test/lock_test.rb",
+     "test/changes_test.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: versioned
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - twoism
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 -05:00
+date: 2010-02-17 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -72,13 +72,13 @@ signing_key:
 specification_version: 3
 summary: Versioning for MongoMapper
 test_files: 
+- test/test_helper.rb
 - test/between_test.rb
-- test/changes_test.rb
 - test/comparable_test.rb
+- test/revert_test.rb
 - test/creation_test.rb
 - test/latest_changes_test.rb
-- test/lock_test.rb
-- test/revert_test.rb
-- test/schema.rb
 - test/specified_version_key_test.rb
-- test/test_helper.rb
+- test/schema.rb
+- test/lock_test.rb
+- test/changes_test.rb