mm-versionable 0.2.2 → 0.2.3

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'rake'
-require 'jeweler'
 
 require File.join(File.dirname(__FILE__), '/lib/versionable/version')
 
@@ -23,17 +22,14 @@ end
 
 task :default => 'test:units'
 
-Jeweler::Tasks.new do |gem|
-  gem.name          = 'mm-versionable'
-  gem.summary       = 'A MongoMapper extension for document versioning'
-  gem.description   = 'A MongoMapper extension that enables document versionable'
-  gem.email         = 'dhruva.sagar@gmail.com'
-  gem.homepage      = 'https://github.com/artha42/mm-versionable/'
-  gem.authors       = ['Dhruva Sagar']
-  gem.version       = Versionable::Version
-
-  gem.add_dependency('differ')
-  gem.add_dependency('mongo_mapper')
+desc 'Builds the gem'
+task :build do
+  sh 'gem build mm-versionable.gemspec'
+  Dir.mkdir('pkg') unless File.directory?('pkg')
+  sh "mv mm-versionable-#{Versionable::Version}.gem pkg/mm-versionable-#{Versionable::Version}.gem"
 end
 
-Jeweler::GemcutterTasks.new
+desc 'Builds and Installs the gem'
+task :install => :build do
+  sh "gem install pkg/mm-versionable-#{Versionable::Version}.gem"
+end

data/lib/versionable/plugins/versionable.rb

@@ -1,38 +1,43 @@
 require 'versionable/models/version'
 
 module Versionable
+  extend ActiveSupport::Concern
+
   module InstanceMethods
+    # Save new versions but only if the data changes
     def save(options={})
       save_version(options.delete(:updater_id)) if self.respond_to?(:rolling_back) && !rolling_back
       super
     end
 
-    private
-      def save_version(updater_id=nil)
-        if self.respond_to?(:versions)
-          version = self.current_version
-          version.message = self.version_message
-          if self.versions.empty?
-            version.pos = 0
-          else
-            version.pos = self.versions.last.pos + 1
-          end
+    def save_version(updater_id=nil)
+      if self.respond_to?(:versions)
+        version = self.current_version
+        version.message = self.version_message
+        if self.versions.empty?
+          version.pos = 0
+        else
+          version.pos = self.versions.last.pos + 1
+        end
+        if self.version_at(self.version_number).try(:data) != version.data
           version.updater_id = updater_id
           version.save
 
           self.versions.shift if self.versions.count >= @limit
           self.versions << version
+          self.version_number = version.pos
 
           @versions_count = @versions_count.to_i + 1
         end
       end
+    end
   end
 
   module ClassMethods
     def enable_versioning(opts={})
       attr_accessor :rolling_back
 
-      key :version_number, Integer
+      key :version_number, Integer, :default => 0
 
       define_method(:version_message) do
         @version_message
@@ -55,7 +60,8 @@ module Versionable
         Version.where(:doc_id => self._id.to_s).sort(:pos.desc)
       end
 
-      define_method(:rollback) do |pos = nil|
+      define_method(:rollback) do |*args|
+        pos = args.first #workaround for optional args in ruby1.8
         #The last version is always same as the current version, so -2 instead of -1
         pos = self.versions.count-2 if pos.nil?
         version = self.version_at(pos)
@@ -67,8 +73,9 @@ module Versionable
         self.version_number = version.pos
         self
       end
-      
-      define_method(:rollback!) do |pos = nil|
+
+      define_method(:rollback!) do |*args|
+        pos = args.first #workaround for optional args in ruby1.8
         self.rollback(pos)
 
         @rolling_back = true
@@ -78,7 +85,8 @@ module Versionable
         self
       end
 
-      define_method(:diff) do |key, pos1, pos2, format = :html|
+      define_method(:diff) do |key, pos1, pos2, *optional_format|
+        format = optional_format.first || :html #workaround for optional args in ruby1.8
         version1 = self.version_at(pos1)
         version2 = self.version_at(pos2)
 
@@ -86,7 +94,9 @@ module Versionable
       end
 
       define_method(:current_version) do
-        Version.new(:data => self.attributes, :date => Time.now, :doc_id => self._id.to_s)
+        data = self.attributes
+        data.delete(:version_number)
+        Version.new(:data => data, :date => Time.now, :doc_id => self._id.to_s)
       end
 
       define_method(:version_at) do |pos|
@@ -107,7 +117,7 @@ module Versionable
           index = self.versions.index {|v| v.pos == pos}
           version = self.versions[index] if index
           version ||= Version.first(:user_id => self._id.to_s, :pos => pos)
-          version 
+          version
         end
       end
     end

data/lib/versionable/version.rb

@@ -1,3 +1,3 @@
 module Versionable
-  Version = '0.2.2'
+  Version = '0.2.3'
 end

data/lib/versionable.rb

@@ -2,10 +2,4 @@ require 'differ'
 require 'mongo_mapper'
 require 'versionable/plugins/versionable'
 
-module VersionablePlugin
-  def self.included(model)
-    model.plugin Versionable
-  end
-end
-
-MongoMapper::Document.append_inclusions(VersionablePlugin)
+MongoMapper::Document.plugin(Versionable)

data/test/unit/test_versioning.rb

@@ -35,6 +35,9 @@ class VersioningTest < Test::Unit::TestCase
     should 'respond to method version_at' do
       assert @user.respond_to?(:version_at)
     end
+    should 'respond to method save_version' do
+      assert @user.respond_to?(:save_version)
+    end
   end
 
   context 'Version manipulations' do
@@ -77,11 +80,32 @@ class VersioningTest < Test::Unit::TestCase
       assert @user.posts.empty?
       assert @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 @user.posts.empty?
+      assert @user.version_number == (@user.versions_count - 2)
+    end
+    should 'only create a new version when the data changes' do
+      versions_count = @user.versions_count
+      @user.save
+      assert_equal versions_count, @user.versions_count
+    end
     should 'revert to latest version on rollback!' do
       @user.rollback!(:latest)
       assert @user.fname == 'Dhruva'
       assert !@user.posts.empty?
       assert @user.version_number == (@user.versions_count - 1)
     end
+    should 'create a new version without saving' do
+      user = User.create :fname => 'Dave', :lname => 'Smiggins'
+      initial_version_number = user.version_number
+      user.fname = 'Steve'
+      user.save_version
+      assert_equal user.version_number, user.versions.last.pos
+      user.reload
+      assert_equal initial_version_number, user.version_number
+    end
+
   end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mm-versionable
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors: 
 - Dhruva Sagar
@@ -14,63 +10,123 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 +05:30
+date: 2011-06-04 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: differ
+  name: i18n
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mongo_mapper
+  name: differ
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
-description: A MongoMapper extension that enables document versionable
+- !ruby/object:Gem::Dependency 
+  name: builder
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    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 
+    none: false
+    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 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    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 
+    none: false
+    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 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id008
+description: 
 email: dhruva.sagar@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
-- LICENSE
-- README.md
-- Rakefile
-- config.ru
 - lib/versionable.rb
 - lib/versionable/models/version.rb
 - lib/versionable/plugins/versionable.rb
 - lib/versionable/version.rb
-- mm-versionable.gemspec
-- test/config/config.rb
-- test/config/database.yml
-- test/models/post.rb
+- config.ru
+- Gemfile
+- Rakefile
+- README.md
+- test/unit/test_versioning.rb
 - test/models/user.rb
+- test/models/post.rb
 - test/performance/read_write.rb
+- test/config/database.yml
+- test/config/config.rb
 - test/test_helper.rb
-- test/unit/test_versioning.rb
 has_rdoc: true
-homepage: https://github.com/artha42/mm-versionable/
+homepage: http://github.com/dhruvasagar/mm-versionable
 licenses: []
 
 post_install_message: 
@@ -83,28 +139,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: A MongoMapper extension for document versioning
+summary: A MongoMapper extension adding Versioning
 test_files: 
-- test/config/config.rb
-- test/models/post.rb
+- test/unit/test_versioning.rb
 - test/models/user.rb
+- test/models/post.rb
 - test/performance/read_write.rb
+- test/config/database.yml
+- test/config/config.rb
 - test/test_helper.rb
-- test/unit/test_versioning.rb

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 Dhruva Sagar
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 

data/mm-versionable.gemspec

@@ -1,66 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{mm-versionable}
-  s.version = "0.2.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dhruva Sagar"]
-  s.date = %q{2011-01-18}
-  s.description = %q{A MongoMapper extension that enables document versionable}
-  s.email = %q{dhruva.sagar@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "config.ru",
-    "lib/versionable.rb",
-    "lib/versionable/models/version.rb",
-    "lib/versionable/plugins/versionable.rb",
-    "lib/versionable/version.rb",
-    "mm-versionable.gemspec",
-    "test/config/config.rb",
-    "test/config/database.yml",
-    "test/models/post.rb",
-    "test/models/user.rb",
-    "test/performance/read_write.rb",
-    "test/test_helper.rb",
-    "test/unit/test_versioning.rb"
-  ]
-  s.homepage = %q{https://github.com/artha42/mm-versionable/}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A MongoMapper extension for document versioning}
-  s.test_files = [
-    "test/config/config.rb",
-    "test/models/post.rb",
-    "test/models/user.rb",
-    "test/performance/read_write.rb",
-    "test/test_helper.rb",
-    "test/unit/test_versioning.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<differ>, [">= 0"])
-      s.add_runtime_dependency(%q<mongo_mapper>, [">= 0"])
-    else
-      s.add_dependency(%q<differ>, [">= 0"])
-      s.add_dependency(%q<mongo_mapper>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<differ>, [">= 0"])
-    s.add_dependency(%q<mongo_mapper>, [">= 0"])
-  end
-end
-