mongoid_connection_pool 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: af30e7fe5080cef0ed8640c322486fc14752172c
+  data.tar.gz: 35b4ae73ad57ae936572ea230aee5ad74e7c9c6b
+SHA512:
+  metadata.gz: 8a930a2324268e11bc7bbece3f0975cc967057c98736a2ec0fd6d0afcb6b502a29b88c112eb00ad4f192f77d4df524ab24337f87a1f12ed6bdbea425f11babc4
+  data.tar.gz: c86ced6234965db97d60add4c322228e6a07ed5c05ff1d6b0274aa8df81db1cb756c24f0d46db63e9e353d4de813963443759caf5598162fe5de1a52a31d9c1c

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - rbx-19mode
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode

data/Gemfile

@@ -4,5 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'mongoid', '~> 3.1.0'
+gem 'thread_safe', '~> 0.1.3'
 
 gem 'rspec', groups: [:development, :test]

data/README.md

@@ -1,4 +1,5 @@
-# MongoidConnectionPool
+# Mongoid Connection Pool
+[![Build Status](https://travis-ci.org/cpuguy83/mongoid_connection_pool.png?branch=master)](https://travis-ci.org/cpuguy83/mongoid_connection_pool)
 
 If you ever use Mongoid in a threaded environment such as Sidekiq with Rubinius
 or JRuby you will quickly find out that Mongoid does not handle DB connections

data/Rakefile

@@ -1 +1,4 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+task :default => :spec
+RSpec::Core::RakeTask.new

data/lib/mongoid_connection_pool/mongoid/sessions/session_pool.rb

@@ -94,15 +94,20 @@ module Mongoid
       attr_reader :sessions, :size, :reaper, :reserved_sessions, :available
       def initialize(opts={})
         super()
+
         opts[:name] ||= :default
+        opts[:size] ||= 5
+        opts[:checkout_timeout] ||= 5
+        # Might be false, disables Reaper
+        opts[:reap_frequency] = 3 if opts[:reap_frequency].nil?
 
-        @reaper = Reaper.new(opts[:reap_frequency] || 10, self)
+        @reaper = Reaper.new(opts[:reap_frequency], self)
         @reaper.run
 
-        @checkout_timeout = opts[:checkout_timeout] || 5
+        @checkout_timeout = opts[:checkout_timeout]
 
-        @size = opts[:size] || 5
-        @name = opts[:name] || :default
+        @size = opts[:size]
+        @name = opts[:name]
         @sessions = []
         @reserved_sessions = ThreadSafe::Cache.new(:initial_capacity => @size)
         @available = Queue.new self
@@ -165,7 +170,7 @@ module Mongoid
       def reap
         @reserved_sessions.keys.each do |thread|
           session = @reserved_sessions[thread]
-          checkin(session) if thread.stop?
+          checkin(session) unless thread.alive?
         end
       end
 

data/lib/mongoid_connection_pool/mongoid/sessions.rb

@@ -35,6 +35,10 @@ module Mongoid
         true
       end
 
+      def default
+        with_name(:default)
+      end
+
       def with_name(name)
         session_pool(name).session_for_thread(Thread.current) ||
           session_pool(name).checkout

data/lib/mongoid_connection_pool/version.rb

@@ -1,3 +1,3 @@
 module MongoidConnectionPool
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/mongoid_connection_pool.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
 
   spec.add_runtime_dependency "mongoid", "~> 3.1.0"
+  spec.add_runtime_dependency "thread_safe", "~> 0.1.3"
 end

data/spec/session_pool_spec.rb

@@ -95,7 +95,7 @@ describe Mongoid::Sessions::SessionPool do
       Thread.new { session_pool.checkout }
     end
 
-    it 'Reaps sessions from dead/sleeping threads' do
+    it 'Reaps sessions from dead threads' do
       thread.join
 
       expect(session_pool.reap).to be_true

data/spec/sessions_spec.rb

@@ -1,7 +1,23 @@
+require 'spec_helper'
+
 describe Mongoid::Sessions do
+  before do
+    Mongoid::Sessions.instance_variable_set('@session_pool', nil)
+  end
+
+  describe 'default' do
+    let(:default_pool) do
+      Mongoid::Sessions.instance_variable_get('@session_pool')[:default]
+    end
+
+    it "should take a default session from pool" do
+      expect(Mongoid::Sessions.default).to be_a Moped::Session
+      expect(default_pool.reserved_sessions).to_not be_nil
+    end
+  end
+
   describe '.disconnect' do
     it "does not lock up when no sessions are created" do
-      Mongoid::Sessions.instance_variable_set('@session_pool', nil)
       expect(Mongoid::Sessions.disconnect).to_not raise_error
     end
   end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_connection_pool
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Brian Goff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,39 +27,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,11 +62,24 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: thread_safe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 description: Provides connection pooling for Mongoid
 email:
 - cpuguy83@gmail.com
@@ -83,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,27 +106,26 @@ files:
 homepage: http://www.github.com/cpuguy83/mongoid_connection_pool
 licenses:
 - MIT
+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.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides connection pooling for Mongoid
 test_files:
 - spec/session_pool_spec.rb