@@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.rdoc_options = ["--main", "README.rdoc"] s.summary = "acts_as_revisable enables revision tracking, querying, reverting and branching of ActiveRecord models. Inspired by acts_as_versioned." s.name = "acts_as_revisable" - s.version = "0.9.6" + s.version = "0.9.7" s.extra_rdoc_files = ["README.rdoc", "LICENSE"] s.email = "cavanaugh@fatjam.com" s.has_rdoc = true acts_as_revisable.gemspec @@ -24,7 +24,8 @@ module FatJam base.instance_eval do define_callbacks :before_branch, :after_branch - has_many :branches, :class_name => base.class_name, :foreign_key => :revisable_branched_from_id + has_many :branches, (revisable_options.revision_association_options || {}).merge({:class_name => base.class_name, :foreign_key => :revisable_branched_from_id}) + belongs_to :branch_source, :class_name => base.class_name, :foreign_key => :revisable_branched_from_id after_save :execute_blocks_after_save disable_revisable_scope :branch_source, :branches lib/acts_as_revisable/acts/common.rb @@ -37,12 +37,13 @@ module FatJam # Performs the setup needed for both kinds of acts_as_revisable # models. def revisable_shared_setup(args, block) - self.send(:include, Common) class << self attr_accessor :revisable_options end options = args.extract_options! self.revisable_options = Options.new(options, &block) + + self.send(:include, Common) end end end lib/acts_as_revisable/base.rb @@ -3,7 +3,7 @@ module FatJam #:nodoc: module VERSION #:nodoc: MAJOR = 0 MINOR = 9 - TINY = 6 + TINY = 7 STRING = [MAJOR, MINOR, TINY].join('.') end lib/acts_as_revisable/version.rb 97fc9feab2b3e4eecc578c6bae5fe162d03b871d Rich Cavanaugh rich@silverback.local http://github.com/fatjam/acts_as_revisable/commit/bc88a56b8e57d6bdb94a8d65ca108a1f781c071d bc88a56b8e57d6bdb94a8d65ca108a1f781c071d 2008-07-22T09:59:43-07:00 2008-07-22T09:59:43-07:00 Apply revision_association_options to the branches association. cf9480930a37399eae6d1ccc028d04eed74859f7 Rich Cavanaugh rich@silverback.local