mm-draft 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 73d13795e0d5e002fb08f837f432afd0b22d65c0
-  data.tar.gz: 1c978faf0f27857b7d14594879aed1b9d59ab8dd
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTdiMWNlNGY1Nzg0ZGFiNTE2ZTI0MzhhMzFhNjJkM2IxN2M4MjcwNQ==
+  data.tar.gz: !binary |-
+    MWJmYmNlYWQ0ZWU1Y2YzZjFjN2VlMzZmM2JmZThjZmQyN2I0MTRhMg==
 SHA512:
-  metadata.gz: aecee7907f69b0128c836469d9fd44939922e7e8de5939115d18888aed82a3f395bfbabd438f7e4526918c6f56e28bf4c7245c4e3957e761f2601d9e9ec13046
-  data.tar.gz: 1452006b11cd9ed6c52734bef6bc563f31c32dea2b8297910267351baef83de44022dcf2ccf5a567499fd62238a67b16bd8917137ab922e35b3a0fcd6040bfc6
+  metadata.gz: !binary |-
+    ZmUzMTVjMDBiMmI3NTllYTYxODc3MDVhZmVmODQzZjAzOTA5ZTc5OGYxMzhl
+    YmZiNGRkODI4M2QyZTA1MTJlZjE1YzAxMGI0MDFiMWRmNzQyOTI5ZmE1MDA5
+    ODNhMTAzNGFjNDNmNTNlMzg0MWYyZjhkNWI2MTUzYTI1ODQzMTY=
+  data.tar.gz: !binary |-
+    MjM3ODgyYmQ5YzE4ZjIxODAzMDIzZmJhOTFlNzUxNGRkMzMyZmI0ZjU2Y2I0
+    OWM4ODQzMGQ1MjAwNTc2NzExOWIxZjBlZmNlMmNlMTEwMjU4ZGI2MWZjYmY2
+    OGM1ZTc2YzY4YmY5MjVkOTRhMzFjNWFhMzhlYTI0YTc3NTIxMGY=

data/Gemfile

@@ -5,10 +5,9 @@ gem 'bson_ext', '>= 1.6.4'
 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', :require => 'mocha/setup'
+  gem 'rspec', "~> 2.8"
   gem 'database_cleaner',  '>= 0.8.0'
+  gem 'timecop'
 end
 
 group :development, :test do
@@ -16,4 +15,4 @@ group :development, :test do
   gem 'simplecov', :require => false
 end
 
-gem 'mongo_mapper', '> 0.12'
+gem 'mongo_mapper', '0.13.0'

data/Rakefile

@@ -1,19 +1,10 @@
 require "bundler/gem_tasks"
-require 'rubygems'
-require 'rake'
+require 'rspec/core/rake_task'
 
 require File.join(File.dirname(__FILE__), 'lib', 'mongo_mapper', 'plugins', 'draft', 'version')
 
 require 'rake/testtask'
 namespace :test do
-  Rake::TestTask.new(:units) do |test|
-    test.libs << 'test'
-    test.ruby_opts << '-rubygems'
-    test.pattern = 'test/unit/**/test_*.rb'
-    test.verbose = true
-  end
-
-#TODO Add performance
   Rake::TestTask.new(:performance) do |test|
     test.libs << 'test'
     test.ruby_opts << '-rubygems'
@@ -22,5 +13,6 @@ namespace :test do
   end
 end
 
-task :default => 'test:units'
-
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
+gemspec = eval(File.read("mm-draft.gemspec"))

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

@@ -125,22 +125,13 @@ module MongoMapper
 
       def unpublish
         published_rec = self.published_record
-        draft_rec = self.draft_record
+        draft_rec     = self.draft_record
 
         self.class.skip_callback(:destroy, :before, :unpublish)
         published_rec.destroy if published_rec != nil # destroy published record
         self.class.set_callback(:destroy, :before, :unpublish)
-
-        draft_rec.draft_record_published_id = nil if draft_rec != nil # update draft record
-        draft_rec.save! if draft_rec != nil
-        # if draft?
-        #   published = self.class.find(self.draft_record_published_id)
-        #   published.destroy if (published != nil)
-        #   self.draft_record_published_id = nil
-        #   self.save! # remove draft_record_published_id
-        # else
-        #   self.draft_record.unpublish
-        # end
+        draft_rec.set(published_at: nil) if self.respond_to?("published_at")
+        draft_rec.set(draft_record_published_id: nil)
       end
 
     end # Module Draft

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

@@ -1,5 +1,5 @@
 module MongoMapper
   module Draft
-    VERSION = '0.1.10'
+    VERSION = '0.1.11'
   end
 end

data/test/performance/models/monkey_no_draft.rb

@@ -1,4 +1,4 @@
-class MonkeyNoVersion
+class MonkeyNoDraft
   include MongoMapper::Document
   attr_accessible :name, :age
 

data/test/performance/performance_helper.rb

@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'bundler/setup'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'draft'
+require 'mm-draft'
 
 Bundler.require(:default, :test)
 

data/test/performance/test/read_write.rb

@@ -7,10 +7,10 @@ DatabaseCleaner.start
 Benchmark.bm(22) do |x|
   ids_draft = []
   ids_no_draft = []
-  
+
   # Write performance
   x.report("write without draft  ") do
-    500.times { |i| ids_no_draft << MonkeyNodraft.create(:name => "Baboo", :age => 12, ).id }
+    500.times { |i| ids_no_draft << MonkeyNoDraft.create(:name => "Baboo", :age => 12, ).id }
   end
   x.report("write with draft     ") do
     500.times { |i| ids_draft << Monkey.create(:name => "Baboo", :age => 12, ).id }
@@ -21,8 +21,9 @@ Benchmark.bm(22) do |x|
     ids_draft.each { |id| Monkey.first(:id => id) }
   end
   x.report("read without draft   ") do
-    ids_no_draft.each { |id| MonkeyNodraft.first(:id => id) }
+    ids_no_draft.each { |id| MonkeyNoDraft.first(:id => id) }
   end
 end
 
 DatabaseCleaner.clean
+MongoMapper.database.command({dropDatabase: 1})

metadata

@@ -1,41 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: mm-draft
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Leif Ringstad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -54,14 +82,10 @@ files:
 - lib/mongo_mapper/plugins/draft/draft.rb
 - lib/mongo_mapper/plugins/draft/keys.rb
 - lib/mongo_mapper/plugins/draft/version.rb
-- test/models/dog.rb
-- test/models/monkey.rb
 - test/performance/models/monkey.rb
 - test/performance/models/monkey_no_draft.rb
 - test/performance/performance_helper.rb
 - test/performance/test/read_write.rb
-- test/test_helper.rb
-- test/unit/test_draft.rb
 homepage: http://github.com/leifcr/mm-draft
 licenses: []
 metadata: {}
@@ -71,12 +95,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -86,11 +110,7 @@ signing_key:
 specification_version: 4
 summary: A MongoMapper extension adding draft/publishing support
 test_files:
-- test/models/dog.rb
-- test/models/monkey.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/unit/test_draft.rb

data/test/models/dog.rb

@@ -1,11 +0,0 @@
-class Dog
-  include MongoMapper::Document
-  plugin MongoMapper::Plugins::Draft
-
-  attr_accessible :name
-
-  key :name, String
-  key :published_at, Time
-
-  timestamps!
-end

data/test/models/monkey.rb

@@ -1,10 +0,0 @@
-class Monkey
-  include MongoMapper::Document
-  plugin MongoMapper::Plugins::Draft
-
-  attr_accessible :name
-
-  key :name, String
-
-  timestamps!
-end

data/test/test_helper.rb

@@ -1,47 +0,0 @@
-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'
-
-Bundler.require(:default, :test)
-
-MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017)
-MongoMapper.database = "mm-draft-test"
-
-Dir["#{File.dirname(__FILE__)}/models/*.rb"].each {|file| require file}
-
-DatabaseCleaner.strategy = :truncation
-
-class Test::Unit::TestCase
-  # Drop all collections after each test case.
-  def setup
-    DatabaseCleaner.start
-  end
-
-  def teardown
-    DatabaseCleaner.clean
-  end
-
-  # Make sure that each test case has a teardown
-  # method to clear the db after each test.
-  def inherited(base)
-    base.define_method setup do
-      super
-    end
-
-    base.define_method teardown do
-      super
-    end
-  end
-
-end

data/test/unit/test_draft.rb

