activerecord-userstamp 3.0.2 → 3.0.3

data/lib/active_record/userstamp/stamper.rb

@@ -1,54 +1,54 @@
-module ActiveRecord::Userstamp::Stamper
-  extend ActiveSupport::Concern
-
-  module ClassMethods
-    def model_stamper
-      # don't allow multiple calls
-      return if singleton_class.included_modules.include?(InstanceMethods)
-      extend ActiveRecord::Userstamp::Stamper::InstanceMethods
-    end
-  end
-
-  module InstanceMethods
-    # Used to set the current stamper for this model.
-    #
-    # @overload stamper=(object_id)
-    #   @param [Fixnum] object_id The ID of the stamper.
-    #   @return [Fixnum]
-    # @overload stamper=(object)
-    #   @param [ActiveRecord::Base] object The stamper object.
-    #   @return [ActiveRecord::Base]
-    def stamper=(object)
-      Thread.current[stamper_identifier] = object
-    end
-
-    # Retrieves the existing stamper.
-    def stamper
-      Thread.current[stamper_identifier]
-    end
-
-    # Sets the stamper back to +nil+ to prepare for the next request.
-    def reset_stamper
-      self.stamper = nil
-    end
-
-    # For the duration that execution is within the provided block, the stamper for this class
-    # would be the specified value.
-    #
-    # This replaces the {#stamper=} and {#reset_stamper} pair because this guarantees exception
-    # safety.
-    def with_stamper(stamper)
-      old_stamper = self.stamper
-      self.stamper = stamper
-      yield
-    ensure
-      self.stamper = old_stamper
-    end
-
-    private
-
-    def stamper_identifier
-      "#{self.to_s.downcase}_#{self.object_id}_stamper"
-    end
-  end
-end
+module ActiveRecord::Userstamp::Stamper
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def model_stamper
+      # don't allow multiple calls
+      return if singleton_class.included_modules.include?(InstanceMethods)
+      extend ActiveRecord::Userstamp::Stamper::InstanceMethods
+    end
+  end
+
+  module InstanceMethods
+    # Used to set the current stamper for this model.
+    #
+    # @overload stamper=(object_id)
+    #   @param [Fixnum] object_id The ID of the stamper.
+    #   @return [Fixnum]
+    # @overload stamper=(object)
+    #   @param [ActiveRecord::Base] object The stamper object.
+    #   @return [ActiveRecord::Base]
+    def stamper=(object)
+      Thread.current[stamper_identifier] = object
+    end
+
+    # Retrieves the existing stamper.
+    def stamper
+      Thread.current[stamper_identifier]
+    end
+
+    # Sets the stamper back to +nil+ to prepare for the next request.
+    def reset_stamper
+      self.stamper = nil
+    end
+
+    # For the duration that execution is within the provided block, the stamper for this class
+    # would be the specified value.
+    #
+    # This replaces the {#stamper=} and {#reset_stamper} pair because this guarantees exception
+    # safety.
+    def with_stamper(stamper)
+      old_stamper = self.stamper
+      self.stamper = stamper
+      yield
+    ensure
+      self.stamper = old_stamper
+    end
+
+    private
+
+    def stamper_identifier
+      "#{self.to_s.downcase}_#{self.object_id}_stamper"
+    end
+  end
+end

data/lib/active_record/userstamp/utilities.rb

