jeremyw-paper_trail 1.2.12 → 1.2.14

data/VERSION

@@ -1 +1 @@
-1.2.12
+1.2.13

data/lib/paper_trail.rb

@@ -1,23 +1,27 @@
 require 'yaml'
+require 'paper_trail/config'
 require 'paper_trail/has_paper_trail'
 require 'paper_trail/version'
 
 module PaperTrail
-  @@enabled = true
   @@whodunnit = nil
 
+  def self.config
+    @@config ||= PaperTrail::Config.instance
+  end
+
   def self.included(base)
     base.before_filter :set_whodunnit
   end
 
   def self.enabled=(value)
-    @@enabled = value
+    PaperTrail.config.enabled = value
   end
-  
+
   def self.enabled?
-    @@enabled
+    !!PaperTrail.config.enabled
   end
-  
+
   def self.whodunnit
     @@whodunnit.respond_to?(:call) ? @@whodunnit.call : @@whodunnit
   end
@@ -33,7 +37,7 @@ module PaperTrail
       self.send :current_user rescue nil
     }
   end
-  
+
 end
 
 ActionController::Base.send :include, PaperTrail

data/lib/paper_trail/config.rb

@@ -0,0 +1,10 @@
+module PaperTrail
+  class Config
+    include Singleton
+    attr_accessor :enabled
+
+    def initialize
+      @enabled = true
+    end
+  end
+end

data/lib/paper_trail/has_paper_trail.rb

@@ -8,7 +8,7 @@ module PaperTrail
   module ClassMethods
     def has_paper_trail
       send :include, InstanceMethods
-      
+
       cattr_accessor :paper_trail_active
       self.paper_trail_active = true
 
@@ -48,19 +48,19 @@ module PaperTrail
                       :object    => object_to_string(previous_version),
                       :whodunnit => PaperTrail.whodunnit) if self.class.paper_trail_active && PaperTrail.enabled?
     end
-    
+
     # Returns the object at the version that was valid at the given timestamp.
     def version_at timestamp
       # short-circuit if the current state is valid
       return self if self.updated_at < timestamp
-      
+
       version = versions.first(
-        :conditions => ['created_at < ?', timestamp], 
+        :conditions => ['created_at < ?', timestamp],
         :order => 'created_at DESC')
       version.reify if version
     end
 
-    # Walk the versions to construct an audit trail of the edits made 
+    # Walk the versions to construct an audit trail of the edits made
     # over time, and by whom.
     def audit_trail options={}
       options[:attributes_to_ignore] ||= %w(updated_at)
@@ -77,11 +77,11 @@ module PaperTrail
         attributes_before = yaml_to_hash(previous_version.object)
 
         # remove some attributes that we don't need to report
-        [attributes_before, attributes_after].each do |hash| 
+        [attributes_before, attributes_after].each do |hash|
           hash.reject! { |k,v| k.in? Array(options[:attributes_to_ignore]) }
         end
 
-        audit_trail << { 
+        audit_trail << {
           :event => previous_version.event,
           :changed_by => transform_whodunnit(previous_version.whodunnit),
           :changed_at => previous_version.created_at,
@@ -91,14 +91,14 @@ module PaperTrail
 
       audit_trail
     end
-    
+
     protected
 
     def transform_whodunnit(whodunnit)
       whodunnit
     end
-    
-    
+
+
     private
 
     def previous_version
@@ -113,13 +113,13 @@ module PaperTrail
     def object_to_string(object)
       object.attributes.to_yaml
     end
-    
+
     def yaml_to_hash(yaml)
       return {} if yaml.nil?
       YAML::load(yaml).to_hash
     end
 
-    # Returns an array of hashes, where each hash specifies the +:attribute+, 
+    # Returns an array of hashes, where each hash specifies the +:attribute+,
     # value +:before+ the change, and value +:after+ the change.
     def differences(before, after)
       before.diff(after).keys.sort.inject([]) do |diffs, k|
@@ -129,9 +129,13 @@ module PaperTrail
     end
 
     def versions_including_current_in_descending_order
-      v = self.versions.dup
-      v << Version.new(:event => 'update', 
-        :object => object_to_string(self), 
+      if self.new_record?
+        v = Version.all(:order => 'created_at desc', :conditions => {:item_id => id, :item_type => self.class.name})
+      else
+        v = self.versions.dup
+      end
+      v << Version.new(:event => 'update',
+        :object => object_to_string(self),
         :created_at => self.updated_at)
       v.reverse # newest first
     end

data/paper_trail.gemspec

@@ -1,12 +1,12 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{paper_trail}
-  s.version = "1.2.12"
+  s.name = %q{jeremyw-paper_trail}
+  s.version = "1.2.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Stewart", "Jeremy Weiskotten", "Joe Lind"]
-  s.date = %q{2009-08-07}
+  s.date = %q{2009-10-02}
   s.email = %q{jeremy@weiskotten.com}
   s.extra_rdoc_files = [
     "README.md"
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "init.rb",
      "install.rb",
      "lib/paper_trail.rb",
+     "lib/paper_trail/config.rb",
      "lib/paper_trail/has_paper_trail.rb",
      "lib/paper_trail/version.rb",
      "paper_trail.gemspec",
@@ -55,7 +56,7 @@ Gem::Specification.new do |s|
   # if s.respond_to? :specification_version then
   #   current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
   #   s.specification_version = 2
-  # 
+  #
   #   if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
   #   else
   #   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeremyw-paper_trail
 version: !ruby/object:Gem::Version 
-  version: 1.2.12
+  version: 1.2.14
 platform: ruby
 authors: 
 - Andy Stewart
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-07 00:00:00 -07:00
+date: 2009-10-02 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - init.rb
 - install.rb
 - lib/paper_trail.rb
+- lib/paper_trail/config.rb
 - lib/paper_trail/has_paper_trail.rb
 - lib/paper_trail/version.rb
 - paper_trail.gemspec
@@ -50,7 +51,8 @@ files:
 - uninstall.rb
 has_rdoc: true
 homepage: http://github.com/jeremyw/paper_trail
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -73,7 +75,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Track changes to your models' data.  Good for auditing or versioning.
 test_files: 
 - test/paper_trail_controller_test.rb