drafter 0.3.0 → 0.3.1

data/README.rdoc

@@ -3,7 +3,14 @@
 This is an experimental gem designed to version ActiveRecord objects with
 attached CarrierWave uploads.
 
-Don't use it yet, it's not ready for prime time.
+It's still in development, so don't use it unless you're ready for that.
+
+So far, it can correctly handle the following cases:
+
+* drafts for new records
+* drafts for saved records
+* drafts for new and saved records, with attached CarrierWave uploads
+* drafts for new and saved records, properly saving drafts for sub-objects in has_many associations, with or without attached CarrierWave uploads.
 
 == Contributing to drafter
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/drafter.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "drafter"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["futurechimp"]

data/lib/drafter.rb

@@ -39,9 +39,9 @@ module Drafter
       include Subdrafts
     end
 
-    def approves_drafts_for(*associations)
-      cattr_accessor :approves_drafts_for
-      self.approves_drafts_for = associations
+    def saves_subdrafts_for(*associations)
+      cattr_accessor :saves_subdrafts_for
+      self.saves_subdrafts_for = associations
     end
   end
 

data/lib/drafter/apply.rb

@@ -82,7 +82,7 @@ module Drafter
     #
     def restore_subdrafts
       draft.subdrafts.each_with_index do |subdraft, index|
-        inflated_object = subdraft.build_draftable
+        inflated_object = subdraft.inflate
         self.send(subdraft.parent_association_name.to_sym) << inflated_object
         # THE HACK
         if inflated_object.class.polymorphic_as

data/lib/drafter/draft.rb

@@ -36,7 +36,7 @@ class Draft < ActiveRecord::Base
   # contain the draft content, saving the draftable, and destroying the draft.
   #
   def approve!
-  	draftable = build_draftable
+  	draftable = inflate
   	draftable.save!
   	self.destroy
   	draftable
@@ -65,7 +65,7 @@ class Draft < ActiveRecord::Base
   #
 	# @return the existing draftable object, or a new one of the proper
 	# 	type, with attributes and files hanging off it.
-	def build_draftable
+	def inflate
     draftabl = draftable.nil? ? self.draftable_type.constantize.new(:draft => self) : draftable
     draftabl.draft = self # this should absolutely *not* be necessary, there's an STI bug in AR.
     draftabl.apply_draft

data/lib/drafter/id_hash.rb

@@ -9,7 +9,7 @@ module IdHash
   # identify the object by its :id; other times, you're dealing with an object
   # that only has a Draft but no actual object identity, in which case you'll
   # want to retrieve the Draft object by its :draft_id, and call
-  # @draft.build_draftable on that.
+  # @draft.inflate on that.
   #
   # @return [Hash] a hash with either :draft_id => this object's draft's id,
   #   or :id => this object's id.

data/lib/drafter/subdrafts.rb

@@ -3,7 +3,7 @@ module Subdrafts
   private
 
     def create_subdrafts
-      relations = self.class.approves_drafts_for
+      relations = self.class.saves_subdrafts_for
       unless relations.empty?
         relations.each do |relation|
           create_subdrafts_for(relation)

data/test/drafter/test_apply.rb

@@ -16,7 +16,7 @@ class TestCreation < Minitest::Unit::TestCase
 
       describe "with no comments" do
         before do
-          @article = @draft.build_draftable
+          @article = @draft.inflate
           @article.apply_draft
         end
 
@@ -28,10 +28,10 @@ class TestCreation < Minitest::Unit::TestCase
 
       describe "with comments" do
         before do
-          @article = @draft.build_draftable
+          @article = @draft.inflate
           @article.comments.build(:text => "I'm a comment on a draft article")
           @draft = @article.save_draft
-          @article = @draft.build_draftable
+          @article = @draft.inflate
         end
 
         it "should restore the article, unsaved" do

data/test/drafter/test_draft.rb

@@ -159,7 +159,7 @@ class TestDraft < Minitest::Unit::TestCase
 		describe "for an unsaved object" do
 			before do
 				@draft = @article.save_draft
-				@article = @draft.build_draftable
+				@article = @draft.inflate
 			end
 
 			it "should build the object's attributes properly" do
@@ -187,7 +187,7 @@ class TestDraft < Minitest::Unit::TestCase
 				before do
 	        @article.comments << Comment.new(:text => "comment 3")
 	        @draft = @article.save_draft
-	        @article = @draft.build_draftable
+	        @article = @draft.inflate
 				end
 
 				it "should build the object's attributes properly" do
@@ -216,7 +216,7 @@ class TestDraft < Minitest::Unit::TestCase
 					before do
 		        @article.text = "ChChChanges"
 		        @draft = @article.save_draft
-		        @article = @draft.build_draftable
+		        @article = @draft.inflate
 					end
 					it "should build the object's attributes properly" do
 						assert_equal("ChChChanges", @article.text)
