draftsman 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ecc44a2da54f76db70765c3faf9e515c3aba215
-  data.tar.gz: e54643b21e29a16872f83ca756592c2901220db7
+  metadata.gz: 9fe742f1e72bfd060d5d737fb6de9ee7cec1119f
+  data.tar.gz: f846ec1b196415f5f33609d2a8516ca2fc087294
 SHA512:
-  metadata.gz: 5ec70e969b6bf40a9a8f69c87e504d2cd1fd0aa215757f022798b53d9d6d55ecc46d4282459058c277467d0eb47f397470432ab7c08e4d0641c7baf21396ec22
-  data.tar.gz: 6bcef513664f7de84d96ec42996a8d4130a37794446b0a8ff8df39866fc556d6dbeb24b2d2f8543c67bd9fdaddb9daadb177c2df475bed0ed7ea6af74a484171
+  metadata.gz: a355e08da8ff267cc30be5b6a8bfa7dab673ca84bbda56997bd34dbc574606735b7ef312155cfd840a9ecc42e31513f352c98ef7f682888c4d316c8efaa854c8
+  data.tar.gz: 8f0d1d623df2fa66e332e1d715afa0c80a25f1d5218c6816c6a2110e283bef31587319dafec28f491217e8d4856b23bd44c8983c25f30d453475e7a1dc8d28b8

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
-## v0.2 - June 3, 2014
+## v0.2.1 - June 28, 2014
+
+-  Commit [dbc6c83abb](https://github.com/live-editor/draftsman/commit/dbc6c83abbea5211f67ad883f4a2d18a9f5ac181) - Reifying a record that was drafted for destruction uses data from a drafted update before that if that's what happened.
+
+## v0.2.0 - June 3, 2014
 
 -  Fixed [#4](https://github.com/live-editor/draftsman/issues/4) - Added `referenced_table_name` argument to scopes.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    draftsman (0.2)
+    draftsman (0.2.1)
       activerecord (>= 3.0, < 5.0)
 
 GEM

data/README.md

@@ -1,4 +1,4 @@
-# Draftsman v0.2 (alpha)
+# Draftsman v0.2.1 (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.
@@ -50,13 +50,13 @@ Works well with Rails, Sinatra, or any other application that depends on ActiveR
 Add Draftsman to your `Gemfile`.
 
 ```ruby
-gem 'draftsman', '0.2'
+gem 'draftsman', '0.2.1'
 ```
 
 Or if you want to grab the latest from `master`:
 
 ```ruby
-gem 'draftsman', :github => 'minimalorange/draftsman'
+gem 'draftsman', :github => 'live-editor/draftsman'
 ```
 
 Generate a migration which will add a `drafts` table to your database.
@@ -92,7 +92,7 @@ ActiveRecord Extension, steps for setting up your app with Draftsman will look s
 Add Draftsman to your `Gemfile`.
 
 ```ruby
-gem 'draftsman', :github => 'minimalorange/draftsman'
+gem 'draftsman', :github => 'live-editor/draftsman'
 ```
 
 Generate a migration to add a `drafts` table to your database.
@@ -516,6 +516,6 @@ Draftsman is released under the [MIT License][9].
 [4]: http://railscasts.com/episodes/416-form-objects
 [5]: http://www.sinatrarb.com/
 [6]: https://github.com/janko-m/sinatra-activerecord
-[7]: https://raw.github.com/minimalorange/draftsman/master/lib/generators/draftsman/templates/create_drafts.rb
+[7]: https://raw.github.com/live-editor/draftsman/master/lib/generators/draftsman/templates/create_drafts.rb
 [8]: http://www.sinatrarb.com/intro.html#Modular%20vs.%20Classic%20Style
 [9]: http://www.opensource.org/licenses/MIT

data/lib/draftsman/draft.rb

@@ -186,7 +186,9 @@ class Draftsman::Draft < ActiveRecord::Base
   #     `@category = @category.reify if @category.draft?`
   def reify
     without_identity_map do
-      unless self.object.nil?
+      if !self.previous_draft.nil?
+        reify_previous_draft.reify
+      elsif !self.object.nil?
         # This appears to be necessary if for some reason the draft's model hasn't been loaded (such as when done in the console).
         require self.item_type.underscore
 
@@ -228,6 +230,8 @@ class Draftsman::Draft < ActiveRecord::Base
         # Restore previous draft if one was stashed away
         if self.previous_draft.present?
           prev_draft = reify_previous_draft
+          prev_draft.save!
+
           self.item.class.where(:id => self.item).update_all "#{self.item.class.draft_association_name}_id".to_sym => prev_draft.id,
                                                              self.item.class.trashed_at_attribute_name => nil
         else
@@ -261,7 +265,6 @@ private
       end
     end
 
-    draft.save!
     draft
   end
 

data/lib/draftsman/version.rb

@@ -1,3 +1,3 @@
 module Draftsman
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/models/draft_spec.rb

@@ -294,4 +294,81 @@ describe Draftsman::Draft do
       end
     end
   end
+
+  describe :reify do
+    subject { trashable.draft.reify }
+
+    context 'with `create` draft' do
+      before { trashable.draft_creation }
+      its(:title) { should eql trashable.title }
+
+      context 'updated create' do
+        before do
+          trashable.name = 'Sam'
+          trashable.draft_update
+        end
+
+        its(:name) { should eql 'Sam' }
+        its(:title) { should be_nil }
+      end
+    end
+
+    context 'with `update` draft' do
+      before do
+        trashable.save!
+        trashable.name = 'Sam'
+        trashable.title = 'My Title'
+        trashable.draft_update
+      end
+
+      its(:name) { should eql 'Sam' }
+      its(:title) { should eql 'My Title' }
+
+      context 'updating the update' do
+        before do
+          trashable.title = nil
+          trashable.draft_update
+        end
+
+        its(:name) { should eql 'Sam' }
+        its(:title) { should be_nil }
+      end
+    end
+
+    context 'with `destroy` draft' do
+      context 'without previous draft' do
+        before do
+          trashable.save!
+          trashable.draft_destroy
+        end
+
+        its(:name) { should eql 'Bob' }
+        its(:title) { should be_nil }
+      end
+
+      context 'with previous `create` draft' do
+        before do
+          trashable.draft_creation
+          trashable.draft_destroy
+        end
+
+        its(:name) { should eql 'Bob' }
+        its(:title) { should be_nil }
+      end
+
+      context 'with previous `update` draft' do
+        before do
+          trashable.save!
+          trashable.name = 'Sam'
+          trashable.title = 'My Title'
+          trashable.draft_update
+          # Typically, 2 draft operations won't happen in the same request, so reload before draft-destroying.
+          trashable.reload.draft_destroy
+        end
+
+        its(:name) { should eql 'Sam' }
+        its(:title) { should eql 'My Title' }
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draftsman
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Chris Peters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord