dm-userstamp 0.0.1 → 0.0.2

data/Manifest.txt

@@ -4,8 +4,8 @@ Manifest.txt
 README.txt
 Rakefile
 TODO
-lib/dm-userstamps.rb
-lib/dm-userstamps/version.rb
-spec/integration/userstamps_spec.rb
+lib/dm-userstamp.rb
+lib/dm-userstamp/version.rb
+spec/integration/userstamp_spec.rb
 spec/spec.opts
 spec/spec_helper.rb

data/README.txt

@@ -9,6 +9,7 @@ Eg:
 
 class User
   include DataMapper::Resource
+  include DataMapper::Userstamp::Stamper
   
   cattr_accessor :current_user
   ...
@@ -22,6 +23,11 @@ class Monkey
   ...
 end
 
+== Docs
+
+See rubyforge project:
+ * http://dm-userstamp.rubyforge.org/
+
 == Install
 
 sudo gem install dm-userstamp

data/Rakefile

@@ -2,8 +2,8 @@
 
 require 'rubygems'
 require 'hoe'
-require './lib/dm-userstamps.rb'
-require './lib/dm-userstamps/version.rb'
+require './lib/dm-userstamp.rb'
+require './lib/dm-userstamp/version.rb'
 
 Hoe.new('dm-userstamp', DataMapper::Userstamps::VERSION) do |p|
   p.name            = 'dm-userstamp'

data/lib/{dm-userstamps → dm-userstamp}/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Userstamps
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/{dm-userstamps.rb → dm-userstamp.rb}

@@ -4,7 +4,29 @@ gem 'dm-core', '=0.9.4'
 require 'dm-core'
 
 module DataMapper
+  
   module Userstamp
+    
+    module Stamper
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+      
+      module ClassMethods
+        
+        def current_user=(user)
+          Thread.current["#{self.to_s.downcase}_#{self.object_id}_stamper"] = user
+        end
+        
+        def current_user
+          Thread.current["#{self.to_s.downcase}_#{self.object_id}_stamper"]
+        end
+        
+      end
+      
+    end
+    
+    
     USERSTAMP_PROPERTIES = {
       :created_by_id => lambda { |r| r.created_by_id = User.current_user.id if User.current_user && r.new_record? && r.created_by_id.nil? },
       :updated_by_id => lambda { |r| r.updated_by_id = User.current_user.id if User.current_user}

data/spec/integration/userstamp_spec.rb

@@ -0,0 +1,111 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+require 'pp'
+
+return unless HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
+
+describe 'DataMapper::Userstamp' do
+  before :all do
+    class User
+      include DataMapper::Resource
+      include DataMapper::Userstamp::Stamper
+
+      property :id, Integer, :serial => true
+      property :name, String
+
+      auto_migrate!(:default)
+    end
+    
+    class Monkey
+      include DataMapper::Resource
+
+      property :id, Integer, :serial => true
+      property :name, String
+      property :created_by_id, Integer
+      property :updated_by_id, Integer      
+
+      auto_migrate!(:default)
+    end
+  
+  end
+  
+  before :each do
+    @user = User.create(:name => 'Bob')
+    User.current_user = @user
+  end
+  
+  after do
+   repository(:default).adapter.execute('DELETE from users');
+   repository(:default).adapter.execute('DELETE from monkeys');   
+  end  
+  
+  it "should not set created_by_id if there is no current user" do
+    repository(:default) do
+      User.current_user = nil
+      monkey = Monkey.new(:name => 'Eric')
+      monkey.save
+      monkey.created_by_id.should be_nil
+    end
+  end
+    
+    it "should not set updated_by_id if there is no current user" do
+      repository(:default) do
+        User.current_user = nil
+        monkey = Monkey.new(:name => 'Eric')
+        monkey.save
+        monkey.updated_by_id.should be_nil
+      end
+    end
+    
+    it "should not set created_by_id if already set" do
+      repository(:default) do
+        monkey = Monkey.new(:name => 'Eric')
+        monkey.created_by_id = 5
+        monkey.save
+        monkey.created_by_id.should == 5
+        monkey.created_by_id.should be_a_kind_of(Integer)
+      end
+    end
+    
+    it "should set created_by_id on creation" do
+      repository(:default) do
+        monkey = Monkey.new(:name => 'Clyde')
+        monkey.created_by_id.should be_nil
+        monkey.save
+        monkey.created_by_id.should be_a_kind_of(Integer)
+        monkey.created_by_id.should == User.current_user.id
+      end
+    end
+    
+    it "should not alter created_by_id on model updates" do
+      repository(:default) do
+        monkey = Monkey.new(:name => 'Chump')
+        monkey.created_by_id.should be_nil
+        monkey.save
+        original_created_by_id = monkey.created_by_id
+        monkey.name = 'Wilma'
+        monkey.save
+        monkey.created_by_id.should eql(original_created_by_id)
+      end
+    end
+    
+    it "should set updated_by_id on creation and on update" do
+      repository(:default) do
+        monkey = Monkey.new(:name => 'Johnny')
+        monkey.updated_by_id.should be_nil
+        monkey.save
+        
+        monkey.updated_by_id.should be_a_kind_of(Integer)
+        monkey.updated_by_id.should == User.current_user.id
+        
+        original_updated_by_id = monkey.updated_by_id
+    
+        User.current_user = @user2 = User.create(:name => 'Fred')  
+    
+        monkey.name = 'Roger'
+        monkey.save
+        monkey.updated_by_id.should == @user2.id
+      end
+    end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-userstamp
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Richard Livsey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-28 00:00:00 +01:00
+date: 2008-09-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,9 +39,9 @@ files:
 - README.txt
 - Rakefile
 - TODO
-- lib/dm-userstamps.rb
-- lib/dm-userstamps/version.rb
-- spec/integration/userstamps_spec.rb
+- lib/dm-userstamp.rb
+- lib/dm-userstamp/version.rb
+- spec/integration/userstamp_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true

data/spec/integration/userstamps_spec.rb

@@ -1,112 +0,0 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
-require 'pp'
-
-return unless HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
-
-describe 'DataMapper::Userstamp' do
-  before :all do
-    class User
-      include DataMapper::Resource
-
-      cattr_accessor :current_user
-
-      property :id, Integer, :serial => true
-      property :name, String
-
-      auto_migrate!(:default)
-    end
-    
-    class Monkey
-      include DataMapper::Resource
-
-      property :id, Integer, :serial => true
-      property :name, String
-      property :created_by_id, Integer
-      property :updated_by_id, Integer      
-
-      auto_migrate!(:default)
-    end
-  
-  end
-  
-  before :each do
-    @user = User.create(:name => 'Bob')
-    User.current_user = @user
-  end
-  
-  after do
-   repository(:default).adapter.execute('DELETE from users');
-   repository(:default).adapter.execute('DELETE from monkeys');   
-  end  
-  
-  it "should not set created_by_id if there is no current user" do
-    repository(:default) do
-      User.current_user = nil
-      monkey = Monkey.new(:name => 'Eric')
-      monkey.save
-      monkey.created_by_id.should be_nil
-    end
-  end
-  
-  it "should not set updated_by_id if there is no current user" do
-    repository(:default) do
-      User.current_user = nil
-      monkey = Monkey.new(:name => 'Eric')
-      monkey.save
-      monkey.updated_by_id.should be_nil
-    end
-  end
-  
-  it "should not set created_by_id if already set" do
-    repository(:default) do
-      monkey = Monkey.new(:name => 'Eric')
-      monkey.created_by_id = 5
-      monkey.save
-      monkey.created_by_id.should == 5
-      monkey.created_by_id.should be_a_kind_of(Integer)
-    end
-  end
-  
-  it "should set created_by_id on creation" do
-    repository(:default) do
-      monkey = Monkey.new(:name => 'Clyde')
-      monkey.created_by_id.should be_nil
-      monkey.save
-      monkey.created_by_id.should be_a_kind_of(Integer)
-      monkey.created_by_id.should == User.current_user.id
-    end
-  end
-  
-  it "should not alter created_by_id on model updates" do
-    repository(:default) do
-      monkey = Monkey.new(:name => 'Chump')
-      monkey.created_by_id.should be_nil
-      monkey.save
-      original_created_by_id = monkey.created_by_id
-      monkey.name = 'Wilma'
-      monkey.save
-      monkey.created_by_id.should eql(original_created_by_id)
-    end
-  end
-  
-  it "should set updated_by_id on creation and on update" do
-    repository(:default) do
-      monkey = Monkey.new(:name => 'Johnny')
-      monkey.updated_by_id.should be_nil
-      monkey.save
-      
-      monkey.updated_by_id.should be_a_kind_of(Integer)
-      monkey.updated_by_id.should == User.current_user.id
-      
-      original_updated_by_id = monkey.updated_by_id
-
-      User.current_user = @user2 = User.create(:name => 'Fred')  
-
-      monkey.name = 'Roger'
-      monkey.save
-      monkey.updated_by_id.should == @user2.id
-    end
-  end
-  
-end