delayed_job_shallow_mongoid 0.4.0 → 0.5.0

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+services: mongodb
+rvm:
+  - 1.9.3
+

data/CHANGELOG.md

@@ -0,0 +1,36 @@
+0.5.0
+-----
+
+* [#3](https://github.com/joeyAghion/delayed_job_shallow_mongoid/pull/3): Added Mongoid 3.x support - [@dblock](http://github.com/dblock).
+
+0.4.0 (10/27/2012)
+------------------
+
+* [#2](https://github.com/joeyAghion/delayed_job_shallow_mongoid/pull/2): Silently return on documents that cannot be fetched - [@mixonic](https://github.com/mixonic).
+
+0.3.0 (2/12/2012)
+-----------------
+
+* Delayed_job 3's requires are no longer relative to its root - [@joeyAghion](https://github.com/joeyAghion).
+* Relaxed requirement for mongoid ~> 2.0 - [@dblock](http://github.com/dblock).
+
+0.2.8 (1/4/2012)
+----------------
+
+* Don't transform object into stub if there are pending updates and jobs are being run immediately - [@joeyAghion](https://github.com/joeyAghion).
+* Don't transform object into stub if not yet persisted - [@joeyAghion](https://github.com/joeyAghion).
+
+0.2.7 (12/19/2011)
+------------------
+
+* Added support for embedded documents - [@joeyAghion](https://github.com/joeyAghion).
+
+0.2.0 (11/29/2011)
+------------------
+
+* Reorganize and fix behavior for mailers - [@joeyAghion](https://github.com/joeyAghion).
+
+0.1.0 (28/11/2011)
+------------------
+
+* Intial public release - [@joeyAghion](https://github.com/joeyAghion).

data/Gemfile

@@ -1,2 +1,3 @@
 source "http://rubygems.org"
+
 gemspec

data/README.md

@@ -1,8 +1,12 @@
 delayed_job_shallow_mongoid
 ===========================
 
+[![Build Status](https://secure.travis-ci.org/joeyAghion/delayed_job_shallow_mongoid.png?branch=master)](http://travis-ci.org/joeyAghion/delayed_job_shallow_mongoid)
+
 This library short-circuits serialization of [Mongoid](http://mongoid.org) model instances when a delayed job is called on them, or when they're passed as arguments to a delayed job. Rather than generate and store the fully-serialized YAML, a simple stub is stored. When the job is run, the stub is recognized and a `find` is done to look up the underlying document. If a referenced model isn't found at this point, the job simply does nothing.
 
+Going forward, only [Mongoid 3](http://mongoid.org) will be supported. Feel free to fork and submit pull-requests for backward-compatibility.
+
 Contributions
 -------------
 

data/Rakefile

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'bundler'
+require 'bundler/gem_tasks'
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -12,33 +13,9 @@ end
 require 'rake'
 require 'rspec/core/rake_task'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "delayed_job_shallow_mongoid"
-  gem.homepage = "http://github.com/joeyAghion/delayed_job_shallow_mongoid"
-  gem.license = "MIT"
-  gem.summary = %Q{More efficient Mongoid document serialization for delayed_job.}
-  gem.description = %Q{When the object or arg to a delayed_job is a Mongoid document, store only a small stub of the object instead of the full serialization.}
-  gem.email = "joey@aghion.com"
-  gem.authors = ["Joey Aghion"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 desc "Run all tests"
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end
 
 task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "delayed_job_shallow_mongoid #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1,2 @@
-0.4.0
+0.5.0
+

data/delayed_job_shallow_mongoid.gemspec

@@ -1,15 +1,11 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = "delayed_job_shallow_mongoid"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joey Aghion"]
-  s.date = "2012-10-27"
+  s.date = "2012-11-19"
   s.description = "When the object or arg to a delayed_job is a Mongoid document, store only a small stub of the object instead of the full serialization."
   s.email = "joey@aghion.com"
   s.extra_rdoc_files = [
@@ -18,12 +14,15 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".travis.yml",
+    "CHANGELOG.md",
     "Gemfile",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
     "VERSION",
     "delayed_job_shallow_mongoid.gemspec",
+    "lib/delayed/performable_mailer.rb",
     "lib/delayed/shallow_mongoid.rb",
     "lib/delayed/shallow_mongoid/document_stub.rb",
     "lib/delayed/shallow_mongoid/performable_mailer.rb",
@@ -42,33 +41,29 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<delayed_job_shallow_mongoid>, [">= 0"])
+      s.add_runtime_dependency(%q<delayed_job>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<mongoid>, ["~> 3.0"])
       s.add_development_dependency(%q<actionmailer>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rake>, ["~> 10.0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
-      s.add_development_dependency(%q<bson_ext>, ["~> 1.5"])
     else
-      s.add_dependency(%q<delayed_job_shallow_mongoid>, [">= 0"])
+      s.add_dependency(%q<delayed_job>, ["~> 3.0"])
+      s.add_dependency(%q<mongoid>, ["~> 3.0"])
       s.add_dependency(%q<actionmailer>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
-      s.add_dependency(%q<bson_ext>, ["~> 1.5"])
     end
   else
-    s.add_dependency(%q<delayed_job_shallow_mongoid>, [">= 0"])
+    s.add_dependency(%q<delayed_job>, ["~> 3.0"])
+    s.add_dependency(%q<mongoid>, ["~> 3.0"])
     s.add_dependency(%q<actionmailer>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rake >, ["~> 10.0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
-    s.add_dependency(%q<bson_ext>, ["~> 1.5"])
   end
 end
 

data/lib/delayed/performable_mailer.rb

@@ -0,0 +1,7 @@
+module Delayed
+  class PerformableMailer < PerformableMethod
+    def perform
+      ShallowMongoid.load(object).send(method_name, *args.map{|a| ShallowMongoid.load(a) }).deliver
+    end
+  end
+end

data/lib/delayed/shallow_mongoid/performable_method.rb

@@ -1,5 +1,7 @@
 module Delayed
   class PerformableMethod
+    attr_accessor :object, :method_name, :args
+
     def initialize(object, method_name, args)
       raise NoMethodError, "undefined method `#{method_name}' for #{object.inspect}" unless object.respond_to?(method_name, true)
 
@@ -7,17 +9,18 @@ module Delayed
       self.args         = args.map{|a| ShallowMongoid.dump(a) }
       self.method_name  = method_name.to_sym
     end
-    
+
     def perform
       begin
         klass = ShallowMongoid.load(object)
+        return true unless klass
         delayed_arguments = *args.map{|a| ShallowMongoid.load(a) }
       rescue Mongoid::Errors::DocumentNotFound
         return true  # do nothing if document has been removed
       end
       klass.send(method_name, *delayed_arguments)
     end
-    
+
     def display_name
       if object.is_a?(ShallowMongoid::DocumentStub)
         "#{object.description}##{method_name}"

data/spec/delayed_job_shallow_mongoid_spec.rb

@@ -45,7 +45,7 @@ describe ::Delayed::PerformableMethod do
 
   context "with a saved document" do
     before(:each) do
-      @model = TestModel.create #new(:_id => ::BSON::ObjectId.new)
+      @model = TestModel.create #new(:_id => Moped::BSON::ObjectId.new)
     end
 
     context 'when saving job' do
@@ -70,7 +70,7 @@ describe ::Delayed::PerformableMethod do
       end
       context "with an embedded document" do
         before(:each) do
-          @child = ChildModel.new(:_id => ::BSON::ObjectId.new)
+          @child = ChildModel.new(:_id => Moped::BSON::ObjectId.new)
           @model.child_models.push @child
         end
         after(:each) do
@@ -83,7 +83,7 @@ describe ::Delayed::PerformableMethod do
           @method.object.selector.should == ['child_models', ['find', @child._id.to_s]]
         end
         it "should store the deeply nested selector" do
-          @grandchild = GrandchildModel.new(:_id => ::BSON::ObjectId.new)
+          @grandchild = GrandchildModel.new(:_id => Moped::BSON::ObjectId.new)
           @model.child_models.first.grandchild_models.push @grandchild
           @method = ::Delayed::PerformableMethod.new(@grandchild, :to_s, [])
           @method.object.selector.should == ['child_models', ['find', @child._id.to_s], 'grandchild_models', ['find', @grandchild._id.to_s]]
@@ -99,19 +99,25 @@ describe ::Delayed::PerformableMethod do
       end
       it "should do nothing if document not found" do
         method = ::Delayed::PerformableMethod.new(@model, :to_s, [])
-        error = ::Mongoid::Errors::DocumentNotFound.new(TestModel, @model._id)
+        error = ::Mongoid::Errors::DocumentNotFound.new(TestModel, nil, [ @model.id ])
         TestModel.should_receive(:find).with(@model._id.to_s).and_raise(error)
         method.perform.should be_true
       end
+      it "should do nothing if document find returned nil" do
+        method = ::Delayed::PerformableMethod.new(@model, :to_s, [])
+        @model.destroy
+        TestModel.should_receive(:find).with(@model._id.to_s).and_return(nil)
+        method.perform.should be_true
+      end
       it "should find embedded document" do
-        child = ChildModel.new(:_id => ::BSON::ObjectId.new)
+        child = ChildModel.new(:_id => Moped::BSON::ObjectId.new)
         @model.child_models.push child
         method = ::Delayed::PerformableMethod.new(child, :to_s, [])
         TestModel.should_receive(:find).with(@model._id.to_s).and_return(@model)
         method.perform
       end
     end
-    
+
     context "display_name" do
       it "should return underlying class when a stub is being used" do
         method = ::Delayed::PerformableMethod.new(@model, :to_s, [])
@@ -122,7 +128,7 @@ describe ::Delayed::PerformableMethod do
         method.display_name.should == "Symbol#to_s"
       end
       it "should include selector when document is embedded" do
-        child = ChildModel.new(:_id => ::BSON::ObjectId.new)
+        child = ChildModel.new(:_id => Moped::BSON::ObjectId.new)
         @model.child_models.push child
         method = ::Delayed::PerformableMethod.new(child, :to_s, [])
         method.display_name.should == "TestModel[#{@model._id}].child_models.find(\"#{child._id}\")#to_s"
@@ -146,7 +152,7 @@ describe ::Delayed::PerformableMailer do
       @mailer.perform
     end
     it "should do nothing if an argument document is not found" do
-      error = ::Mongoid::Errors::DocumentNotFound.new(TestModel, @model._id)
+      error = ::Mongoid::Errors::DocumentNotFound.new(TestModel, nil, [ @model._id ])
       TestModel.should_receive(:find).with(@model._id.to_s).and_raise(error)
       @mailer.perform.should be_true
     end
@@ -154,7 +160,7 @@ describe ::Delayed::PerformableMailer do
   context "failing mailer from bad record" do
     before do
       @model = TestModel.create
-      error = ::Mongoid::Errors::DocumentNotFound.new(TestModel, @model._id)
+      error = ::Mongoid::Errors::DocumentNotFound.new(TestModel, nil, [ @model._id ])
       @email = mock('email')
       @email.stub(:deliver).and_raise(error)
       @mailer_class = mock('MailerClass', :signup => @email)

data/spec/spec_helper.rb

@@ -7,16 +7,15 @@ require 'mongoid'
 require 'delayed_job_shallow_mongoid'
 
 Mongoid.configure do |config|
-  name = "delayed_job_shallow_mongoid_test"
-  config.master = Mongo::Connection.new.db(name)
-  config.logger = Logger.new('/dev/null')
+  config.connect_to('delayed_job_shallow_mongoid_test')
 end
 
 RSpec.configure do |config|
   config.before(:each) do
-    Mongoid.master.collections.select {|c| c.name !~ /system/ }.each(&:drop)
+    Mongoid.purge!
+    Mongoid::IdentityMap.clear
   end
   config.after(:all) do
-    Mongoid.master.command({'dropDatabase' => 1})
+    Mongoid.default_session.drop
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_shallow_mongoid
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,42 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: delayed_job_shallow_mongoid
+  name: delayed_job
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: actionmailer
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '3.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,13 +76,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -123,22 +123,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
 description: When the object or arg to a delayed_job is a Mongoid document, store
   only a small stub of the object instead of the full serialization.
 email: joey@aghion.com
@@ -149,12 +133,15 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
 - delayed_job_shallow_mongoid.gemspec
+- lib/delayed/performable_mailer.rb
 - lib/delayed/shallow_mongoid.rb
 - lib/delayed/shallow_mongoid/document_stub.rb
 - lib/delayed/shallow_mongoid/performable_mailer.rb
@@ -177,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2014166991515156884
+      hash: 2112816115078860276
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: