drafter 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/drafter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "drafter"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["futurechimp"]
-  s.date = "2012-08-21"
+  s.date = "2012-08-22"
   s.description = "A"
   s.email = "dave.hrycyszyn@headlondon.com"
   s.extra_rdoc_files = [

data/lib/drafter/creation.rb

@@ -14,10 +14,15 @@ module Drafter
     def save_draft
       if self.valid?
         attrs = self.attributes
-        uploads = build_draft_uploads(attrs)
-        self.build_draft(:data => attrs)
+        if self.draft
+          draft.data = attrs
+        else
+          self.build_draft(:data => attrs)
+        end
+        # https://github.com/rails/rails/issues/617
+        draft.draftable_type = self.class.to_s
         self.draft.save!
-        self.draft.draft_uploads << uploads
+        uploads = build_draft_uploads(attrs)
         self.draft
       end
     end
@@ -33,7 +38,7 @@ module Drafter
         draft_uploads = []
         attrs.keys.each do |key|
           if self.send(key).is_a?(CarrierWave::Uploader::Base)
-            draft_uploads << build_draft_upload(key)
+            self.draft.draft_uploads << build_draft_upload(key)
           end
         end
         draft_uploads
@@ -49,8 +54,11 @@ module Drafter
       def build_draft_upload(key)
         cw_uploader = self.send(key)
         file = File.new(cw_uploader.file.path) if cw_uploader.file
-        draft_upload = DraftUpload.new(
-          :file_data => file, :draftable_mount_column => key)
+        existing_upload = self.draft.draft_uploads.where(:draftable_mount_column => key).first
+        draft_upload = existing_upload.nil? ? DraftUpload.new : existing_upload
+        draft_upload.file_data = file
+        draft_upload.draftable_mount_column = key
+        draft_upload
       end
 
   end

data/test/drafter/test_creation.rb

@@ -39,6 +39,30 @@ class TestCreation < Minitest::Unit::TestCase
 				assert_equal(1, @draft.draft_uploads.length)
 				assert_equal(DraftUpload.last, @draft.draft_uploads.first)
 			end
+
+			describe "a second time" do
+				before do
+					@article_count = Article.count
+					@draft_count = Draft.count
+					@draft_upload_count = DraftUpload.count
+					@article.text = "updated text"
+					@article.upload = file_upload("bar.txt")
+					@draft = @article.save_draft
+				end
+
+				it "should not create a new Article" do
+					assert_equal(@article_count, Article.count)
+				end
+
+				it "should update the Draft in place" do
+					assert_equal(@draft_count, Draft.count)
+				end
+
+				it "should update the DraftUpload in place" do
+					assert_equal(@draft_upload_count, DraftUpload.count)
+				end
+
+			end
 		end
 
 		describe "an existing draftable article" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drafter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000Z
+date: 2012-08-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2172805820 !ruby/object:Gem::Requirement
+  requirement: &2171791000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2172805820
+  version_requirements: *2171791000
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2172804980 !ruby/object:Gem::Requirement
+  requirement: &2171790300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2172804980
+  version_requirements: *2171790300
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &2172804380 !ruby/object:Gem::Requirement
+  requirement: &2171789580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2172804380
+  version_requirements: *2171789580
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2172803900 !ruby/object:Gem::Requirement
+  requirement: &2171788600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2172803900
+  version_requirements: *2171788600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2172803380 !ruby/object:Gem::Requirement
+  requirement: &2171788060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2172803380
+  version_requirements: *2171788060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2172802820 !ruby/object:Gem::Requirement
+  requirement: &2171787360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2172802820
+  version_requirements: *2171787360
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2172802280 !ruby/object:Gem::Requirement
+  requirement: &2171786560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2172802280
+  version_requirements: *2171786560
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &2172801760 !ruby/object:Gem::Requirement
+  requirement: &2171786040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2172801760
+  version_requirements: *2171786040
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &2172801160 !ruby/object:Gem::Requirement
+  requirement: &2171785520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2172801160
+  version_requirements: *2171785520
 - !ruby/object:Gem::Dependency
   name: minitest-rails-shoulda
-  requirement: &2172800560 !ruby/object:Gem::Requirement
+  requirement: &2171784860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2172800560
+  version_requirements: *2171784860
 description: A
 email: dave.hrycyszyn@headlondon.com
 executables: []
@@ -173,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2617672663622739077
+      hash: 3583912681300201080
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: