draftsman 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b38f2627f56beadc10e01b0a07b9484ba4fd9d92
-  data.tar.gz: 98cefed36490f43ce3416ede00b2bfb1ef11b28d
+  metadata.gz: b6b70094474d8a0757c0b6dbf2eda0b44ad23a6c
+  data.tar.gz: efb35b92ed79310bf131ca6a662b65350500dc47
 SHA512:
-  metadata.gz: 60d3bbe5dfb13262fc1075dc987726aaa671affda4c467360353d609722206ed86fadf0fff7c4a3351b4d4593a3cebf39f45e1fb4c9920ce30661d1e2d7d5dd5
-  data.tar.gz: 3f8c96b231067ad01510a80a4c973ed594e7fc5f5d4069b2fa511774cae571d368becbf730e54c4a4f771166fef2513498febc64db05135340bfdaa2c831e61c
+  metadata.gz: 0387972bd595b8b5229f7ed2b72aa718b5a15245c1942b2197ef7a600d6a29c4e8c8d54af8ccb80c48371f0e927d5a52539fc9ec82be9715bcd79a2deeb4f473
+  data.tar.gz: 33a3fcf0f5abb3953231993d44edafed69efedd2379db307bde1a98ea1a1c65149275a5704af867cb16fe49c97969a0616af6c8851356e6ac8229f5ff663d374

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 0.3.5 - July 12, 2015
+
+- [@npafundi](https://github.com/npafundi)
+  [Fixed](https://github.com/liveeditor/draftsman/pull/29)
+  [#28](https://github.com/liveeditor/draftsman/issues/28) -
+  Skipped attributes aren't updated if a model has a draft
+
 ## 0.3.4 - May 21, 2015
 
 - [@npafundi](https://github.com/npafundi)

data/README.md

@@ -1,4 +1,4 @@
-# Draftsman v0.3.4 (alpha)
+# Draftsman v0.3.5 (alpha)
 
 Draftsman is a Ruby gem that lets you create draft versions of your database records. If you're developing a system in
 need of simple drafts or a publishing approval queue, then Draftsman just might be what you need.

data/lib/draftsman/model.rb

@@ -313,6 +313,7 @@ module Draftsman
             if send(self.class.draft_association_name).present?
               data[:object_changes] = changes_for_draftsman if track_object_changes_for_draft?
               send(self.class.draft_association_name).update_attributes data
+              update_skipped_attributes
             # If there's not draft, create an update draft.
             else
               data[:event]          = 'update'

data/lib/draftsman/version.rb

@@ -1,3 +1,3 @@
 module Draftsman
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/spec/models/skipper_spec.rb

@@ -215,7 +215,7 @@ describe Skipper do
         skipper.attributes = skipper.draft.reify.attributes
       end
 
-      context 'with changes' do
+      context 'with changes to drafted attribute' do
         before { skipper.name = 'Steve' }
 
         it 'is persisted' do
@@ -255,6 +255,55 @@ describe Skipper do
         end
       end
 
+      context 'with changes to skipped attributes' do
+        before do
+          skipper.skip_me = 'Skip and save'
+          skipper.draft_update
+          skipper.reload
+          skipper.attributes = skipper.draft.reify.attributes
+        end
+
+        it 'is persisted' do
+          expect(subject).to be_persisted
+        end
+
+        it 'is a draft' do
+          expect(subject.draft?).to eql true
+        end
+
+        it 'has a `draft_id`' do
+          expect(subject.draft_id).to be_present
+        end
+
+        it 'has a `draft`' do
+          expect(subject.draft).to be_present
+        end
+
+        it 'has an `update` draft' do
+          expect(subject.draft.update?).to eql true
+        end
+
+        it 'has the original `name`' do
+          expect(subject.name).to eql 'Bob'
+        end
+
+        it "updates skipped attribute's value" do
+          expect(subject.skip_me).to eql 'Skip and save'
+        end
+
+        it 'updates the existing draft' do
+          expect { subject }.to_not change(Draftsman::Draft.where(:id => skipper.draft_id), :count)
+        end
+
+        it "keeps the draft's `name`" do
+          expect(subject.draft.reify.name).to eql 'Sam'
+        end
+
+        it 'updates skipped attribute on draft' do
+          expect(subject.draft.reify.skip_me).to eql 'Skip and save'
+        end
+      end
+
       context 'with no changes' do
         it 'is persisted' do
           expect(subject).to be_persisted

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draftsman
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Chris Peters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord