mm-versionable 0.2.5 → 0.2.6

data/README.md

@@ -19,10 +19,7 @@ Usage
 The following example should demonstrate how to use versioning well :
 
     require 'mongo_mapper'
-    require 'config'  # Since versionable defines it's own Version model and has a few indexes defined for the same, 
-                      # we need to load & configure mongo_mapper before we can load versionable.
-    require 'versionable' 
-    # gem 'mm-versionable', :require => 'versionable' -- Put this in your Gemfile if you're using bundler
+    require 'versionable' # gem 'mm-versionable', :require => 'versionable' -- Put this in your Gemfile if you're using bundler
 
     class Thing
         include MongoMapper::Document
@@ -44,6 +41,10 @@ The following example should demonstrate how to use versioning well :
     #example :
     #thing.save :updater_id => "4cef9936f61aa33717000001"
 
+    #Also you can now pass :updater_id to update_attrubytes
+    #example :
+    #thing.update_attributes(:updater_id => "4cef9936f61aa33717000001", params[:thing])
+
     thing.versions_count 
     #=> 2
 

data/lib/versionable/models/version.rb

@@ -3,11 +3,13 @@ class Version
 
   key :data, Hash
   key :date, Time
-  key :pos, Integer, :index => true
-  key :doc_id, String, :index => true
+  key :pos, Integer
+  key :doc_id, String
   key :message, String
   key :updater_id, String
 
+  ensure_index [[:doc_id, 1], [:pos, -1]]
+
   def content(key)
     cdata = self.data[key]
     if cdata.respond_to?(:join)

data/lib/versionable/plugins/versionable.rb

@@ -4,7 +4,12 @@ module Versionable
   extend ActiveSupport::Concern
 
   module InstanceMethods
-    # Save new versions but only if the data changes
+    def update_attributes(attrs={})
+      updater_id = attrs.delete(:updater_id)
+      assign(attrs)
+      save_version(updater_id) if self.respond_to?(:rolling_back) && !rolling_back
+    end
+
     def save(options={})
       save_version(options.delete(:updater_id)) if self.respond_to?(:rolling_back) && !rolling_back
       super
@@ -27,7 +32,11 @@ module Versionable
           self.versions << version
           self.version_number = version.pos
 
-          @versions_count = @versions_count.to_i + 1
+          if @versions_count
+            @versions_count = @versions_count + 1
+          else
+            @versions_count = Version.count(:doc_id => self._id.to_s)
+          end
         end
       end
     end

data/lib/versionable/version.rb

@@ -1,3 +1,3 @@
 module Versionable
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/test/unit/test_versioning.rb

@@ -56,35 +56,35 @@ class VersioningTest < Test::Unit::TestCase
       assert @user.all_versions.is_a?(Plucky::Query)
     end
     should 'load first version on rollback :first' do
-      assert @user.rollback(:first).fname == 'dhruva'
-      assert @user.version_number == 0
+      assert_equal @user.rollback(:first).fname, 'dhruva'
+      assert_equal @user.version_number, 0
     end
     should 'load last version on rollback :last' do
-      assert @user.rollback(:last).fname == 'Dhruva'
+      assert_equal @user.rollback(:last).fname, 'Dhruva'
       assert @user.posts.empty?
-      assert @user.version_number == (@user.versions_count - 2)
+      assert_equal @user.version_number, (@user.versions_count - 2)
     end
     should 'load latest version on rollback :latest' do
-      assert @user.rollback(:latest).fname == 'Dhruva'
+      assert_equal @user.rollback(:latest).fname, 'Dhruva'
       assert !@user.posts.empty?
-      assert @user.version_number == (@user.versions_count - 1)
+      assert_equal @user.version_number, (@user.versions_count - 1)
     end
     should 'revert to first version on rollback!' do
       @user.rollback!(:first)
-      assert @user.fname == 'dhruva'
-      assert @user.version_number == 0
+      assert_equal @user.fname, 'dhruva'
+      assert_equal @user.version_number, 0
     end
     should 'revert to last version on rollback!' do
       @user.rollback!(:last)
-      assert @user.fname == 'Dhruva'
+      assert_equal @user.fname, 'Dhruva'
       assert @user.posts.empty?
-      assert @user.version_number == (@user.versions_count - 2)
+      assert_equal @user.version_number, (@user.versions_count - 2)
     end
     should 'revert to last version on rollback! without args' do
       @user.rollback!
-      assert @user.fname == 'Dhruva'
+      assert_equal @user.fname, 'Dhruva'
       assert @user.posts.empty?
-      assert @user.version_number == (@user.versions_count - 2)
+      assert_equal @user.version_number, (@user.versions_count - 2)
     end
     should 'only create a new version when the data changes' do
       versions_count = @user.versions_count
@@ -95,7 +95,7 @@ class VersioningTest < Test::Unit::TestCase
       @user.rollback!(:latest)
       assert @user.fname == 'Dhruva'
       assert !@user.posts.empty?
-      assert @user.version_number == (@user.versions_count - 1)
+      assert_equal @user.version_number, (@user.versions_count - 1)
     end
     should 'create a new version without saving' do
       user = User.create :fname => 'Dave', :lname => 'Smiggins'
@@ -106,6 +106,40 @@ class VersioningTest < Test::Unit::TestCase
       user.reload
       assert_equal initial_version_number, user.version_number
     end
+  end
 
+  context 'Versioning with update_attributes' do
+    setup do
+      @user = User.first
+    end
+    should 'create a new version for changes' do
+      versions_count = @user.versions_count
+      @user.update_attributes(:fname => 'Dave')
+      assert_equal @user.versions_count, (versions_count + 1)
+    end
+    should 'not create a new version without changes' do
+      versions_count = @user.versions_count
+      @user.update_attributes
+      assert_equal @user.versions_count, versions_count
+    end
+  end
+
+  context 'assigning updater_id' do
+    setup do
+      @user = User.first
+    end
+    should 'create a new version and update the updater_id for save' do
+      versions_count = @user.versions_count
+      @user.fname = 'Updater1'
+      @user.save(:updater_id => 'test_id')
+      assert_equal @user.versions_count, (versions_count + 1)
+      assert_equal @user.version_at(:latest).updater_id, 'test_id'
+    end
+    should 'create a new version and update the updater_id for update_attributes' do
+      versions_count = @user.versions_count
+      @user.update_attributes(:updater_id => 'test_id_2', :fname => 'Updater2')
+      assert_equal @user.versions_count, (versions_count + 1)
+      assert_equal @user.version_at(:latest).updater_id, 'test_id_2'
+    end
   end
 end

metadata

@@ -1,163 +1,154 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mm-versionable
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.6
   prerelease: 
-  version: 0.2.5
 platform: ruby
-authors: 
+authors:
 - Dhruva Sagar
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-18 00:00:00 +05:30
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: i18n
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &14826060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: differ
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *14826060
+- !ruby/object:Gem::Dependency
+  name: differ
+  requirement: &14825500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *14825500
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &14824920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *14824920
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &14824300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mongo_mapper
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *14824300
+- !ruby/object:Gem::Dependency
+  name: mongo_mapper
+  requirement: &14823660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *14823660
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &14823140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *14823140
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &14822620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *14822620
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &14822100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *14822100
 description: 
 email: dhruva.sagar@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/versionable.rb
+- lib/versionable/version.rb
 - lib/versionable/models/version.rb
 - lib/versionable/plugins/versionable.rb
-- lib/versionable/version.rb
 - config.ru
 - Gemfile
 - Rakefile
 - README.md
-- test/unit/test_versioning.rb
+- test/config/config.rb
+- test/config/database.yml
 - test/models/user.rb
 - test/models/post.rb
+- test/unit/test_versioning.rb
 - test/performance/read_write.rb
-- test/config/database.yml
-- test/config/config.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/dhruvasagar/mm-versionable
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A MongoMapper extension adding Versioning
-test_files: 
-- test/unit/test_versioning.rb
+test_files:
+- test/config/config.rb
+- test/config/database.yml
 - test/models/user.rb
 - test/models/post.rb
+- test/unit/test_versioning.rb
 - test/performance/read_write.rb
-- test/config/database.yml
-- test/config/config.rb
 - test/test_helper.rb