drafter 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/drafter.gemspec

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

data/lib/drafter/apply.rb

@@ -20,7 +20,7 @@ module Drafter
     # @return [Draftable] the draftable object populated with the draft attrs.
     def restore_attrs
       draftable_columns.each do |key|
-        self.send "#{key}=", self.draft.data[key]
+        self.send "#{key}=", self.draft.data[key] if self.respond_to?(key)
       end
       self
     end

data/lib/drafter/creation.rb

@@ -14,7 +14,9 @@ module Drafter
     def save_draft
       if self.valid?
         attrs = self.attributes
-        attrs.merge!("draftable_draft_title" => attrs[self.draftable_draft_title.to_s])
+        if self.draftable_draft_title
+          attrs.merge!("draft_title" => attrs[self.draftable_draft_title.to_s])
+        end
         if self.draft
           draft.data = attrs
         else
@@ -38,7 +40,7 @@ module Drafter
       def build_draft_uploads(attrs)
         draft_uploads = []
         attrs.keys.each do |key|
-          if self.send(key).is_a?(CarrierWave::Uploader::Base)
+          if self.respond_to?(key) && self.send(key).is_a?(CarrierWave::Uploader::Base)
             self.draft.draft_uploads << build_draft_upload(key)
           end
         end

data/lib/drafter/draftable.rb

@@ -5,7 +5,7 @@ module Drafter
 
     # Overrides the +draftable+ method to define the +draftable?+ class method.
     module ClassMethods
-      def draftable(options)
+      def draftable(options={})
 
         cattr_accessor :draftable_draft_title
         self.draftable_draft_title = options[:draft_title]

data/test/drafter/test_creation.rb

@@ -40,8 +40,8 @@ class TestCreation < Minitest::Unit::TestCase
 				assert_equal(DraftUpload.last, @draft.draft_uploads.first)
 			end
 
-			it "should merge in a draftable_draft_title key and value, with the proper field content" do
-				assert_equal("original text", @draft.draftable_draft_title)
+			it "should merge in a draft_title key and value, with the proper field content" do
+				assert_equal("original text", @draft.draft_title)
 			end
 
 			describe "a second time" do

data/test/drafter/test_draftable.rb

@@ -3,6 +3,22 @@ require 'helper'
 class TestDraftable < MiniTest::Unit::TestCase
 
 	describe "A draftable ActiveRecord class" do
+		describe "with a :draftable_title" do
+			describe "instantiating" do
+				it "works" do
+					assert Article.new
+				end
+			end
+		end
+
+		describe "without a :draft_title option" do
+			describe "instantiating" do
+				it "works" do
+					assert Post.new
+				end
+			end
+		end
+
 		it "should know it's draftable" do
 			assert Article.draftable?
 		end

data/test/support/models.rb

@@ -11,6 +11,12 @@ class Article < ActiveRecord::Base
 
 end
 
+class Post < ActiveRecord::Base
+
+  draftable
+
+end
+
 
 # A non-draftable comment class
 class Comment < ActiveRecord::Base

data/test/support/schema.rb

@@ -8,6 +8,11 @@ ActiveRecord::Schema.define do
     t.timestamps
   end
 
+  create_table :posts, :force => true do |t|
+    t.string :text
+    t.timestamps
+  end
+
   create_table :drafts, :force => true do |t|
   	t.text :data
   	t.references :draftable, :polymorphic => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drafter
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2164712140 !ruby/object:Gem::Requirement
+  requirement: &2177205280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164712140
+  version_requirements: *2177205280
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2164711660 !ruby/object:Gem::Requirement
+  requirement: &2177204460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164711660
+  version_requirements: *2177204460
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &2164711180 !ruby/object:Gem::Requirement
+  requirement: &2177203900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164711180
+  version_requirements: *2177203900
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2164710640 !ruby/object:Gem::Requirement
+  requirement: &2177203400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164710640
+  version_requirements: *2177203400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164709980 !ruby/object:Gem::Requirement
+  requirement: &2177202860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2164709980
+  version_requirements: *2177202860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2164708760 !ruby/object:Gem::Requirement
+  requirement: &2177202300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2164708760
+  version_requirements: *2177202300
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2164707540 !ruby/object:Gem::Requirement
+  requirement: &2177201800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164707540
+  version_requirements: *2177201800
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &2164706200 !ruby/object:Gem::Requirement
+  requirement: &2177201220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164706200
+  version_requirements: *2177201220
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &2164705380 !ruby/object:Gem::Requirement
+  requirement: &2177200600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164705380
+  version_requirements: *2177200600
 - !ruby/object:Gem::Dependency
   name: minitest-rails-shoulda
-  requirement: &2164704140 !ruby/object:Gem::Requirement
+  requirement: &2177199960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164704140
+  version_requirements: *2177199960
 description: A
 email: dave.hrycyszyn@headlondon.com
 executables: []
@@ -173,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2002143360601067755
+      hash: 3604450445430464214
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: