qu-mongoid 0.2.0 → 0.2.1

data/Gemfile

@@ -6,6 +6,7 @@ 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'

data/README.md

@@ -7,8 +7,10 @@ This gem provides a Mongoid 3 / Moped backend for the queueing library [Qu](http
 
 Add this line to your application's Gemfile:
 
-    gem 'qu'
-    gem 'qu-mongoid'
+```ruby
+gem 'qu'
+gem 'qu-mongoid'
+```
 
 And then execute:
 
@@ -26,11 +28,19 @@ Mongoid version 2 and below uses the mongo driver, so use qu-mongo if you are on
 
 ## Configuration
 
-Qu-Mongoid will automatically connect to the default session configured in mongoid.yml. If a default session is not configured, it will attempt to read from ENV['MONGOHQ_URL'] and ENV['MONGOLAB_URI'], so it should work on Heroku. If you need to use a different Mongoid connection, you can do the following:
+Qu-Mongoid will automatically connect to the default session configured in mongoid.yml. If a default session is not configured, it will attempt to read from ```ENV['MONGOHQ_URL']``` and ```ENV['MONGOLAB_URI']```, so it should work on Heroku. If you need to use a different Mongoid session, you should do the following:
+
+```ruby
+Qu.configure do |c|
+  c.backend.session = :qu
+end
+```
+
+You may also configure the Qu connection using the code below, but **WARNING**: if you are running your workers in threads, this configuration is **NOT** recommended. This is because Mongoid uses a separate connection on each thread, so only the original thread will use the configured connection. New threads will use the default Mongoid session as described above.
 
 ``` ruby
 Qu.configure do |c|
-  c.connection = Mongoid::Sessions.with_name(:qu)
+  c.connection = Mongoid::Sessions.with_name(:qu) # New threads will not use this configured connection.
 end
 ```
 

data/lib/qu-mongoid/version.rb

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

data/lib/qu/backend/mongoid.rb

@@ -12,27 +12,40 @@ module Qu
 
       # Seconds to wait before looking for more jobs when the queue is empty (default: 5)
       attr_accessor :poll_frequency
+      
+      attr_accessor :session
 
       def initialize
         self.max_retries     = 5
         self.retry_frequency = 1
         self.poll_frequency  = 5
+        self.session = :default
       end
 
       def connection
-        @connection ||= begin
-          unless ::Mongoid.sessions[:default]
+        Thread.current[self.to_s] ||= begin
+          unless ::Mongoid.sessions[@session]
             if (uri = (ENV['MONGOHQ_URL'] || ENV['MONGOLAB_URI']).to_s) && !uri.empty?
               ::Mongoid.sessions = {:default => {:uri => uri, :max_retries_on_connection_failure => 4}}
             else
               ::Mongoid.connect_to('qu')
             end
           end
-          ::Mongoid::Sessions.default
+          ::Mongoid::Sessions.with_name(@session)
         end
       end
       alias_method :database, :connection
 
+      def connection=(conn)
+        warn %q(If you are using threads, setting the Qu::Mongoid connection will not work. Configure the session instead.
+Example:
+  Qu.configure do |c|
+    c.backend.session = :qu
+  end
+)
+        Thread.current[self.to_s] = conn
+      end
+
       def clear(queue = nil)
         queue ||= queues + ['failed']
         logger.info { "Clearing queues: #{queue.inspect}" }

data/spec/qu/backend/mongoid_spec.rb

@@ -5,15 +5,51 @@ describe Qu::Backend::Mongoid do
   it_should_behave_like 'a backend'
 
   describe 'connection' do
-    it 'should default the qu database' do
+    it 'should use 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
+    end
+    
+    it 'should default to the qu database' do
       subject.connection.should be_instance_of(Moped::Session)
       subject.connection.options[:database].should == 'qu'
     end
     
+    it 'should default to the :default session' do
+      subject.session.should == :default
+      subject.connection.should == ::Mongoid::Sessions.with_name(subject.session)
+    end
+    
+    it 'should have 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}
+      Qu.backend = subject
+      Qu.configure do |c|
+        c.backend.session = :qu
+      end
+      subject.connection.should == ::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
+      
+      # Clean up
+      subject.connection=nil
+      ::Mongoid.connect_to('qu')
+    end
+    
     it 'should use MONGOHQ_URL from heroku' do
       # Clean up from other tests
       ::Mongoid.sessions[:default]  = nil
-      subject.instance_eval {@connection=nil}
+      subject.connection=nil
       ::Mongoid::Sessions.clear
       
       ENV['MONGOHQ_URL'] = 'mongodb://127.0.0.1:27017/quspec'
@@ -23,7 +59,7 @@ describe Qu::Backend::Mongoid do
       
       # Clean up MONGOHQ stuff
       ENV.delete('MONGOHQ_URL')
-      subject.instance_eval {@connection=nil}
+      subject.connection=nil
       ::Mongoid.connect_to('qu')
     end
   end

metadata

@@ -1,48 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: qu-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  prerelease:
+  version: 0.2.1
 platform: ruby
 authors:
 - David Butler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: qu
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
 description: Mongoid backend for the Ruby queuing library Qu
 email:
 - dwbutler@ucla.edu
@@ -64,27 +66,28 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/dwbutler/qu-mongoid
 licenses: []
-post_install_message: 
+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
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Mongoid backend for Qu
 test_files: []
-has_rdoc: