activerecord-bogacs 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cade13cd15b5374a780d1f8d0de1d63b7e0c89a
-  data.tar.gz: 51949daaccd651b2d8fa51ccfa3379109885ed16
+  metadata.gz: 930e066b793b68dafffe166563475cfa1812aad6
+  data.tar.gz: 56cd2c22124126859b4e8bb5da2f8fe133c43a5e
 SHA512:
-  metadata.gz: 91259b8c14a9eeea273eddb83c0b561ab65908683619a6b4f0bd7d744198c7a9e1a1b4dae5d1705b82b98fa5e8c0097d00b06c9b1c90ca7113cbfa1b59018fa7
-  data.tar.gz: 9f814b2b2eb6ced23c2da439c2dfd05c9fec270ed50f2f410748c75906e9911f62a7e794b28e5021de0de9eec5169b13d381dd077fba94fe1f39b159b6bebfde
+  metadata.gz: 8b9a4c0e4877fd090e266096c7c48cff52d3a2856efc712c8e3919c659d9f8a866ccf1f19d92ac44258e0d44cbfc255bab33473ab4a2c2200fbd6a5e228ebcc5
+  data.tar.gz: daaf27dcb6b82139cfeaf396181ddfbe6bf3ff36300f79dc56ae6aee9d4b604250f2172f434296136350c2bfb290907a2030d8b741e06330343b5fe51db2e4b2

data/.travis.yml

@@ -1,26 +1,44 @@
 language: ruby
+sudo: false
 jdk:
   #- openjdk6
   - oraclejdk7
   - oraclejdk8
 rvm:
-  - jruby
+  - jruby-1.7.16
   #- jruby-head
-  #- jruby-18mode
-  #- jruby-19mode
   #- 2.1.2
 before_install:
   - ((jruby -v | grep 1.8.7) && jruby --1.9 -S gem update --system 2.1.11) || true
 before_script:
   #- echo \"JRUBY_OPTS: $JRUBY_OPTS\"
-  - export JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false"
+  - export JRUBY_OPTS="$JRUBY_OPTS --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
   - export JAVA_OPTS="$JAVA_OPTS" # -Xmx600M
 script:
   - bundle exec rake tomcat:jndi:download tomcat:jdbc:download tomcat:dbcp:download
-  - bundle exec rake c3p0:download hikari:download
+  - bundle exec rake c3p0:download
+  - bundle exec rake hikari:download
+  - bundle exec rake dbcp:download
   - bundle exec rake db:create:mysql db:create:postgresql
 env:
-  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.6"
-  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 4.1.6"
-  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 3.2.18"
-  - JRUBY_OPTS="--1.8 $JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 3.2.18"
+  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.2"
+  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.1-java6"
+  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.0.1-java6"
+  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 3.2.18" HIKARI_VERSION="1.4.0"
+  - JRUBY_OPTS="--1.8 $JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 3.2.18" HIKARI_VERSION="2.2.5-java6"
+matrix:
+  #allow_failures:
+    #- rvm: jruby-head
+  exclude:
+    - rvm: jruby-1.7.16
+      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.2"
+      jdk: oraclejdk7
+    - rvm: jruby-1.7.16
+      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.1-java6"
+      jdk: oraclejdk8
+    - rvm: jruby-1.7.16
+      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.0.1-java6"
+      jdk: oraclejdk8
+    - rvm: jruby-1.7.16
+      env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 3.2.18" HIKARI_VERSION="2.2.5-java6"
+      jdk: oraclejdk8

data/Gemfile

@@ -16,6 +16,11 @@ else
   gem 'activerecord', :require => nil
 end
 
