mm-draft 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 220381bc555c836661398b132bf81d72da0f555c
-  data.tar.gz: 246c792cc5415c90189e39f57c4b36a4fa05e1f9
+  metadata.gz: 3e1db6a6bf3c38fb8e5024fee979f5edd37174b8
+  data.tar.gz: 4f1e604160432a5a8ef04efa74fe3f705fb2bd7f
 SHA512:
-  metadata.gz: f177e282b70d2073b394ec42db30d6045e17fba04593a0b63797feeb0ddbab4e574f6dd42499a8a4408eb2d4a825515f9dc7f00b7f0847ea7397d35c6c169c3c
-  data.tar.gz: 98e8501ff1417fd4310b2235d6bf2cc7e1351018cb267f476dd8a247b2dee33aa4bc4f30917e631670b4e0ffa102e76b4e5c852aa12bbcca3f0d8ce6b96d281a
+  metadata.gz: f85ba7db6bda0423638745931227cfe3514d05c20d5d24ea348c49f2b70a118a4a46152bbad205f6e3cdc29cd2c7738f496fbcec8d63870891638d56b5531558
+  data.tar.gz: ac814e646bddfae8e3b0f9b432f8f0bd0ce0663a55f622a21d55929764fde6da46468216c7b7567f4ecbbee15271454fdd400514132d92479f4a1a8162f0a0b4

data/README.md

@@ -7,17 +7,19 @@ Plugin for MongoMapper to have draft/published option on models.
 NOTE: Can have issues with other plugins...
 
 ##Instance methods
-<pre>
+
+```
 .draft?           - true/false
 .published?       - true/false
 .published_record - returns the published record) (or nil, if the document never has been published)
 .draft_record     - returns the draft record for a published record
-</pre>
+```
 
 *draft_record* will return self if the draft? returns true
 *published_record* will return self if draft? returns false
 
 ## Usage:
+
 Create record as normal.
 
 *.save* - Saves draft (with normal validation)
@@ -33,16 +35,19 @@ Duplicating the records also gives the benefit of working directly on the publis
 ## Example
 
 ### Model
-<pre>
+
+```ruby
 class Monkey
   include MongoMapper::Document
   plugin MongoMapper::Draft
 
   key :name, String, :default => "test"
 end
-</pre>
+```
+
 ### Usage of model
-<pre>
+
+```ruby
 m = Monkey.new
 m.name = "Leif"
 m.save
@@ -56,7 +61,7 @@ m.save
 m.name # returns "Artn"
 
 m.published_model.name # returns "Leif"
-</pre>
+```
 
 
 Copyright (c) 2011 Leif Ringstad, released under the MIT license

data/Rakefile

@@ -10,7 +10,7 @@ namespace :test do
     test.libs << 'test'
     test.ruby_opts << '-rubygems'
     test.pattern = 'test/unit/**/test_*.rb'
-    test.verbose = true 
+    test.verbose = true
   end
 
 #TODO Add performance
@@ -18,7 +18,7 @@ namespace :test do
     test.libs << 'test'
     test.ruby_opts << '-rubygems'
     test.pattern = 'test/performance/test/**/*.rb'
-    test.verbose = true 
+    test.verbose = true
   end
 end
 

data/lib/mongo_mapper/plugins/draft/draft.rb

@@ -33,9 +33,9 @@ module MongoMapper
         end
 
 
-        # if already published, keep some old data to update instead of insert
+        # if already published, update the record
         if (self.published?)
-          old_published_record = self.published_record
+          # old_published_record = self.published_record
           # support for mm-tree
           # remove parents from previous published record
           # TREE Support disabled for now
@@ -44,19 +44,31 @@ module MongoMapper
           #   old_published_record.save
           # end
           # destroy old published record... Not ideal, but should work
-          self.published_record.destroy if self.published_record != nil
-          live_record = self.clone
-          live_record.created_at = old_published_record.created_at if self.respond_to?("created_at")
-        else
+          # self.published_record.destroy if self.published_record != nil
+          # live_record = self.clone
+          # live_record.created_at = old_published_record.created_at if self.respond_to?("created_at")
+          update_attribs = self.attributes.clone
+          ["_id", "created_at", "updated_at"].each do |rmkey|
+            update_attribs.delete(rmkey)
+          end
+          update_attribs["draft"] = false
+          update_attribs["draft_record_published_id"] = nil
+          live_record = self.published_record
+          live_record.update_attributes!(update_attribs)
+        else # clone the record
+
           live_record = self.clone
-          live_record.created_at = Time.now.utc if self.respond_to?("created_at")
+          if self.respond_to?("created_at")
+            time_proc = lambda { Time.now.utc }
+            live_record.created_at = time_proc.call
+          end
+          live_record.draft_record_published_id = nil
+          live_record.draft = false
+          live_record.save!
         end
 
-        self.draft_record_published_id = live_record._id
-        self.class.skip_callback(:save, :before, :update_timestamps ) if self.respond_to?("updated_at")
-        self.save!
-        self.class.set_callback(:save, :before, :update_timestamps ) if self.respond_to?("updated_at")
-
+        self.set(draft_record_published_id: live_record._id)
+        self.reload
 
         # TREE Support disabled for now
         # if (self.respond_to?("parent_id_field") && self.respond_to?("path_field") && self.respond_to?("depth_field"))
@@ -75,9 +87,6 @@ module MongoMapper
         #   end
         # end
 
-        live_record.draft = false;
-        live_record.updated_at = Time.now.utc if self.respond_to?("updated_at")
-        live_record.save!
         return true
       end
 

data/lib/mongo_mapper/plugins/draft/version.rb

@@ -1,5 +1,5 @@
 module MongoMapper
   module Draft
-    VERSION = '0.1.8'
+    VERSION = '0.1.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mm-draft
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Leif Ringstad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n