created-and-updated-by 0.0.1 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

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.0.1"
+  s.version = "0.1.0"
 
   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,34 +1,20 @@
-module CreatedAndUpdatedBy
-	
+module CreatedAndUpdatedBy	
 	class Stamper
 		cattr_accessor :stampable, :attribute
 		def self.attach(stamp_model = User, stamp_attribute = :current)
 			raise ArgumentError, "#{stamp_model.name} does not respond to #{stamp_attribute}" unless stamp_model.respond_to?(stamp_attribute)
 			self.stampable, self.attribute = stamp_model, stamp_attribute
-			ActiveRecord::Base.extend CreatedAndUpdatedBy  
-			ActiveRecord::Base.send(:acts_as_stampable)
+			ActiveRecord::Base.send(:include, CreatedAndUpdatedBy)
 		end
 	end
-	
-	def acts_as_stampable
-		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
-	end
-	
-	module InstanceMethods
+	class_eval do
 		def stamper
 			CreatedAndUpdatedBy::Stamper.stampable.send(CreatedAndUpdatedBy::Stamper.attribute)
 		end
+		def updated_by; CreatedAndUpdatedBy::Stamper.stampable.find(updated_by_id); end
+		def created_by; CreatedAndUpdatedBy::Stamper.stampable.find(updated_by_id); end
 		def set_stamps
-			if stamper && respond_to?(:created_by_id) && respond_to?(:updated_by_id)
-				self.created_by ||= stamper
-				self.updated_by = stamper
-			end
+			self.created_by_id ||= self.updated_by_id = stamper.id 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.0.1
+  version: 0.1.0
 platform: ruby
 authors: 
 - James Daniels