trackzor 0.1.2 → 0.1.3

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('trackzor', '0.1.2') do |gem|
+Echoe.new('trackzor', '0.1.3') do |gem|
   gem.description = "Track ATTR_updated_at and ATTR_updated_by"
   gem.url = "http://github.com/corneldm/trackzor"
   gem.author = "David Cornelius"

data/lib/trackzor.rb

@@ -5,47 +5,81 @@ module Trackzor
 
   module ClassMethods
     def trackzored(options = {})
+      class_inheritable_reader :trackzor_exempt_columns
+
       if options[:only]
         except = self.column_names - options[:only].flatten.map(&:to_s)
       else
         except = [self.primary_key, inheritance_column, 'lock_version', 'created_at', 'updated_at']
         except |= Array(options[:except]).collect(&:to_s) if options[:except]
       end
-
+      write_inheritable_attribute :trackzor_exempt_columns, except
       aaa_present = self.respond_to?(:non_audited_columns)
 
-      (self.column_names - except).select{|column| column =~ /_updated_by|_updated_at/ }.each do |col|
-        if col =~ /_updated_by/
-          belongs_to "#{col.split('_updated_by')[0]}_source".to_sym, :class_name => 'User', :foreign_key => col
+      # create ATTR_source associations
+      (self.column_names - self.trackzor_exempt_columns).select{|column| column =~ /(_updated_by|_updated_at)$/ }.each do |col|
+        if col =~ /_updated_by$/
+          belongs_to col.sub(/_updated_by$/, '_source').to_sym, :class_name => 'User', :foreign_key => col
         end
-
         self.non_audited_columns << col if aaa_present
       end
 
-      validate do |record|
-        user = Thread.current[:trackzor_user] || Thread.current[:acts_as_audited_user]
+      validate :trackzor_assign_and_validate
 
-        record.changes.keys.each do |attr|
-          unless except.include?(attr)
-            time_column = "#{attr}_updated_at"
-            user_association = "#{attr}_source"
+      include Trackzor::InstanceMethods
+    end
+  end # ClassMethods
 
-            if record.respond_to?(time_column.to_sym)
-              record.send("#{time_column}=".to_sym, Time.now)
-            end
+  module InstanceMethods
+    def trackzor_assign_and_validate
+      user = Thread.current[:trackzor_user] || Thread.current[:acts_as_audited_user]
 
-            if record.respond_to?(user_association.to_sym)
-              if user
-                record.send("#{user_association}=".to_sym, user)
-              else
-                record.errors.add("#{attr}_updated_by", "requires Trackzor user to be set")
-              end
+      self.changes.keys.each do |attr|
+        unless self.trackzor_exempt_columns.include?(attr)
+          time_column = "#{attr}_updated_at"
+          user_association = "#{attr}_source"
+
+          if self.respond_to?(time_column.to_sym)
+            self.send("#{time_column}=".to_sym, Time.now)
+          end
+
+          if self.respond_to?(user_association.to_sym)
+            if user
+              self.send("#{user_association}=".to_sym, user)
+            else
+              self.errors.add("#{attr}_updated_by", "requires Trackzor user to be set")
             end
           end
         end
       end
     end
-  end
+
+    # force update of multiple attributes
+    def will_update_attributes!(new_attributes, guard_protected_attributes = true)
+      return if new_attributes.nil?
+      attributes = new_attributes.dup
+      attributes.stringify_keys!
+
+      multi_parameter_attributes = []
+      attributes = remove_attributes_protected_from_mass_assignment(attributes) if guard_protected_attributes
+
+      attributes.each do |k, v|
+        if k.include?("(")
+          multi_parameter_attributes << [ k, v ]
+        else
+          if respond_to?("#{k}=")
+            send("#{k}=", v)
+            send("#{k}_will_change!")
+          else
+            raise "unknown attribute: #{k}"
+          end
+        end
+      end
+
+      assign_multiparameter_attributes(multi_parameter_attributes)
+      save!
+    end
+  end # InstanceMethods
 
   # All X attribute changes where X_updated_by exists will be recorded as made by +user+.
   def self.as_user(user, &block)

data/trackzor.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trackzor}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Cornelius"]
-  s.date = %q{2010-01-18}
+  s.date = %q{2010-01-22}
   s.description = %q{Track ATTR_updated_at and ATTR_updated_by}
   s.email = %q{david.cornelius@bluefishwireless.net}
   s.extra_rdoc_files = ["CHANGELOG", "README.rdoc", "lib/trackzor.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trackzor
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - David Cornelius
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-18 00:00:00 -05:00
+date: 2010-01-22 00:00:00 -05:00
 default_executable: 
 dependencies: []