track_history 0.0.10 → 0.0.11

data/lib/track_history.rb

@@ -53,7 +53,7 @@ module TrackHistory
       end
  
       # get the history class in line
-      @klass_reference.send(:extend, HistoryMethods)
+      @klass_reference.send(:extend, TrackHistory::HistoryMethods)
  
       # figure out the field for tracking action (enum)
       @klass_reference.instance_variable_set(:@historical_action_field, @klass_reference.columns_hash.has_key?('action') ? 'action' : nil)
@@ -73,23 +73,23 @@ module TrackHistory
       
       # create the history class
       rel = base.name.singularize.underscore.downcase.to_sym
-      @klass_reference.send(:include, HistoricalRelationHelpers)
+      @klass_reference.send(:include, TrackHistory::HistoricalRelationHelpers)
 
       # create a backward reference
       if track_reference
         @klass_reference.belongs_to rel
         @klass_reference.send(:alias_method, :historical_relation, rel)
-        has_many :histories, :class_name => model_name, :order => 'created_at desc, id desc' if track_reference
+        has_many :histories, :class_name => model_name, :order => 'id desc' if track_reference
       end
 
       # tell the other class about us
       # purposely don't define these until after getting historical_fields
-      before_update { |c| c.send(:record_historical_changes, 'update') }
+      before_update :record_historical_changes
 
       # track other things (optionally)
       unless @klass_reference.historical_action_field.nil?
-        after_create { |c| c.send(:record_historical_changes, 'create') }
-        before_destroy { |c| c.send(:record_historical_changes, 'destroy') }
+        after_create :record_historical_changes_on_create
+        before_destroy :record_historical_changes_on_destroy
       end
 
     end
@@ -100,7 +100,15 @@ module TrackHistory
 
     private
 
-    def record_historical_changes(action)
+    def record_historical_changes_on_destroy
+      record_historical_changes('destroy')
+    end
+
+    def record_historical_changes_on_create
+      record_historical_changes('create')
+    end
+
+    def record_historical_changes(action = 'update')
       historical_fields = self.class.historical_class.historical_fields
       historical_tracks = self.class.historical_class.historical_tracks
       return if historical_fields.empty? && historical_tracks.empty?

data/lib/track_history/historical_relation_helpers.rb

@@ -1,17 +1,21 @@
-module HistoricalRelationHelpers
+module TrackHistory
 
-  # Get a list of the modifications in a given history
-  def modifications
-    self.class.historical_fields.reject do |field, options|
-      send(options[:before]) == send(options[:after])
-    end.keys
-  end
+  module HistoricalRelationHelpers
+
+    # Get a list of the modifications in a given history
+    def modifications
+      self.class.historical_fields.reject do |field, options|
+        send(options[:before]) == send(options[:after])
+      end.keys
+    end
+
+    def to_s
+      return 'modified nothing' if modifications.empty?
+      str = 'modified ' + modifications.sort.join(', ')
+      str += " on #{historical_relation}" if self.class.instance_variable_get(:@track_historical_reference)
+      str
+    end
 
-  def to_s
-    return 'modified nothing' if modifications.empty?
-    str = 'modified ' + modifications.sort.join(', ')
-    str += " on #{historical_relation}" if self.class.instance_variable_get(:@track_historical_reference)
-    str
   end
 
 end

data/lib/track_history/history_methods.rb

@@ -1,38 +1,42 @@
-module HistoryMethods
+module TrackHistory
 
-  attr_reader :historical_fields, :historical_action_field
+  module HistoryMethods
 
-  def track_historical_reference?
-    @track_historical_reference
-  end
+    attr_reader :historical_fields, :historical_action_field
 
-  def historical_fields
-    @historical_fields ||= {}
-  end
+    def track_historical_reference?
+      @track_historical_reference
+    end
 
-  def historical_tracks
-    @historical_tracks ||= {}
-  end
+    def historical_fields
+      @historical_fields ||= {}
+    end
 
-  def field(field, options = {})
-    options.assert_valid_keys(:before, :after)
-    field_s = field.is_a?(String) ? field : field.to_s
-    historical_fields[field_s] = { 
-      :before => options[:before] || nil,
-      :after => options[:after] || nil
-    }
-    nil
-  end
+    def historical_tracks
+      @historical_tracks ||= {}
+    end
+
+    def field(field, options = {})
+      options.assert_valid_keys(:before, :after)
+      field_s = field.is_a?(String) ? field : field.to_s
+      historical_fields[field_s] = { 
+        :before => options[:before] || nil,
+        :after => options[:after] || nil
+      }
+      nil
+    end
+
+    def annotate(field, options = {}, &block) # haha
+      options.assert_valid_keys(:as)
+      save_as = options.has_key?(:as) ? options[:as] : field
 
-  def annotate(field, options = {}, &block) # haha
-    options.assert_valid_keys(:as)
-    save_as = options.has_key?(:as) ? options[:as] : field
+      unless columns_hash.has_key?(save_as.to_s)
+        raise ActiveRecord::StatementInvalid.new("No such attribute '#{save_as}' on #{self.name}")
+      end
 
-    unless columns_hash.has_key?(save_as.to_s)
-      raise ActiveRecord::StatementInvalid.new("No such attribute '#{save_as}' on #{self.name}")
+      historical_tracks[save_as] = block.nil? ? field : block
     end
 
-    historical_tracks[save_as] = block.nil? ? field : block
   end
 
 end

data/lib/track_history/version.rb

@@ -1,5 +1,5 @@
 module TrackHistory
 
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: track_history
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - John Crepezzi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -05:00
+date: 2011-01-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency