created-and-updated-by 0.1.1 → 0.1.2

data/Rakefile

@@ -11,6 +11,8 @@ begin
     gem.homepage = "http://github.com/jamesdaniels/created-and-updated-by"
     gem.authors = ["James Daniels"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "activerecord"
+    gem.add_development_dependency "activesupport"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/created-and-updated-by.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{created-and-updated-by}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Daniels"]
-  s.date = %q{2010-01-18}
+  s.date = %q{2010-01-21}
   s.description = %q{This gem extends ActiveRecord::Base causing created_by_id and updated_by_id attributes to be set magically with about 30 LOC}
   s.email = %q{james@jamesdaniels.net}
   s.extra_rdoc_files = [
@@ -26,6 +26,10 @@ Gem::Specification.new do |s|
      "created-and-updated-by.gemspec",
      "lib/created-and-updated-by.rb",
      "spec/created-and-updated-by_spec.rb",
+     "spec/db/database.yml",
+     "spec/db/models.rb",
+     "spec/db/schema.rb",
+     "spec/db/test.sqlite3",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
@@ -36,6 +40,8 @@ Gem::Specification.new do |s|
   s.summary = %q{Preforms magic on created_by_id and updated_by_id fields}
   s.test_files = [
     "spec/created-and-updated-by_spec.rb",
+     "spec/db/models.rb",
+     "spec/db/schema.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -45,11 +51,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<activerecord>, [">= 0"])
+      s.add_development_dependency(%q<activesupport>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
   end
 end
 

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

@@ -1,24 +1,32 @@
+require 'rubygems'
+require 'active_support'
+require 'active_support/core_ext'
+
 module CreatedAndUpdatedBy
 	class Stamper
+		include ActiveSupport::CoreExtensions
 		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)
+		def self.attach(stamp_model = :User, stamp_attribute = :current)
+			raise ArgumentError, "#{stamp_model} does not respond to #{stamp_attribute}" unless Object.const_get(stamp_model).respond_to?(stamp_attribute)
 			self.stampable, self.attribute = stamp_model, stamp_attribute
 			ActiveRecord::Base.send(:include, CreatedAndUpdatedBy)
 		end
 	end
 	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
+		base.class_eval [
+			"send :include, InstanceMethods",
+			"before_validation :set_stamps",
+			"belongs_to :updated_by, :class_name => '#{CreatedAndUpdatedBy::Stamper.stampable}'",
+			"belongs_to :created_by, :class_name => '#{CreatedAndUpdatedBy::Stamper.stampable}'",
+		].join("\n")
 	end
 	module InstanceMethods
-		def stamper; CreatedAndUpdatedBy::Stamper.stampable.send(CreatedAndUpdatedBy::Stamper.attribute); end
+		def stamper; Object.const_get(CreatedAndUpdatedBy::Stamper.stampable).send(CreatedAndUpdatedBy::Stamper.attribute); end
 		def set_stamps
-			self.created_by ||= self.updated_by = stamper if stamper && respond_to?(:created_by_id) && respond_to?(:updated_by_id)
+			if stamper && stamper.respond_to?(:id) && respond_to?(:created_by_id) && respond_to?(:updated_by_id)
+				self.created_by_id = stamper.id if new_record?
+				self.updated_by_id = stamper.id
+			end
 		end
 	end
 end

data/spec/created-and-updated-by_spec.rb

@@ -1,7 +1,46 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "CreatedAndUpdatedBy" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
+describe User do
+  it 'should have a freaking user' do
+		User.count > 0
+	end
+	it 'should have a curent_user set' do
+		User.current.should == User.first
+	end
 end
+
+describe WithCreated do
+	it 'should set the created_by_id on create' do
+		created = WithCreated.create!
+		created.created_by_id.should == User.first.id
+		created.updated_by_id.should == User.first.id
+	end
+	it 'can retrieve the created by' do
+		created = WithCreated.create!
+		created.created_by.should == User.first
+		created.updated_by.should == User.first
+	end
+	it 'sets the updated by' do
+		User.current = User.first
+		created = WithCreated.create!
+		User.current = User.last
+		created.something = 'blah blah something else'
+		created.save!
+		created.created_by_id.should == User.first.id
+		created.updated_by_id.should == User.last.id
+		User.current = User.first
+	end
+end
+
+describe WithoutCreated do
+	it 'should set the created_by_id on create' do
+		created = WithoutCreated.create!
+		created.respond_to?(:created_by_id).should be_false
+		created.respond_to?(:updated_by_id).should be_false
+	end
+	it 'can retrieve the created by' do
+		created = WithoutCreated.create!
+		created.created_by.should == nil
+		created.updated_by.should == nil
+	end
+end

data/spec/db/database.yml

@@ -0,0 +1,3 @@
+active_record_merge_test:
+  adapter: sqlite3
+  database: 'spec/db/test.sqlite3'

data/spec/db/models.rb

@@ -0,0 +1,9 @@
+class User < ActiveRecord::Base
+	cattr_accessor :current
+end
+
+class WithCreated < ActiveRecord::Base
+end
+
+class WithoutCreated < ActiveRecord::Base
+end

data/spec/db/schema.rb

@@ -0,0 +1,13 @@
+ActiveRecord::Schema.define(:version => 1) do
+  create_table :with_createds, :force => true do |t|
+    t.column :something, :string
+    t.column :created_by_id, :integer
+    t.column :updated_by_id, :integer
+  end
+  create_table :without_createds, :force => true do |t|
+    t.column :something, :string
+  end
+	create_table :users, :force => true do |t|
+    t.column :something, :string
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,30 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'created-and-updated-by'
+require 'active_record'
+require 'active_record/fixtures'
+require 'active_support'
+require 'active_support/core_ext'
 require 'spec'
 require 'spec/autorun'
 
+# establish the database connection
+ActiveRecord::Base.configurations = YAML::load(IO.read(File.dirname(__FILE__) + '/db/database.yml'))
+ActiveRecord::Base.establish_connection('active_record_merge_test')
+
+# load the schema
+$stdout = File.open('/dev/null', 'w')
+load(File.dirname(__FILE__) + "/db/schema.rb")
+$stdout = STDOUT
+
+
+require File.dirname(__FILE__) + '/db/models'
+CreatedAndUpdatedBy::Stamper.attach(:User, :current)
+
+users = [User.create!(:something => 'test'), User.create!(:something => 'something else')]
+
+User.current = users[0]
+
 Spec::Runner.configure do |config|
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: created-and-updated-by
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - James Daniels
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-18 00:00:00 -05:00
+date: 2010-01-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.9
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: This gem extends ActiveRecord::Base causing created_by_id and updated_by_id attributes to be set magically with about 30 LOC
 email: james@jamesdaniels.net
 executables: []
@@ -41,6 +61,10 @@ files:
 - created-and-updated-by.gemspec
 - lib/created-and-updated-by.rb
 - spec/created-and-updated-by_spec.rb
+- spec/db/database.yml
+- spec/db/models.rb
+- spec/db/schema.rb
+- spec/db/test.sqlite3
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -73,4 +97,6 @@ specification_version: 3
 summary: Preforms magic on created_by_id and updated_by_id fields
 test_files: 
 - spec/created-and-updated-by_spec.rb
+- spec/db/models.rb
+- spec/db/schema.rb
 - spec/spec_helper.rb