@@ -247,7 +247,7 @@ class TestDraft < Minitest::Unit::TestCase
 				@article.save!
 				@article.text = "flappa flap flap"
 				@draft = @article.save_draft
-				@article = @draft.build_draftable
+				@article = @draft.inflate
 			end
 
 			it "should build the object's attributes properly" do

data/test/drafter/test_subdrafts.rb

@@ -32,22 +32,22 @@ class TestSubdrafts < Minitest::Unit::TestCase
       end
 
       it "should serialize the comment draft fields properly" do
-        assert @comment_draft.build_draftable.is_a? Comment
+        assert @comment_draft.inflate.is_a? Comment
         assert_equal("What a great article!", @comment_draft.text)
       end
 
       it "should save a draft upload for the comment's uploaded file" do
         assert_equal(@draft_upload_count + 1, DraftUpload.count)
-        assert_equal(file_upload.size, File.new(@comment_draft.build_draftable.upload.path).size)
+        assert_equal(file_upload.size, File.new(@comment_draft.inflate.upload.path).size)
       end
 
       it "should correctly associate the comment draft with its parent" do
         assert_equal(@article_draft, @comment_draft.parent)
       end
 
-      describe "after calling build_draftable on a draft" do
+      describe "after calling inflate on a draft" do
         before do
-          @article = @draft.build_draftable
+          @article = @draft.inflate
         end
 
         it "should still have 1 comment on it" do
@@ -56,7 +56,7 @@ class TestSubdrafts < Minitest::Unit::TestCase
 
         describe "restoring the draft" do
           it "should work" do
-            assert (@article = @draft.build_draftable).is_a? Article
+            assert (@article = @draft.inflate).is_a? Article
           end
         end
 
@@ -64,7 +64,7 @@ class TestSubdrafts < Minitest::Unit::TestCase
           before do
             @article.comments << Comment.new(:text => "SuperComment")
             @draft = @article.save_draft
-            @article = @draft.build_draftable
+            @article = @draft.inflate
             @article.comments << Comment.new(:text => "AnotherComment")
           end
 
@@ -93,7 +93,7 @@ class TestSubdrafts < Minitest::Unit::TestCase
 
       describe "restoring the like subdraft to the article" do
         before do
-          @article = @article_draft.build_draftable
+          @article = @article_draft.inflate
         end
 
         it "should work" do
@@ -140,7 +140,7 @@ class TestSubdrafts < Minitest::Unit::TestCase
 
       describe "restoring the like subdraft to the article" do
         before do
-          @article = @article_draft.build_draftable
+          @article = @article_draft.inflate
         end
 
         it "should work, using the parent class association" do

data/test/support/models.rb

@@ -3,7 +3,7 @@
 # A draftable article class
 class Article < ActiveRecord::Base
 	draftable
-  approves_drafts_for :comments
+  saves_subdrafts_for :comments
 
   has_many :comments
   has_many :likes, :as => :likeable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drafter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2164530720 !ruby/object:Gem::Requirement
+  requirement: &2168697080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164530720
+  version_requirements: *2168697080
 - !ruby/object:Gem::Dependency
   name: diffy
-  requirement: &2164525340 !ruby/object:Gem::Requirement
+  requirement: &2168689840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164525340
+  version_requirements: *2168689840
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2164524700 !ruby/object:Gem::Requirement
+  requirement: &2168688720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164524700
+  version_requirements: *2168688720
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2164524100 !ruby/object:Gem::Requirement
+  requirement: &2168687540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164524100
+  version_requirements: *2168687540
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &2164523500 !ruby/object:Gem::Requirement
+  requirement: &2168686500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164523500
+  version_requirements: *2168686500
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2164522840 !ruby/object:Gem::Requirement
+  requirement: &2168685820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164522840
+  version_requirements: *2168685820
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164522100 !ruby/object:Gem::Requirement
+  requirement: &2168684900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2164522100
+  version_requirements: *2168684900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2164521300 !ruby/object:Gem::Requirement
+  requirement: &2168684240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2164521300
+  version_requirements: *2168684240
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2164520000 !ruby/object:Gem::Requirement
+  requirement: &2168683540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164520000
+  version_requirements: *2168683540
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &2164518760 !ruby/object:Gem::Requirement
+  requirement: &2168682640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164518760
+  version_requirements: *2168682640
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &2164517880 !ruby/object:Gem::Requirement
+  requirement: &2168676860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164517880
+  version_requirements: *2168676860
 - !ruby/object:Gem::Dependency
   name: minitest-rails-shoulda
-  requirement: &2164512320 !ruby/object:Gem::Requirement
+  requirement: &2168676200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164512320
+  version_requirements: *2168676200
 description: A
 email: dave.hrycyszyn@headlondon.com
 executables: []
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3960351796204955300
+      hash: 1334542519238778841
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: