acts_as_versioner 1.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d2358c69672d8feac037526ab9513951a5ae197
-  data.tar.gz: 848639453794e3025c584b834ebf073aca5f88c2
+  metadata.gz: cf3d13dbd86c5a13e69d319ca761ce4eb027e4a7
+  data.tar.gz: ac7cbac9c20887bf3ff8b23929ea2699122d5ac8
 SHA512:
-  metadata.gz: ec883fcad954d7ac02bb1b1a223386f980a425a28f2cb20a0241d996337b30465771c2b58fa5deb9c475781e65c2626a0b3493bcea3e0f044caf3c1eb16e89bf
-  data.tar.gz: 4cb7cc81cbbab950970caac6657e1dcf455b7b6be99e240ab90843d751abd271ebe54281a29d85c70927f5b4188873717faf20db1eff737379cd3a5065017fcc
+  metadata.gz: ab2a1f735b7bb4b08b39c84f1617afdf0ae90b1d4280be318fa5a5ac6b4f5d852714285522292c1e8a20658d93d8bd2d24ce24024bb49446acbb3142b6222adb
+  data.tar.gz: 310179d467124ecc80834f36fb5003a3a2e6efe8510dde32adacaaa8068716c3571161fb3cd36250a52b20a4a27e88ada5031af421309c13d9be5b40cd14e262

data/VERSION

@@ -1 +1 @@
-1.0
+1.0.3

data/acts_as_versioner.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = "acts_as_versioner"
-  s.version = "1.0"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Markus Hediger"]
-  s.date = "2018-01-01"
+  s.date = "2018-07-23"
   s.description = "Versioning of ar tables"
   s.email = "m.hed@gmx.ch"
   s.extra_rdoc_files = [

data/lib/acts_as_versioner.rb

@@ -2,7 +2,8 @@ require File.dirname(__FILE__) + '/acts_as_versioner/acts_as_versioner.rb'
 require File.dirname(__FILE__) + '/acts_as_versioner/userstamp.rb'
 module ActiveRecord::Acts::Versioner
   @@configurator = {
-    :default_versioned_class_name => '_versions',
+    :default_versioned_class_name => 'Version',
+    :default_versioned_table_name => '_versions',
     :default_versioned_created_at => 'created_at',
     :default_versioned_updated_at => 'updated_at',
     :default_versioned_created_by => 'created_by',

data/lib/acts_as_versioner/acts_as_versioner.rb

@@ -25,8 +25,8 @@ module ActiveRecord
 
           send :attr_accessor
 
-          self.versioned_class_name         = options[:class_name]  || "#{base_class}Version"
-          self.versioned_table_name         = options[:table_name]  || "#{table_name_prefix}#{base_class.name.demodulize.underscore}#{ActiveRecord::Acts::Versioner::configurator[:default_versioned_class_name]}#{table_name_suffix}"
+          self.versioned_class_name         = options[:class_name]  || "#{base_class}#{ActiveRecord::Acts::Versioner::configurator[:default_versioned_class_name]}"
+          self.versioned_table_name         = options[:table_name]  || "#{table_name_prefix}#{base_class.name.demodulize.underscore}#{ActiveRecord::Acts::Versioner::configurator[:default_versioned_table_name]}#{table_name_suffix}"
           self.versioned_foreign_key        = options[:versioned_foreign_key]  || "#{table_name_prefix}#{base_class.name.demodulize.underscore}_id"   # quick 'n' dirty fix
 
           if block_given?
@@ -63,12 +63,12 @@ module ActiveRecord
 
         # Returns the current version.
 	    def get_current_version
-          instance_eval(self.versioned_class_name).where([self.versioned_foreign_key + ' = ?', self.id]).order("#{ActiveRecord::Acts::Versioner::configurator[:default_versioned_updated_at]} desc, id desc").first
+          instance_eval(self.versioned_class_name).where([self.versioned_foreign_key + ' = ?', self.id]).order(Arel.sql("#{ActiveRecord::Acts::Versioner::configurator[:default_versioned_updated_at]} desc, id desc")).first
 	    end
 
         # Returns all versions of a model.
 	    def get_versions
-          instance_eval(self.versioned_class_name).where([self.versioned_foreign_key + ' = ?', self.id]).order("#{ActiveRecord::Acts::Versioner::configurator[:default_versioned_updated_at]} asc, id asc").all
+          instance_eval(self.versioned_class_name).where([self.versioned_foreign_key + ' = ?', self.id]).order(Arel.sql("#{ActiveRecord::Acts::Versioner::configurator[:default_versioned_updated_at]} asc, id asc")).all
 	    end
 
         # This methods returns all versions of associated tables (table that belong to the existing model).
@@ -77,7 +77,7 @@ module ActiveRecord
 	      stack = Array.new # Stack of the same algorithm.
 
           # Initiate algorithm with the used model
-	      versions = instance_eval(self.versioned_class_name).where([self.versioned_foreign_key + ' = ?', self.id]).order("#{ActiveRecord::Acts::Versioner::configurator[:default_versioned_updated_at]} asc, #{ActiveRecord::Acts::Versioner::configurator[:default_versioned_created_at]} asc").all
+	      versions = instance_eval(self.versioned_class_name).where([self.versioned_foreign_key + ' = ?', self.id]).order(Arel.sql("#{ActiveRecord::Acts::Versioner::configurator[:default_versioned_updated_at]} asc, #{ActiveRecord::Acts::Versioner::configurator[:default_versioned_created_at]} asc")).all
 	      associations[self.versioned_class_name] = versions # Caching itself in the result hash
 	      stack.push self.class => versions # Setting itself onto the stack
 
@@ -118,7 +118,7 @@ module ActiveRecord
               }
 
               unless foreign_ids.blank?
-	            tmp_new_data_set = association_klass.versioned_class.where(["#{class_name.to_s.tableize.singularize.downcase}_id IN (?)", foreign_ids]).order("#{ActiveRecord::Acts::Versioner::configurator[:default_versioned_updated_at]} asc, #{ActiveRecord::Acts::Versioner::configurator[:default_versioned_created_at]} asc").all
+	            tmp_new_data_set = association_klass.versioned_class.where(["#{class_name.to_s.tableize.singularize.downcase}_id IN (?)", foreign_ids]).order(Arel.sql("#{ActiveRecord::Acts::Versioner::configurator[:default_versioned_updated_at]} asc, #{ActiveRecord::Acts::Versioner::configurator[:default_versioned_created_at]} asc")).all
 	            unless tmp_new_data_set.blank? then new_data_set.concat(tmp_new_data_set) end
               end
 
@@ -168,7 +168,7 @@ module ActiveRecord
 	    def prepare_versioning(mode = 0)
 	      @acts_as_versioner_mode = mode # mode : 0 = insert, 1 = update, 2 = delete
 	      @acts_as_versioner_model = self.dup
-          @acts_as_versioner_model.updated_at = Time.now
+        @acts_as_versioner_model.updated_at = Time.now
 
 	      if mode == 0 && self.id != nil then @acts_as_versioner_mode = 1 end  
 	    end
@@ -186,6 +186,9 @@ module ActiveRecord
 
 	      attributes[self.versioned_foreign_key] = self.id
 	      attributes[:action] = @acts_as_versioner_mode
+        
+        # Conserve the created_at field in the versions table
+        attributes[ActiveRecord::Acts::Versioner::configurator[:default_versioned_created_at].to_sym] = self[ActiveRecord::Acts::Versioner::configurator[:default_versioned_created_at].to_sym]
 
 	      modelversion = instance_eval(self.versioned_class_name).new(attributes)
 	      modelversion.save(:validate => false)
@@ -215,7 +218,7 @@ module ActiveRecord
 
           # Rake migration task to create the versioned table
           def create_versioned_table(create_table_options = {})
-            versioned_table_name = self.to_s.underscore + ActiveRecord::Acts::Versioner::configurator[:default_versioned_class_name]
+            versioned_table_name = "#{self.to_s.underscore}#{ActiveRecord::Acts::Versioner::configurator[:default_versioned_table_name]}"
             puts table_name
             # create version column in main table if it does not exist
             add_column_to_table(table_name, ActiveRecord::Acts::Versioner::configurator[:default_versioned_created_at], :datetime)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_versioner
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.3
 platform: ruby
 authors:
 - Markus Hediger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-01 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Versioning of ar tables