rtiss_acts_as_versioned 0.6.2 → 0.7.2

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 group :development do
-  gem 'rails',        '2.3.16'
+  gem 'rails', '3.0.20'
   gem 'sqlite3-ruby', '1.3.1'
-  gem 'mysql',        '2.8.1'
+  gem 'mysql', '2.8.1'
 end

data/Rakefile

@@ -13,7 +13,7 @@ def name
 end
 
 def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line = File.read("lib/acts_as_versioned.rb")[/^\s*VERSION\s*=\s*.*/]
   line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
 end
 
@@ -70,7 +70,7 @@ end
 
 desc "Open an irb session preloaded with this library"
 task :console do
-  sh "irb -rubygems -r ./lib/#{name}.rb"
+  sh "irb -rubygems -r ./lib/acts_as_versioned.rb"
 end
 
 #############################################################################
@@ -88,8 +88,8 @@ end
 #############################################################################
 
 task :release => :build do
-  unless `git branch` =~ /^\* master$/ || `git branch` =~ /^\* rails2$/
-    puts "You must be on the master branch or the rails2 branch to release!"
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
     exit!
   end
   sh "git commit --allow-empty -a -m 'Release #{version}'"
@@ -133,9 +133,9 @@ task :gemspec => :validate do
 end
 
 task :validate do
-  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
+  libfiles = Dir['lib/*'] - ["lib/acts_as_versioned.rb", "lib/acts_as_versioned"]
   unless libfiles.empty?
-    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
+    puts "Directory `lib` should only contain a `acts_as_versioned..rb` file and `acts_as_versioned` dir."
     exit!
   end
   unless Dir['VERSION*'].empty?

data/init.rb

@@ -1,2 +1,2 @@
 # encoding: utf-8
-require 'rtiss_acts_as_versioned'
+require 'acts_as_versioned'

data/lib/{rtiss_acts_as_versioned.rb → acts_as_versioned.rb}

@@ -20,7 +20,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-VERSION = '0.6.2'
+VERSION = '0.7.2'
 
 module ActiveRecord #:nodoc:
   module Acts #:nodoc:
@@ -292,12 +292,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
       end
 
@@ -371,7 +371,7 @@ module ActiveRecord #:nodoc:
           ret = false
           without_locking do
             without_revision do
-              ret = save(perform_validation)
+              ret = save(:validate => perform_validation)
             end
           end
           return ret
@@ -395,9 +395,13 @@ module ActiveRecord #:nodoc:
             new_model.send("#{col.name}=", orig_model.send(col.name)) if orig_model.has_attribute?(col.name)
           end
 
-          if orig_model.is_a?(self.class.versioned_class)
+          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)
+          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
@@ -491,7 +495,7 @@ module ActiveRecord #:nodoc:
 
           # Gets the next available version for the current record, or 1 for a new record
           def next_version
-            (new_record? ? 0 : versions.calculate(:max, version_column).to_i) + 1
+            (new_record? ? 0 : versions.calculate(:maximum, version_column).to_i) + 1
           end
 
         module ClassMethods

data/rtiss_acts_as_versioned.gemspec

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
 ## This is the rakegem gemspec template. Make sure you read and understand
 ## all of the comments. Some sections require modification, and others can
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'rtiss_acts_as_versioned'
-  s.version           = '0.6.2'
+  s.version           = '0.7.2'
   s.date              = '2014-02-03'
   s.rubyforge_project = 'rtiss_acts_as_versioned'
 
@@ -48,7 +48,7 @@ to use technoweenie's version (can be found also on github)"
 
   ## 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', ["~> 2.3.16"])
+  s.add_dependency('activerecord', [">= 3.0.9"])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
@@ -66,7 +66,7 @@ to use technoweenie's version (can be found also on github)"
     RUNNING_UNIT_TESTS
     Rakefile
     init.rb
-    lib/rtiss_acts_as_versioned.rb
+    lib/acts_as_versioned.rb
     rtiss_acts_as_versioned.gemspec
     test/abstract_unit.rb
     test/database.yml

data/test/abstract_unit.rb

@@ -15,7 +15,7 @@ begin
 rescue LoadError
 end
 
-require 'rtiss_acts_as_versioned'
+require 'acts_as_versioned'
 
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")

data/test/fixtures/locked_rolle.rb

@@ -1,6 +1,6 @@
 # Same as Rolle except for the presence of the lock_version field
 class LockedRolle < ActiveRecord::Base
-  set_table_name 'locked_rolle'
+        set_table_name 'locked_rolle'
 	acts_as_versioned
 
 	validates_presence_of :name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtiss_acts_as_versioned
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -18,17 +18,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.16
+        version: 3.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.16
+        version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ files:
 - RUNNING_UNIT_TESTS
 - Rakefile
 - init.rb
-- lib/rtiss_acts_as_versioned.rb
+- lib/acts_as_versioned.rb
 - rtiss_acts_as_versioned.gemspec
 - test/abstract_unit.rb
 - test/database.yml
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1039730172068389622
+      hash: -4385912415049936283
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: