activerecord-draft_records 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/active_record/draft_records.rb

@@ -38,16 +38,21 @@ module ActiveRecord
       end
     end
     
+    # Override valid? to automatically and temporarily set it as a draft for the validation.
+    def valid?
+      self.draft, is_draft = false, self.draft
+      super
+    ensure
+      self.draft = is_draft
+    end
+    
     # Save the record and, if it is a draft, attempt to transform it in a normal (non-draft) record.
     def save_and_attempt_to_undraft
-      self.draft, is_draft = false, self.draft
-      
-      if self.valid?
-        save
-      elsif self.draft = is_draft
+      if self.draft?
+        self.draft = false if self.valid?
         save(false)
       else
-        false
+        save
       end
     end
     

data/spec/features_spec.rb

@@ -70,4 +70,13 @@ describe "Integration features" do
     user.should_not be_draft
     user.should be_changed
   end
+  
+  it "should validate object as not draft" do
+    User.create :email => 'joe@example.com', :username => 'joe'
+    user = User.new :username => 'joe'
+    user.save_as_draft.should be_true
+    user.should_not be_valid
+    user.errors.on(:username).should_not be_blank
+    user.errors.on(:username).should include("has already been taken")
+  end
 end

data/spec/spec_helper.rb

@@ -24,6 +24,7 @@ end
 class User < ActiveRecord::Base
   include ActiveRecord::DraftRecords
   validates_presence_of :username, :email
+  validates_uniqueness_of :username, :email, :scope => :draft
 end
 
 Spec::Runner.configure do |config|

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Rodrigo Kochenburger
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 -03:00
+date: 2010-07-29 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency