trinidad_dbpool 0.2.0 → 0.3.0

data/README.rdoc

@@ -7,6 +7,8 @@ container.
 
 * MySql (trinidad_mysql_dbpool_extension)
 * PostgreSQL (trinidad_postgresql_dbpool_extension)
+* Mssql (trinidad_mssql_dbpool_extension)
+* Oracle (trinidad_oracle_dbpool_extension)
 
 == Usage
 
@@ -37,6 +39,7 @@ http://commons.apache.org/dbcp/configuration.html
   production:
     adapter: jdbc
     jndi: java:/comp/env/jdbc/TestDB
+    driver: com.mysql.jdbc.Driver     # jdbc driver is mandatory
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.3.0

data/lib/trinidad_dbpool/webapp_extension.rb

@@ -2,22 +2,29 @@ module Trinidad
   module Extensions
     class DbpoolWebAppExtension < WebAppExtension
       def configure(tomcat, app_context)
-        jndi = @options.delete(:jndi)
-        url = @options.delete(:url)
+        case @options
+        when Hash
+          [create_resource tomcat, app_context, @options]
+        when Array
+          @options.map { |opts| create_resource tomcat, app_context, opts }
+        end
+      end
+
+      private
+      def create_resource tomcat, app_context, opts
+        jndi = opts.delete(:jndi)
+        url = opts.delete(:url)
         url = protocol + url unless %r{^#{protocol}} =~ url
-        @options[:url] = url
+        opts[:url] = url
 
         resource = Trinidad::Tomcat::ContextResource.new
-        resource.setAuth(@options.delete(:auth)) if @options.has_key?(:auth) 
-        resource.setName(jndi)
-        resource.setType("javax.sql.DataSource")
-        resource.setDescription(@options.delete(:description)) if @options.has_key?(:description)
-
-        @options.each do |key, value|
-          resource.setProperty(key.to_s, value.to_s)
-        end
+        resource.set_auth(opts.delete(:auth)) if opts.key?(:auth)
+        resource.set_name(jndi)
+        resource.set_type('javax.sql.DataSource')
+        resource.set_description(opts.delete(:description)) if opts.key?(:description)
 
-        resource.setProperty("driverClassName", driver_name)
+        opts.each { |key, value| resource.set_property(key.to_s, value.to_s) }
+        resource.set_property('driverClassName', driver_name)
 
         app_context.naming_resources.add_resource(resource)
         app_context.naming_resources = resource.naming_resources

metadata

@@ -1,53 +1,40 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad_dbpool
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors: 
-- David Calavera
+  - David Calavera
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 +02:00
+date: 2011-07-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: trinidad_jars
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
-  version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: trinidad_jars
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.2.9
+    type: :development
+    version_requirements: *id002
 description: Addon to support database pools in Trinidad
 email: calavera@apache.org
 executables: []
@@ -55,51 +42,42 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+  - LICENSE
+  - README.rdoc
 files: 
-- LICENSE
-- README.rdoc
-- VERSION
-- lib/trinidad_dbpool.rb
-- lib/trinidad_dbpool/webapp_extension.rb
-- trinidad-libs/tomcat-dbcp.jar
-- spec/spec_helper.rb
-- spec/trinidad_mysql_dbpool_extension_spec.rb
+  - LICENSE
+  - README.rdoc
+  - VERSION
+  - lib/trinidad_dbpool.rb
+  - lib/trinidad_dbpool/webapp_extension.rb
+  - trinidad-libs/tomcat-dbcp.jar
 has_rdoc: true
 homepage: http://github.com/calavera/trinidad-dbpool
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Addon to support database pools in Trinidad
-test_files: 
-- spec/spec_helper.rb
-- spec/trinidad_mysql_dbpool_extension_spec.rb
+test_files: []
+

data/spec/spec_helper.rb

@@ -1,10 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'trinidad-libs'))
-
-require 'trinidad_mysql_dbpool_extension'
-require 'spec'
-
-Spec::Runner.configure do |config| 
-  config.mock_with :mocha
-end

data/spec/trinidad_mysql_dbpool_extension_spec.rb

@@ -1,48 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe Trinidad::Extensions::MysqlDbpoolWebAppExtension do
-  before(:each) do
-    @options = {
-      :url => 'jdbc:mysql://localhost:3306/test',
-      :jndi => 'jdbc/TestDB',
-      :maxIdle => 300
-    }
-    @extension = Trinidad::Extensions::MysqlDbpoolWebAppExtension.new(@options)
-    @context = Trinidad::Tomcat::StandardContext.new
-
-    @tomcat = mock
-    resource_context = mock
-    naming = mock
-
-    naming.stubs(:addResource)
-    resource_context.stubs(:naming_resources).returns(naming)
-    resource_context.stubs(:naming_resources=)
-    @tomcat.stubs(:addContext).returns(resource_context)
-  end
-
-  it "sets the mysql driver name as a resource property" do
-    resource = configure_extension
-    resource.getProperty('driverClassName').should == 'com.mysql.jdbc.Driver'
-  end
-
-  it "adds the resource to the tomcat standard context" do
-    configure_extension
-    @context.naming_resources.find_resource('jdbc/TestDB').should_not be_nil
-  end
-
-  it "adds properties to the resource" do
-    resource = configure_extension
-    resource.getProperty('maxIdle').should == '300'
-  end
-
-  it "adds the protocol if the url doesn't include it" do
-    @options[:url] = "localhost:3306/test_protocol"
-    extension = Trinidad::Extensions::MysqlDbpoolWebAppExtension.new(@options)
-    resource = extension.configure(@tomcat, @context)
-    resource.get_property('url').should == "jdbc:mysql://localhost:3306/test_protocol"
-  end
-
-  def configure_extension
-    @extension.configure(@tomcat, @context)
-  end
-end