sequel-rails 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 395942ff9378ccc865cd522cc7f9007900357a02
-  data.tar.gz: f6f81cc77327938dd8a151e43f3c7edc9fd73b61
+  metadata.gz: 6ee4521d1afd135d7d65cc7ba45017216fd2f348
+  data.tar.gz: aff23da29a4c91b19ff7cfc4bdd293bfa48854c4
 SHA512:
-  metadata.gz: a0bdf0d65e0b1bbb43b59db21e2522f00cea7627c6dd0c944a662c74696f1c30241f4324fc7675decbaa6e7ab48242785924c528b0d518763b25ec29d6f9fb7b
-  data.tar.gz: 2f2159dbe2b44a605860661316f2e803975e21caf15fd4938c18cb12a9da6204dae1a1f8573078a4da7acaddf14ee9ae50ff32f3209ddd55d1b0a9465843457c
+  metadata.gz: 5e9eb46be203ba4ba9d45a67fb5d39db1ecdca29345c9c7077d7b0350e624a75c53ccc5ccce72656c7ae5f29f9ef64fe5cb5701fcaeb22b051b97879cf605570
+  data.tar.gz: 2132e25c69b9fb4504ae054344fea7113e349b6001408a375ba839119ccd6142ccd904edd2a95c45197e0c9d3e5851344b315f78a19cb516a3b8328566b887ea

data/.travis.yml

@@ -1,9 +1,14 @@
 language: ruby
+before_install:
+  - gem update --system 2.1.11
+  - gem --version
+  - gem install bundler -v 1.5.1
 rvm:
   - ree
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-18mode
   - jruby-19mode
   - jruby-20mode

data/History.md

@@ -1,3 +1,10 @@
+0.9.1 (2013-12-31)
+==================
+
+* Map `ActiveRecord`'s `pool` key to `Sequel`'s `max_connections` in YAML
+  configuration [#59](https://github.com/TalentBox/sequel-rails/issues/59)
+* Run tests on Ruby 2.1.0
+
 0.9.0 (2013-11-16)
 ==================
 

data/README.md

@@ -1,8 +1,12 @@
-sequel-rails
-============
+# sequel-rails
+
+[![Gem Version](https://badge.fury.io/rb/sequel-rails.png)][gem]
+[![Build Status](https://secure.travis-ci.org/TalentBox/sequel-rails.png?branch=master)][travis]
+[![Code Climate](https://codeclimate.com/github/TalentBox/sequel-rails.png)][codeclimate]
 
-[![Build Status](https://travis-ci.org/TalentBox/sequel-rails.png?branch=master)](https://travis-ci.org/TalentBox/sequel-rails)
-[![Code Climate](https://codeclimate.com/github/TalentBox/sequel-rails.png)](https://codeclimate.com/github/TalentBox/sequel-rails)
+[gem]: https://rubygems.org/gems/sequel-rails
+[travis]: http://travis-ci.org/TalentBox/sequel-rails
+[codeclimate]: https://codeclimate.com/github/TalentBox/sequel-rails
 
 This gem provides the railtie that allows
 [sequel](http://github.com/jeremyevans/sequel) to hook into
@@ -173,6 +177,7 @@ Here's some examples:
       ctype: en_US.UTF-8 # Optional
       template: template1 # Optional
       tablespace: non_default_tablespace_name # Optional
+      max_connections: 20 # Optional, also accept 'pool' as key, if both are present 'max_connections' is used (default to nil, Sequel default is 4)
     ```
 
 2. For MySQL:

data/lib/sequel_rails/configuration.rb

@@ -87,6 +87,7 @@ module SequelRails
       end
 
       # override max connections if requested in app configuration
+      config['max_connections'] ||= config['pool']
       config['max_connections'] = max_connections if max_connections
       config['search_path'] = search_path if search_path
 

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/spec/lib/sequel_rails/configuration_spec.rb

@@ -142,6 +142,22 @@ describe SequelRails::Configuration do
             subject.connect environment
           end
         end
+
+        context 'with pool configuration key' do
+          before do
+            environments[environment]['pool'] = 7
+          end
+          it 'uses the value' do
+            expect(::Sequel).to receive(:connect) do |hash_or_url, *_|
+              if hash_or_url.is_a? Hash
+                expect(hash_or_url['max_connections']).to eq(7)
+              else
+                expect(hash_or_url).to include('max_connections=7')
+              end
+            end
+            subject.connect environment
+          end
+        end
       end
 
       context 'for a postgres connection' do

data/spec/lib/sequel_rails/railties/log_subscriber_spec.rb

@@ -3,7 +3,7 @@ require 'active_support/log_subscriber/test_helper'
 
 describe SequelRails::Railties::LogSubscriber do
   include ActiveSupport::LogSubscriber::TestHelper
-  def set_logger(logger)
+  def set_logger(logger) # rubocop:disable AccessorMethodName
     SequelRails.configuration.logger = logger
     ActiveSupport::LogSubscriber.logger = logger
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-16 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Use Sequel with Rails (3.x and 4.x)