originator 3.1 → 3.2

data/test/models/post.rb

@@ -1,13 +1,12 @@
 class Post < ActiveRecord::Base
-  stampable :stamper_class_name => :person, :deleter => true
+  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)
+    run_callbacks :destroy do
+      self.deleted_at = DateTime.now
+    end
   end
-  
-end
+end

data/test/models/user.rb

@@ -1,3 +1,3 @@
 class User < ActiveRecord::Base
   model_stamper
-end
+end

data/test/schema.rb

@@ -1,54 +1,53 @@
 ActiveRecord::Schema.define(:version => 0) do
   # Users are created and updated by other Users
   create_table :users, :force => true do |t|
-    t.column :name,           :string
-    t.column :creator_id,     :integer
-    t.column :created_on,     :datetime
-    t.column :updater_id,     :integer
-    t.column :updated_at,     :datetime
+    t.column :name, :string
+    t.column :creator_id, :integer
+    t.column :created_at, :datetime
+    t.column :updater_id, :integer
+    t.column :updated_at, :datetime
   end
 
   # People are created and updated by Users
   create_table :people, :force => true do |t|
-    t.column :name,           :string
-    t.column :creator_id,     :integer
-    t.column :created_on,     :datetime
-    t.column :updater_id,     :integer
-    t.column :updated_at,     :datetime
+    t.column :name, :string
+    t.column :creator_id, :integer
+    t.column :created_at, :datetime
+    t.column :updater_id, :integer
+    t.column :updated_at, :datetime
   end
 
   # Posts are created and updated by People
   create_table :posts, :force => true do |t|
-    t.column :title,          :string
-    t.column :creator_id,     :integer
-    t.column :created_on,     :datetime
-    t.column :updater_id,     :integer
-    t.column :updated_at,     :datetime
-    t.column :deleter_id,     :integer
-    t.column :deleted_at,     :datetime
+    t.column :title, :string
+    t.column :creator_id, :integer
+    t.column :created_at, :datetime
+    t.column :updater_id, :integer
+    t.column :updated_at, :datetime
+    t.column :deleter_id, :integer
+    t.column :deleted_at, :datetime
   end
 
   # Comments are created and updated by People
   # and also use non-standard foreign keys.
   create_table :comments, :force => true do |t|
-    t.column :post_id,        :integer
-    t.column :comment,        :string
-    t.column :created_by,     :integer
-    t.column :created_at,     :datetime
-    t.column :updated_by,     :integer
-    t.column :updated_at,     :datetime
-    t.column :deleted_by,     :integer
-    t.column :deleted_at,     :datetime
+    t.column :post_id, :integer
+    t.column :comment, :string
+    t.column :created_by, :integer
+    t.column :created_at, :datetime
+    t.column :updated_by, :integer
+    t.column :updated_at, :datetime
+    t.column :deleted_by, :integer
+    t.column :deleted_at, :datetime
   end
 
   # 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 :updated_by,     :integer
-    t.column :updated_at,     :datetime
-    t.column :deleted_by,     :integer
-    t.column :deleted_at,     :datetime
+    t.column :created_by, :integer
+    t.column :created_at, :datetime
+    t.column :updated_by, :integer
+    t.column :updated_at, :datetime
+    t.column :deleted_by, :integer
+    t.column :deleted_at, :datetime
   end
-
-end
+end

data/test/stamping_test.rb

@@ -1,6 +1,6 @@
-require 'test/helper'
+require_relative "helper"
 
-class StampingTests < Test::Unit::TestCase  # :nodoc:
+class StampingTests < Test::Unit::TestCase # :nodoc:
   def setup
     reset_to_defaults
     User.stamper = @zeus
@@ -9,7 +9,7 @@ class StampingTests < Test::Unit::TestCase  # :nodoc:
 
   def test_person_creation_with_stamped_object
     assert_equal @zeus.id, User.stamper
-    
+
     person = Person.create(:name => "David")
     assert_equal @zeus.id, person.creator_id
     assert_equal @zeus.id, person.updater_id
@@ -23,7 +23,7 @@ class StampingTests < Test::Unit::TestCase  # :nodoc:
 
     person = Person.create(:name => "Daniel")
     assert_equal @hera.id, person.creator_id
-    assert_equal @hera.id,  person.updater_id
+    assert_equal @hera.id, person.updater_id
     assert_equal @hera, person.creator
     assert_equal @hera, person.updater
   end
@@ -114,25 +114,24 @@ class StampingTests < Test::Unit::TestCase  # :nodoc:
     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')
+    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')
+    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')
+    assert_equal true, @foo.respond_to?("creator")
+    assert_equal true, @foo.respond_to?("updater")
+    assert_equal true, @foo.respond_to?("deleter")
   end
-
-end
+end

data/test/userstamp_controller_test.rb

@@ -1,54 +1,54 @@
-require 'test/helper'
+require_relative "helper"
 
 class PostsControllerTest < ActionController::TestCase
   def setup
     reset_to_defaults
-    @controller   = PostsController.new
-    @request      = ActionController::TestRequest.new
-    @response     = ActionController::TestResponse.new
+    @controller = PostsController.new
+    @request = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
   end
 
   def test_update_post
-    @request.session  = {:person_id => @delynn.id}
-    post :update, :id => @first_post.id, :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 "Different", assigns["post"].title
     assert_equal @delynn, assigns["post"].updater
   end
 
   def test_update_with_multiple_requests
-    @request.session = {:person_id => @delynn.id}
+    @request.session = { :person_id => @delynn.id }
     get :edit, :id => @first_post.id
     assert_response :success
 
-    simulate_second_request    
+    simulate_second_request
 
-    post :update, :id => @first_post.id, :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
+    assert_equal "Different", assigns["post"].title
+    assert_equal @delynn, assigns["post"].updater
   end
-  
+
   def simulate_second_request
-    @second_controller  = PostsController.new
-    @second_request     = ActionController::TestRequest.new
-    @second_response    = ActionController::TestResponse.new
-    @second_response.session = {:person_id => @nicole.id}
+    @second_controller = PostsController.new
+    @second_request = ActionController::TestRequest.new
+    @second_response = ActionController::TestResponse.new
+    @second_response.session = { :person_id => @nicole.id }
 
-    @second_request.env['REQUEST_METHOD'] = "POST"
-    @second_request.action = 'update'
+    @second_request.env["REQUEST_METHOD"] = "POST"
+    @second_request.action = "update"
 
-    parameters = {:id => @first_post.id, :post => {:title => 'Different Second'}}
-    @second_request.assign_parameters(@second_controller.class.controller_path, 'update', parameters)
+    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.update(:only_path => true, :action => 'update')
-    
+    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
   end
 end
@@ -57,47 +57,47 @@ class UsersControllerTest < ActionController::TestCase
   def setup
     reset_to_defaults
     @controller = UsersController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+    @request = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
   end
 
   def test_update_user
-    @request.session  = {:user_id => @hera.id}
-    post :update, :id => @hera.id, :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
+    assert_equal "Different", assigns["user"].name
+    assert_equal @hera, assigns["user"].updater
   end
-  
+
   def test_update_with_multiple_requests
-    @request.session  = {:user_id => @hera.id}
-    get :edit, :id =>  @hera.id
+    @request.session = { :user_id => @hera.id }
+    get :edit, :id => @hera.id
     assert_response :success
-    
+
     simulate_second_request
   end
 
   def simulate_second_request
-    @second_controller  = UsersController.new
-    @second_request     = ActionController::TestRequest.new
-    @second_response    = ActionController::TestResponse.new
-    @second_response.session = {:user_id => @zeus.id}
+    @second_controller = UsersController.new
+    @second_request = ActionController::TestRequest.new
+    @second_response = ActionController::TestResponse.new
+    @second_response.session = { :user_id => @zeus.id }
+
+    @second_request.env["REQUEST_METHOD"] = "POST"
+    @second_request.action = "update"
 
-    @second_request.env['REQUEST_METHOD'] = "POST"
-    @second_request.action = 'update'
+    parameters = { :id => @hera.id, :user => { :name => "Different Second" } }
+    @second_request.assign_parameters(@second_controller.class.controller_path, "update", parameters)
 
-    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.update(:only_path => true, :action => 'update')
-    
+    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
   end
-end
+end

data/test/userstamp_test.rb

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: originator
 version: !ruby/object:Gem::Version
-  version: '3.1'
+  version: '3.2'
 platform: ruby
 authors:
 - DeLynn Berry
 - Thomas von Deyen
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -39,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: This gem 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.
@@ -60,31 +73,6 @@ files:
 - lib/stamper.rb
 - lib/userstamp.rb
 - originator.gemspec
-- rdoc/classes/Ddb/Controller.html
-- rdoc/classes/Ddb/Controller/Userstamp.html
-- rdoc/classes/Ddb/Controller/Userstamp/InstanceMethods.html
-- rdoc/classes/Ddb/Userstamp.html
-- rdoc/classes/Ddb/Userstamp/MigrationHelper.html
-- rdoc/classes/Ddb/Userstamp/MigrationHelper/InstanceMethods.html
-- rdoc/classes/Ddb/Userstamp/Stampable.html
-- rdoc/classes/Ddb/Userstamp/Stampable/ClassMethods.html
-- 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_rdoc.html
-- rdoc/files/lib/migration_helper_rb.html
-- rdoc/files/lib/stampable_rb.html
-- rdoc/files/lib/stamper_rb.html
-- rdoc/files/lib/userstamp_rb.html
-- rdoc/fr_class_index.html
-- rdoc/fr_file_index.html
-- rdoc/fr_method_index.html
-- rdoc/index.html
-- rdoc/rdoc-style.css
 - test/compatibility_stamping_test.rb
 - test/controllers/posts_controller.rb
 - test/controllers/users_controller.rb
@@ -103,7 +91,6 @@ homepage: https://github.com/AlchemyCMS/originator
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -118,9 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 3
 summary: Adds originator attributes to your ActiveRecord models.
 test_files: []

data/rdoc/classes/Ddb/Controller/Userstamp/InstanceMethods.html

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Module: Ddb::Controller::Userstamp::InstanceMethods</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Module</strong></td>
-          <td class="class-name-in-header">Ddb::Controller::Userstamp::InstanceMethods</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../../../files/lib/userstamp_rb.html">
-                lib/userstamp.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-
-   </div>
-
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>

data/rdoc/classes/Ddb/Controller/Userstamp.html

@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Module: Ddb::Controller::Userstamp</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Module</strong></td>
-          <td class="class-name-in-header">Ddb::Controller::Userstamp</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../../files/lib/userstamp_rb.html">
-                lib/userstamp.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-    <div id="description">
-      <p>
-The <a href="Userstamp.html">Userstamp</a> module, when included into a
-controller, adds a before filter (named <tt>set_stamper</tt>) and an after
-filter (name <tt>reset_stamper</tt>). These methods assume a couple of
-things, but can be re-implemented in your controller to better suite your
-application.
-</p>
-<p>
-See the documentation for <tt>set_stamper</tt> and <tt>reset_stamper</tt>
-for specific implementation details.
-</p>
-
-    </div>
-
-
-   </div>
-
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-    <div id="class-list">
-      <h3 class="section-bar">Classes and Modules</h3>
-
-      Module <a href="Userstamp/InstanceMethods.html" class="link">Ddb::Controller::Userstamp::InstanceMethods</a><br />
-
-    </div>
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>