draftsman 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54041224c0ef580764ae1570192ce7f81a93c44c
-  data.tar.gz: de68aa15f34f6ec56b6b6cbd087bc2bce726cf73
+  metadata.gz: 8b81db1f80bb1d8742793931418a05f425f4574d
+  data.tar.gz: 40e32fd2383a15cc1e8e96552e63220faf0c4784
 SHA512:
-  metadata.gz: 282c2be7d66bfef55acc7ac61f9c3109b9e9e36fee1329723067a695e98b591aa8bf531776af0578762329f9c158f5f4ca1430bb0c27ce192517eb909590afa1
-  data.tar.gz: f28d6437916d060b4dbef7285bef2f60483585a8c8e354b1303f0062850add28b1f70dc6f6ca348c5d6872ed2996287709442c6e630e98cbe6bf77fe1cd4bec0
+  metadata.gz: 6b3e3e7a21e4078e32d66726366674d1bc0af4eb68fdb7aeec02d82dcb8d0c96f09be4366d3239dbee20b3363758507fbb608b5e5b2c3b04da510a0a003c4a2c
+  data.tar.gz: c97dd6e0a81c69d5c5d83ba034b8fceb6db7fee0fa54da1c8b62bc73ee5550c9812e74754910796172d338bdc0549e1cd1afa8708d696c74900136dfe0278bf9

data/.travis.yml

@@ -4,9 +4,14 @@ cache: bundler
 sudo: false
 
 rvm:
-  - 2.4.0-preview3
-  - 2.3.1
-  - 2.2.5
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
+
+gemfile:
+  - gemfiles/ar_5_1.gemfile
+  - gemfiles/ar_5_0.gemfile
+  - gemfiles/ar_4_2.gemfile
 
 before_script:
   - bundle exec rake -f spec/dummy/Rakefile db:schema:load

data/CHANGELOG.md

@@ -1,6 +1,37 @@
 # CHANGELOG
 