+if RUBY_VERSION.index('1.8') == 0
+  gem 'i18n', '< 0.7.0' # Gem::InstallError: i18n requires Ruby version >= 1.9.3
+  gem 'atomic', '1.1.16' # concurrent-ruby gem only for Ruby version >= 1.9.3
+end
+
 platform :jruby do
   if version = ENV['AR_JDBC_VERSION']
     if version.index('/') && ::File.exist?(version)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2014 [Karol Bucek](http://kares.org)
+Copyright (c) 2013-2015 [Karol Bucek](http://kares.org)
 
 MIT License
 

data/README.md

@@ -117,7 +117,7 @@ Only tested with ActiveRecord-JDBC-Adapter using the official Postgres' driver.
 
 ## Copyright
 
-Copyright (c) 2014 [Karol Bucek](http://kares.org).
+Copyright (c) 2015 [Karol Bucek](http://kares.org).
 See LICENSE (http://en.wikipedia.org/wiki/MIT_License) for details.
 
 [0]: http://res.cloudinary.com/kares/image/upload/c_scale,h_600,w_800/v1406451696/bogacs.jpg

data/Rakefile

@@ -94,7 +94,7 @@ namespace :tomcat do
 
   tomcat_maven_repo = 'http://repo2.maven.org/maven2/org/apache/tomcat'
   download_dir = File.expand_path('test/jars', File.dirname(__FILE__))
-  version_default = '7.0.54'
+  version_default = '7.0.59'
 
   [ 'tomcat-jdbc', 'tomcat-dbcp' ].each do |tomcat_pool|
     namespace tomcat_pool.sub('tomcat-', '') do # rake tomcat:dbcp:download
@@ -102,7 +102,8 @@ namespace :tomcat do
       tomcat_pool_jar = "#{tomcat_pool}.jar"
 
       task :download, :version do |_,args| # rake tomcat:jdbc:download[7.0.54]
-        version = args[:version] || version_default
+        env_key = "#{tomcat_pool.upcase.sub('-', '_')}_VERSION" # 'TOMCAT_JDBC_VERSION'
+        version = args[:version] || ENV[env_key] || version_default
 
         uri = "#{tomcat_maven_repo}/#{tomcat_pool}/#{version}/#{tomcat_pool}-#{version}.jar"
 
@@ -173,24 +174,47 @@ namespace :tomcat do
 
 end
 
+namespace :dbcp do # a.k.a DBCP2
+
+  commons_repo = 'http://repo2.maven.org/maven2/org/apache/commons'
+  download_dir = File.expand_path('test/jars', File.dirname(__FILE__))
+  version_default = '2.0.1'
+
+  task :download, :version do |_,args| # rake dbcp:download
+    version = args[:version] || ENV['DBCP_VERSION'] || version_default
+
+    dbcp_jar = "commons-dbcp2-#{version}.jar"
+
+    uri = "#{commons_repo}/commons-dbcp2/#{version}/#{dbcp_jar}"
+
+    _download(uri, download_dir, dbcp_jar)
+  end
+
+  task :clear do
+    Dir.glob( File.join(download_dir, '{commons-dbcp2}*.jar') ).each { |jar| rm jar }
+  end
+
+end
+
 namespace :c3p0 do
 
   mchange_base_repo = 'http://repo2.maven.org/maven2/com/mchange'
   download_dir = File.expand_path('test/jars', File.dirname(__FILE__))
-  c3p0_version = '0.9.5-pre9'
-  mchange_commons_version = '0.2.8'
+  c3p0_version = '0.9.5'
+  mchange_commons_version = '0.2.9'
 
-  c3p0_jar = "c3p0-#{c3p0_version}.jar"
   mchange_commons_jar = "mchange-commons-java-#{mchange_commons_version}.jar"
 
   task :download, :version do |_,args| # rake c3p0:download
-    # version = args[:version] || version_default
+    version = args[:version] || ENV['C3P0_VERSION'] || c3p0_version
+
+    c3p0_jar = "c3p0-#{version}.jar"
 
     uri = "#{mchange_base_repo}/mchange-commons-java/#{mchange_commons_version}/#{mchange_commons_jar}"
 
     _download(uri, download_dir, mchange_commons_jar)
 
-    uri = "#{mchange_base_repo}/c3p0/#{c3p0_version}/#{c3p0_jar}"
+    uri = "#{mchange_base_repo}/c3p0/#{version}/#{c3p0_jar}"
 
     _download(uri, download_dir, c3p0_jar)
   end
@@ -207,8 +231,8 @@ namespace :hikari do
   slf4j_base_repo = 'http://repo2.maven.org/maven2/org/slf4j'
   javassist_base_repo = 'http://repo2.maven.org/maven2/org/javassist'
   download_dir = File.expand_path('test/jars', File.dirname(__FILE__))
-  hikari_version = '1.3.9'
-  slf4j_version = '1.7.7'
+  hikari_version = '1.4.0'
+  slf4j_version = '1.7.10'
   javassist_version = '3.18.2-GA'
 
   slf4j_api_jar = "slf4j-api-#{slf4j_version}.jar"
@@ -216,11 +240,17 @@ namespace :hikari do
   javassist_jar = "javassist-#{javassist_version}.jar"
 
   task :download, :version do |_,args| # rake c3p0:download
-    version = args[:version] || hikari_version
-
-    hikari_jar = "HikariCP-#{hikari_version}.jar"
+    version = args[:version] || ENV['HIKARI_VERSION'] || hikari_version
+
+    version = version.dup
+    if version.sub!('-java6', '') # e.g. '2.3.2-java6'
+      hikari_jar = "HikariCP-java6-#{version}.jar"
+      uri = "#{hikari_base_repo}/HikariCP-java6/#{version}/#{hikari_jar}"
+    else
+      hikari_jar = "HikariCP-#{version}.jar"
+      uri = "#{hikari_base_repo}/HikariCP/#{version}/#{hikari_jar}"
+    end
 
-    uri = "#{hikari_base_repo}/HikariCP/#{version}/#{hikari_jar}"
     _download(uri, download_dir, hikari_jar)
 
     uri = "#{slf4j_base_repo}/slf4j-api/#{slf4j_version}/#{slf4j_api_jar}"
@@ -234,7 +264,7 @@ namespace :hikari do
   end
 
   task :clear do
-    Dir.glob( File.join(download_dir, '{HikariCP,slf4j}*.jar') ).each { |jar| rm jar }
+    Dir.glob( File.join(download_dir, '{HikariCP,slf4j,javassist}*.jar') ).each { |jar| rm jar }
   end
 
 end

data/activerecord-bogacs.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^test/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency 'atomic', '~> 1.1'
   gem.add_runtime_dependency 'thread_safe', '~> 0.3'
 
+  gem.add_development_dependency 'concurrent-ruby', '>= 0.8' if RUBY_VERSION.index('1.8') != 0
   gem.add_development_dependency 'rake', '~> 10.3'
   gem.add_development_dependency 'test-unit', '~> 2.5'
 end

data/lib/active_record/bogacs/shareable_pool.rb

@@ -2,7 +2,16 @@ require 'active_record/connection_adapters/abstract/connection_pool'
 
 require 'thread'
 require 'thread_safe'
-require 'atomic'
+begin
+  require 'concurrent/atomic'
+rescue LoadError => e
+  begin
+    require 'atomic'
+  rescue LoadError
+    warn "shareable pool needs gem 'concurrent-ruby' please install or add it to your Gemfile"
+    raise e
+  end
+end
 
 require 'active_record/bogacs/pool_support'
 
@@ -223,6 +232,12 @@ module ActiveRecord
         least_shared # might be nil in that case we'll likely wait (as super)
       end
 
+      if defined? Concurrent::Atomic
+        Atomic = Concurrent::Atomic
+      else
+        Atomic = ::Atomic
+      end
+
       def add_shared_connection(connection)
         @shared_connections[connection] = Atomic.new(1)
       end

data/lib/active_record/bogacs/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bogacs
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/test/active_record/bogacs/false_pool_test.rb

@@ -1,7 +1,5 @@
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
-require 'atomic'
-
 ActiveRecord::Bogacs::FalsePool.class_eval do
   # ...
 end
@@ -178,7 +176,7 @@ module ActiveRecord
           (max_pool_size - 1).times { threads_ready.pop } # awaits
 
           connection = t1_ready.pop
-          t1_jdbc_connection = connection.jdbc_connection(true)
+          t1_jdbc_connection = unwrap_connection(connection)
 
           # pool = ActiveRecord::Base.connection_pool
 
@@ -202,7 +200,7 @@ module ActiveRecord
 
           if defined? JRUBY_VERSION
             if connection2 = t2.join.value
-              assert_equal t1_jdbc_connection, connection2.jdbc_connection(true)
+              assert_equal t1_jdbc_connection, unwrap_connection(connection2)
             end
           end
 
@@ -212,6 +210,12 @@ module ActiveRecord
           threads && threads.each(&:join)
         end
 
+        protected
+
+        def unwrap_connection(connection)
+          connection.jdbc_connection(true)
+        end
+
       end
 
       class ConnectionPoolWrappingTomcatJdbcDataSourceTest < TestBase
@@ -235,6 +239,62 @@ module ActiveRecord
 
       end
 
+      class ConnectionPoolWrappingTomcatDbcpDataSourceTest < TestBase
+        include ConnectionPoolWrappingDataSourceTestMethods
+
+        def self.build_data_source(config)
+          build_tomcat_dbcp_data_source(config)
+        end
+
+        def self.jndi_name; 'jdbc/TestTomcatDbcpDB' end
+
+        def self.close_data_source
+          @@data_source.close if @@data_source
+        end
+
+        def max_pool_size; @@data_source.max_active end
+
+        def teardown
+          self.class.establish_jndi_connection # for next test
+        end
+
+        protected
+
+        def unwrap_connection(connection)
+          connection = connection.jdbc_connection(true)
+          connection.delegate
+        end
+
+      end
+
+      class ConnectionPoolWrappingDbcpDataSourceTest < TestBase
+        include ConnectionPoolWrappingDataSourceTestMethods
+
+        def self.build_data_source(config)
+          build_tomcat_dbcp_data_source(config)
+        end
+
+        def self.jndi_name; 'jdbc/TestTomcatDbcpDB' end
+
+        def self.close_data_source
+          @@data_source.close if @@data_source
+        end
+
+        def max_pool_size; @@data_source.max_active end
+
+        def teardown
+          self.class.establish_jndi_connection # for next test
+        end
+
+        protected
+
+        def unwrap_connection(connection)
+          connection = connection.jdbc_connection(true)
+          connection.delegate
+        end
+
+      end
+
       class ConnectionPoolWrappingC3P0DataSourceTest < TestBase
         include ConnectionPoolWrappingDataSourceTestMethods
 

data/test/test_helper.rb

@@ -110,6 +110,14 @@ end
 module ActiveRecord
   module Bogacs
 
+    begin
+      require 'concurrent/atomic'
+      Atomic = Concurrent::Atomic
+    rescue LoadError
+      require 'atomic'
+      Atomic = ::Atomic
+    end
+
     module TestHelper
 
       def _test_name
@@ -251,6 +259,28 @@ module ActiveRecord
         data_source
       end
 
+      def build_tomcat_dbcp_data_source(ar_jdbc_config = AR_CONFIG)
+        load 'test/jars/tomcat-dbcp.jar'
+
+        data_source = org.apache.tomcat.dbcp.dbcp.BasicDataSource.new
+        configure_dbcp_data_source(data_source, ar_jdbc_config)
+
+        data_source.setAccessToUnderlyingConnectionAllowed true
+
+        data_source
+      end
+
+      def build_commons_dbcp_data_source(ar_jdbc_config = AR_CONFIG)
+        load Dir.glob('test/jars/{commons-dbcp}*.jar').first
+
+        data_source = org.apache.tomcat.dbcp.dbcp.BasicDataSource.new
+        configure_dbcp_data_source(data_source, ar_jdbc_config)
+
+        data_source.setAccessToUnderlyingConnectionAllowed true
+
+        data_source
+      end
+
       def configure_dbcp_data_source(data_source, ar_jdbc_config)
         unless driver = ar_jdbc_config[:driver]
           jdbc_driver_module.load_driver
@@ -261,10 +291,18 @@ module ActiveRecord
         data_source.setUrl ar_jdbc_config[:url]
         data_source.setUsername ar_jdbc_config[:username] if ar_jdbc_config[:username]
         data_source.setPassword ar_jdbc_config[:password] if ar_jdbc_config[:password]
-        if ar_jdbc_config[:properties]
-          properties = java.util.Properties.new
-          properties.putAll ar_jdbc_config[:properties]
-          data_source.setDbProperties properties
+        if properties = ar_jdbc_config[:properties]
+          if data_source.respond_to?(:setDbProperties) # TC-JDBC
+            db_properties = java.util.Properties.new
+            properties.each { |name, value| db_properties.put(name, value.to_s) }
+            data_source.setDbProperties db_properties
+          else # Tomcat-DBCP / Commons DBCP2
+            # format of the string must be: [propertyName=property;]
+            connection_properties = properties.inject('') do
+              |str, name, val| str << "[#{name}=#{val};]"; str
+            end
+            data_source.setConnectionProperties connection_properties
+          end
         end
         # JDBC pool tunings (some mapped from AR configuration) :
         if ar_jdbc_config[:pool] # default is 100

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bogacs
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Karol Bucek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: atomic
+  name: thread_safe
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.3'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.3'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: concurrent-ruby
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.8'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.8'
   prerelease: false
-  type: :runtime
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: A small body of still water, usually fresh ... for ActiveRecord!