draftsman 0.5.1 → 0.6.0

data/spec/models/talkative_spec.rb

@@ -1,17 +1,14 @@
 require 'spec_helper'
 
-# A Talkative has a call to `has_drafts` and all nine callbacks defined:
+# A Talkative has a call to `has_drafts` and all six callbacks defined:
 #
-# -  `before_draft_creation`
-# -  `around_draft_creation`
-# -  `after_draft_creation`
-# -  `before_draft_update`
-# -  `around_draft_update`
-# -  `after_draft_update`
+# -  `before_save_draft`
+# -  `around_save_draft`
+# -  `after_save_draft`
 # -  `before_draft_destruction`
 # -  `around_draft_destruction`
 # -  `after_draft_destruction`
-RSpec.describe Talkative do
+RSpec.describe Talkative, type: :model do
   let(:talkative) { subject }
 
   describe '.draftable?' do
@@ -20,164 +17,166 @@ RSpec.describe Talkative do
     end
   end
 
-  describe '#draft_creation' do
-    before { talkative.draft_creation }
+  describe '#save_draft' do
+    context 'on create' do
+      before { talkative.save_draft }
 
-    describe '`before_draft_creation` callback' do
-      it 'changes `before_comment` attribute' do
-        expect(talkative.before_comment).to eql "I changed before creation"
-      end
+      describe '`before_save_draft` callback' do
+        it 'changes `before_comment` attribute' do
+          expect(talkative.before_comment).to eql 'I changed before save'
+        end
 
-      it 'persists updated `before_comment` attribute to draft' do
-        talkative.reload
-        expect(talkative.draft.reify.before_comment).to eql "I changed before creation"
+        it 'persists updated `before_comment` attribute to draft' do
+          talkative.reload
+          expect(talkative.draft.reify.before_comment).to eql 'I changed before save'
+        end
       end
-    end
 
-    describe 'around_draft_creation callback' do
-      it 'changes `around_early_comment` attribute (before yield)' do
-        expect(talkative.around_early_comment).to eql "I changed around creation (before yield)"
-      end
+      describe '`around_save_draft` callback' do
+        it 'changes `around_early_comment` attribute (before yield)' do
+          expect(talkative.around_early_comment).to eql 'I changed around save (before yield)'
+        end
 
-      it 'persists updated `around_early_comment` attribute to draft' do
-        talkative.reload
-        expect(talkative.draft.reify.around_late_comment).to be_nil
-      end
+        it 'does not persist updated `around_early_comment` attribute to draft' do
+          talkative.reload
+          expect(talkative.draft.reify.around_late_comment).to be_nil
+        end
 
-      it 'changes `around_late_comment` attribute (after yield)' do
-        expect(talkative.around_late_comment).to eql "I changed around creation (after yield)"
-      end
+        it 'changes `around_late_comment` attribute (after yield)' do
+          expect(talkative.around_late_comment).to eql 'I changed around save (after yield)'
+        end
 
-      it 'does not persist updated `around_late_comment` attribute' do
-        talkative.reload
-        expect(talkative.around_late_comment).to be_nil
-      end
+        it 'does not persist updated `around_late_comment` attribute' do
+          talkative.reload
+          expect(talkative.around_late_comment).to be_nil
+        end
 
-      it 'does not persist updated `around_late_comment` attribute to draft' do
-        talkative.reload
-        expect(talkative.draft.reify.around_late_comment).to be_nil
+        it 'does not persist updated `around_late_comment` attribute to draft' do
+          talkative.reload
+          expect(talkative.draft.reify.around_late_comment).to be_nil
+        end
       end
-    end
 
-    describe '`after_draft_creation` callback' do
-      it 'changes `after_comment` attribute' do
-        expect(talkative.after_comment).to eql "I changed after creation"
-      end
+      describe '`after_save_draft` callback' do
+        it 'changes `after_comment` attribute' do
+          expect(talkative.after_comment).to eql 'I changed after save'
+        end
 
-      it 'does not persist updated `after_comment` attribute' do
-        talkative.reload
-        expect(talkative.after_comment).to be_nil
-      end
+        it 'does not persist updated `after_comment` attribute' do
+          talkative.reload
+          expect(talkative.after_comment).to be_nil
+        end
 
-      it 'does not persist updated `after_comment` attribute to draft' do
-        talkative.reload
-        expect(talkative.draft.reify.after_comment).to be_nil
+        it 'does not persist updated `after_comment` attribute to draft' do
+          talkative.reload
+          expect(talkative.draft.reify.after_comment).to be_nil
+        end
       end
     end
-  end
 
-  describe '#draft_update' do
-    before do
-      talkative.draft_creation
-      talkative.draft_update
-    end
-
-    describe '`before_draft_update` callback' do
-      it 'changes `before_comment` attribute' do
-        expect(talkative.before_comment).to eql "I changed before update"
+    context 'on update' do
+      before do
+        talkative.save
+        talkative.save_draft
       end
 
-      it 'persists updated `before_comment` attribute to draft' do
-        talkative.reload
-        expect(talkative.draft.reify.before_comment).to eql "I changed before update"
-      end
-    end
+      describe '`before_save_draft` callback' do
+        it 'changes `before_comment` attribute' do
+          expect(talkative.before_comment).to eql 'I changed before save'
+        end
 
-    describe '`around_draft_update` callback' do
-      it 'changes `around_early_comment` attribute (before yield)' do
-        expect(talkative.around_early_comment).to eql "I changed around update (before yield)"
+        it 'persists updated `before_comment` attribute to draft' do
+          talkative.reload
+          expect(talkative.draft.reify.before_comment).to eql 'I changed before save'
+        end
       end
 
-      it 'persists updated `around_early_comment` attribute' do
-        talkative.reload
-        expect(talkative.around_early_comment).to eql "I changed around update (before yield)"
-      end
+      describe '`around_save_draft` callback' do
+        it 'changes `around_early_comment` attribute (before yield)' do
+          expect(talkative.around_early_comment).to eql 'I changed around save (before yield)'
+        end
 
-      it 'persists updated `around_early_comment` attribute to draft' do
-        talkative.reload
-        expect(talkative.draft.reify.around_early_comment).to eql "I changed around update (before yield)"
-      end
+        it 'does not persist updated `around_early_comment` attribute' do
+          talkative.reload
+          expect(talkative.around_early_comment).to be_nil
+        end
 
-      it 'changes `around_late_comment` attribute (after yield)' do
-        expect(talkative.around_late_comment).to eql "I changed around update (after yield)"
-      end
+        it 'persists updated `around_early_comment` attribute to draft' do
+          talkative.reload
+          expect(talkative.draft.reify.around_early_comment).to eql 'I changed around save (before yield)'
+        end
 
-      it 'does not persist updated `around_late_comment` attribute' do
-        talkative.reload
-        expect(talkative.around_late_comment).to eql 'I changed around creation (after yield)'
-      end
+        it 'changes `around_late_comment` attribute (after yield)' do
+          expect(talkative.around_late_comment).to eql 'I changed around save (after yield)'
+        end
 
-      it 'does not persist updated `around_late_comment` attribute to draft' do
-        talkative.reload
-        expect(talkative.draft.reify.around_late_comment).to eql 'I changed around creation (after yield)'
-      end
-    end
+        it 'does not persist updated `around_late_comment` attribute' do
+          talkative.reload
+          expect(talkative.around_late_comment).to be_nil
+        end
 
-    describe 'after callback' do
-      it 'changes `after_comment` attribute' do
-        expect(talkative.after_comment).to eql "I changed after update"
+        it 'does not persist updated `around_late_comment` attribute to draft' do
+          talkative.reload
+          expect(talkative.draft.reify.around_late_comment).to be_nil
+        end
       end
 
-      it 'does not persist updated `after_comment` attribute' do
-        talkative.reload
-        expect(talkative.after_comment).to eql 'I changed after creation'
-      end
+      describe 'after callback' do
+        it 'changes `after_comment` attribute' do
+          expect(talkative.after_comment).to eql 'I changed after save'
+        end
 
-      it 'does not persist updated `after_comment` attribute to draft' do
-        talkative.reload
-        expect(talkative.draft.reify.after_comment).to eql 'I changed after creation'
+        it 'does not persist updated `after_comment` attribute' do
+          talkative.reload
+          expect(talkative.after_comment).to be_nil
+        end
+
+        it 'does not persist updated `after_comment` attribute to draft' do
+          talkative.reload
+          expect(talkative.draft.reify.after_comment).to be_nil
+        end
       end
     end
   end
 
   describe '#draft_destruction' do
     before do
-      talkative.draft_creation
+      talkative.save_draft
       talkative.draft_destruction
     end
 
     describe '`before_draft_destruction` callback' do
       it 'changes `before_comment` attribute' do
-        expect(talkative.before_comment).to eql "I changed before destroy"
+        expect(talkative.before_comment).to eql 'I changed before destroy'
       end
 
       it 'does not persist updated `before_comment` attribute' do
         talkative.reload
-        expect(talkative.before_comment).to eql "I changed before creation"
+        expect(talkative.before_comment).to eql 'I changed before save'
       end
 
       it 'does not persist updated `before_comment` attribute to draft' do
         talkative.reload
-        expect(talkative.draft.reify.before_comment).to eql "I changed before creation"
+        expect(talkative.draft.reify.before_comment).to eql 'I changed before save'
       end
     end
 
     describe '`around_draft_destruction` callback' do
       it 'changes `around_early_comment` attribute (before yield)' do
-        expect(talkative.around_early_comment).to eql "I changed around destroy (before yield)"
+        expect(talkative.around_early_comment).to eql 'I changed around destroy (before yield)'
       end
 
       it 'does not persist `around_early_comment` attribute (before yield)' do
-        expect(talkative.around_early_comment).to eql "I changed around destroy (before yield)"
+        expect(talkative.around_early_comment).to eql 'I changed around destroy (before yield)'
       end
 
       it 'does not persist updated `around_early_comment` attribute to draft' do
         talkative.reload
-        expect(talkative.draft.reify.around_early_comment).to eql "I changed around creation (before yield)"
+        expect(talkative.draft.reify.around_early_comment).to eql 'I changed around save (before yield)'
       end
 
       it 'changes `around_late_comment` attribute (after yield)' do
-        expect(talkative.around_late_comment).to eql "I changed around destroy (after yield)"
+        expect(talkative.around_late_comment).to eql 'I changed around destroy (after yield)'
       end
 
       it 'does not persist updated `around_late_comment` attribute' do
@@ -193,21 +192,21 @@ RSpec.describe Talkative do
 
     describe '`after_draft_destruction` callback' do
       it 'changes `before_comment` attribute' do
-        expect(talkative.before_comment).to eql "I changed before destroy"
+        expect(talkative.before_comment).to eql 'I changed before destroy'
       end
 
       it 'does not persist updated `before_comment` attribute' do
         talkative.reload
-        expect(talkative.before_comment).to eql 'I changed before creation'
+        expect(talkative.before_comment).to eql 'I changed before save'
       end
 
       it 'does not persist updated `before_comment` attribute to draft' do
         talkative.reload
-        expect(talkative.draft.reify.before_comment).to eql 'I changed before creation'
+        expect(talkative.draft.reify.before_comment).to eql 'I changed before save'
       end
 
       it 'changes `after_comment` attribute' do
-        expect(talkative.after_comment).to eql "I changed after destroy"
+        expect(talkative.after_comment).to eql 'I changed after destroy'
       end
 
       it 'does not persist updated `after_comment` attribute' do

data/spec/models/trashable_spec.rb

@@ -12,16 +12,12 @@ describe Trashable do
   end
 
   # Not affected by this customization
-  describe '#draft_creation' do
-  end
-
-  # Not affected by this customization
-  describe '#draft_update' do
+  describe '#save_draft' do
   end
 
   describe '#draft_destruction' do
     context 'with `:create` draft' do
-      before { trashable.draft_creation }
+      before { trashable.save_draft }
       subject { trashable.draft_destruction; return trashable }
 
       it 'is persisted' do
@@ -83,7 +79,7 @@ describe Trashable do
         trashable.published_at = Time.now
         trashable.save!
         trashable.name = 'Sam'
-        trashable.draft_update
+        trashable.save_draft
       end
 
       subject { trashable.draft_destruction; return trashable.reload }
@@ -200,9 +196,9 @@ describe Trashable do
   end
 
   describe 'scopes' do
-    let!(:drafted_trashable)   { trashable.draft_creation; return trashable }
-    let!(:published_trashable) { Trashable.create :name => 'Jane', :published_at => Time.now }
-    let!(:trashed_trashable)   { Trashable.create :name => 'Ralph' }
+    let!(:drafted_trashable)   { trashable.save_draft; return trashable }
+    let!(:published_trashable) { Trashable.create(name: 'Jane', published_at: Time.now) }
+    let!(:trashed_trashable)   { Trashable.create(name: 'Ralph') }
 
     # Not affected by this customization
     describe '.drafted' do