dm-userstamp 0.0.3 → 0.0.4

data/.gitignore

@@ -0,0 +1,5 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg

data/Rakefile

@@ -1,18 +1,48 @@
-# -*- ruby -*-
-
 require 'rubygems'
-require 'hoe'
-require './lib/dm-userstamp.rb'
-require './lib/dm-userstamp/version.rb'
-
-Hoe.new('dm-userstamp', DataMapper::Userstamps::VERSION) do |p|
-  p.name            = 'dm-userstamp'
-  p.remote_rdoc_dir = '' # Release to root
-  p.rubyforge_name  = 'dm-userstamp'
-  p.author          = "Richard Livsey"
-  p.description     = "DataMapper plugin to add automatic updating of created_by_id and updated_by_id attributes"
-  p.summary         = "DataMapper plugin to add automatic updating of created_by_id and updated_by_id attributes"
-  p.email           = 'richard@livsey.org' 
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "dm-userstamp"
+    gem.summary = %Q{DataMapper plugin to add automatic updating of created_by_id and updated_by_id attributes}
+    gem.email = "richard@livsey.org"
+    gem.homepage = "http://github.com/rlivsey/dm-userstamp"
+    gem.authors = ["Richard Livsey"]
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "dm-userstamp #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-# vim: syntax=Ruby

data/VERSION

@@ -0,0 +1 @@
+0.0.4

data/dm-userstamp.gemspec

@@ -0,0 +1,50 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dm-userstamp}
+  s.version = "0.0.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Richard Livsey"]
+  s.date = %q{2009-10-29}
+  s.email = %q{richard@livsey.org}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.txt"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "LICENSE",
+     "README.txt",
+     "Rakefile",
+     "TODO",
+     "VERSION",
+     "dm-userstamp.gemspec",
+     "lib/.DS_Store",
+     "lib/dm-userstamp.rb",
+     "lib/dm-userstamp/version.rb",
+     "spec/integration/userstamp_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/rlivsey/dm-userstamp}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{DataMapper plugin to add automatic updating of created_by_id and updated_by_id attributes}
+  s.test_files = [
+    "spec/integration/userstamp_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/lib/dm-userstamp.rb

@@ -1,19 +1,20 @@
 require 'rubygems'
 
-gem 'dm-core', '>=0.9.4'
+gem 'dm-core', '>=0.9.10'
 require 'dm-core'
 
 module DataMapper
-  
   module Userstamp
-    
     module Stamper
       def self.included(base)
         base.extend(ClassMethods)
       end
-      
+
       module ClassMethods
-        
+        def userstamp_class
+          User
+        end
+
         def current_user=(user)
           Thread.current["#{self.to_s.downcase}_#{self.object_id}_stamper"] = user
         end
@@ -21,15 +22,16 @@ module DataMapper
         def current_user
           Thread.current["#{self.to_s.downcase}_#{self.object_id}_stamper"]
         end
-        
       end
-      
     end
-    
-    
+
+    def self.userstamp_class
+      User
+    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}
+      :created_by_id => lambda { |r| r.created_by_id = userstamp_class.current_user.id if userstamp_class.current_user && r.new_record? && r.created_by_id.nil? },
+      :updated_by_id => lambda { |r| r.updated_by_id = userstamp_class.current_user.id if userstamp_class.current_user}
     }
 
     def self.included(model)
@@ -39,11 +41,11 @@ module DataMapper
     private
 
     def set_userstamp_properties
-      self.class.properties.slice(*USERSTAMP_PROPERTIES.keys).compact.each do |property|
+      self.class.properties.values_at(*USERSTAMP_PROPERTIES.keys).compact.each do |property|
         USERSTAMP_PROPERTIES[property.name][self]
       end
     end
   end
-  
+
   Resource::append_inclusions Userstamp
 end

data/spec/integration/userstamp_spec.rb

@@ -35,12 +35,12 @@ describe 'DataMapper::Userstamp' do
   end
   
   after do
-   repository(:default).adapter.execute('DELETE from users');
-   repository(:default).adapter.execute('DELETE from monkeys');   
+   DataMapper.repository(:default).adapter.execute('DELETE from users');
+   DataMapper.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
+    DataMapper.repository(:default) do
       User.current_user = nil
       monkey = Monkey.new(:name => 'Eric')
       monkey.save
@@ -49,7 +49,7 @@ describe 'DataMapper::Userstamp' do
   end
     
     it "should not set updated_by_id if there is no current user" do
-      repository(:default) do
+      DataMapper.repository(:default) do
         User.current_user = nil
         monkey = Monkey.new(:name => 'Eric')
         monkey.save
@@ -58,7 +58,7 @@ describe 'DataMapper::Userstamp' do
     end
     
     it "should not set created_by_id if already set" do
-      repository(:default) do
+      DataMapper.repository(:default) do
         monkey = Monkey.new(:name => 'Eric')
         monkey.created_by_id = 5
         monkey.save
@@ -68,7 +68,7 @@ describe 'DataMapper::Userstamp' do
     end
     
     it "should set created_by_id on creation" do
-      repository(:default) do
+      DataMapper.repository(:default) do
         monkey = Monkey.new(:name => 'Clyde')
         monkey.created_by_id.should be_nil
         monkey.save
@@ -78,7 +78,7 @@ describe 'DataMapper::Userstamp' do
     end
     
     it "should not alter created_by_id on model updates" do
-      repository(:default) do
+      DataMapper.repository(:default) do
         monkey = Monkey.new(:name => 'Chump')
         monkey.created_by_id.should be_nil
         monkey.save
@@ -90,7 +90,7 @@ describe 'DataMapper::Userstamp' do
     end
     
     it "should set updated_by_id on creation and on update" do
-      repository(:default) do
+      DataMapper.repository(:default) do
         monkey = Monkey.new(:name => 'Johnny')
         monkey.updated_by_id.should be_nil
         monkey.save

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ def load_driver(name, default_uri)
   lib = "do_#{name}"
 
   begin
-    gem lib, '=0.9.4'
+    gem lib, '>=0.9.10'
     require lib
     DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
     DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-userstamp
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Richard Livsey
@@ -9,47 +9,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-27 00:00:00 +01:00
+date: 2009-10-29 00:00:00 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.7.0
-    version: 
-description: DataMapper plugin to add automatic updating of created_by_id and updated_by_id attributes
+dependencies: []
+
+description: 
 email: richard@livsey.org
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
+- LICENSE
 - README.txt
 files: 
+- .gitignore
 - History.txt
 - LICENSE
-- Manifest.txt
 - README.txt
 - Rakefile
 - TODO
+- VERSION
+- dm-userstamp.gemspec
+- lib/.DS_Store
 - lib/dm-userstamp.rb
 - lib/dm-userstamp/version.rb
 - spec/integration/userstamp_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: DataMapper plugin which adds "magic" to created_by_id, updated_by_id fields
+homepage: http://github.com/rlivsey/dm-userstamp
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -66,10 +60,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: dm-userstamp
-rubygems_version: 1.2.0
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: DataMapper plugin to add automatic updating of created_by_id and updated_by_id attributes
-test_files: []
-
+test_files: 
+- spec/integration/userstamp_spec.rb
+- spec/spec_helper.rb

data/Manifest.txt

@@ -1,11 +0,0 @@
-History.txt
-LICENSE
-Manifest.txt
-README.txt
-Rakefile
-TODO
-lib/dm-userstamp.rb
-lib/dm-userstamp/version.rb
-spec/integration/userstamp_spec.rb
-spec/spec.opts
-spec/spec_helper.rb