mm-draft 0.1.7 → 0.1.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 220381bc555c836661398b132bf81d72da0f555c
+  data.tar.gz: 246c792cc5415c90189e39f57c4b36a4fa05e1f9
+SHA512:
+  metadata.gz: f177e282b70d2073b394ec42db30d6045e17fba04593a0b63797feeb0ddbab4e574f6dd42499a8a4408eb2d4a825515f9dc7f00b7f0847ea7397d35c6c169c3c
+  data.tar.gz: 98e8501ff1417fd4310b2235d6bf2cc7e1351018cb267f476dd8a247b2dee33aa4bc4f30917e631670b4e0ffa102e76b4e5c852aa12bbcca3f0d8ce6b96d281a

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rake'
 gem 'bson_ext', '>= 1.6.4'
@@ -7,14 +7,13 @@ gem 'multi_json', '>= 1.3.6'
 group :test do
   gem 'jnunemaker-matchy', '>= 0.4', :require => 'matchy'
   gem 'shoulda',           '>= 3.1.1'
-  gem 'mocha',             '>= 0.12.3'
+  gem 'mocha',             '>= 0.12.3', :require => 'mocha/setup'
   gem 'database_cleaner',  '>= 0.8.0'
 end
 
-group :development do
-  gem "wirble"
-  gem "hirb"
-  gem "awesome_print"  
+group :development, :test do
+  gem 'coveralls', :require => false
+  gem 'simplecov', :require => false
 end
 
-gemspec
+gem 'mongo_mapper', '> 0.12'

data/README.md

@@ -1,10 +1,10 @@
 # MongoMapper Draft plugin
+[![Build Status](https://travis-ci.org/leifcr/mm-draft.svg?branch=master)](https://travis-ci.org/leifcr/mm-draft) [![Coverage Status](https://coveralls.io/repos/leifcr/mm-draft/badge.png)](https://coveralls.io/r/leifcr/mm-draft) [![Dependency Status](https://gemnasium.com/leifcr/mm-draft.svg)](https://gemnasium.com/leifcr/mm-draft)
 
-Plugin for MongoMapper to have draft/published option on models.
 
-Works with ramdiv-mongo_mapper_acts_as_tree.
+Plugin for MongoMapper to have draft/published option on models.
 
-NOTE: Since ramdiv-mongo_mapper_acts_as_tree hasn't been updated in a while, I will change this to support Oktavilla/mongo_mapper_tree instead (http://github.com/ramdiv/mongo_mapper_acts_as_tree)
+NOTE: Can have issues with other plugins...
 
 ##Instance methods
 <pre>

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

@@ -14,7 +14,7 @@ module MongoMapper
       def draft?
         self.draft
       end
-      
+
       def published?
         if draft?
           return false if self.draft_record_published_id == nil # save a query and return false
@@ -24,28 +24,28 @@ module MongoMapper
         end
         false
       end
-      
+
       def publish
-        if (draft? == false) # don't publish non-drafts... 
-          return false
-        end
-        
+        return false if (draft? == false) # don't publish non-drafts...
+
         if (self.changed?) # save any changes, in case publish is called directly instead of save
           return false if (self.save == false)
         end
 
-        
+
         # if already published, keep some old data to update instead of insert
         if (self.published?)
           old_published_record = self.published_record
           # support for mm-tree
           # remove parents from previous published record
-          if (self.respond_to?("parent_id_field") && self.respond_to?("path_field") && self.respond_to?("depth_field"))
-            old_published_record.parent = nil
-            old_published_record.save
-          end
+          # TREE Support disabled for now
+          # if (self.respond_to?("parent_id_field") && self.respond_to?("path_field") && self.respond_to?("depth_field"))
+          #   old_published_record.parent = nil
+          #   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._id = self.published_record_id
           live_record.created_at = old_published_record.created_at if self.respond_to?("created_at")
         else
           live_record = self.clone
@@ -57,28 +57,30 @@ module MongoMapper
         self.save!
         self.class.set_callback(:save, :before, :update_timestamps ) if self.respond_to?("updated_at")
 
-        if (self.respond_to?("parent_id_field") && self.respond_to?("path_field") && self.respond_to?("depth_field"))
-          # if so, remove the current parent (should have already been don)
-          # set parent to nil for live_record before setting "real" parent.
-          # live_record.parent = nil
-
-          if (self.parent != nil)
-            # no need to copy order value, as it's copied in the clone process
-            # check draft.parent.published_record != nil, and set as parent
-            if (self.parent != nil)
-              if (self.parent.published_record != nil)
-                live_record.parent = self.parent.published_record
-              end
-            end
-          end
-        end
-        
+
+        # TREE Support disabled for now
+        # if (self.respond_to?("parent_id_field") && self.respond_to?("path_field") && self.respond_to?("depth_field"))
+        #   # if so, remove the current parent (should have already been don)
+        #   # set parent to nil for live_record before setting "real" parent.
+        #   # live_record.parent = nil
+
+        #   if (self.parent != nil)
+        #     # no need to copy order value, as it's copied in the clone process
+        #     # check draft.parent.published_record != nil, and set as parent
+        #     if (self.parent != nil)
+        #       if (self.parent.published_record != nil)
+        #         live_record.parent = self.parent.published_record
+        #       end
+        #     end
+        #   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
-      
+
       def published_record
         if draft?
           return nil if self.draft_record_published_id == nil # save a query and return nil of draft_record_published_id == nil
@@ -95,7 +97,7 @@ module MongoMapper
           self._id
         end
       end
-      
+
       def draft_record
         if draft?
           self
@@ -103,7 +105,7 @@ module MongoMapper
           self.class.all(:conditions => { :draft => true, :draft_record_published_id => self._id }).first
         end
       end
-      
+
       def unpublish
         published_rec = self.published_record
         draft_rec = self.draft_record

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

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

data/test/test_helper.rb

@@ -1,6 +1,14 @@
 require 'rubygems'
 require 'bundler/setup'
 
+if ENV['TRAVIS']
+  require 'coveralls'
+  Coveralls.wear!
+elsif ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start
+end
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'mm-draft'

data/test/unit/test_draft.rb

@@ -17,32 +17,32 @@ class DraftTest < Test::Unit::TestCase
     should "be published" do
       @monkey_1.published_record.should_not == nil
     end
-    
+
     should "not have same created time as draft" do
-      @monkey_1.unpublish 
+      @monkey_1.unpublish
       @monkey_1.publish
       @monkey_1.created_at.should_not == @monkey_1.published_record.created_at
     end
-    
+
     should "not be published" do
       @monkey_2.published?.should_not == true
       @monkey_2.published_record.should == nil
     end
-    
+
     should "not be draft" do
       @monkey_1.published_record.draft?.should_not == true
     end
-    
+
     should "be draft" do
       @monkey_2.draft?.should == true
     end
-    
+
     should "rename draft only" do
       @monkey_1.name = "Sagofon"
       @monkey_1.published_record.should_not == nil
       @monkey_1.name.should_not == @monkey_1.published_record.name
     end
-    
+
     should "rename both draft and published record" do
       @monkey_1.name = "Sagofon"
       @monkey_1.publish
@@ -98,15 +98,34 @@ class DraftTest < Test::Unit::TestCase
       Monkey.find(tmp_published_id).should == nil
     end
 
+    should 'get id of the published record on the published record' do
+      @monkey_1.published_record.published_record_id.should == @monkey_1.published_record._id
+      @monkey_1.draft_record_published_id.should == @monkey_1.published_record.published_record_id
+    end
+
+    should 'not be able to publish a published record' do
+      @monkey_1.published_record.publish.should == false
+    end
+
+    should 'return that a published_record is published' do
+      @monkey_1.published_record.published?.should == true
+    end
+
+    should 'return false for published? if a published record has been deleted instead of destroyed' do
+      @monkey_1.published_record.delete
+      @monkey_1.published?.should == false
+    end
+
+
   end # context "draft monkey records" do
-    
+
   # context "tree-record" do
   #   setup do
   #     @root_1     = Dog.create(:name => "Atmel")
   #     @child_1    = Dog.create(:name => "ATmega644P", :parent => @root_1)
   #     @child_2    = Dog.create(:name => "ATmega2561", :parent => @root_1)
   #     @child_2_1  = Dog.create(:name => "ATtiny24", :parent => @child_2)
-  
+
   #     @root_2     = Dog.create(:name => "ST Ericsson")
   #     @child_3    = Dog.create(:name => "ISP1181B", :parent => @root_2)
 
@@ -116,10 +135,10 @@ class DraftTest < Test::Unit::TestCase
   #     @child_2_1.publish
   #     @root_2.publish
   #   end
-    
+
   #   should "test draft record parents" do
   #     assert_equal(@root_2, @child_3.parent)
-  #     assert_equal(@child_2, @child_2_1.parent)     
+  #     assert_equal(@child_2, @child_2_1.parent)
   #   end
 
   #   should "test parents for published records" do
@@ -130,7 +149,7 @@ class DraftTest < Test::Unit::TestCase
 
   #   should "move draft record to new parent, but keep published at old parent" do
   #     @child_2.parent = @root_2
-      
+
   #     assert !@root_2.is_or_is_ancestor_of?(@child_2_1)
   #     assert !@child_2_1.is_or_is_descendant_of?(@root_2)
   #     assert !@root_2.descendants.include?(@child_2_1)
@@ -145,12 +164,12 @@ class DraftTest < Test::Unit::TestCase
   #     # test published against root_1
   #     assert @root_1.published_record.is_or_is_ancestor_of?(@child_2_1.published_record)
   #     assert @child_2_1.published_record.is_or_is_descendant_of?(@root_1.published_record)
-  #     assert @root_1.published_record.descendants.include?(@child_2_1.published_record)     
+  #     assert @root_1.published_record.descendants.include?(@child_2_1.published_record)
   #   end
-    
+
   #   should "move both draft and published record to new parent" do
   #     @child_2.parent = @root_2
-      
+
   #     assert !@root_2.is_or_is_ancestor_of?(@child_2_1)
   #     assert !@child_2_1.is_or_is_descendant_of?(@root_2)
   #     assert !@root_2.descendants.include?(@child_2_1)
@@ -169,10 +188,10 @@ class DraftTest < Test::Unit::TestCase
   #     assert @child_2_1.published_record.is_or_is_descendant_of?(@root_2.published_record)
   #     assert @root_2.published_record.descendants.include?(@child_2_1.published_record)
   #   end
-    
+
   #   should "set a record as a root and check for ancestor" do
   #     @child_2.parent = nil
-      
+
   #     assert !@root_2.is_or_is_ancestor_of?(@child_2_1)
   #     assert !@child_2_1.is_or_is_descendant_of?(@root_2)
   #     assert !@root_2.descendants.include?(@child_2_1)
@@ -189,6 +208,6 @@ class DraftTest < Test::Unit::TestCase
 
   #     assert !@root_1.published_record.is_or_is_ancestor_of?(@child_2_1.published_record)
   #     assert !@child_2_1.published_record.is_or_is_descendant_of?(@root_1.published_record)
-  #     assert !@root_1.published_record.descendants.include?(@child_2_1.published_record)      
+  #     assert !@root_1.published_record.descendants.include?(@child_2_1.published_record)
   #   end
 end

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: mm-draft
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.1.8
 platform: ruby
 authors:
 - Leif Ringstad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0'
 description: 
 email:
 - leifcr@gmail.com
@@ -50,15 +45,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- README.md
+- Rakefile
 - lib/locale/en.yml
 - lib/mm-draft.rb
 - lib/mongo_mapper/plugins/draft/callbacks.rb
 - lib/mongo_mapper/plugins/draft/draft.rb
 - lib/mongo_mapper/plugins/draft/keys.rb
 - lib/mongo_mapper/plugins/draft/version.rb
-- Gemfile
-- Rakefile
-- README.md
 - test/models/monkey.rb
 - test/performance/models/monkey.rb
 - test/performance/models/monkey_no_draft.rb
@@ -68,33 +63,32 @@ files:
 - test/unit/test_draft.rb
 homepage: http://github.com/leifcr/mm-draft
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A MongoMapper extension adding draft/publishing support
 test_files:
 - test/models/monkey.rb
-- test/performance/models/monkey.rb
-- test/performance/models/monkey_no_draft.rb
+- test/test_helper.rb
 - test/performance/performance_helper.rb
+- test/performance/models/monkey_no_draft.rb
+- test/performance/models/monkey.rb
 - test/performance/test/read_write.rb
-- test/test_helper.rb
 - test/unit/test_draft.rb