freerange_acts_as_versioned 0.8.2 → 1.0.0

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 group :development do
-  gem 'rails',        '3.0.0.beta4'
-  gem 'sqlite3-ruby', '1.3.1'
+  gem 'rails', '~> 3.2'
+  gem 'pg', '~> 0.16'
   gem 'mysql',        '2.8.1'
-end
+end

data/acts_as_versioned.gemspec

@@ -7,20 +7,19 @@
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '1.3.5'
 
   ## Leave these as is they will be modified for you by the rake gemspec task.
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'freerange_acts_as_versioned'
-  s.version           = '0.8.2'
-  s.date              = '2012-04-24'
+  s.version           = '1.0.0'
+  s.date              = '2013-08-15'
   s.rubyforge_project = 'freerange_acts_as_versioned'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
-  s.summary     = "Add simple versioning to ActiveRecord models. This version supports rails 3.1.1. Also it have support for autosave. It introduces new method auto_save_version which keeps 1 autosave version for an object."
-  s.description = "Add simple versioning to ActiveRecord models. rails 3.1.1"
+  s.summary     = "Add simple versioning to ActiveRecord models. This version supports rails 3.2. Also it have support for autosave. It introduces new method auto_save_version which keeps 1 autosave version for an object."
+  s.description = "Add simple versioning to ActiveRecord models. rails 3.2"
 
   ## List the primary authors. If there are a bunch of authors, it's probably
   ## better to set the email to an email list or something. If you don't have
@@ -40,7 +39,7 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('activerecord', ["~> 3.1.1"])
+  s.add_dependency('activerecord', ["~> 3.2"])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
@@ -82,4 +81,4 @@ Gem::Specification.new do |s|
   ## Test files will be grabbed from the file list. Make sure the path glob
   ## matches what you actually use.
   s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
-end
+end

data/lib/acts_as_versioned.rb

@@ -67,7 +67,7 @@ module ActiveRecord #:nodoc:
     #
     # See ActiveRecord::Acts::Versioned::ClassMethods#acts_as_versioned for configuration options
     module Versioned
-      VERSION   = "0.8.2"
+      VERSION   = "1.0.0"
       CALLBACKS = [:set_new_version, :save_version, :save_version?]
 
       # == Configuration options
@@ -249,12 +249,12 @@ module ActiveRecord #:nodoc:
 
         versioned_class.cattr_accessor :original_class
         versioned_class.original_class = self
-        versioned_class.set_table_name versioned_table_name
+        versioned_class.table_name = versioned_table_name
         versioned_class.belongs_to self.to_s.demodulize.underscore.to_sym,
                                    :class_name  => "::#{self.to_s}",
                                    :foreign_key => versioned_foreign_key
         versioned_class.send :include, options[:extend] if options[:extend].is_a?(Module)
-        versioned_class.set_sequence_name version_sequence_name if version_sequence_name
+        versioned_class.sequence_name = version_sequence_name if version_sequence_name
       end
 
       module Behaviors
@@ -268,158 +268,136 @@ module ActiveRecord #:nodoc:
           after_save :clear_old_versions
         end
 
-        module InstanceMethods
-          # Saves a version of the model in the versioned table.  This is called in the after_save callback by default
-          def save_version
-            if @saving_version
-              @saving_version = nil
-              rev = self.class.versioned_class.new
-              clone_versioned_model(self, rev)
-              rev.send("#{self.class.version_column}=", send(self.class.version_column))
-              rev.send("#{self.class.versioned_foreign_key}=", id)
-              rev.save
-            end
-          end
-          
-          # Saves a version of the model in the versioned table.  This is called in the after_save callback by default
-          def auto_save_version
-            if @saving_version
-              @saving_version = nil
-              rev = self.class.versioned_class.new
-              clone_versioned_model(self, rev)
-              rev.send("#{self.class.version_column}=", send(self.class.version_column))
-              rev.send("#{self.class.versioned_foreign_key}=", id)
-              rev.send("autosave=", true)
-              saving_status = rev.save
-              clear_old_auto_save_versions
-              saving_status
-            end
+        # Saves a version of the model in the versioned table.  This is called in the after_save callback by default
+        def save_version
+          if @saving_version
+            @saving_version = nil
+            rev = self.class.versioned_class.new
+            clone_versioned_model(self, rev)
+            rev.send("#{self.class.version_column}=", send(self.class.version_column))
+            rev.send("#{self.class.versioned_foreign_key}=", id)
+            rev.save
           end
+        end
 
-          # Clears old revisions if a limit is set with the :limit option in <tt>acts_as_versioned</tt>.
-          # Override this method to set your own criteria for clearing old versions.
-          def clear_old_versions
-            return if self.class.max_version_limit == 0
-            excess_baggage = send(self.class.version_column).to_i - self.class.max_version_limit
-            if excess_baggage > 0
-              self.class.versioned_class.delete_all ["#{self.class.version_column} <= ? and #{self.class.versioned_foreign_key} = ?", excess_baggage, id]
-            end
-          end
-          
-          # Clears old revisions if a limit is set with the :limit option in <tt>acts_as_versioned</tt>.
-          # Override this method to set your own criteria for clearing old versions.
-          def clear_old_auto_save_versions
-            excess_baggage = self.class.versioned_class.where(["autosave = ? and #{self.class.versioned_foreign_key} = ?", true,id]).order("updated_at desc").all
-            if excess_baggage.length > 2
-              excess_baggage.last.destroy
-            end
+        # Clears old revisions if a limit is set with the :limit option in <tt>acts_as_versioned</tt>.
+        # Override this method to set your own criteria for clearing old versions.
+        def clear_old_versions
+          return if self.class.max_version_limit == 0
+          excess_baggage = send(self.class.version_column).to_i - self.class.max_version_limit
+          if excess_baggage > 0
+            self.class.versioned_class.delete_all ["#{self.class.version_column} <= ? and #{self.class.versioned_foreign_key} = ?", excess_baggage, id]
           end
+        end
 
-          # Reverts a model to a given version.  Takes either a version number or an instance of the versioned model
-          def revert_to(version)
-            if version.is_a?(self.class.versioned_class)
-              return false unless version.send(self.class.versioned_foreign_key) == id and !version.new_record?
-            else
-              return false unless version = versions.where(self.class.version_column => version).first
-            end
-            self.clone_versioned_model(version, self)
-            send("#{self.class.version_column}=", version.send(self.class.version_column))
-            true
+        # Reverts a model to a given version.  Takes either a version number or an instance of the versioned model
+        def revert_to(version)
+          if version.is_a?(self.class.versioned_class)
+            return false unless version.send(self.class.versioned_foreign_key) == id and !version.new_record?
+          else
+            return false unless version = versions.where(self.class.version_column => version).first
           end
+          self.clone_versioned_model(version, self)
+          send("#{self.class.version_column}=", version.send(self.class.version_column))
+          true
+        end
 
-          # Reverts a model to a given version and saves the model.
-          # Takes either a version number or an instance of the versioned model
-          def revert_to!(version)
-            revert_to(version) ? save_without_revision : false
-          end
+        # Reverts a model to a given version and saves the model.
+        # Takes either a version number or an instance of the versioned model
+        def revert_to!(version)
+          revert_to(version) ? save_without_revision : false
+        end
 
-          # Temporarily turns off Optimistic Locking while saving.  Used when reverting so that a new version is not created.
-          def save_without_revision
-            save_without_revision!
-            true
-          rescue
-            false
-          end
+        # Temporarily turns off Optimistic Locking while saving.  Used when reverting so that a new version is not created.
+        def save_without_revision
+          save_without_revision!
+          true
+        rescue
+          false
+        end
 
-          def save_without_revision!
-            without_locking do
-              without_revision do
-                save!
-              end
+        def save_without_revision!
+          without_locking do
+            without_revision do
+              save!
             end
           end
+        end
 
-          def altered?
-            track_altered_attributes ? (version_if_changed - changed).length < version_if_changed.length : changed?
-          end
-
-          # Clones a model.  Used when saving a new version or reverting a model's version.
-          def clone_versioned_model(orig_model, new_model)
-            self.class.versioned_columns.each do |col|
-              new_model[col.name] = orig_model.send(col.name) if orig_model.has_attribute?(col.name)
-            end
+        def altered?
+          track_altered_attributes ? (version_if_changed - changed).length < version_if_changed.length : changed?
+        end
 
-            if orig_model.is_a?(self.class.versioned_class)
-              new_model[new_model.class.inheritance_column] = orig_model[self.class.versioned_inheritance_column]
-            elsif new_model.is_a?(self.class.versioned_class)
-              new_model[self.class.versioned_inheritance_column] = orig_model[orig_model.class.inheritance_column]
-            end
+        # Clones a model.  Used when saving a new version or reverting a model's version.
+        def clone_versioned_model(orig_model, new_model)
+          self.class.versioned_columns.each do |col|
+            new_model[col.name] = orig_model.send(col.name) if orig_model.has_attribute?(col.name)
           end
 
-          # Checks whether a new version shall be saved or not.  Calls <tt>version_condition_met?</tt> and <tt>changed?</tt>.
-          def save_version?
-            version_condition_met? && altered?
+          clone_inheritance_column(orig_model, new_model)
+        end
+        
+        def clone_inheritance_column(orig_model, new_model)
+          if orig_model.is_a?(self.class.versioned_class) && new_model.class.column_names.include?(new_model.class.inheritance_column.to_s)
+            new_model[new_model.class.inheritance_column] = orig_model[self.class.versioned_inheritance_column]
+          elsif new_model.is_a?(self.class.versioned_class) && new_model.class.column_names.include?(self.class.versioned_inheritance_column.to_s)
+            new_model[self.class.versioned_inheritance_column] = orig_model[orig_model.class.inheritance_column]
           end
+        end
 
-          # Checks condition set in the :if option to check whether a revision should be created or not.  Override this for
-          # custom version condition checking.
-          def version_condition_met?
-            case
-              when version_condition.is_a?(Symbol)
-                send(version_condition)
-              when version_condition.respond_to?(:call) && (version_condition.arity == 1 || version_condition.arity == -1)
-                version_condition.call(self)
-              else
-                version_condition
-            end
-          end
+        # Checks whether a new version shall be saved or not.  Calls <tt>version_condition_met?</tt> and <tt>changed?</tt>.
+        def save_version?
+          version_condition_met? && altered?
+        end
 
-          # Executes the block with the versioning callbacks disabled.
-          #
-          #   @foo.without_revision do
-          #     @foo.save
-          #   end
-          #
-          def without_revision(&block)
-            self.class.without_revision(&block)
+        # Checks condition set in the :if option to check whether a revision should be created or not.  Override this for
+        # custom version condition checking.
+        def version_condition_met?
+          case
+            when version_condition.is_a?(Symbol)
+              send(version_condition)
+            when version_condition.respond_to?(:call) && (version_condition.arity == 1 || version_condition.arity == -1)
+              version_condition.call(self)
+            else
+              version_condition
           end
+        end
 
-          # Turns off optimistic locking for the duration of the block
-          #
-          #   @foo.without_locking do
-          #     @foo.save
-          #   end
-          #
-          def without_locking(&block)
-            self.class.without_locking(&block)
-          end
+        # Executes the block with the versioning callbacks disabled.
+        #
+        #   @foo.without_revision do
+        #     @foo.save
+        #   end
+        #
+        def without_revision(&block)
+          self.class.without_revision(&block)
+        end
 
-          def empty_callback()
-          end
+        # Turns off optimistic locking for the duration of the block
+        #
+        #   @foo.without_locking do
+        #     @foo.save
+        #   end
+        #
+        def without_locking(&block)
+          self.class.without_locking(&block)
+        end
 
-          #:nodoc:
+        def empty_callback()
+        end
 
-          protected
-          # sets the new version before saving, unless you're using optimistic locking.  In that case, let it take care of the version.
-          def set_new_version
-            @saving_version = new_record? || save_version?
-            self.send("#{self.class.version_column}=", next_version) if new_record? || (!locking_enabled? && save_version?)
-          end
+        #:nodoc:
 
-          # Gets the next available version for the current record, or 1 for a new record
-          def next_version
-            (new_record? ? 0 : versions.calculate(:maximum, version_column).to_i) + 1
-          end
+        protected
+        # sets the new version before saving, unless you're using optimistic locking.  In that case, let it take care of the version.
+        def set_new_version
+          @saving_version = new_record? || save_version?
+          self.send("#{self.class.version_column}=", next_version) if new_record? || (!locking_enabled? && save_version?)
+        end
+
+        # Gets the next available version for the current record, or 1 for a new record
+        def next_version
+          (new_record? ? 0 : versions.calculate(:maximum, version_column).to_i) + 1
         end
 
         module ClassMethods
@@ -446,7 +424,6 @@ module ActiveRecord #:nodoc:
             self.connection.create_table(versioned_table_name, create_table_options) do |t|
               t.column versioned_foreign_key, :integer
               t.column version_column, :integer
-              t.column :autosave, :boolean , :default => false
             end
 
             self.versioned_columns.each do |col|

metadata

@@ -1,66 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: freerange_acts_as_versioned
-version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 2
-  version: 0.8.2
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Abdul Rauf
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-24 00:00:00 +09:30
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 1
-        - 1
-        version: 3.1.1
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.3.1
   type: :development
-  version_requirements: *id002
-description: Add simple versioning to ActiveRecord models. rails 3.1.1
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+description: Add simple versioning to ActiveRecord models. rails 3.2
 email: abdul.rauf.au@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - MIT-LICENSE
 - CHANGELOG
-files: 
+files:
 - CHANGELOG
 - Gemfile
 - MIT-LICENSE
@@ -86,39 +77,31 @@ files:
 - test/migration_test.rb
 - test/schema.rb
 - test/versioned_test.rb
-has_rdoc: true
 homepage: http://github.com/abdulrauf/acts_as_versioned
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-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 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: freerange_acts_as_versioned
-rubygems_version: 1.3.7
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 2
-summary: Add simple versioning to ActiveRecord models. This version supports rails 3.1.1. Also it have support for autosave. It introduces new method auto_save_version which keeps 1 autosave version for an object.
+summary: Add simple versioning to ActiveRecord models. This version supports rails
+  3.2. Also it have support for autosave. It introduces new method auto_save_version
+  which keeps 1 autosave version for an object.
 test_files: []
-