created-and-updated-by 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/created-and-updated-by.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{created-and-updated-by}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Daniels"]

data/lib/created-and-updated-by.rb

@@ -1,4 +1,4 @@
-module CreatedAndUpdatedBy	
+module CreatedAndUpdatedBy
 	class Stamper
 		cattr_accessor :stampable, :attribute
 		def self.attach(stamp_model = User, stamp_attribute = :current)
@@ -7,14 +7,18 @@ module CreatedAndUpdatedBy
 			ActiveRecord::Base.send(:include, CreatedAndUpdatedBy)
 		end
 	end
-	class_eval do
-		def stamper
-			CreatedAndUpdatedBy::Stamper.stampable.send(CreatedAndUpdatedBy::Stamper.attribute)
+	def self.included(base)
+		base.class_eval do
+			send :include, InstanceMethods
+			before_validation :set_stamps
+			belongs_to :updated_by, :class_name => CreatedAndUpdatedBy::Stamper.stampable.name
+			belongs_to :created_by, :class_name => CreatedAndUpdatedBy::Stamper.stampable.name
 		end
-		def updated_by; CreatedAndUpdatedBy::Stamper.stampable.find(updated_by_id); end
-		def created_by; CreatedAndUpdatedBy::Stamper.stampable.find(updated_by_id); end
+	end
+	module InstanceMethods
+		def stamper; CreatedAndUpdatedBy::Stamper.stampable.send(CreatedAndUpdatedBy::Stamper.attribute); end
 		def set_stamps
-			self.created_by_id ||= self.updated_by_id = stamper.id if stamper && respond_to?(:created_by_id) && respond_to?(:updated_by_id)
+			self.created_by ||= self.updated_by = stamper if stamper && respond_to?(:created_by_id) && respond_to?(:updated_by_id)
 		end
-	end	
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: created-and-updated-by
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - James Daniels