-## 0.6.0 - November 16, 2015
+## 0.7.0 - June 12, 2017
+
+### Enhancements
+
+- [@jmfederico](https://github.com/jmfederico)
+  [implemented](https://github.com/liveeditor/draftsman/commit/87f242374ad9fd97f7dba2e485d68da407c46fed)
+  [#67](https://github.com/liveeditor/draftsman/pull/67)
+  5.1 compatibility
+- [@chrisdpeters](https://github.com/chrisdpeters)
+  [implemented](https://github.com/liveeditor/draftsman/commit/e2c8e497899a453daf4c60d6ce02cacbf15a0f12)
+  Change Draft.object_col_is_json? to skip over itself if not stashing drafted changes
+- [@npezza93](https://github.com/npezza93)
+  [implemented](https://github.com/liveeditor/draftsman/commit/936d5a37c044c5ca0a5699a553d9bc111f2d91d2)
+  [#58](https://github.com/liveeditor/draftsman/pull/58)
+  Only update attributes that get changed instead of all of them
+- [@jmfederico](https://github.com/jmfederico)
+  [implemented](https://github.com/liveeditor/draftsman/commit/e8ba201db6bb88ea0ebc47c1262eb24e892e9a0b)
+  [#65](https://github.com/liveeditor/draftsman/pull/65)
+  Do not "touch" models when not updating the base table content
+
+### Bug Fixes
+
+- [@jokius](https://github.com/jokius)
+  [fixed](https://github.com/liveeditor/draftsman/commit/5ca7d6717109d753959a5d56c0fe81c3cd7b75f1)
+  [#57](https://github.com/liveeditor/draftsman/pull/57)
+  Fix if self.changeset is nil
+- [@jmfederico](https://github.com/jmfederico)
+  [fixed](https://github.com/liveeditor/draftsman/commit/207d158d054ed13ca6dc0a15ae2c499b0aac5f5f)
+  [#64](https://github.com/liveeditor/draftsman/pull/64)
+  Fix error when saving a draft when one already existed
+
+## 0.6.0 - November 16, 2016
 
 ### Enhancements
 

data/README.md

@@ -1,4 +1,4 @@
-# Draftsman v0.6.0
+# Draftsman v0.7.0
 
 [![Build Status](https://secure.travis-ci.org/liveeditor/draftsman.svg?branch=master)](http://travis-ci.org/liveeditor/draftsman)
 
@@ -64,7 +64,7 @@ ActiveRecord.
 Add Draftsman to your `Gemfile`.
 
 ```ruby
-gem 'draftsman', '~> 0.6.0'
+gem 'draftsman', '~> 0.7.0'
 ```
 
 Or if you want to grab the latest from `master`:
@@ -611,8 +611,8 @@ included, please do the following:
 
 2.  Run `bundle install`.
 
-3.  `cd spec/dummy` and run `RAILS_ENV=test rake db:migrate` to apply test
-    database migrations.
+3.  Run `RAILS_ENV=test bundle exec rake -f spec/dummy/
+    Rakefile db:schema:load` to load test database schema.
 
 4.  Add at least one test for your change. Only refactoring and documentation
     changes require no new tests. If you are adding functionality or fixing a

data/draftsman.gemspec

@@ -16,10 +16,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'activerecord', ['>= 3.0', '< 5.1']
+  s.add_dependency 'activerecord', ['>= 4.0', '< 5.2']
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'railties', ['>= 3.0', '< 5.1']
+  s.add_development_dependency 'railties', ['>= 4.0', '< 5.2']
   s.add_development_dependency 'sinatra', '~> 1.0'
   s.add_development_dependency 'rspec-rails', '~> 3.5'
 

data/gemfiles/ar_4_2.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 4.2.8'
+gem 'railties', '~> 4.2.8'

data/gemfiles/ar_5_0.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 5.0.0'
+gem 'railties', '~> 5.0.0'

data/gemfiles/ar_5_1.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 5.1.0'
+gem 'railties', '~> 5.1.0'

data/lib/draftsman.rb

@@ -30,6 +30,11 @@ module Draftsman
     !!draftsman_store[:request_enabled_for_controller]
   end
 
+  # Returns whether or not ActiveRecord is configured to assume that `belongs_to` associations are required.
+  def self.active_record_belongs_to_required?
+    @active_record_belongs_to_required ||= ActiveRecord::VERSION::STRING.to_f >= 5.0
+  end
+
   # Returns whether or not ActiveRecord is configured to require mass assignment whitelisting via `attr_accessible`.
   def self.active_record_protected_attributes?
     @active_record_protected_attributes ||= ActiveRecord::VERSION::STRING.to_f < 4.0 || defined?(ProtectedAttributes)

data/lib/draftsman/draft.rb

@@ -20,7 +20,7 @@ class Draftsman::Draft < ActiveRecord::Base
   # Returns whether the `object` column is using the `json` type supported by
   # PostgreSQL.
   def self.object_col_is_json?
-    @object_col_is_json ||= columns_hash['object'].type == :json
+    @object_col_is_json ||= Draftsman.stash_drafted_changes? && columns_hash['object'].type == :json
   end
 
   # Returns whether or not this class has an `object_changes` column.
@@ -175,23 +175,11 @@ class Draftsman::Draft < ActiveRecord::Base
         self.item.attributes = self.reify.attributes if Draftsman.stash_drafted_changes? && self.update?
 
         # Write `published_at` attribute
-        self.item.send("#{self.item.class.published_at_attribute_name}=", Time.now)
+        self.item.send("#{self.item.class.published_at_attribute_name}=", current_time_from_proper_timezone)
 
         # Clear out draft
         self.item.send("#{self.item.class.draft_association_name}_id=", nil)
 
-        # Determine which columns should be updated
-        only   = self.item.class.draftsman_options[:only]
-        ignore = self.item.class.draftsman_options[:ignore]
-        skip   = self.item.class.draftsman_options[:skip]
-        attributes_to_change = only.any? ? only : self.item.attribute_names
-        attributes_to_change = attributes_to_change - ignore + ['published_at', "#{self.item.class.draft_association_name}_id"] - skip
-
-        # Save without validations or callbacks
-        self.item.attributes.slice(*attributes_to_change).each do |key, value|
-          self.item.send("#{key}=", value)
-        end
-
         self.item.save(validate: false)
         self.item.reload
 
@@ -223,7 +211,7 @@ class Draftsman::Draft < ActiveRecord::Base
       elsif self.previous_draft.present?
         reify_previous_draft.reify
       # Prefer changeset for refication if it's present.
-      elsif !self.changeset.empty?
+      elsif self.changeset.present? && self.changeset.any?
         self.changeset.each do |key, value|
           # Skip counter_cache columns
           if self.item.respond_to?("#{key}=") && !key.end_with?('_count')
@@ -277,7 +265,7 @@ class Draftsman::Draft < ActiveRecord::Base
         end
         # Then clear out the draft ID.
         self.item.send("#{self.item.class.draft_association_name}_id=", nil)
-        self.item.save!(validate: false)
+        self.item.save!(validate: false, touch: false)
         # Then destroy draft.
         self.destroy
       when :destroy

data/lib/draftsman/model.rb

@@ -90,7 +90,11 @@ module Draftsman
         self.trashed_at_attribute_name = options[:trashed_at] || :trashed_at
 
         # `belongs_to :draft` association
-        belongs_to(self.draft_association_name, class_name: self.draft_class_name, dependent: :destroy)
+        if ::Draftsman.active_record_belongs_to_required?
+          belongs_to(self.draft_association_name, class_name: self.draft_class_name, dependent: :destroy, optional: true)
+        else
+          belongs_to(self.draft_association_name, class_name: self.draft_class_name, dependent: :destroy)
+        end
 
         # Scopes
         scope :drafted, -> (referenced_table_name = nil) {
@@ -169,7 +173,7 @@ module Draftsman
         object ||= self
 
         attrs = object.attributes.except(*self.class.draftsman_options[:skip]).tap do |attributes|
-          self.class.serialize_attributes_for_draftsman attributes
+          self.class.serialize_attributes_for_draftsman(attributes)
         end
 
         if self.class.draft_class.object_col_is_json?
@@ -326,17 +330,18 @@ module Draftsman
 
               data = merge_metadata_for_draft(data)
               send(self.class.draft_association_name).update(data)
-              self.save
+              save
             else
               the_changes = changes_for_draftsman(:update)
               save_only_columns_for_draft if Draftsman.stash_drafted_changes?
 
-              # Destroy the draft if this record has changed back to the original
-              # record.
+              # Destroy the draft if this record has changed back to the
+              # original values.
               if self.draft? && the_changes.empty?
                 nilified_draft = send(self.class.draft_association_name)
+                touch = changed?
                 send("#{self.class.draft_association_name}_id=", nil)
-                self.save
+                save(touch: touch)
                 nilified_draft.destroy
               # Save an update draft if record is changed notably.
               elsif !the_changes.empty?
@@ -397,7 +402,7 @@ module Draftsman
         if event == :update
           # Collect all attributes' previous and new values.
           draftable_attrs.each do |attr|
-            if self.draft? && self.draft.changeset.key?(attr)
+            if self.draft? && self.draft.changeset && self.draft.changeset.key?(attr)
               the_changes[attr] = [self.draft.changeset[attr].first, send(attr)]
             else
               the_changes[attr] = [self.send("#{attr}_was"), send(attr)]
@@ -443,7 +448,7 @@ module Draftsman
           only_changed_attributes = self.attributes.keys - self.class.draftsman_options[:only]
 
           only_changed_attributes.each do |key|
-            only_changes[key] = send(key)
+            only_changes[key] = send(key) if changed.include?(key)
           end
 
           self.update_columns(only_changes) if only_changes.any?
@@ -469,7 +474,8 @@ module Draftsman
       # Updates skipped attributes' values on this model.
       def update_skipped_attributes
         # Skip over this if nothing's being skipped.
-        return true unless draftsman_options[:skip].present?
+        skipped_changed = changed_attributes.keys & draftsman_options[:skip]
+        return true unless skipped_changed.present?
 
         keys = self.attributes.keys.select { |key| draftsman_options[:skip].include?(key) }
         attrs = {}

data/lib/draftsman/version.rb

@@ -1,3 +1,3 @@
 module Draftsman
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/spec/controllers/informants_controller_spec.rb

@@ -1,45 +1,63 @@
 require 'spec_helper'
+require 'support/feature_detection'
 
 # Tests controller `info_for_draftsman` method
 describe InformantsController, type: :controller do
   let(:trashable) { Trashable.create!(name: 'Bob') }
 
   describe 'create' do
-    before { post :create }
-    subject { Draftsman::Draft.last }
-
     it 'records `ip` from custom `info_for_draftsman`' do
-      expect(subject.ip).to eql '123.45.67.89'
+      post :create
+      expect(Draftsman::Draft.last.ip).to eql '123.45.67.89'
     end
 
     it 'records `user_agent` from custom `info_for_draftsman`' do
-      expect(subject.user_agent).to eql '007'
+      post :create
+      expect(Draftsman::Draft.last.user_agent).to eql '007'
     end
   end
 
   describe 'update' do
-    before { put :update, id: trashable.id }
-    subject { Draftsman::Draft.last }
-
     it 'records `ip` from custom `info_for_draftsman`' do
-      expect(subject.ip).to eql '123.45.67.89'
+      if request_test_helpers_require_keyword_args?
+        put :update, params: { id: trashable.id }
+      else
+        put :update, id: trashable.id
+      end
+
+      expect(Draftsman::Draft.last.ip).to eql '123.45.67.89'
     end
 
     it 'records `user_agent` from custom `info_for_draftsman`' do
-      expect(subject.user_agent).to eql '007'
+      if request_test_helpers_require_keyword_args?
+        put :update, params: { id: trashable.id }
+      else
+        put :update, id: trashable.id
+      end
+
+      expect(Draftsman::Draft.last.user_agent).to eql '007'
     end
   end
 
   describe 'destroy' do
-    before { delete :destroy, id: trashable.id }
-    subject { Draftsman::Draft.last }
-
     it 'records `ip` from custom `info_for_draftsman`' do
-      expect(subject.ip).to eql '123.45.67.89'
+      if request_test_helpers_require_keyword_args?
+        delete :destroy, params: { id: trashable.id }
+      else
+        delete :destroy, id: trashable.id
+      end
+
+      expect(Draftsman::Draft.last.ip).to eql '123.45.67.89'
     end
 
     it 'records `user_agent` from custom `info_for_draftsman`' do
-      expect(subject.user_agent).to eql '007'
+      if request_test_helpers_require_keyword_args?
+        delete :destroy, params: { id: trashable.id }
+      else
+        delete :destroy, id: trashable.id
+      end
+
+      expect(Draftsman::Draft.last.user_agent).to eql '007'
     end
   end
 end

data/spec/controllers/users_controller_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'support/feature_detection'
 
 describe UsersController, type: :controller do
   let(:trashable) { Trashable.create!(name: 'Bob') }
@@ -13,20 +14,26 @@ describe UsersController, type: :controller do
   end
 
   describe 'update' do
-    before { put :update, id: trashable.id }
-    subject { return Draftsman::Draft.last }
-
     it 'records user name via `user_for_draftsman`' do
-      expect(subject.whodunnit).to eql 'A User'
+      if request_test_helpers_require_keyword_args?
+        put :update, params: { id: trashable.id }
+      else
+        put :update, id: trashable.id
+      end
+
+      expect(Draftsman::Draft.last.whodunnit).to eql 'A User'
     end
   end
 
   describe 'destroy' do
-    before { delete :destroy, id: trashable.id }
-    subject { return Draftsman::Draft.last }
-
     it 'records user name via `user_for_draftsman`' do
-      expect(subject.whodunnit).to eql 'A User'
+      if request_test_helpers_require_keyword_args?
+        delete :destroy, params: { id: trashable.id }
+      else
+        delete :destroy, id: trashable.id
+      end
+
+      expect(Draftsman::Draft.last.whodunnit).to eql 'A User'
     end
   end
 end

data/spec/controllers/whodunnits_controller_spec.rb

@@ -1,33 +1,38 @@
 require 'spec_helper'
+require 'support/feature_detection'
 
 # Tests the automatic usage of `current_user` as the `whodunnit` attribute on the draft object
 describe WhodunnitsController, type: :controller do
   let(:trashable) { Trashable.create!(name: 'Bob') }
 
   describe 'create' do
-    before { post :create }
-    subject { Draftsman::Draft.last }
-
     it 'records `current_user` via `user_for_draftsman' do
-      expect(subject.whodunnit).to eql '153'
+      post :create
+      expect(Draftsman::Draft.last.whodunnit).to eql '153'
     end
   end
 
   describe 'update' do
-    before { put :update, id: trashable.id }
-    subject { Draftsman::Draft.last }
-
     it 'records `current_user` via `user_for_draftsman' do
-      expect(subject.whodunnit).to eql '153'
+      if request_test_helpers_require_keyword_args?
+        put :update, params: { id: trashable.id }
+      else
+        put :update, id: trashable.id
+      end
+
+      expect(Draftsman::Draft.last.whodunnit).to eql '153'
     end
   end
 
   describe 'destroy' do
-    before { delete :destroy, id: trashable.id }
-    subject { Draftsman::Draft.last }
-
     it 'records `current_user` via `user_for_draftsman' do
-      expect(subject.whodunnit).to eql '153'
+      if request_test_helpers_require_keyword_args?
+        delete :destroy, params: { id: trashable.id }
+      else
+        delete :destroy, id: trashable.id
+      end
+
+      expect(Draftsman::Draft.last.whodunnit).to eql '153'
     end
   end
 end

data/spec/models/child_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe Child, type: :model do
   let(:parent) { Parent.new(name: 'Marge') }
   let(:child)  { Child.new(name: 'Lisa', parent: parent) }
 
-  describe 'publish!' do
+  describe '#publish!' do
     context 'parent `create` draft with child `create` draft' do
       before do
         parent.save_draft
@@ -74,7 +74,7 @@ RSpec.describe Child, type: :model do
     end
   end
 
-  describe 'revert!' do
+  describe '#revert!' do
     context 'parent `create` draft with child `create` draft' do
       before do
         parent.save_draft
@@ -150,7 +150,7 @@ RSpec.describe Child, type: :model do
     end
   end
 
-  describe 'draft_publication_dependencies' do
+  describe '#draft_publication_dependencies' do
     context 'parent `create` draft with child `create` draft' do
       before do
         parent.save_draft
@@ -228,7 +228,7 @@ RSpec.describe Child, type: :model do
     end
   end
 
-  describe 'draft_reversion_dependencies' do
+  describe '#draft_reversion_dependencies' do
     context 'parent `create` draft with child `create` draft' do
       before do
         parent.save_draft

data/spec/models/skipper_spec.rb

@@ -1,10 +1,22 @@
 require 'spec_helper'
 
 RSpec.describe Skipper, type: :model do
-  let(:skipper) { Skipper.new :name => 'Bob', :skip_me => 'Skipped 1' }
+  let(:skipper) { Skipper.new(name: 'Bob', skip_me: 'Skipped 1') }
 
-  it 'is draftable' do
-    expect(subject.class.draftable?).to eql true
+  describe '.draftable?' do
+    it 'is `true`' do
+      expect(subject.class.draftable?).to eql true
+    end
+  end
+
+  describe '#object_attrs_for_draft_record' do
+    it 'contains changed but not skipped column name' do
+      expect(skipper.object_attrs_for_draft_record).to include 'name'
+    end
+
+    it 'does not contain the skipped column name' do
+      expect(skipper.object_attrs_for_draft_record).to_not include 'skip_me'
+    end
   end
 
   describe '#save_draft' do
@@ -41,6 +53,11 @@ RSpec.describe Skipper, type: :model do
       it 'has a value for `skip_me`' do
         expect(subject.skip_me).to eql 'Skipped 1'
       end
+
+      it 'sets `updated_at`' do
+        time = Time.now
+        expect(subject.updated_at).to be > time
+      end
     end
 
     context 'on update' do
@@ -87,6 +104,11 @@ RSpec.describe Skipper, type: :model do
         it 'creates a new draft' do
           expect { subject }.to change(Draftsman::Draft, :count).by(1)
         end
+
+        it 'has a newer `updated_at`' do
+          time = skipper.updated_at
+          expect(subject.updated_at).to be > time
+        end
       end
 
       describe 'changing back to initial state' do
@@ -123,10 +145,18 @@ RSpec.describe Skipper, type: :model do
         it 'destroys the draft' do
           expect { subject }.to change(Draftsman::Draft.where(:id => skipper.draft_id), :count).by(-1)
         end
+
+        it 'has a newer `updated_at`' do
+          time = skipper.updated_at
+          expect(subject.updated_at).to be > time
+        end
       end
 
       context 'with existing `create` draft' do
-        before { skipper.save_draft }
+        before do
+          skipper.save_draft
+          skipper.reload
+        end
 
         context 'with changes' do
           before do
@@ -169,6 +199,33 @@ RSpec.describe Skipper, type: :model do
           it "updates the draft's `name`" do
             expect(subject.draft.reify.name).to eql 'Sam'
           end
+
+          it 'has a newer `updated_at`' do
+            time = skipper.updated_at
+            expect(subject.updated_at).to be > time
+          end
+        end
+
+        context 'with changes to drafted attribute' do
+          before do
+            skipper.name = 'Sam'
+          end
+
+          it 'has a newer `updated_at`' do
+            time = skipper.updated_at
+            expect(subject.updated_at).to be > time
+          end
+        end
+
+        context 'with changes to skipped attribute' do
+          before do
+            skipper.skip_me = 'Skipped 2'
+          end
+
+          it 'has a newer `updated_at`' do
+            time = skipper.updated_at
+            expect(subject.updated_at).to be > time
+          end
         end
 
         context 'with no changes' do
@@ -203,6 +260,11 @@ RSpec.describe Skipper, type: :model do
           it "doesn't change the number of drafts" do
             expect { subject }.to_not change(Draftsman::Draft.where(:id => skipper.draft_id), :count)
           end
+
+          it 'has the original `updated_at`' do
+            time = skipper.updated_at
+            expect(subject.updated_at).to eq time
+          end
         end
       end
 
@@ -254,14 +316,16 @@ RSpec.describe Skipper, type: :model do
           it "updates the draft's `name`" do
             expect(subject.draft.reify.name).to eql 'Steve'
           end
+
+          it 'has the original `updated_at`' do
+            time = skipper.updated_at
+            expect(subject.updated_at).to eq time
+          end
         end
 
         context 'with changes to skipped attributes' do
           before do
             skipper.skip_me = 'Skip and save'
-            skipper.save_draft
-            skipper.reload
-            skipper.attributes = skipper.draft.reify.attributes
           end
 
           it 'is persisted' do
@@ -303,6 +367,11 @@ RSpec.describe Skipper, type: :model do
           it 'updates skipped attribute on draft' do
             expect(subject.draft.reify.skip_me).to eql 'Skip and save'
           end
+
+          it 'has a newer `updated_at`' do
+            time = skipper.updated_at
+            expect(subject.updated_at).to be > time
+          end
         end
 
         context 'with no changes' do
@@ -341,6 +410,11 @@ RSpec.describe Skipper, type: :model do
           it "does not update the draft's `name`" do
             expect(subject.draft.reify.name).to eql 'Sam'
           end
+
+          it 'has the original `updated_at`' do
+            time = skipper.updated_at
+            expect(subject.updated_at).to eq time
+          end
         end
       end
     end

data/spec/models/vanilla_spec.rb

@@ -5,6 +5,20 @@ describe Vanilla do
   let(:vanilla) { Vanilla.new(name: 'Bob') }
   it { should be_draftable }
 
+  describe '#object_attrs_for_draft_record' do
+    it 'contains column name' do
+      expect(vanilla.object_attrs_for_draft_record).to include 'name'
+    end
+
+    it 'contains column updated_at' do
+      expect(vanilla.object_attrs_for_draft_record).to include 'updated_at'
+    end
+
+    it 'contains column created_at' do
+      expect(vanilla.object_attrs_for_draft_record).to include 'created_at'
+    end
+  end
+
   describe '#save_draft' do
     context 'on create' do
       it 'is persisted' do
@@ -36,6 +50,18 @@ describe Vanilla do
         vanilla.save_draft
         expect(vanilla.name).to eql 'Bob'
       end
+
+      it 'sets `updated_at`' do
+        time = Time.now
+        vanilla.save_draft
+        expect(vanilla.updated_at).to be > time
+      end
+
+      it 'sets `created_at`' do
+        time = Time.now
+        vanilla.save_draft
+        expect(vanilla.created_at).to be > time
+      end
     end
 
     context 'on update' do
@@ -84,6 +110,12 @@ describe Vanilla do
           it 'creates a new draft' do
             expect { vanilla.save_draft }.to change(Draftsman::Draft, :count).by(1)
           end
+
+          it 'has the original `updated_at`' do
+            vanilla.save_draft
+            vanilla.reload
+            expect(vanilla.updated_at).to eq vanilla.created_at
+          end
         end
 
         describe 'changing back to initial state' do
@@ -123,6 +155,14 @@ describe Vanilla do
           it 'destroys the draft' do
             expect { vanilla.save_draft }.to change(Draftsman::Draft.where(id: vanilla.draft_id), :count).by(-1)
           end
+
+          it 'has the original `updated_at`' do
+            if activerecord_save_touch_option?
+              vanilla.save_draft
+              vanilla.reload
+              expect(vanilla.updated_at).to eq vanilla.created_at
+            end
+          end
         end
 
         context 'with existing `create` draft' do
@@ -176,6 +216,13 @@ describe Vanilla do
               vanilla.reload
               expect(vanilla.draft.create?).to eql true
             end
+
+            it 'has a new `updated_at`' do
+              time = vanilla.updated_at
+              vanilla.save_draft
+              vanilla.reload
+              expect(vanilla.updated_at).to be > time
+            end
           end # with changes
 
           context 'with no changes' do
@@ -217,6 +264,12 @@ describe Vanilla do
             it "doesn't change the number of drafts" do
               expect { vanilla.save_draft }.to_not change(Draftsman::Draft.where(id: vanilla.draft_id), :count)
             end
+
+            it 'has the original `updated_at`' do
+              vanilla.save_draft
+              vanilla.reload
+              expect(vanilla.updated_at).to eq vanilla.created_at
+            end
           end
         end # with no changes
 
@@ -275,6 +328,12 @@ describe Vanilla do
               vanilla.save_draft
               expect(vanilla.draft.update?).to eql true
             end
+
+            it 'has the original `updated_at`' do
+              vanilla.save_draft
+              vanilla.reload
+              expect(vanilla.updated_at).to eq vanilla.created_at
+            end
           end # with changes
 
           context 'with no changes' do
@@ -322,6 +381,12 @@ describe Vanilla do
               vanilla.reload
               expect(vanilla.draft.reify.name).to eql 'Sam'
             end
+
+            it 'has the original `updated_at`' do
+              vanilla.save_draft
+              vanilla.reload
+              expect(vanilla.updated_at).to eq vanilla.created_at
+            end
           end # with no changes
         end # with existing `update` draft
       end # with stashed drafted changes
@@ -374,6 +439,13 @@ describe Vanilla do
           it 'creates a new draft' do
             expect { vanilla.save_draft }.to change(Draftsman::Draft, :count).by(1)
           end
+
+          it 'has a new `updated_at`' do
+            time = vanilla.updated_at
+            vanilla.save_draft
+            vanilla.reload
+            expect(vanilla.updated_at).to be > time
+          end
         end
 
         describe 'changing back to initial state' do
@@ -413,6 +485,13 @@ describe Vanilla do
           it 'destroys the draft' do
             expect { vanilla.save_draft }.to change(Draftsman::Draft.where(id: vanilla.draft_id), :count).by(-1)
           end
+
+          it 'has a new `updated_at`' do
+            time = vanilla.updated_at
+            vanilla.save_draft
+            vanilla.reload
+            expect(vanilla.updated_at).to be > time
+          end
         end
 
         context 'with existing `create` draft' do
@@ -459,6 +538,13 @@ describe Vanilla do
               vanilla.save_draft
               expect(vanilla.draft.create?).to eql true
             end
+
+            it 'has a new `updated_at`' do
+              time = vanilla.updated_at
+              vanilla.save_draft
+              vanilla.reload
+              expect(vanilla.updated_at).to be > time
+            end
           end
 
           context 'with no changes' do
@@ -494,6 +580,11 @@ describe Vanilla do
             it "doesn't change the number of drafts" do
               expect { vanilla.save_draft }.to_not change(Draftsman::Draft.where(id: vanilla.draft_id), :count)
             end
+
+            it 'has the original `updated_at`' do
+              vanilla.save_draft
+              expect(vanilla.reload.updated_at).to eq vanilla.created_at
+            end
           end
         end
 
@@ -553,6 +644,13 @@ describe Vanilla do
               vanilla.reload
               expect(vanilla.draft.update?).to eql true
             end
+
+            it 'has a new `updated_at`' do
+              time = vanilla.updated_at
+              vanilla.save_draft
+              vanilla.reload
+              expect(vanilla.updated_at).to be > time
+            end
           end # with changes
 
           context 'with no changes' do
@@ -594,6 +692,13 @@ describe Vanilla do
               vanilla.save_draft
               expect(vanilla.draft.reify.name).to eql 'Sam'
             end
+
+            it 'does not update `updated_at`' do
+              time = vanilla.updated_at
+              vanilla.save_draft
+              vanilla.reload
+              expect(vanilla.updated_at).to eq time
+            end
           end # with no changes
         end # with existing `update` draft
       end # without stashed drafted changes

data/spec/models/whitelister_spec.rb

@@ -4,6 +4,18 @@ describe Whitelister do
   let(:whitelister) { Whitelister.new(name: 'Bob') }
   it { should be_draftable }
 
+  describe '#object_attrs_for_draft_record' do
+    before { whitelister.ignored = 'Meh.' }
+
+    it 'contains included column name' do
+      expect(whitelister.object_attrs_for_draft_record).to include 'name'
+    end
+
+    it 'does not include non-included column name' do
+      expect(whitelister.object_attrs_for_draft_record).to include 'name'
+    end
+  end
+
   describe '#save_draft' do
     # Not affected by this customization.
     context 'on create' do

data/spec/spec_helper.rb

@@ -40,8 +40,3 @@ RSpec.configure do |config|
 
   config.mock_with :rspec
 end
-
-#require 'rails/railtie'
-#require 'active_record'
-#
-#require 'draftsman'

data/spec/support/feature_detection.rb

@@ -0,0 +1,11 @@
+# Returns whether or not Rails test helpers recommend or require keyword
+# arguments for controller/request helpers.
+def request_test_helpers_require_keyword_args?
+  ActiveRecord::VERSION::STRING.to_f >= 5.0
+end
+
+# Returns whether or not the current version of ActiveRecord supports the
+# `touch` option for `#save`.
+def activerecord_save_touch_option?
+  ActiveRecord::VERSION::STRING.to_f >= 5.0
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draftsman
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Chris Peters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -50,20 +50,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,9 @@ files:
 - README.md
 - Rakefile
 - draftsman.gemspec
+- gemfiles/ar_4_2.gemfile
+- gemfiles/ar_5_0.gemfile
+- gemfiles/ar_5_1.gemfile
 - lib/draftsman.rb
 - lib/draftsman/attributes_serialization.rb
 - lib/draftsman/config.rb
@@ -204,6 +207,7 @@ files:
 - spec/models/vanilla_spec.rb
 - spec/models/whitelister_spec.rb
 - spec/spec_helper.rb
+- spec/support/feature_detection.rb
 homepage: https://github.com/liveeditor/draftsman
 licenses:
 - MIT
@@ -224,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Create draft versions of your database records.
@@ -293,3 +297,4 @@ test_files:
 - spec/models/vanilla_spec.rb
 - spec/models/whitelister_spec.rb
 - spec/spec_helper.rb
+- spec/support/feature_detection.rb