activerecord-userstamp 2.1.1 → 3.0.0

data/lib/active_record/userstamp/stamper.rb

@@ -1,39 +1,47 @@
-module ActiveRecord::Userstamp
-  module Stamper
-    def self.included(base) # :nodoc:
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      def model_stamper
-        # don't allow multiple calls
-        return if self.included_modules.include?(ActiveRecord::Userstamp::Stamper::InstanceMethods)
-        send(:extend, ActiveRecord::Userstamp::Stamper::InstanceMethods)
-      end
-    end
-
-    module InstanceMethods
-      # Used to set the stamper for a particular request. See the Userstamp module for more
-      # details on how to use this method.
-      def stamper=(object)
-        object_stamper = if object.is_a?(ActiveRecord::Base)
-          object.send("#{object.class.primary_key}".to_sym)
-        else
-          object
-        end
-
-        Thread.current["#{self.to_s.downcase}_#{self.object_id}_stamper"] = object_stamper
-      end
-
-      # Retrieves the existing stamper for the current request.
-      def stamper
-        Thread.current["#{self.to_s.downcase}_#{self.object_id}_stamper"]
-      end
-
-      # Sets the stamper back to +nil+ to prepare for the next request.
-      def reset_stamper
-        Thread.current["#{self.to_s.downcase}_#{self.object_id}_stamper"] = nil
-      end
-    end
-  end
-end
+module ActiveRecord::Userstamp
+  module Stamper
+    extend ActiveSupport::Concern
+
+    included do
+      extend ClassMethods
+    end
+
+    module ClassMethods
+      def model_stamper
+        # don't allow multiple calls
+        return if self.included_modules.include?(ActiveRecord::Userstamp::Stamper::InstanceMethods)
+        send(:extend, ActiveRecord::Userstamp::Stamper::InstanceMethods)
+      end
+    end
+
+    module InstanceMethods
+      # Used to set the stamper for a particular request. See the Userstamp module for more
+      # details on how to use this method.
+      def stamper=(object)
+        object_stamper = if object.is_a?(ActiveRecord::Base)
+          object.send("#{object.class.primary_key}".to_sym)
+        else
+          object
+        end
+
+        Thread.current[stamper_identifier] = object_stamper
+      end
+
+      # Retrieves the existing stamper for the current request.
+      def stamper
+        Thread.current[stamper_identifier]
+      end
+
+      # Sets the stamper back to +nil+ to prepare for the next request.
+      def reset_stamper
+        Thread.current[stamper_identifier] = nil
+      end
+
+      private
+
+      def stamper_identifier
+        "#{self.to_s.downcase}_#{self.object_id}_stamper"
+      end
+    end
+  end
+end

data/lib/active_record/userstamp/utilities.rb

@@ -0,0 +1,18 @@
+module ActiveRecord::Userstamp::Utilities
+  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
+end
+

data/lib/active_record/userstamp/version.rb

@@ -1,4 +1,4 @@
-module ActiveRecord; end
-module ActiveRecord::Userstamp
-  VERSION = '2.1.1'
-end
+module ActiveRecord; end
+module ActiveRecord::Userstamp
+  VERSION = '3.0.0'
+end

data/lib/activerecord/userstamp.rb

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

data/spec/controllers/posts_controller_spec.rb

@@ -1,46 +1,46 @@
-require 'rails_helper'
-
-RSpec.describe PostsController, type: :controller do
-  controller do
-  end
-
-  before(:each) do
-    reset_to_defaults
-  end
-
-  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) do
+    reset_to_defaults
+  end
+
+  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,41 +1,41 @@
-require 'rails_helper'
-
-RSpec.describe UsersController, type: :controller do
-  controller do
-  end
-
-  before(:each) do
-    reset_to_defaults
-  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
-end
+require 'rails_helper'
+
+RSpec.describe UsersController, type: :controller do
+  controller do
+  end
+
+  before(:each) do
+    reset_to_defaults
+  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
+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>.

data/spec/dummy/Rakefile

@@ -1,6 +1,6 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-
-Rails.application.load_tasks
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks

data/spec/dummy/app/assets/javascripts/application.js

@@ -1,13 +1,13 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require_tree .

data/spec/dummy/app/assets/stylesheets/application.css

@@ -1,15 +1,15 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
- *= require_tree .
- *= require_self
- */
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,13 +1,13 @@
-class ApplicationController < ActionController::Base
-  include ActiveRecord::Userstamp::ControllerAdditions
-
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
-
-  protected
-
-  def current_user
-    User.find(session[:user_id])
-  end
-end
+class ApplicationController < ActionController::Base
+  include ActiveRecord::Userstamp::ControllerAdditions
+
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+
+  protected
+
+  def current_user
+    User.find(session[:user_id])
+  end
+end