qu-mongoid 0.2.1 → 0.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7140f4126b6506d6e860cb53dc541667e50675d8
+  data.tar.gz: ca5e0b3a506f94d0a103842f46a971d18a6f6e2b
+SHA512:
+  metadata.gz: 1b718555a14375b1d435d47ee11c1d3d160563fbec7a5e8079525489b394e1fc09aaa08ee7399f3ee92b5faf4994d8f24a5b71d6cb4c7a6c8f3104d9e3e57afd
+  data.tar.gz: 417bfd942886d26510d16d01fcd12c73108031c848e139626ae8a8e67e4b2835eb1569e88c982e574870b1f8eac671ba87e570a505d1dd94001b7fa668bc40ba

data/.travis.yml

@@ -1,2 +1,8 @@
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.2
+  - jruby-19mode
+  - rbx-2
 services:
   - mongodb

data/Gemfile

@@ -1,15 +1,8 @@
-source :rubygems
+source "http://rubygems.org"
 
 # Specify your gem's dependencies in qu-mongoid.gemspec
 gemspec
 
 group :test do
   gem 'SystemTimer',  :platform => :mri_18
-  gem 'ruby-debug',   :platform => :mri_18
-  gem 'ruby-debug',   :platform => :jruby
-  gem 'debugger',     :platform => :mri_19
-  gem 'rake'
-  gem 'rspec', '~> 2.0'
-  gem 'guard-rspec'
-  gem 'guard-bundler'
-end
+end

data/README.md

@@ -20,6 +20,8 @@ Or install it yourself as:
 
     $ gem install qu-mongoid
 
+Tested in Ruby 1.9.3, 2.0.0, JRuby (1.9 mode), and Rubinius (1.9 mode). Ruby 1.8.7 is not supported because Mongoid 3 only supports Ruby 1.9+.
+
 ## Why not just use the Mongo backend?
 
 Starting with version 3, Mongoid uses its own mongoDB driver (Moped) instead of the official 10gen ruby driver (mongo). To avoid loading both drivers, I ported the Mongo backend to Mongoid/Moped.

data/lib/qu-mongoid/version.rb

@@ -1,5 +1,5 @@
 module Qu
   module Mongoid
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/lib/qu/backend/mongoid.rb

@@ -64,8 +64,19 @@ Example:
         jobs(queue).find.count
       end
 
+      if defined?(::Moped::BSON::ObjectId)
+        def new_id
+          ::Moped::BSON::ObjectId.new
+        end
+      else
+        def new_id
+          ::BSON::ObjectId.new
+        end
+      end
+      private :new_id
+
       def enqueue(payload)
-        payload.id = ::Moped::BSON::ObjectId.new
+        payload.id = new_id
         jobs(payload.queue).insert({:_id => payload.id, :klass => payload.klass.to_s, :args => payload.args})
         self[:queues].where({:name => payload.queue}).upsert({:name => payload.queue})
         logger.debug { "Enqueued job #{payload}" }

data/qu-mongoid.gemspec

@@ -14,6 +14,9 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency 'mongoid', '~> 3.0'
+  s.add_dependency 'mongoid', '>= 3.0'
   s.add_dependency 'qu'
+
+  s.add_development_dependency 'rspec', '~> 2.14'
+  s.add_development_dependency 'rake'
 end

data/spec/qu/backend/mongoid_spec.rb

@@ -5,27 +5,27 @@ describe Qu::Backend::Mongoid do
   it_should_behave_like 'a backend'
 
   describe 'connection' do
-    it 'should use a separate connection in each thread' do
+    it 'uses a separate connection in each thread' do
       backend = subject
       connection = subject.connection
       separate_connection = false
       Thread.new do
         separate_connection = (backend.connection != connection)
       end.join
-      separate_connection.should be_true
+      expect(separate_connection).to be true
     end
     
-    it 'should default to the qu database' do
-      subject.connection.should be_instance_of(Moped::Session)
-      subject.connection.options[:database].should == 'qu'
+    it 'defaults to the qu database' do
+      expect(subject.connection).to be_instance_of(Moped::Session)
+      expect(subject.connection.options[:database]).to eq('qu')
     end
     
-    it 'should default to the :default session' do
-      subject.session.should == :default
-      subject.connection.should == ::Mongoid::Sessions.with_name(subject.session)
+    it 'defaults to the :default session' do
+      expect(subject.session).to eq(:default)
+      expect(subject.connection).to eq(::Mongoid::Sessions.with_name(subject.session))
     end
     
-    it 'should have a configurable session that works with threads' do
+    it 'has a configurable session that works with threads' do
       subject.connection = nil
       
       ::Mongoid.sessions[:qu] = {:uri => 'mongodb://127.0.0.1:27017/quspec', :max_retries_on_connection_failure => 4}
@@ -33,29 +33,38 @@ describe Qu::Backend::Mongoid do
       Qu.configure do |c|
         c.backend.session = :qu
       end
-      subject.connection.should == ::Mongoid::Sessions.with_name(:qu)
+      expect(subject.connection).to eq(::Mongoid::Sessions.with_name(:qu))
       
       should_have_qu_session_in_new_thread = false
       Thread.new do
         should_have_qu_session_in_new_thread = (subject.connection == ::Mongoid::Sessions.with_name(:qu))
       end.join
-      should_have_qu_session_in_new_thread.should be_true
+      expect(should_have_qu_session_in_new_thread).to be true
       
       # Clean up
       subject.connection=nil
       ::Mongoid.connect_to('qu')
     end
     
-    it 'should use MONGOHQ_URL from heroku' do
+    it 'uses MONGOHQ_URL from heroku' do
       # Clean up from other tests
       ::Mongoid.sessions[:default]  = nil
-      subject.connection=nil
+      subject.connection = nil
       ::Mongoid::Sessions.clear
       
       ENV['MONGOHQ_URL'] = 'mongodb://127.0.0.1:27017/quspec'
-      subject.connection.options[:database].should == 'quspec'
-      subject.connection.cluster.nodes.first.resolved_address.should == "127.0.0.1:27017"
-      ::Mongoid.sessions[:default][:hosts].should include("127.0.0.1:27017")
+      expect(subject.connection.options[:database]).to eq('quspec')
+
+      node = subject.connection.cluster.nodes.first
+      resolved_address = if node.respond_to?(:resolved_address)
+                           node.resolved_address
+                         else
+                           node.address.resolved
+                         end
+
+      expect(resolved_address).to eq("127.0.0.1:27017")
+
+      expect(::Mongoid.sessions[:default][:hosts]).to include("127.0.0.1:27017")
       
       # Clean up MONGOHQ stuff
       ENV.delete('MONGOHQ_URL')
@@ -68,18 +77,18 @@ describe Qu::Backend::Mongoid do
     let(:worker) { Qu::Worker.new }
 
     describe "on mongo >=2" do
-      it 'should return nil when no jobs exist' do
+      it 'returns nil when no jobs exist' do
         subject.clear
-        Moped::Session.any_instance.should_receive(:command).and_return(nil)
-        lambda { subject.reserve(worker, :block => false).should be_nil }.should_not raise_error
+        expect_any_instance_of(Moped::Session).to receive(:command).and_return(nil)
+        expect { expect(subject.reserve(worker, :block => false)).to be_nil }.not_to raise_error
       end
     end
 
     describe 'on mongo <2' do
-      it 'should return nil when no jobs exist' do
+      it 'returns nil when no jobs exist' do
         subject.clear
-        subject.connection.should_receive(:command).and_raise(Moped::Errors::OperationFailure.new(nil, 'test'))
-        lambda { subject.reserve(worker, :block => false).should be_nil }.should_not raise_error
+        expect(subject.connection).to receive(:command).and_raise(Moped::Errors::OperationFailure.new(nil, 'test'))
+        expect { expect(subject.reserve(worker, :block => false)).to be_nil }.not_to raise_error
       end
     end
   end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'qu/backend/spec'
 
 RSpec.configure do |config|
   config.before do
-    Qu.backend = mock('a backend', :reserve => nil, :failed => nil, :completed => nil,
+    Qu.backend = double('a backend', :reserve => nil, :failed => nil, :completed => nil,
       :register_worker => nil, :unregister_worker => nil)
     Qu.failure = nil
   end

metadata

@@ -1,50 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: qu-mongoid
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - David Butler
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: qu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    none: false
-  prerelease: false
+        version: '0'
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: qu
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
+  type: :development
   prerelease: false
-  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Mongoid backend for the Ruby queuing library Qu
 email:
 - dwbutler@ucla.edu
@@ -52,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -66,28 +87,25 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/dwbutler/qu-mongoid
 licenses: []
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
-specification_version: 3
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
+specification_version: 4
 summary: Mongoid backend for Qu
 test_files: []