@@ -1,226 +0,0 @@
-require 'test_helper'
-
-class DraftTest < Test::Unit::TestCase
-  context "draft monkey records" do
-    setup do
-      @monkey_1   = Monkey.create(:name => "Chip")
-      @monkey_2   = Monkey.create(:name => "Unaton")
-      @monkey_1.publish
-    end
-
-    should "have same name as draft" do
-      @monkey_1.name.should == "Chip"
-      @monkey_1.published_record.name.should == "Chip"
-      @monkey_1.published_record.name.should == @monkey_1.name
-    end
-
-    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.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
-      @monkey_1.published_record.should_not == nil
-      @monkey_1.name.should == @monkey_1.published_record.name
-    end
-
-    should "have updated updated_at both published record" do
-      @monkey_1.name ="Kake"
-      @monkey_1.save
-      @monkey_1.publish
-      @monkey_1.published_record.updated_at.should_not == @monkey_1.updated_at
-    end
-
-    should "unpublish draft record" do
-      @monkey_1.unpublish
-      assert !@monkey_1.published?
-      @monkey_1.published_record_id.should == nil
-      @monkey_1.published_record.should == nil
-    end
-
-    should "unpublish published record directly" do
-      # It is recommended to unpublish a draft record instead of unpublising a published record
-      @monkey_1.publish # publish record again...
-      @monkey_1.published_record.unpublish
-      # reload monkey_1
-      @monkey_1.reload
-      @monkey_1.published?.should_not == true
-      @monkey_1.published_record_id.should == nil
-      @monkey_1.published_record.should == nil
-    end
-
-    should "destroy published record only" do
-      @monkey_2.publish
-      tmp_id = @monkey_2.published_record_id
-      @monkey_2.published_record.destroy
-      @monkey_2.reload
-      @monkey_2.published_record_id.should == nil
-      @monkey_2.published_record.should == nil
-      @monkey_2.name.should == "Unaton" # make sure we didn't loose the draft
-      @monkey_2.published?.should_not == true
-      @monkey_2.draft?.should == true
-      Monkey.find(tmp_id).should == nil
-    end
-
-    should "destroy draft and published record" do
-      @monkey_2.publish # publish record again...
-      tmp_draft_id = @monkey_2._id
-      tmp_published_id = @monkey_2.published_record_id
-      @monkey_2.destroy
-      # keep ID's in order to check that they are destroyed!
-      Monkey.find(tmp_draft_id).should == nil
-      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 "draft dog records with pubished_at" do
-    setup do
-      @monkey_1   = Dog.create(:name => "Chip")
-    end
-
-    should "should set published_at when publishing" do
-      @monkey_1.publish
-      @monkey_1.published_record.should_not                  == nil
-      @monkey_1.published_at.should_not                      == nil
-      @monkey_1.published_record.published_at.should_not     == nil
-      @monkey_1.published_record.published_at.should         == @monkey_1.published_at
-    end
-  end
-
-  # 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)
-
-  #     @root_1.publish
-  #     @child_1.publish
-  #     @child_2.publish
-  #     @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)
-  #   end
-
-  #   should "test parents for published records" do
-  #     assert_equal(@root_1.published_record, @child_1.published_record.parent)
-  #     assert_equal(@root_1.published_record, @child_2.published_record.parent)
-  #     assert_equal(@child_2.published_record, @child_2_1.published_record.parent)
-  #   end
-
-  #   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)
-
-  #     @child_2.save
-  #     @child_2_1.reload
-
-  #     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)
-
-  #     # 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)
-  #   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)
-
-  #     # can only test published after saving and publishing
-  #     @child_2.save
-  #     @child_2.publish # will also save
-  #     @child_2.reload
-  #     @child_2_1.reload
-
-  #     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)
-
-  #     assert @root_2.published_record.is_or_is_ancestor_of?(@child_2_1.published_record)
-  #     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)
-
-  #     # can only test published after saving and publishing
-  #     @child_2.save
-  #     @child_2.publish # will also save
-  #     @child_2.reload
-  #     @child_2_1.reload
-
-  #     assert @child_2.root?
-  #     assert @child_2.published_record.root?
-  #     assert @child_2_1.is_or_is_descendant_of?(@child_2)
-
-  #     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)
-  #   end
-end