paper_trail 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1054af34e2822ac77b034943d283274d8a9daa62
-  data.tar.gz: 219b4b1fd749df6babf4517ff056ae223ba6bb6e
+  metadata.gz: a4b0bcf1de1e90e178545aca16201e7f3bf5de2a
+  data.tar.gz: 01b443dae88b5d51479bbca1e788b723f2c37c89
 SHA512:
-  metadata.gz: 0397014880df4049900f6191b41d31c70b4bee0373943dfd1fd8cc876ed4ed220273a5e973c8d8bae471be9ebc875d12b23ede208bf246ebe2247a230fc99f03
-  data.tar.gz: 9697bea9302726a452c319909a77face2e281392ca29a187f1bd7d5c3f35ce92b1ba94e3c9698aca50b5c88623d0bcb0b7f66fc692a2fe723a7ef171efece060
+  metadata.gz: f4ca7aa698867e094708d43673e77a29a681674ab3ddceefda21df783167d7f5876e0ea067945978e58615b25fdd7229f27a1630100d881c9da99feb01ee873a
+  data.tar.gz: f01d87966c55fe86b9894d015cf906ef833fe70e67187a920aa20676694ab5a1c64a79182917fbdb6b5a0cd8ea66d457f3d2370862f6ce764af0573530bbb112

data/.gitignore

@@ -1,6 +1,7 @@
 NOTES
 test/debug.log
 test/paper_trail_plugin.sqlite3.db
+test/dummy/config/database.yml
 test/dummy/db/*.sqlite3
 test/dummy/log/*
 test/dummy/tmp/*

data/.travis.yml

@@ -5,8 +5,18 @@ rvm:
   - 1.8.7
   - jruby-19mode
   - jruby-18mode
+env:
+  - DB=mysql
+  - DB=postgres
+  - DB=sqlite
 
-before_install: gem update --system 2.2.1
+before_script:
+  - sh -c "if [ \"$DB\" = 'mysql' ]; then mysql   -e 'create database paper_trail_test;'; fi"
+  - sh -c "if [ \"$DB\" = 'mysql' ]; then mysql   -e 'create database paper_trail_bar; '; fi"
+  - sh -c "if [ \"$DB\" = 'mysql' ]; then mysql   -e 'create database paper_trail_foo; '; fi"
+  - sh -c "if [ \"$DB\" = 'postgres' ]; then psql -c 'create database paper_trail_test;' -U postgres; fi"
+  - sh -c "if [ \"$DB\" = 'postgres' ]; then psql -c 'create database paper_trail_bar;'  -U postgres; fi"
+  - sh -c "if [ \"$DB\" = 'postgres' ]; then psql -c 'create database paper_trail_foo;'  -U postgres; fi"
 
 gemfile:
   - Gemfile
@@ -19,3 +29,4 @@ matrix:
       gemfile: Gemfile
     - rvm: 1.8.7
       gemfile: Gemfile
+    

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 3.0.2
+
+  - [#357](https://github.com/airblade/paper_trail/issues/357) - If a `Version` instance is reified and then persisted at that state,
+    it's timestamp attributes for update should still get `touch`ed.
+  - [#351](https://github.com/airblade/paper_trail/pull/351) / [#352](https://github.com/airblade/paper_trail/pull/352) -
+    `PaperTrail::Rails::Controller` should hook into all controller types, and should not get loaded unless `ActionController` is.
+  - [#346](https://github.com/airblade/paper_trail/pull/346) - `user_for_paper_trail` method should accommodate different types
+    for return values from `current_user` method.
+  - [#344](https://github.com/airblade/paper_trail/pull/344) - Gem is now tested against `MySQL` and `PostgreSQL` in addition to `SQLite`.
+  - [#317](https://github.com/airblade/paper_trail/issues/317) / [#314](https://github.com/airblade/paper_trail/issues/314) -
+    `versions` should default to ordering via the primary key if it is an integer to avoid timestamp comparison issues.
+  - `PaperTrail::Cleaner.clean_versions!` should group versions by `PaperTrail.timestamp_field` when deciding which ones to
+    keep / destroy, instead of always grouping by the `created_at` field.
+  - If a `Version` instance is reified and then persisted at that state, it's source version
+    (`model_instance#version_association_name`, usually `model_instance#version`) will get cleared since persisting it causes it to
+    become the live instance.
+  - If `destroy` actions are tracked for a versioned model, invoking `destroy` on the model will cause the corresponding version that
+    gets generated to be assigned as the source version (`model_instance#version_association_name`, usually `model_instance#version`).
+
 ## 3.0.1
 
   - [#340](https://github.com/airblade/paper_trail/issues/340) - Prevent potential error encountered when using the `InstallGenerator`
@@ -32,7 +51,7 @@
   - [#281](https://github.com/airblade/paper_trail/issues/281) - `Rails::Controller` helper will return `false` for the
     `paper_trail_enabled_for_controller` method if `PaperTrail.enabled? == false`.
   - [#280](https://github.com/airblade/paper_trail/pull/280) - Don't track virtual timestamp attributes.
-  - [#278](https://github.com/airblade/paper_trail/issues/278)/[#272](https://github.com/airblade/paper_trail/issues/272) -
+  - [#278](https://github.com/airblade/paper_trail/issues/278) / [#272](https://github.com/airblade/paper_trail/issues/272) -
     Make RSpec and Cucumber helpers usable with [Spork](https://github.com/sporkrb/spork) and [Zeus](https://github.com/burke/zeus).
   - [#273](https://github.com/airblade/paper_trail/pull/273) - Make the `only` and `ignore` options accept `Hash` arguments;
     allows for conditional tracking.

data/README.md

@@ -42,7 +42,7 @@ The Rails 2.3 code is on the [`rails2`](https://github.com/airblade/paper_trail/
 
 1. Add `PaperTrail` to your `Gemfile`.
 
-    `gem 'paper_trail', '~> 3.0.1'`
+    `gem 'paper_trail', '~> 3.0.2'`
 
 2. Generate a migration which will add a `versions` table to your database.
 
@@ -64,7 +64,7 @@ your applications `ActiveRecord` connection in a manner similar to the way `Rail
 
 1. Add `PaperTrail` to your `Gemfile`.
 
-    `gem 'paper_trail', '~> 3.0.1'`
+    `gem 'paper_trail', '~> 3.0.2'`
 
 2. Generate a migration to add a `versions` table to your database.
 
@@ -889,7 +889,7 @@ A valid serializer is a `module` (or `class`) that defines a `load` and `dump` m
 
 ## Limiting the number of versions created per object instance
 
-If you are weary of your `versions` table growing to an unwieldy size, or just don't care to track more than a certain number of versions per object,
+If you are wary of your `versions` table growing to an unwieldy size, or just don't care to track more than a certain number of versions per object,
 there is a configuration option that can be set to cap the number of versions saved per object. Note that this value must be numeric, and it only applies to
 versions other than `create` events (which will always be preserved if they are stored).
 
@@ -1018,11 +1018,23 @@ require 'rspec/rails'
 require 'paper_trail/frameworks/rspec'
 ```
 
+## Testing PaperTrail
+
+Paper Trail has facilities to test aganist Postgres, Mysql and SQLite. To switch between DB engines you will need to export the DB Variable for the engine you wish to test aganist. 
+
+Though be aware we do not have the abilty to create the db's (except sqlite) for you.   You can look at .travis.yml before_script for an example of how to create the db's needed.  
+
+```
+export DB=postgres
+export DB=mysql
+export DB=sqlite # this is default
+```
+
 ## Articles
 
-[Using PaperTrail to track stack traces](http://rubyrailsexpert.com/?p=36), T James Corcoran's blog, 1st October 2013.
-[RailsCast #255 - Undo with PaperTrail](http://railscasts.com/episodes/255-undo-with-paper-trail), 28th February 2011.
-[Keep a Paper Trail with PaperTrail](http://www.linux-mag.com/id/7528), Linux Magazine, 16th September 2009.
+* [Using PaperTrail to track stack traces](http://rubyrailsexpert.com/?p=36), T James Corcoran's blog, 1st October 2013.
+* [RailsCast #255 - Undo with PaperTrail](http://railscasts.com/episodes/255-undo-with-paper-trail), 28th February 2011.
+* [Keep a Paper Trail with PaperTrail](http://www.linux-mag.com/id/7528), Linux Magazine, 16th September 2009.
 
 
 ## Problems
@@ -1034,6 +1046,7 @@ Please use GitHub's [issue tracker](http://github.com/airblade/paper_trail/issue
 
 Many thanks to:
 
+* [Russell Osborne](https://github.com/rposborne)
 * [Zachery Hostens](http://github.com/zacheryph)
 * [Jeremy Weiskotten](http://github.com/jeremyw)
 * [Phan Le](http://github.com/revo)
@@ -1082,6 +1095,7 @@ Many thanks to:
 * [Sean Marcia](https://github.com/SeanMarcia)
 * [Chulki Lee](https://github.com/chulkilee)
 * [Lucas Souza](https://github.com/lucasas)
+* [Russell Osborne](https://github.com/rposborne)
 
 
 ## Inspirations

data/Rakefile

@@ -1,6 +1,18 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
+desc 'Set a relevant database.yml for testing'
+task :prepare do
+  ENV["DB"] ||= "sqlite"
+  if RUBY_VERSION.to_f >= 1.9
+    FileUtils.cp "test/dummy/config/database.#{ENV["DB"]}.yml", "test/dummy/config/database.yml"
+  else
+    require 'ftools'
+    File.cp "test/dummy/config/database.#{ENV["DB"]}.yml", "test/dummy/config/database.yml"
+  end
+end
+
+
 require 'rake/testtask'
 desc 'Run tests on PaperTrail with Test::Unit.'
 Rake::TestTask.new(:test) do |t|
@@ -15,4 +27,4 @@ desc 'Run PaperTrail specs for the RSpec helper.'
 RSpec::Core::RakeTask.new(:spec)
 
 desc 'Default: run all available test suites'
-task :default => [:test, :spec]
+task :default => [:prepare, :test, :spec]

data/gemfiles/3.0.gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 3.0'
 
 group :development, :test do
-  gem 'rake'
+  gem 'rake', '~> 10.1.1'
   gem 'shoulda', '~> 3.5'
   gem 'ffaker',  '>= 1.15'
 
@@ -14,19 +14,29 @@ group :development, :test do
   gem 'sinatra', '~> 1.0'
   gem 'rack-test', '>= 0.6'
 
-  # Use sqlite3 gem for regular Ruby
-  gem 'sqlite3', '~> 1.2', :platform => :ruby
-
   # RSpec testing
   gem 'rspec-rails', '~> 2.14'
   gem 'generator_spec'
 
+  # To do proper transactional testing with ActiveSupport::TestCase on MySQL
+  gem 'database_cleaner', '~> 1.2'
+
+  platforms :ruby do 
+    gem 'sqlite3', '~> 1.2'
+    gem 'mysql2', '~> 0.3'
+    gem 'pg', '~> 0.17'
+  end
+
   platforms :jruby, :ruby_18 do
     # shoulda-matchers > 2.0 is not compatible with Ruby18.
     # Since we can't specify difference between JRuby 18/19, we need to use shoulda-matchers 1.5 for all JRuby testing.
     gem 'shoulda-matchers', '~> 1.5'
   end
 
-  # Use jRuby's sqlite3 adapter for jRuby
-  gem 'activerecord-jdbcsqlite3-adapter', '~> 1.2.9', :platform => :jruby
+  platforms :jruby do 
+    # Use jRuby's sqlite3 adapter for jRuby
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3'
+    gem 'activerecord-jdbcmysql-adapter', '~> 1.3'
+  end
 end

data/lib/paper_trail.rb

@@ -120,17 +120,18 @@ end
 
 require 'paper_trail/version'
 
+ActiveSupport.on_load(:active_record) do
+  include PaperTrail::Model
+end
+
 # Require frameworks
-require 'paper_trail/frameworks/rails'
 require 'paper_trail/frameworks/sinatra'
 require 'paper_trail/frameworks/rspec' if defined? RSpec
 require 'paper_trail/frameworks/cucumber' if defined? World
 
-ActiveSupport.on_load(:active_record) do
-  include PaperTrail::Model
-end
-
 if defined?(ActionController)
+  require 'paper_trail/frameworks/rails'
+
   ActiveSupport.on_load(:action_controller) do
     include PaperTrail::Rails::Controller
   end

data/lib/paper_trail/cleaner.rb

@@ -12,8 +12,9 @@ module PaperTrail
     def clean_versions!(options = {})
       options = {:keeping => 1, :date => :all}.merge(options)
       gather_versions(options[:item_id], options[:date]).each do |item_id, versions|
-        versions.group_by { |v| v.created_at.to_date }.each do |date, versions| # now group the versions by date and iterate through those
-          versions.pop(options[:keeping]) # remove the number of versions we wish to keep from the collection of versions prior to destruction
+        versions.group_by { |v| v.send(PaperTrail.timestamp_field).to_date }.each do |date, versions|
+          # remove the number of versions we wish to keep from the collection of versions prior to destruction
+          versions.pop(options[:keeping])
           versions.map(&:destroy)
         end
       end

data/lib/paper_trail/frameworks/rails.rb

@@ -3,10 +3,8 @@ module PaperTrail
     module Controller
 
       def self.included(base)
-        if defined?(ActionController) && (base == ActionController::Base || base == ActionController::API)
-          base.before_filter :set_paper_trail_enabled_for_controller
-          base.before_filter :set_paper_trail_whodunnit, :set_paper_trail_controller_info
-        end
+        base.before_filter :set_paper_trail_enabled_for_controller
+        base.before_filter :set_paper_trail_whodunnit, :set_paper_trail_controller_info
       end
 
       protected
@@ -17,7 +15,10 @@ module PaperTrail
       # Override this method in your controller to call a different
       # method, e.g. `current_person`, or anything you like.
       def user_for_paper_trail
-        current_user.try(:id) if defined?(current_user)
+        return unless defined?(current_user)
+        ActiveSupport::VERSION::MAJOR >= 4 ? current_user.try!(:id) : current_user.try(:id)
+      rescue NoMethodError
+        current_user
       end
 
       # Returns any information about the controller or request that you

data/lib/paper_trail/frameworks/sinatra.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object' # provides the `try` method
+
 module PaperTrail
   module Sinatra
 
@@ -15,7 +17,10 @@ module PaperTrail
     # Override this method in your controller to call a different
     # method, e.g. `current_person`, or anything you like.
     def user_for_paper_trail
-      current_user.try(:id) if defined?(current_user)
+      return unless defined?(current_user)
+      ActiveSupport::VERSION::MAJOR >= 4 ? current_user.try!(:id) : current_user.try(:id)
+    rescue NoMethodError
+      current_user
     end
 
     private

data/lib/paper_trail/has_paper_trail.rb

@@ -61,18 +61,22 @@ module PaperTrail
 
         if ::ActiveRecord::VERSION::MAJOR >= 4 # `has_many` syntax for specifying order uses a lambda in Rails 4
           has_many self.versions_association_name,
-            lambda { order("#{PaperTrail.timestamp_field} ASC") },
+            lambda { |model| order(model.version_class_name.constantize.timestamp_sort_order) },
             :class_name => self.version_class_name, :as => :item
         else
           has_many self.versions_association_name,
             :class_name => self.version_class_name,
             :as         => :item,
-            :order      => "#{PaperTrail.timestamp_field} ASC"
+            :order      => self.paper_trail_version_class.timestamp_sort_order
         end
 
         options_on = Array(options[:on]) # so that a single symbol can be passed in without wrapping it in an `Array`
         after_create  :record_create, :if => :save_version? if options_on.empty? || options_on.include?(:create)
-        before_update :record_update, :if => :save_version? if options_on.empty? || options_on.include?(:update)
+        if options_on.empty? || options_on.include?(:update)
+          before_save   :reset_timestamp_attrs_for_update_if_needed!, :on => :update
+          before_update :record_update, :if => :save_version?
+          after_update  :clear_version_instance!
+        end
         after_destroy :record_destroy, :if => :save_version? if options_on.empty? || options_on.include?(:destroy)
       end
 
@@ -91,7 +95,7 @@ module PaperTrail
         PaperTrail.enabled_for_model(self, true)
       end
 
-	    def paper_trail_on
+      def paper_trail_on
         warn "DEPRECATED: use `paper_trail_on!` instead of `paper_trail_on`. Support for `paper_trail_on` will be removed in PaperTrail 3.1"
         self.paper_trail_on!
       end
@@ -165,7 +169,7 @@ module PaperTrail
       # Returns true if this instance is the current, live one;
       # returns false if this instance came from a previous version.
       def live?
-        @is_live ||= source_version.nil?
+        source_version.nil?
       end
 
       # Returns who put the object into its current state.
@@ -177,7 +181,7 @@ module PaperTrail
       def version_at(timestamp, reify_options={})
         # Because a version stores how its object looked *before* the change,
         # we need to look for the first version created *after* the timestamp.
-        v = send(self.class.versions_association_name).subsequent(timestamp).first
+        v = send(self.class.versions_association_name).subsequent(timestamp, true).first
         v ? v.reify(reify_options) : self
       end
 
@@ -271,6 +275,7 @@ module PaperTrail
             :object    => self.class.paper_trail_version_class.object_col_is_json? ? object_attrs : PaperTrail.serializer.dump(object_attrs),
             :whodunnit => PaperTrail.whodunnit
           }
+
           if self.class.paper_trail_version_class.column_names.include?('object_changes')
             data[:object_changes] = self.class.paper_trail_version_class.object_changes_col_is_json? ? changes_for_paper_trail :
               PaperTrail.serializer.dump(changes_for_paper_trail)
@@ -285,6 +290,16 @@ module PaperTrail
         end.tap { |changes| self.class.serialize_attribute_changes(changes) }
       end
 
+      # Invoked via `after_update` callback for when a previous version is reified and then saved
+      def clear_version_instance!
+        send("#{self.class.version_association_name}=", nil)
+      end
+
+      def reset_timestamp_attrs_for_update_if_needed!
+        return if self.live? # invoked via callback when a user attempts to persist a reified `Version`
+        timestamp_attributes_for_update_in_model.each { |column| send("reset_#{column}!") }
+      end
+
       def record_destroy
         if paper_trail_switched_on? and not new_record?
           object_attrs = object_attrs_for_paper_trail(item_before_change)
@@ -295,7 +310,7 @@ module PaperTrail
             :object    => self.class.paper_trail_version_class.object_col_is_json? ? object_attrs : PaperTrail.serializer.dump(object_attrs),
             :whodunnit => PaperTrail.whodunnit
           }
-          self.class.paper_trail_version_class.create merge_metadata(data)
+          send("#{self.class.version_association_name}=", self.class.paper_trail_version_class.create(merge_metadata(data)))
           send(self.class.versions_association_name).send :load_target
         end
       end

data/lib/paper_trail/version_concern.rb

@@ -33,22 +33,45 @@ module PaperTrail
         where 'event <> ?', 'create'
       end
 
-      # These methods accept a timestamp or a version and returns other versions that come before or after
-      def subsequent(obj)
+      # Expects `obj` to be an instance of `PaperTrail::Version` by default, but can accept a timestamp if
+      # `timestamp_arg` receives `true`
+      def subsequent(obj, timestamp_arg = false)
+        if timestamp_arg != true && self.primary_key_is_int?
+          return where("#{table_name}.#{self.primary_key} > ?", obj).order("#{table_name}.#{self.primary_key} ASC")
+        end
+
         obj = obj.send(PaperTrail.timestamp_field) if obj.is_a?(self)
-        where("#{table_name}.#{PaperTrail.timestamp_field} > ?", obj).
-          order("#{table_name}.#{PaperTrail.timestamp_field} ASC")
+        where("#{table_name}.#{PaperTrail.timestamp_field} > ?", obj).order(self.timestamp_sort_order)
       end
 
-      def preceding(obj)
+      def preceding(obj, timestamp_arg = false)
+        if timestamp_arg != true && self.primary_key_is_int?
+          return where("#{table_name}.#{self.primary_key} < ?", obj).order("#{table_name}.#{self.primary_key} DESC")
+        end
+
         obj = obj.send(PaperTrail.timestamp_field) if obj.is_a?(self)
-        where("#{table_name}.#{PaperTrail.timestamp_field} < ?", obj).
-          order("#{table_name}.#{PaperTrail.timestamp_field} DESC")
+        where("#{table_name}.#{PaperTrail.timestamp_field} < ?", obj).order(self.timestamp_sort_order('DESC'))
       end
 
+
       def between(start_time, end_time)
         where("#{table_name}.#{PaperTrail.timestamp_field} > ? AND #{table_name}.#{PaperTrail.timestamp_field} < ?",
-          start_time, end_time).order("#{table_name}.#{PaperTrail.timestamp_field} ASC")
+          start_time, end_time).order(self.timestamp_sort_order)
+      end
+
+      # defaults to using the primary key as the secondary sort order if possible
+      def timestamp_sort_order(order = 'ASC')
+        if self.primary_key_is_int?
+          "#{table_name}.#{PaperTrail.timestamp_field} #{order}, #{table_name}.#{self.primary_key} #{order}"
+        else
+          "#{table_name}.#{PaperTrail.timestamp_field} #{order}"
+        end
+      end
+
+      def primary_key_is_int?
+        @primary_key_is_int ||= columns_hash[primary_key].type == :integer
+      rescue
+        true
       end
 
       # Returns whether the `object` column is using the `json` type supported by PostgreSQL

data/lib/paper_trail/version_number.rb

@@ -1,3 +1,3 @@
 module PaperTrail
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

data/paper_trail.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', ['>= 3.0', '< 5.0']
   s.add_dependency 'activesupport', ['>= 3.0', '< 5.0']
 
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', '~> 10.1.1'
   s.add_development_dependency 'shoulda', '~> 3.5'
   # s.add_development_dependency 'shoulda-matchers', '~> 1.5' # needed for ActiveRecord < 4
   s.add_development_dependency 'ffaker',  '>= 1.15'
@@ -31,11 +31,16 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test', '>= 0.6'
   s.add_development_dependency 'rspec-rails', '~> 2.14'
   s.add_development_dependency 'generator_spec'
+  s.add_development_dependency 'database_cleaner', '~> 1.2'
 
   # JRuby support for the test ENV
   unless defined?(JRUBY_VERSION)
     s.add_development_dependency 'sqlite3', '~> 1.2'
+    s.add_development_dependency 'mysql2', '~> 0.3'
+    s.add_development_dependency 'pg', '~> 0.17'
   else
     s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.3'
+    s.add_development_dependency 'activerecord-jdbcpostgresql-adapter', '~> 1.3'
+    s.add_development_dependency 'activerecord-jdbcmysql-adapter', '~> 1.3'
   end
 end

data/spec/models/widget_spec.rb

@@ -5,7 +5,7 @@ describe Widget do
     it { should be_versioned }
   end
 
-  let(:widget) { Widget.create :name => 'Bob', :an_integer => 1 }
+  let(:widget) { Widget.create! :name => 'Bob', :an_integer => 1 }
 
   describe "`versioning` option" do
     context :enabled, :versioning => true do
@@ -21,6 +21,46 @@ describe Widget do
     end
   end
 
+  describe "Callbacks", :versioning => true do
+    describe :before_save do
+      context ':on => :update' do
+        before { widget.update_attributes!(:name => 'Foobar') }
+
+        subject { widget.versions.last.reify }
+
+        it "should reset the value for the timestamp attrs for update so that value gets updated properly" do
+          expect { subject.save! }.to change(subject, :updated_at)
+        end
+      end
+    end
+
+    describe :after_update do
+      before { widget.update_attributes!(:name => 'Foobar') }
+
+      subject { widget.versions.last.reify }
+
+      it { subject.should_not be_live }
+
+      it "should clear the `versions_association_name` virtual attribute" do
+        subject.save!
+        subject.should be_live
+      end
+    end
+
+    describe :after_destroy do
+      it "should create a version for that event" do
+        expect { widget.destroy }.to change(widget.versions, :count).by(1)
+      end
+
+      it "should assign the version into the `versions_association_name`" do
+        widget.version.should be_nil
+        widget.destroy
+        widget.version.should_not be_nil
+        widget.version.should == widget.versions.last
+      end
+    end
+  end
+
   describe "Methods" do
     describe "Instance", :versioning => true do
       describe :whodunnit do

data/spec/requests/articles_spec.rb

@@ -16,4 +16,19 @@ describe "Articles" do
       PaperTrail.should be_enabled_for_controller
     end
   end
+
+  with_versioning do
+    let(:article) { Article.last }
+
+    context "`current_user` method returns a `String`" do
+      if RUBY_VERSION.to_f >= 1.9
+        it "should set that value as the `whodunnit`" do
+          expect { post articles_path(valid_params) }.to change(PaperTrail::Version, :count).by(1)
+          article.title.should == 'Doh'
+          PaperTrail.whodunnit.should == 'foobar'
+          article.versions.last.whodunnit.should == 'foobar'
+        end
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,9 @@
 ENV["RAILS_ENV"] ||= 'test'
+ENV["DB"] ||= 'sqlite'
+
+unless File.exists?(File.expand_path('../../test/dummy/config/database.yml', __FILE__))
+  warn "WARNING: No database.yml detected for the dummy app, please run `rake prepare` first"
+end
 
 require File.expand_path('../../test/dummy/config/environment', __FILE__)
 require 'rspec/rails'

data/spec/support/alt_db_init.rb

@@ -2,15 +2,21 @@
 # then defines those namespaces, then establishes the sqlite3 connection for the namespaces
 # to simulate an application with multiple database connections.
 
+#Load database yaml to use
+configs = YAML.load_file("#{Rails.root}/config/database.yml")
+
+#If we are testing with sqlite make it quick
 db_directory = "#{Rails.root}/db"
 # setup alternate databases
-if RUBY_VERSION.to_f >= 1.9
-  FileUtils.cp "#{db_directory}/test.sqlite3", "#{db_directory}/test-foo.sqlite3"
-  FileUtils.cp "#{db_directory}/test.sqlite3", "#{db_directory}/test-bar.sqlite3"
-else
-  require 'ftools'
-  File.cp "#{db_directory}/test.sqlite3", "#{db_directory}/test-foo.sqlite3"
-  File.cp "#{db_directory}/test.sqlite3", "#{db_directory}/test-bar.sqlite3"
+if ENV["DB"] == "sqlite"
+  if  RUBY_VERSION.to_f >= 1.9
+    FileUtils.cp "#{db_directory}/test.sqlite3", "#{db_directory}/test-foo.sqlite3"
+    FileUtils.cp "#{db_directory}/test.sqlite3", "#{db_directory}/test-bar.sqlite3"
+  else
+    require 'ftools'
+    File.cp "#{db_directory}/test.sqlite3", "#{db_directory}/test-foo.sqlite3"
+    File.cp "#{db_directory}/test.sqlite3", "#{db_directory}/test-bar.sqlite3"
+  end
 end
 
 module Foo
@@ -26,7 +32,11 @@ module Foo
     has_paper_trail :class_name => 'Foo::Version'
   end
 end
-Foo::Base.establish_connection(:adapter => 'sqlite3', :database => "#{db_directory}/test-foo.sqlite3")
+
+Foo::Base.configurations = configs
+Foo::Base.establish_connection(:foo)
+ActiveRecord::Base.establish_connection(:foo)
+ActiveRecord::Migrator.migrate File.expand_path("#{db_directory}/migrate/", __FILE__)
 
 module Bar
   class Base < ActiveRecord::Base
@@ -41,4 +51,9 @@ module Bar
     has_paper_trail :class_name => 'Bar::Version'
   end
 end
-Bar::Base.establish_connection(:adapter => 'sqlite3', :database => "#{db_directory}/test-bar.sqlite3")
+
+Bar::Base.configurations = configs
+Bar::Base.establish_connection(:bar)
+ActiveRecord::Base.establish_connection(:bar)
+
+ActiveRecord::Migrator.migrate File.expand_path("#{db_directory}/migrate/", __FILE__)

data/test/dummy/app/controllers/articles_controller.rb

@@ -7,4 +7,8 @@ class ArticlesController < ApplicationController
     end
     head :ok
   end
+
+  def current_user
+    'foobar'
+  end
 end

data/test/dummy/config/database.mysql.yml

@@ -0,0 +1,19 @@
+test: &test
+  adapter: mysql2
+  encoding: utf8
+  database: paper_trail_test
+  pool: 5
+  username: root
+  password:
+  host: localhost
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+foo:
+  <<: *test
+  database: paper_trail_foo
+
+bar:
+  <<: *test
+  database: paper_trail_bar

data/test/dummy/config/database.postgres.yml

@@ -0,0 +1,15 @@
+test: &test
+  adapter: postgresql
+  database: paper_trail_test
+  username: postgres
+  password: 
+  host:     localhost
+  port:     5432
+
+foo:
+  <<: *test
+  database: paper_trail_foo
+
+bar:
+  <<: *test
+  database: paper_trail_bar

data/test/dummy/config/database.sqlite.yml

@@ -0,0 +1,15 @@
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+test: &test
+  adapter: sqlite3
+  pool: 5
+  timeout: 5000
+  database: db/test.sqlite3
+
+foo:
+  <<: *test
+  database: db/test-foo.sqlite3
+
+bar:
+  <<: *test
+  database: db/test-bar.sqlite3

data/test/dummy/db/migrate/20110208155312_set_up_test_tables.rb

@@ -5,7 +5,7 @@ class SetUpTestTables < ActiveRecord::Migration
       t.text      :a_text
       t.integer   :an_integer
       t.float     :a_float
-      t.decimal   :a_decimal
+      t.decimal   :a_decimal, :precision => 6, :scale => 4
       t.datetime  :a_datetime
       t.time      :a_time
       t.date      :a_date

data/test/functional/controller_test.rb

@@ -62,11 +62,10 @@ class ControllerTest < ActionController::TestCase
     assert_equal 1, w.versions.length
     delete :destroy, :id => w.id
     widget = assigns(:widget)
-    versions_for_widget = PaperTrail::Version.with_item_keys('Widget', w.id)
-    assert_equal 2,               versions_for_widget.length
-    assert_equal 153,             versions_for_widget.last.whodunnit.to_i
-    assert_equal '127.0.0.1',     versions_for_widget.last.ip
-    assert_equal 'Rails Testing', versions_for_widget.last.user_agent
+    assert_equal 2,               widget.versions.length
+    assert_equal '127.0.0.1',     widget.versions.last.ip
+    assert_equal 'Rails Testing', widget.versions.last.user_agent
+    assert_equal 153,             widget.versions.last.whodunnit.to_i
   end
 
   test "controller metadata methods should get evaluated if paper trail is enabled for controller" do

data/test/functional/modular_sinatra_test.rb

@@ -3,7 +3,9 @@ require 'sinatra/base'
 
 # --- Tests for modular `Sinatra::Base` style ----
 class BaseApp < Sinatra::Base
-  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => File.expand_path('../../dummy/db/test.sqlite3', __FILE__))
+  configs = YAML.load_file(File.expand_path('../../dummy/config/database.yml', __FILE__))
+  ActiveRecord::Base.configurations = configs
+  ActiveRecord::Base.establish_connection(:test)
   register PaperTrail::Sinatra
 
   get '/test' do
@@ -27,7 +29,6 @@ class ModularSinatraTest < ActionDispatch::IntegrationTest
   end
 
   test 'baseline' do
-    assert_nil Widget.first
     assert_nil Widget.create.versions.first.whodunnit
   end
 
@@ -36,7 +37,7 @@ class ModularSinatraTest < ActionDispatch::IntegrationTest
     should "sets the `user_for_paper_trail` from the `current_user` method" do
       get '/test'
       assert_equal 'Hello', last_response.body
-      widget = Widget.first
+      widget = Widget.last
       assert_not_nil widget
       assert_equal 'foo', widget.name
       assert_equal 1, widget.versions.size

data/test/functional/sinatra_test.rb

@@ -3,7 +3,9 @@ require 'test_helper'
 
 # --- Tests for non-modular `Sinatra::Application` style ----
 class Sinatra::Application
-  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => File.expand_path('../../dummy/db/test.sqlite3', __FILE__))
+  configs = YAML.load_file(File.expand_path('../../dummy/config/database.yml', __FILE__))
+  ActiveRecord::Base.configurations = configs
+  ActiveRecord::Base.establish_connection(:test)
   register PaperTrail::Sinatra # we shouldn't actually need this line if I'm not mistaken but the tests seem to fail without it ATM
 
   get '/test' do
@@ -28,7 +30,6 @@ class SinatraTest < ActionDispatch::IntegrationTest
   end
 
   test 'baseline' do
-    assert_nil Widget.first
     assert_nil Widget.create.versions.first.whodunnit
   end
 
@@ -37,7 +38,7 @@ class SinatraTest < ActionDispatch::IntegrationTest
     should "sets the `user_for_paper_trail` from the `current_user` method" do
       get '/test'
       assert_equal 'Hai', last_response.body
-      widget = Widget.first
+      widget = Widget.last
       assert_not_nil widget
       assert_equal 'bar', widget.name
       assert_equal 1, widget.versions.size

data/test/test_helper.rb

@@ -1,10 +1,19 @@
-# Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
+ENV["DB"] ||= "sqlite"
+
+unless File.exists?(File.expand_path('../../test/dummy/config/database.yml', __FILE__))
+  warn "WARNING: No database.yml detected for the dummy app, please run `rake prepare` first"
+end
+
+def using_mysql?
+  @using_mysql ||= ActiveRecord::Base.connection_config[:adapter].to_sym == :mysql2
+end
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require 'shoulda'
 require 'ffaker'
+require 'database_cleaner' if using_mysql?
 
 Rails.backtrace_cleaner.remove_silencers!
 
@@ -14,9 +23,18 @@ ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
+# DatabaseCleaner is apparently necessary for doing proper transactions within MySQL (ugh)
+DatabaseCleaner.strategy = :truncation if using_mysql?
+
 # global setup block resetting Thread.current
 class ActiveSupport::TestCase
+  if using_mysql?
+    self.use_transactional_fixtures = false
+    setup { DatabaseCleaner.start }
+  end
+
   teardown do
+    DatabaseCleaner.clean if using_mysql?
     Thread.current[:paper_trail] = nil
   end
 end
@@ -32,4 +50,20 @@ def change_schema
     add_column :versions, :custom_created_at, :datetime
   end
   ActiveRecord::Migration.verbose = true
+  reset_version_class_column_info!
+end
+
+def restore_schema
+  ActiveRecord::Migration.verbose = false
+  ActiveRecord::Schema.define do
+    add_column :widgets, :sacrificial_column, :string
+    remove_column :versions, :custom_created_at
+  end
+  ActiveRecord::Migration.verbose = true
+  reset_version_class_column_info!
+end
+
+def reset_version_class_column_info!
+  PaperTrail::Version.connection.schema_cache.clear!
+  PaperTrail::Version.reset_column_information
 end

data/test/unit/cleaner_test.rb

@@ -2,19 +2,21 @@ require 'test_helper'
 
 class PaperTrailCleanerTest < ActiveSupport::TestCase
 
-  setup do
+  def populate_db!
     @animals = [@animal = Animal.new, @dog = Dog.new, @cat = Cat.new]
     @animals.each do |animal|
       3.times { animal.update_attribute(:name, Faker::Name.name) }
     end
   end
 
-  test 'Baseline' do
-    assert_equal 9, PaperTrail::Version.count
-    @animals.each { |animal| assert_equal 3, animal.versions.size }
-  end
-
   context '`clean_versions!` method' do
+    setup { self.populate_db! }
+
+    should 'Baseline' do
+      assert_equal 9, PaperTrail::Version.count
+      @animals.each { |animal| assert_equal 3, animal.versions.size }
+    end
+
     should 'be extended by `PaperTrail` module' do
       assert_respond_to PaperTrail, :clean_versions!
     end
@@ -140,4 +142,41 @@ class PaperTrailCleanerTest < ActiveSupport::TestCase
     end
 
   end # clean_versions! method
+
+  context "Custom timestamp field" do
+    setup do
+      change_schema
+      self.populate_db!
+      # now mess with the timestamps
+      @animals.each do |animal|
+        animal.versions.reverse.each_with_index do |version, index|
+          version.update_attribute(:custom_created_at, Time.now.utc + index.days)
+        end
+      end
+      PaperTrail.timestamp_field = :custom_created_at
+      @animals.map { |a| a.versions(true) } # reload the `versions` association for each animal
+    end
+
+    teardown do
+      PaperTrail.timestamp_field = :created_at
+      restore_schema
+    end
+
+    should 'Baseline' do
+      assert_equal 9, PaperTrail::Version.count
+      @animals.each do |animal|
+        assert_equal 3, animal.versions.size
+        animal.versions.each_cons(2) do |a,b|
+          a.created_at.to_date == b.created_at.to_date
+          a.custom_created_at.to_date != b.custom_created_at.to_date
+        end
+      end
+    end
+
+    should 'group by `PaperTrail.timestamp_field` when seperating the versions by date to clean' do
+      assert_equal 9, PaperTrail::Version.count
+      PaperTrail.clean_versions!
+      assert_equal 9, PaperTrail::Version.count
+    end
+  end
 end

data/test/unit/inheritance_column_test.rb

@@ -23,19 +23,19 @@ class InheritanceColumnTest < ActiveSupport::TestCase
     should 'work with custom STI inheritance column' do
       assert_equal 12, PaperTrail::Version.count
       assert_equal 4, @animal.versions.count
-      assert @animal.versions.first.reify.nil?
+      assert_nil @animal.versions.first.reify
       @animal.versions[1..-1].each { |v| assert_equal 'Animal', v.reify.class.name }
 
       # For some reason `@dog.versions` doesn't include the final `destroy` version.
       # Neither do `@dog.versions.scoped` nor `@dog.versions(true)` nor `@dog.versions.reload`.
       dog_versions = PaperTrail::Version.where(:item_id => @dog.id)
       assert_equal 4, dog_versions.count
-      assert dog_versions.first.reify.nil?
+      assert_nil dog_versions.first.reify
       dog_versions[1..-1].each { |v| assert_equal 'Dog', v.reify.class.name }
 
       cat_versions = PaperTrail::Version.where(:item_id => @cat.id)
       assert_equal 4, cat_versions.count
-      assert cat_versions.first.reify.nil?
+      assert_nil cat_versions.first.reify
       cat_versions[1..-1].each { |v| assert_equal 'Cat', v.reify.class.name }
     end
   end

data/test/unit/model_test.rb

@@ -213,13 +213,18 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
       end
 
       should 'have changes' do
+
+        #TODO Postgres does not appear to pass back ActiveSupport::TimeWithZone, 
+        # so chosing the lowest common denominator to test. 
+
         changes = {
           'name'       => [nil, 'Henry'],
-          'created_at' => [nil, @widget.created_at],
-          'updated_at' => [nil, @widget.updated_at],
-          'id'         => [nil, 1]
+          'created_at' => [nil, @widget.created_at.to_time.utc],
+          'updated_at' => [nil, @widget.updated_at.to_time.utc],
+          'id'         => [nil, @widget.id]
         }
 
+        assert_equal "Time", @widget.versions.last.changeset['updated_at'][1].class.to_s
         assert_equal changes, @widget.versions.last.changeset
       end
 
@@ -437,6 +442,10 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
         @last = @widget.versions.last
       end
 
+      teardown do 
+        restore_schema
+      end
+
       should 'reify previous version' do
         assert_kind_of Widget, @last.reify
       end
@@ -933,7 +942,7 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     should 'store version on join clear' do
       @book.authors << @dostoyevsky
       count = PaperTrail::Version.count
-      @book.authorships(true).clear
+      @book.authorships(true).destroy_all
       assert_equal 1, PaperTrail::Version.count - count
       assert_equal @book, PaperTrail::Version.last.reify.book
       assert_equal @dostoyevsky, PaperTrail::Version.last.reify.person

data/test/unit/serializer_test.rb

@@ -65,7 +65,7 @@ class SerializerTest < ActiveSupport::TestCase
     end
 
     should 'store object_changes' do
-      initial_changeset = {"name" => [nil, "Some text."], "id" => [nil, 1]}
+      initial_changeset = {"name" => [nil, "Some text."], "id" => [nil, @fluxor.id]}
       second_changeset =  {"name"=>["Some text.", "Some more text."]}
       assert_equal initial_changeset, @fluxor.versions[0].changeset
       assert_equal second_changeset,  @fluxor.versions[1].changeset
@@ -107,7 +107,7 @@ class SerializerTest < ActiveSupport::TestCase
     end
 
     should 'store object_changes' do
-      initial_changeset = {"id" => [nil, 1]}
+      initial_changeset = {"id" => [nil, @fluxor.id]}
       second_changeset =  {"name"=>[nil, "Some more text."]}
       assert_equal initial_changeset, @fluxor.versions[0].changeset
       assert_equal second_changeset,  @fluxor.versions[1].changeset

data/test/unit/timestamp_test.rb

@@ -5,8 +5,6 @@ class TimestampTest < ActiveSupport::TestCase
   setup do
     PaperTrail.timestamp_field = :custom_created_at
     change_schema
-    PaperTrail::Version.connection.schema_cache.clear!
-    PaperTrail::Version.reset_column_information
 
     Fluxor.instance_eval <<-END
       has_paper_trail
@@ -19,6 +17,7 @@ class TimestampTest < ActiveSupport::TestCase
 
   teardown do
     PaperTrail.timestamp_field = :created_at
+    restore_schema
   end
 
   test 'versions works with custom timestamp field' do

data/test/unit/version_test.rb

@@ -7,6 +7,12 @@ class PaperTrail::VersionTest < ActiveSupport::TestCase
     assert PaperTrail::Version.creates.present?
   end
 
+  teardown do
+    restore_schema
+    Animal.connection.schema_cache.clear!
+    Animal.reset_column_information
+  end
+
   context "PaperTrail::Version.creates" do
     should "return only create events" do
       PaperTrail::Version.creates.each do |version|
@@ -59,10 +65,10 @@ class PaperTrail::VersionTest < ActiveSupport::TestCase
     setup { 2.times { @animal.update_attributes(:name => Faker::Lorem.word) } }
 
     context "receiving a TimeStamp" do
-      should "return all versions that were created before the Timestamp; descendingly by order of the `PaperTrail.timestamp_field`" do
-        value = PaperTrail::Version.subsequent(1.hour.ago)
+      should "return all versions that were created before the Timestamp" do
+        value = PaperTrail::Version.subsequent(1.hour.ago, true)
         assert_equal value, @animal.versions.to_a
-        assert_not_nil value.to_sql.match(/ORDER BY versions.created_at ASC\z/)
+        assert_not_nil value.to_sql.match(/ORDER BY versions.created_at ASC/)
       end
     end
 
@@ -70,10 +76,6 @@ class PaperTrail::VersionTest < ActiveSupport::TestCase
       should "grab the Timestamp from the version and use that as the value" do
         value = PaperTrail::Version.subsequent(@animal.versions.first)
         assert_equal value, @animal.versions.to_a.tap { |assoc| assoc.shift }
-        # This asssertion can't pass in Ruby18 because the `strftime` method doesn't accept the %6 (milliseconds) command
-        if RUBY_VERSION.to_f >= 1.9 and not defined?(JRUBY_VERSION)
-          assert_not_nil value.to_sql.match(/WHERE \(versions.created_at > '#{@animal.versions.first.send(PaperTrail.timestamp_field).strftime("%F %T.%6N")}'\)/)
-        end
       end
     end
   end
@@ -82,10 +84,10 @@ class PaperTrail::VersionTest < ActiveSupport::TestCase
     setup { 2.times { @animal.update_attributes(:name => Faker::Lorem.word) } }
 
     context "receiving a TimeStamp" do
-      should "return all versions that were created before the Timestamp; descendingly by order of the `PaperTrail.timestamp_field`" do
-        value = PaperTrail::Version.preceding(Time.now)
+      should "return all versions that were created before the Timestamp" do
+        value = PaperTrail::Version.preceding(5.seconds.from_now, true)
         assert_equal value, @animal.versions.reverse
-        assert_not_nil value.to_sql.match(/ORDER BY versions.created_at DESC\z/)
+        assert_not_nil value.to_sql.match(/ORDER BY versions.created_at DESC/)
       end
     end
 
@@ -93,10 +95,6 @@ class PaperTrail::VersionTest < ActiveSupport::TestCase
       should "grab the Timestamp from the version and use that as the value" do
         value = PaperTrail::Version.preceding(@animal.versions.last)
         assert_equal value, @animal.versions.to_a.tap { |assoc| assoc.pop }.reverse
-        # This asssertion can't pass in Ruby18 because the `strftime` method doesn't accept the %6 (milliseconds) command
-        if RUBY_VERSION.to_f >= 1.9 and not defined?(JRUBY_VERSION)
-          assert_not_nil value.to_sql.match(/WHERE \(versions.created_at < '#{@animal.versions.last.send(PaperTrail.timestamp_field).strftime("%F %T.%6N")}'\)/)
-        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Andy Stewart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -55,16 +55,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +169,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +197,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.17'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.17'
 description: Track changes to your models' data. Good for auditing or versioning.
 email: batkinz@gmail.com
 executables: []
@@ -257,7 +299,9 @@ files:
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
-- test/dummy/config/database.yml
+- test/dummy/config/database.mysql.yml
+- test/dummy/config/database.postgres.yml
+- test/dummy/config/database.sqlite.yml
 - test/dummy/config/environment.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
@@ -367,7 +411,9 @@ test_files:
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
-- test/dummy/config/database.yml
+- test/dummy/config/database.mysql.yml
+- test/dummy/config/database.postgres.yml
+- test/dummy/config/database.sqlite.yml
 - test/dummy/config/environment.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb

data/test/dummy/config/database.yml

@@ -1,22 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000