@@ -1,54 +1,55 @@
-module ActiveRecord::Userstamp::Utilities
-  # Removes the association methods from the model.
-  #
-  # @param [Class] model The model to remove methods from.
-  # @param [Symbol] association The name of the association to remove.
-  # @return [void]
-  def self.remove_association(model, association)
-    methods = [
-      association,
-      "#{association}=",
-      "build_#{association}",
-      "create_#{association}",
-      "create_#{association}!"
-    ]
-
-    model.generated_association_methods.module_eval do
-      methods.each do |method|
-        remove_method(method) if method_defined?(method)
-      end
-    end
-  end
-
-  # Obtains the creator/updater/deleter columns which are present in the model.
-  #
-  # @param [Class] model The model to query.
-  # @return [nil|Array<(bool, bool, bool)>] Nil if the model does not have a table defined.
-  #   Otherwise, a tuple of booleans indicating the presence of the created, updated, and deleted
-  #   columns.
-  def self.available_association_columns(model)
-    columns = Set[*model.column_names]
-    config = ActiveRecord::Userstamp.config
-
-    [config.creator_attribute.present? && columns.include?(config.creator_attribute.to_s),
-     config.updater_attribute.present? && columns.include?(config.updater_attribute.to_s),
-     config.deleter_attribute.present? && columns.include?(config.deleter_attribute.to_s)]
-  rescue ActiveRecord::StatementInvalid => _
-    nil
-  end
-
-  # Assigns the given attribute to the record, based on the model's stamper.
-  #
-  # If the stamper is a record, then it is assigned to the attribute; if it is a number, then it
-  # is assigned to the +_id+ attribute
-  #
-  # @param [ActiveRecord::Base] record The record to assign.
-  # @param [Symbol] attribute The attribute to assign.
-  def self.assign_attribute(record, attribute)
-    attribute = attribute.to_s
-    stamp_value = record.class.stamper_class.stamper
-
-    attribute = attribute[0..-4] if !stamp_value.is_a?(Fixnum) && attribute.end_with?('_id')
-    record.send("#{attribute}=", stamp_value)
-  end
-end
+module ActiveRecord::Userstamp::Utilities
+  # Removes the association methods from the model.
+  #
+  # @param [Class] model The model to remove methods from.
+  # @param [Symbol] association The name of the association to remove.
+  # @return [void]
+  def self.remove_association(model, association)
+    methods = [
+      association,
+      "#{association}=",
+      "build_#{association}",
+      "create_#{association}",
+      "create_#{association}!"
+    ]
+
+    model.generated_association_methods.module_eval do
+      methods.each do |method|
+        remove_method(method) if method_defined?(method)
+      end
+    end
+  end
+
+  # Obtains the creator/updater/deleter columns which are present in the model.
+  #
+  # @param [Class] model The model to query.
+  # @return [nil|Array<(bool, bool, bool)>] Nil if the model does not have a table defined.
+  #   Otherwise, a tuple of booleans indicating the presence of the created, updated, and deleted
+  #   columns.
+  def self.available_association_columns(model)
+    return nil if model.table_name.empty?
+    columns = Set[*model.column_names]
+    config = ActiveRecord::Userstamp.config
+
+    [config.creator_attribute.present? && columns.include?(config.creator_attribute.to_s),
+     config.updater_attribute.present? && columns.include?(config.updater_attribute.to_s),
+     config.deleter_attribute.present? && columns.include?(config.deleter_attribute.to_s)]
+  rescue ActiveRecord::StatementInvalid => _
+    nil
+  end
+
+  # Assigns the given attribute to the record, based on the model's stamper.
+  #
+  # If the stamper is a record, then it is assigned to the attribute; if it is a number, then it
+  # is assigned to the +_id+ attribute
+  #
+  # @param [ActiveRecord::Base] record The record to assign.
+  # @param [Symbol] attribute The attribute to assign.
+  def self.assign_attribute(record, attribute)
+    attribute = attribute.to_s
+    stamp_value = record.class.stamper_class.stamper
+
+    attribute = attribute[0..-4] if !stamp_value.is_a?(Fixnum) && attribute.end_with?('_id')
+    record.send("#{attribute}=", stamp_value)
+  end
+end

data/lib/active_record/userstamp/version.rb

@@ -1,4 +1,4 @@
-module ActiveRecord; end
-module ActiveRecord::Userstamp
-  VERSION = '3.0.2'
-end
+module ActiveRecord; end
+module ActiveRecord::Userstamp
+  VERSION = '3.0.3'
+end

data/lib/activerecord/userstamp.rb

@@ -1 +1 @@
-require 'active_record/userstamp'
+require 'active_record/userstamp'

data/spec/controllers/posts_controller_spec.rb

@@ -1,44 +1,44 @@
-require 'rails_helper'
-
-RSpec.describe PostsController, type: :controller do
-  controller do
-  end
-
-  before(:each) { define_first_post }
-
-  context 'when updating a Post' do
-    it 'sets the correct updater' do
-      request.session  = { person_id: @delynn.id }
-      post :update, id: @first_post.id, post: { title: 'Different' }
-
-      expect(response.status).to eq(200)
-      expect(controller.instance_variable_get(:@post).title).to eq('Different')
-      expect(controller.instance_variable_get(:@post).updater).to eq(@delynn)
-    end
-  end
-
-  context 'when handling multiple requests' do
-    def simulate_second_request
-      old_request_session = request.session
-      request.session = { person_id: @nicole.id }
-
-      post :update, id: @first_post.id, post: { title: 'Different Second'}
-      expect(controller.instance_variable_get(:@post).updater).to eq(@nicole)
-    ensure
-      request.session = old_request_session
-    end
-
-    it 'sets the correct updater' do
-      request.session = { person_id: @delynn.id }
-      get :edit, id: @first_post.id
-      expect(response.status).to eq(200)
-
-      simulate_second_request
-
-      post :update, id: @first_post.id, post: { title: 'Different' }
-      expect(response.status).to eq(200)
-      expect(controller.instance_variable_get(:@post).title).to eq('Different')
-      expect(controller.instance_variable_get(:@post).updater).to eq(@delynn)
-    end
-  end
-end
+require 'rails_helper'
+
+RSpec.describe PostsController, type: :controller do
+  controller do
+  end
+
+  before(:each) { define_first_post }
+
+  context 'when updating a Post' do
+    it 'sets the correct updater' do
+      request.session  = { person_id: @delynn.id }
+      post :update, id: @first_post.id, post: { title: 'Different' }
+
+      expect(response.status).to eq(200)
+      expect(controller.instance_variable_get(:@post).title).to eq('Different')
+      expect(controller.instance_variable_get(:@post).updater).to eq(@delynn)
+    end
+  end
+
+  context 'when handling multiple requests' do
+    def simulate_second_request
+      old_request_session = request.session
+      request.session = { person_id: @nicole.id }
+
+      post :update, id: @first_post.id, post: { title: 'Different Second'}
+      expect(controller.instance_variable_get(:@post).updater).to eq(@nicole)
+    ensure
+      request.session = old_request_session
+    end
+
+    it 'sets the correct updater' do
+      request.session = { person_id: @delynn.id }
+      get :edit, id: @first_post.id
+      expect(response.status).to eq(200)
+
+      simulate_second_request
+
+      post :update, id: @first_post.id, post: { title: 'Different' }
+      expect(response.status).to eq(200)
+      expect(controller.instance_variable_get(:@post).title).to eq('Different')
+      expect(controller.instance_variable_get(:@post).updater).to eq(@delynn)
+    end
+  end
+end

data/spec/controllers/users_controller_spec.rb

@@ -1,50 +1,50 @@
-require 'rails_helper'
-
-RSpec.describe UsersController, type: :controller do
-  controller do
-  end
-
-  context 'when updating a User' do
-    it 'sets the correct updater' do
-      request.session = { user_id: @hera.id }
-      patch :update, id: @hera.id, user: { name: 'Different'}
-
-      expect(response.status).to eq(200)
-      expect(controller.instance_variable_get(:@user).name).to eq('Different')
-      expect(controller.instance_variable_get(:@user).updater).to eq(@hera)
-    end
-  end
-
-  context 'when handling multiple requests' do
-    def simulate_second_request
-      old_request_session = request.session
-      request.session = { user_id: @zeus.id }
-
-      post :update, id: @hera.id, user: { name: 'Different Second' }
-      expect(controller.instance_variable_get(:@user).updater).to eq(@zeus)
-    ensure
-      request.session = old_request_session
-    end
-
-    it 'sets the correct updater' do
-      request.session = { user_id: @hera.id }
-      get :edit, id: @hera.id
-      expect(response.status).to eq(200)
-
-      simulate_second_request
-    end
-  end
-
-  context 'when the handler raises an exception' do
-    before { @stamper = User.stamper }
-    it 'restores the correct stamper' do
-      begin
-        request.session = { user_id: @zeus.id }
-        post :create
-      rescue
-      end
-
-      expect(User.stamper).to be(@stamper)
-    end
-  end
-end
+require 'rails_helper'
+
+RSpec.describe UsersController, type: :controller do
+  controller do
+  end
+
+  context 'when updating a User' do
+    it 'sets the correct updater' do
+      request.session = { user_id: @hera.id }
+      patch :update, id: @hera.id, user: { name: 'Different'}
+
+      expect(response.status).to eq(200)
+      expect(controller.instance_variable_get(:@user).name).to eq('Different')
+      expect(controller.instance_variable_get(:@user).updater).to eq(@hera)
+    end
+  end
+
+  context 'when handling multiple requests' do
+    def simulate_second_request
+      old_request_session = request.session
+      request.session = { user_id: @zeus.id }
+
+      post :update, id: @hera.id, user: { name: 'Different Second' }
+      expect(controller.instance_variable_get(:@user).updater).to eq(@zeus)
+    ensure
+      request.session = old_request_session
+    end
+
+    it 'sets the correct updater' do
+      request.session = { user_id: @hera.id }
+      get :edit, id: @hera.id
+      expect(response.status).to eq(200)
+
+      simulate_second_request
+    end
+  end
+
+  context 'when the handler raises an exception' do
+    before { @stamper = User.stamper }
+    it 'restores the correct stamper' do
+      begin
+        request.session = { user_id: @zeus.id }
+        post :create
+      rescue
+      end
+
+      expect(User.stamper).to be(@stamper)
+    end
+  end
+end

data/spec/dummy/README.rdoc

@@ -1,28 +1,28 @@
-== README
-
-This README would normally document whatever steps are necessary to get the
-application up and running.
-
-Things you may want to cover:
-
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.
+== README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.