userstamp 2.0.0 → 2.0.1

data/test/models/comment.rb

@@ -1,3 +1,4 @@
+# this class is only meant for compatability mode testing
 class Comment < ActiveRecord::Base
   stampable   :stamper_class_name => :person
   belongs_to  :post

data/test/models/foo.rb

@@ -0,0 +1,3 @@
+class Foo < ActiveRecord::Base
+  stampable :deleter_attribute => :deleter_id
+end

data/test/models/post.rb

@@ -1,4 +1,13 @@
 class Post < ActiveRecord::Base
-  stampable :stamper_class_name => :person
+  stampable :stamper_class_name => :person, :deleter => true
   has_many :comments
+  
+  # override destroy to get soft delete like acts_as_paranoid style delete
+  # Note: delete_all (used in helper) bypasses this and deletes all rows.
+  def destroy
+    return false if callback(:before_destroy) == false
+    self.deleted_at = DateTime.now
+    callback(:after_destroy)
+  end
+  
 end

data/test/schema.rb

@@ -41,16 +41,14 @@ ActiveRecord::Schema.define(:version => 0) do
     t.column :deleted_at,     :datetime
   end
 
-  # Pings are created and updated by People,
-  # but they store their foreign keys as strings.
-  create_table :pings, :force => true do |t|
-    t.column :post_id,        :integer
-    t.column :ping,           :string
-    t.column :creator_name,   :string
+  # only used to test :stampable args
+  create_table :foos, :force => true do |t|
+    t.column :created_by,     :integer
     t.column :created_at,     :datetime
-    t.column :updater_name,   :string
+    t.column :updated_by,     :integer
     t.column :updated_at,     :datetime
-    t.column :deleter_name,   :string
+    t.column :deleted_by,     :integer
     t.column :deleted_at,     :datetime
   end
+
 end

data/test/stamping_test.rb

@@ -1,15 +1,8 @@
-$:.unshift(File.dirname(__FILE__))
-
-require 'helpers/unit_test_helper'
-require 'models/user'
-require 'models/person'
-require 'models/post'
-require 'models/comment'
+require 'test/helper'
 
 class StampingTests < Test::Unit::TestCase  # :nodoc:
-  fixtures :users, :people, :posts, :comments
-
   def setup
+    reset_to_defaults
     User.stamper = @zeus
     Person.stamper = @delynn
   end
@@ -25,8 +18,8 @@ class StampingTests < Test::Unit::TestCase  # :nodoc:
   end
 
   def test_person_creation_with_stamped_integer
-    User.stamper = 2
-    assert_equal 2, User.stamper
+    User.stamper = @nicole.id
+    assert_equal @nicole.id, User.stamper
 
     person = Person.create(:name => "Daniel")
     assert_equal @hera.id, person.creator_id
@@ -46,8 +39,8 @@ class StampingTests < Test::Unit::TestCase  # :nodoc:
   end
 
   def test_post_creation_with_stamped_integer
-    Person.stamper = 2
-    assert_equal 2, Person.stamper
+    Person.stamper = @nicole.id
+    assert_equal @nicole.id, Person.stamper
 
     post = Post.create(:title => "Test Post - 2")
     assert_equal @nicole.id, post.creator_id
@@ -70,8 +63,8 @@ class StampingTests < Test::Unit::TestCase  # :nodoc:
   end
 
   def test_person_updating_with_stamped_integer
-    User.stamper = 2
-    assert_equal 2, User.stamper
+    User.stamper = @hera.id
+    assert_equal @hera.id, User.stamper
 
     @delynn.name << " Berry"
     @delynn.save
@@ -96,8 +89,8 @@ class StampingTests < Test::Unit::TestCase  # :nodoc:
   end
 
   def test_post_updating_with_stamped_integer
-    Person.stamper = 2
-    assert_equal 2, Person.stamper
+    Person.stamper = @nicole.id
+    assert_equal @nicole.id, Person.stamper
 
     @first_post.title << " - Updated"
     @first_post.save
@@ -107,4 +100,39 @@ class StampingTests < Test::Unit::TestCase  # :nodoc:
     assert_equal @delynn, @first_post.creator
     assert_equal @nicole, @first_post.updater
   end
+
+  def test_delete_post_sets_deleter_id
+    assert_equal nil, @first_post.deleted_at
+
+    Person.stamper = @nicole.id
+    assert_equal @nicole.id, Person.stamper
+
+    @first_post.destroy
+    @first_post.save
+    @first_post.reload
+
+    assert_not_equal nil, @first_post.deleted_at
+    assert_equal @nicole.id, @first_post.deleter_id
+  end
+  
+  def test_deleter_not_present_did_not_create_deleter_relation
+    @comment = Comment.create
+    assert_equal true, @comment.respond_to?('creator')
+    assert_equal true, @comment.respond_to?('updater')
+    assert_equal false, @comment.respond_to?('deleter')
+  end
+
+  def test_deleter_true_created_deleter_relation
+    assert_equal true, @first_post.respond_to?('creator')
+    assert_equal true, @first_post.respond_to?('updater')
+    assert_equal true, @first_post.respond_to?('deleter')
+  end
+
+  def test_deleter_attribute_set_created_deleter_relation
+    @foo = Foo.create
+    assert_equal true, @foo.respond_to?('creator')
+    assert_equal true, @foo.respond_to?('updater')
+    assert_equal true, @foo.respond_to?('deleter')
+  end
+
 end

data/test/userstamp_controller_test.rb

@@ -1,43 +1,29 @@
-$:.unshift(File.dirname(__FILE__))
-
-require 'helpers/functional_test_helper'
-require 'controllers/userstamp_controller'
-require 'controllers/users_controller'
-require 'controllers/posts_controller'
-require 'models/user'
-require 'models/person'
-require 'models/post'
-require 'models/comment'
-
-ActionController::Routing::Routes.draw do |map|
-  map.connect ':controller/:action/:id'
-end
-
-class PostsControllerTest < Test::Unit::TestCase
-  fixtures :users, :people, :posts, :comments
+require 'test/helper'
 
+class PostsControllerTest < ActionController::TestCase
   def setup
+    reset_to_defaults
     @controller   = PostsController.new
     @request      = ActionController::TestRequest.new
     @response     = ActionController::TestResponse.new
   end
 
   def test_update_post
-    @request.session  = {:person_id => 1}
-    post :update, :id => 1, :post => {:title => 'Different'}
+    @request.session  = {:person_id => @delynn.id}
+    post :update, :id => @first_post.id, :post => {:title => 'Different'}
     assert_response :success
-    assert_equal    'Different', assigns["post"].title
-    assert_equal    @delynn, assigns["post"].updater
+    assert_equal 'Different', assigns["post"].title
+    assert_equal @delynn, assigns["post"].updater
   end
 
   def test_update_with_multiple_requests
-    @request.session    = {:person_id => 1}
-    get :edit, :id => 2
+    @request.session = {:person_id => @delynn.id}
+    get :edit, :id => @first_post.id
     assert_response :success
 
     simulate_second_request    
 
-    post :update, :id => 2, :post => {:title => 'Different'}
+    post :update, :id => @first_post.id, :post => {:title => 'Different'}
     assert_response :success
     assert_equal    'Different', assigns["post"].title
     assert_equal    @delynn, assigns["post"].updater
@@ -47,46 +33,45 @@ class PostsControllerTest < Test::Unit::TestCase
     @second_controller  = PostsController.new
     @second_request     = ActionController::TestRequest.new
     @second_response    = ActionController::TestResponse.new
-    @second_response.session = {:person_id => 2}
+    @second_response.session = {:person_id => @nicole.id}
 
     @second_request.env['REQUEST_METHOD'] = "POST"
     @second_request.action = 'update'
 
-    parameters = {:id => 1, :post => {:title => 'Different Second'}}
+    parameters = {:id => @first_post.id, :post => {:title => 'Different Second'}}
     @second_request.assign_parameters(@second_controller.class.controller_path, 'update', parameters)
     @second_request.session = ActionController::TestSession.new(@second_response.session)
     
-    options = @second_controller.send!(:rewrite_options, parameters)
+    options = @second_controller.send(:rewrite_options, parameters)
     options.update(:only_path => true, :action => 'update')
     
     url = ActionController::UrlRewriter.new(@second_request, parameters)
     @second_request.set_REQUEST_URI(url.rewrite(options))
     @second_controller.process(@second_request, @second_response)
     
-    assert_equal    @nicole, @second_response.template.instance_variable_get("@post").updater
+    assert_equal @nicole, @second_response.template.instance_variable_get("@post").updater
   end
 end
 
-class UsersControllerTest < Test::Unit::TestCase
-  fixtures :users, :people, :posts, :comments
-
+class UsersControllerTest < ActionController::TestCase
   def setup
+    reset_to_defaults
     @controller = UsersController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
   end
 
   def test_update_user
-    @request.session  = {:user_id => 2}
-    post :update, :id => 2, :user => {:name => 'Different'}
+    @request.session  = {:user_id => @hera.id}
+    post :update, :id => @hera.id, :user => {:name => 'Different'}
     assert_response :success
     assert_equal    'Different', assigns["user"].name
     assert_equal    @hera, assigns["user"].updater
   end
   
   def test_update_with_multiple_requests
-    @request.session  = {:user_id => 2}
-    get :edit, :id =>  2
+    @request.session  = {:user_id => @hera.id}
+    get :edit, :id =>  @hera.id
     assert_response :success
     
     simulate_second_request
@@ -96,23 +81,23 @@ class UsersControllerTest < Test::Unit::TestCase
     @second_controller  = UsersController.new
     @second_request     = ActionController::TestRequest.new
     @second_response    = ActionController::TestResponse.new
-    @second_response.session = {:user_id => 1}
+    @second_response.session = {:user_id => @zeus.id}
 
     @second_request.env['REQUEST_METHOD'] = "POST"
     @second_request.action = 'update'
 
-    parameters = {:id => 2, :user => {:name => 'Different Second'}}
+    parameters = {:id => @hera.id, :user => {:name => 'Different Second'}}
     @second_request.assign_parameters(@second_controller.class.controller_path, 'update', parameters)
     
     @second_request.session = ActionController::TestSession.new(@second_response.session)
     
-    options = @second_controller.send!(:rewrite_options, parameters)
+    options = @second_controller.send(:rewrite_options, parameters)
     options.update(:only_path => true, :action => 'update')
     
     url = ActionController::UrlRewriter.new(@second_request, parameters)
     @second_request.set_REQUEST_URI(url.rewrite(options))
     @second_controller.process(@second_request, @second_response)
     
-    assert_equal    @zeus, @second_response.template.instance_variable_get("@user").updater
+    assert_equal @zeus, @second_response.template.instance_variable_get("@user").updater
   end
 end

data/test/userstamp_test.rb

@@ -0,0 +1,7 @@
+require 'test/helper'
+
+class UserstampTests < ActiveSupport::TestCase
+  test "it has a VERSION" do
+    assert_match /^\d+\.\d+\.\d+$/, Userstamp::VERSION
+  end
+end

data/userstamp.gemspec

@@ -5,22 +5,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{userstamp}
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["DeLynn Berry"]
-  s.date = %q{2009-11-18}
+  s.date = %q{2010-08-09}
   s.email = %q{delynn@gmail.com}
   s.extra_rdoc_files = [
-    "LICENSE",
-     "README"
+    "LICENSE"
   ]
   s.files = [
     ".gitignore",
      "CHANGELOG",
+     "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
-     "README",
      "Rakefile",
+     "Readme.rdoc",
      "VERSION",
      "init.rb",
      "lib/migration_helper.rb",
@@ -38,10 +39,11 @@ Gem::Specification.new do |s|
      "rdoc/classes/Ddb/Userstamp/Stamper.html",
      "rdoc/classes/Ddb/Userstamp/Stamper/ClassMethods.html",
      "rdoc/classes/Ddb/Userstamp/Stamper/InstanceMethods.html",
+     "rdoc/classes/Userstamp.html",
      "rdoc/created.rid",
      "rdoc/files/CHANGELOG.html",
      "rdoc/files/LICENSE.html",
-     "rdoc/files/README.html",
+     "rdoc/files/Readme_rdoc.html",
      "rdoc/files/lib/migration_helper_rb.html",
      "rdoc/files/lib/stampable_rb.html",
      "rdoc/files/lib/stamper_rb.html",
@@ -55,42 +57,37 @@ Gem::Specification.new do |s|
      "test/controllers/posts_controller.rb",
      "test/controllers/users_controller.rb",
      "test/controllers/userstamp_controller.rb",
-     "test/database.yml",
-     "test/fixtures/comments.yml",
-     "test/fixtures/people.yml",
-     "test/fixtures/posts.yml",
-     "test/fixtures/users.yml",
-     "test/helpers/functional_test_helper.rb",
-     "test/helpers/unit_test_helper.rb",
+     "test/helper.rb",
      "test/models/comment.rb",
+     "test/models/foo.rb",
      "test/models/person.rb",
-     "test/models/ping.rb",
      "test/models/post.rb",
      "test/models/user.rb",
      "test/schema.rb",
      "test/stamping_test.rb",
      "test/userstamp_controller_test.rb",
+     "test/userstamp_test.rb",
      "userstamp.gemspec"
   ]
   s.homepage = %q{http://github.com/delynn/userstamp}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{This Rails plugin extends ActiveRecord::Base to add automatic updating of created_by and updated_by attributes of your models in much the same way that the ActiveRecord::Timestamp module updates created_(at/on) and updated_(at/on) attributes.}
   s.test_files = [
-    "test/helpers/unit_test_helper.rb",
-     "test/helpers/functional_test_helper.rb",
-     "test/schema.rb",
-     "test/userstamp_controller_test.rb",
-     "test/compatibility_stamping_test.rb",
+    "test/schema.rb",
      "test/controllers/userstamp_controller.rb",
-     "test/controllers/posts_controller.rb",
      "test/controllers/users_controller.rb",
-     "test/models/ping.rb",
-     "test/models/person.rb",
-     "test/models/user.rb",
+     "test/controllers/posts_controller.rb",
+     "test/compatibility_stamping_test.rb",
+     "test/helper.rb",
      "test/models/post.rb",
+     "test/models/foo.rb",
      "test/models/comment.rb",
+     "test/models/person.rb",
+     "test/models/user.rb",
+     "test/userstamp_controller_test.rb",
+     "test/userstamp_test.rb",
      "test/stamping_test.rb"
   ]
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: userstamp
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - DeLynn Berry
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 +01:00
+date: 2010-08-09 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -21,13 +26,14 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README
 files: 
 - .gitignore
 - CHANGELOG
+- Gemfile
+- Gemfile.lock
 - LICENSE
-- README
 - Rakefile
+- Readme.rdoc
 - VERSION
 - init.rb
 - lib/migration_helper.rb
@@ -45,10 +51,11 @@ files:
 - rdoc/classes/Ddb/Userstamp/Stamper.html
 - rdoc/classes/Ddb/Userstamp/Stamper/ClassMethods.html
 - rdoc/classes/Ddb/Userstamp/Stamper/InstanceMethods.html
+- rdoc/classes/Userstamp.html
 - rdoc/created.rid
 - rdoc/files/CHANGELOG.html
 - rdoc/files/LICENSE.html
-- rdoc/files/README.html
+- rdoc/files/Readme_rdoc.html
 - rdoc/files/lib/migration_helper_rb.html
 - rdoc/files/lib/stampable_rb.html
 - rdoc/files/lib/stamper_rb.html
@@ -62,21 +69,16 @@ files:
 - test/controllers/posts_controller.rb
 - test/controllers/users_controller.rb
 - test/controllers/userstamp_controller.rb
-- test/database.yml
-- test/fixtures/comments.yml
-- test/fixtures/people.yml
-- test/fixtures/posts.yml
-- test/fixtures/users.yml
-- test/helpers/functional_test_helper.rb
-- test/helpers/unit_test_helper.rb
+- test/helper.rb
 - test/models/comment.rb
+- test/models/foo.rb
 - test/models/person.rb
-- test/models/ping.rb
 - test/models/post.rb
 - test/models/user.rb
 - test/schema.rb
 - test/stamping_test.rb
 - test/userstamp_controller_test.rb
+- test/userstamp_test.rb
 - userstamp.gemspec
 has_rdoc: true
 homepage: http://github.com/delynn/userstamp
@@ -91,33 +93,35 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: This Rails plugin extends ActiveRecord::Base to add automatic updating of created_by and updated_by attributes of your models in much the same way that the ActiveRecord::Timestamp module updates created_(at/on) and updated_(at/on) attributes.
 test_files: 
-- test/helpers/unit_test_helper.rb
-- test/helpers/functional_test_helper.rb
 - test/schema.rb
-- test/userstamp_controller_test.rb
-- test/compatibility_stamping_test.rb
 - test/controllers/userstamp_controller.rb
-- test/controllers/posts_controller.rb
 - test/controllers/users_controller.rb
-- test/models/ping.rb
-- test/models/person.rb
-- test/models/user.rb
+- test/controllers/posts_controller.rb
+- test/compatibility_stamping_test.rb
+- test/helper.rb
 - test/models/post.rb
+- test/models/foo.rb
 - test/models/comment.rb
+- test/models/person.rb
+- test/models/user.rb
+- test/userstamp_controller_test.rb
+- test/userstamp_test.rb
 - test/stamping_test.rb