blamer 3.0.1 → 4.0.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Mjg3YTVhMzdjNjZmMmU1MmMyY2MyYmMxYWZiNzY4MDJhMDE1YTRmMA==
+  data.tar.gz: !binary |-
+    Zjc2NjEyYTQ4N2NkOGYzMTM2ZGYzZTU5NmU5MTQyMmJjNzAyZGU5Yg==
+SHA512:
+  metadata.gz: !binary |-
+    ZmIyNTIwYzA3ZjM1MGMyMTVlOGQ5ZTMyNTJhNDk3OTA4ZDhjZTJkNWNhMDgx
+    NWEwMGE5NjljNzg5NDFkYWZhZDI3N2UzZDhjNDZkNzRjMjY4MGFiYmNlZDZm
+    MTBjNTk4YjNjM2Y4MWEyZGQwODU3M2JiOGJlZDNjOGY4ZjhkOWQ=
+  data.tar.gz: !binary |-
+    OTZkMTU5MTMxZjExYjk4NzU0ZTg1ZTMzNTFiODkyNTc4ZDM0NTg4OWMzODJk
+    ZDAxMDhkNzNhOGFiYjA4YmQ1NDg4OTY2OTk0ZmVlYjQxMGFkOGUzMmNlMDkz
+    YmE3MWE2MzA3YTdlOTA0NDVlYTQwMzU2MTcwYzY2ODJjMTc2N2I=

data/Gemfile

@@ -1,5 +1,9 @@
+source 'https://rubygems.org'
+
 gemspec
 
 group :test do
+  gem 'rake'
   gem 'sqlite3'
+  gem 'test-unit'
 end

data/Gemfile.lock

@@ -1,39 +1,46 @@
 PATH
   remote: .
   specs:
-    blamer (3.0.0)
-      activerecord (> 2.3.0, < 3.2.0)
+    blame (4.0.0)
+      activerecord (>= 4.0.0)
+      activesupport (>= 4.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.1.12)
-      activesupport (= 3.1.12)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activesupport (3.1.12)
-      multi_json (~> 1.0)
-    arel (2.2.3)
-    builder (3.0.4)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.13)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.2)
+    builder (3.1.4)
     i18n (0.7.0)
+    minitest (4.7.5)
     multi_json (1.10.1)
     power_assert (0.2.2)
     rake (10.4.2)
     sqlite3 (1.3.10)
-    test-unit (3.0.9)
+    test-unit (3.0.8)
       power_assert
+    thread_safe (0.3.4)
     tzinfo (0.3.43)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  blamer!
+  blame!
   rake
   sqlite3
   test-unit

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2014 Keith Morrison <keithm@infused.org>
+Copyright (c) 2008-2015 Keith Morrison <keithm@infused.org>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,13 +1,30 @@
 # Blamer
 
+[![Version](http://img.shields.io/gem/v/blamer.svg?style=flat)](https://rubygems.org/gems/blamer)
+[![Build Status](http://img.shields.io/travis/infused/blamer/master.svg?style=flat)](http://travis-ci.org/infused/blamer)
+[![Code Quality](http://img.shields.io/codeclimate/github/infused/blamer.svg?style=flat)](https://codeclimate.com/github/infused/blamer)
+
 Automatically userstamps create and update operations if the table has columns named *created_by* and/or *updated_by*.
-The Blamer plugin attempts to mirror the simplicity of ActiveRecord's timestamp module.
+The Blame plugin attempts to mirror the simplicity of ActiveRecord's timestamp module.
+
+Blamer expects User.current_user to return the current user. Basic setup involves assigning to `User.current_user` in a controller before filter:
+
+    class User < ActiveRecord::Base
+      cattr_accessor :current_user
+    end
+
+    class ApplicationController < ActionController::Base
+      before_filter :set_userstamp
+
+      def set_userstamp
+        User.current_user = User.find(session[:user_id])
+      end
+    end
 
-Blamer assumes that you are using restful-authentication and expects User.current_user to return the current user. You
-can override this behavior by writing your own *userstamp_object* method in ActiveRecord::Base or any of your models. For example:
+If you don't want to use `User.current_user` you can override this behavior by writing your own *userstamp_object* method in ActiveRecord::Base or any of your models. For example, to use Person.current:
 
     def userstamp_object
-      User.find(session[:user_id])
+      Person.current
     end
 
 If you don't like created_by/updated_by you can customize the column names:
@@ -41,25 +58,38 @@ Blamer adds a *userstamps* migration helper which will add the created_by and up
 
 Add a line to your environment.rb
 
-    config.gem 'blame'
+    config.gem 'Blamer', '~> 2.0.0'
 
+### Rails 3.x
 
-### Rails 3.x +
+Add to your Gemfile
+
+    gem 'Blamer', '~> 3.0.0'
+
+Or
+
+    gem 'Blamer', :github => 'infused/blame', :branch => '3_stable'
+
+### Rails 4.x
 
 Add to your Gemfile
 
-    gem 'blame'
+    gem 'Blamer', '~> 4.0.0'
+
+Or
+
+gem 'Blamer', :github => 'infused/blame', :branch => '4_stable'
 
 
 ## Credit
 
 Thanks to DeLynn Berry <delynn@gmail.com> for writing the original Userstamp plugin
-(http://github.com/delynn/userstamp/tree/master), which was the inspiration for this plugin.
+(http://github.com/delynn/userstamp/), which was the inspiration for this plugin.
 
 
 ## License
 
-Copyright (c) 2008-2014 Keith Morrison <<keithm@infused.org>>
+Copyright (c) 2008-2015 Keith Morrison <<keithm@infused.org>>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rake'
 require 'rake/testtask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -10,3 +11,17 @@ Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
+
+desc 'Generate documentation for the blame plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Blame'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -I lib -r blame.rb"
+end

data/blamer.gemspec

@@ -0,0 +1,23 @@
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
+Gem::Specification.new do |s|
+  s.name = 'blamer'
+  s.version = '4.0.0'
+  s.authors = ['Keith Morrison']
+  s.email = 'keithm@infused.org'
+  s.homepage = 'http://github.com/infused/blamer'
+  s.summary = 'Userstamps for ActiveRecord'
+  s.description = 'Automatically userstamps create and update operations if the table has created_by and/or updated_by columns'
+  s.license = 'MIT'
+
+  s.rdoc_options = ['--charset=UTF-8']
+  s.extra_rdoc_files = ['README.md', 'CHANGELOG.md', 'LICENSE']
+  s.files = Dir['[A-Z]*', '{lib,test}/**/*', 'blamer.gemspec']
+  s.test_files = Dir.glob('test/**/*_test.rb')
+  s.require_paths = ['lib']
+
+  s.required_rubygems_version = '>= 1.3.0'
+  s.add_dependency 'activerecord', '>= 4.0.0'
+  s.add_dependency 'activesupport', '>= 4.0.0'
+end

data/lib/blamer.rb

@@ -1,57 +1,19 @@
+require 'active_support'
 require 'active_record'
-
-module Blamer
-  module Userstamp
-    def self.included(base)
-      base.alias_method_chain :create, :userstamps
-      base.alias_method_chain :update, :userstamps
-
-      if base.respond_to?(:class_attribute)
-        base.class_attribute :record_userstamps
-        base.class_attribute :created_userstamp_column
-        base.class_attribute :updated_userstamp_column
-      else
-        base.class_inheritable_accessor :record_userstamps, :instance_writer => false
-        base.class_inheritable_accessor :created_userstamp_column, :instance_writer => false
-        base.class_inheritable_accessor :updated_userstamp_column, :instance_writer => false
-      end
-
-      base.record_userstamps = true
-      base.created_userstamp_column = :created_by
-      base.updated_userstamp_column = :updated_by
-    end
-
-    private
-
-    def userstamp_object
-      User.current_user
-    end
-
-    def create_with_userstamps
-      if record_userstamps && userstamp_object
-        write_attribute(created_userstamp_column, userstamp_object.id) if respond_to?(created_userstamp_column)
-        write_attribute(updated_userstamp_column, userstamp_object.id) if respond_to?(updated_userstamp_column)
+require 'blamer/userstamp'
+
+if defined?(Rails::Railtie)
+  class Railtie < Rails::Railtie
+    initializer 'blame.insert_into_active_record' do
+      ActiveSupport.on_load :active_record do
+        ActiveRecord::Base.send :include, Blamer::Userstamp
+        ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Blamer::UserstampMigrationHelper
       end
-      create_without_userstamps
     end
-
-    def update_with_userstamps(*args)
-      if record_userstamps && userstamp_object && (!partial_updates? || changed?)
-        write_attribute(updated_userstamp_column, userstamp_object.id) if respond_to?(updated_userstamp_column)
-      end
-      update_without_userstamps
-    end
-
   end
-
-  module UserstampMigrationHelper
-    def userstamps
-      column ActiveRecord::Base.created_userstamp_column, :integer
-      column ActiveRecord::Base.updated_userstamp_column, :integer
-    end
+else
+  if defined?(ActiveRecord)
+    ActiveRecord::Base.send :include, Blamer::Userstamp
+    ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Blamer::UserstampMigrationHelper
   end
-
 end
-
-ActiveRecord::Base.send :include, Blamer::Userstamp
-ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Blamer::UserstampMigrationHelper

data/lib/blamer/userstamp.rb

@@ -0,0 +1,47 @@
+module Blamer
+  module Userstamp
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :record_userstamps, :instance_writer => false
+      class_attribute :created_userstamp_column, :instance_writer => false
+      class_attribute :updated_userstamp_column, :instance_writer => false
+
+      self.record_userstamps = true
+      self.created_userstamp_column = :created_by
+      self.updated_userstamp_column = :updated_by
+    end
+
+    private
+
+    def userstamp_object
+      User.current_user
+    end
+
+    def _create_record(*args)
+      if record_userstamps && userstamp_object
+        write_attribute(created_userstamp_column, userstamp_object.id) if respond_to?(created_userstamp_column)
+        write_attribute(updated_userstamp_column, userstamp_object.id) if respond_to?(updated_userstamp_column)
+      end
+
+      super
+    end
+
+    def _update_record(*args)
+      if record_userstamps && userstamp_object && changed?
+        write_attribute(updated_userstamp_column, userstamp_object.id) if respond_to?(updated_userstamp_column)
+      end
+
+      super
+    end
+
+  end
+
+  module UserstampMigrationHelper
+    def userstamps
+      column ActiveRecord::Base.created_userstamp_column, :integer
+      column ActiveRecord::Base.updated_userstamp_column, :integer
+    end
+  end
+
+end

data/test/blame_test.rb

@@ -1,28 +1,28 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class BlamerTest < Test::Unit::TestCase
+class BlameTest < Test::Unit::TestCase
   def setup
-    ActiveRecord::Base.partial_updates = false
-    @user1 = User.create
-    @user2 = User.create
+    @user1 = User.create!
+    @user2 = User.create!
     User.current_user = @user1
-    @widget = Widget.create :name => 'One'
+    @widget = Widget.create! :name => 'One'
   end
-  
-  def test_partial_updates_disabled
-    assert !ActiveRecord::Base.partial_updates
-  end
-  
+
   def test_create
+    assert_equal 'One', @widget.name
     assert_equal @user1.id, @widget.created_by
     assert_equal @user1.id, @widget.updated_by
   end
-  
+
   def test_update
     User.current_user = @user2
     @widget.update_attribute(:name, 'Two')
+
+    @widget.reload
+
+    assert_equal 'Two', @widget.name
     assert_equal @user1.id, @widget.created_by
     assert_equal @user2.id, @widget.updated_by
   end
-  
-end
+
+end

data/test/override_userstamp_object_test.rb

@@ -1,31 +1,35 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class OverrideBlamerTest < Test::Unit::TestCase
-  
+class OverrideBlameTest < Test::Unit::TestCase
+
   # Override the default userstamp_object method
   class Sprocket < ActiveRecord::Base
     def userstamp_object
       Monkey.banana
     end
   end
-  
+
   def setup
-    @monkey1 = Monkey.create
-    @monkey2 = Monkey.create
+    @monkey1 = Monkey.create!
+    @monkey2 = Monkey.create!
     Monkey.banana = @monkey1
-    @sprocket = Sprocket.create :name => 'One'
+    @sprocket = Sprocket.create! :name => 'One'
   end
-  
+
   def test_create
+    assert_equal 'One', @sprocket.name
     assert_equal @monkey1.id, @sprocket.created_by
     assert_equal @monkey1.id, @sprocket.updated_by
   end
-  
+
   def test_update
     Monkey.banana = @monkey2
     @sprocket.update_attribute(:name, 'Two')
+
+    @sprocket.reload
+    assert_equal 'Two', @sprocket.name
     assert_equal @monkey1.id, @sprocket.created_by
     assert_equal @monkey2.id, @sprocket.updated_by
   end
-  
-end
+
+end

data/test/partial_blame_test.rb

@@ -1,28 +1,27 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class PartialBlamerTest < Test::Unit::TestCase
+class PartialBlameTest < Test::Unit::TestCase
   def setup
-    ActiveRecord::Base.partial_updates = true
-    @user1 = User.create
-    @user2 = User.create
+    @user1 = User.create!
+    @user2 = User.create!
     User.current_user = @user1
-    @widget = Widget.create :name => 'One'
+    @widget = Widget.create! :name => 'One'
   end
-  
-  def test_partial_updates_enabled
-    assert ActiveRecord::Base.partial_updates
-  end
-  
+
   def test_create
+    assert_equal 'One', @widget.name
     assert_equal @user1.id, @widget.created_by
     assert_equal @user1.id, @widget.updated_by
   end
-  
+
   def test_update
     User.current_user = @user2
     @widget.update_attribute(:name, 'Two')
+
+    @widget.reload
+    assert_equal 'Two', @widget.name
     assert_equal @user1.id, @widget.created_by
     assert_equal @user2.id, @widget.updated_by
   end
-  
-end
+
+end

metadata

@@ -1,36 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: blamer
 version: !ruby/object:Gem::Version
-  version: 3.0.1
-  prerelease: 
+  version: 4.0.0
 platform: ruby
 authors:
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-    - - <
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
-    - - <
+        version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 description: Automatically userstamps create and update operations if the table has
@@ -47,9 +52,11 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- Rakefile
 - README.md
+- Rakefile
+- blamer.gemspec
 - lib/blamer.rb
+- lib/blamer/userstamp.rb
 - test/blame_test.rb
 - test/models/monkey.rb
 - test/models/sprocket.rb
@@ -59,31 +66,30 @@ files:
 - test/partial_blame_test.rb
 - test/schema.rb
 - test/test_helper.rb
-homepage: http://github.com/infused/blame
+homepage: http://github.com/infused/blamer
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Userstamps for ActiveRecord
 test_files:
 - test/blame_test.rb