jdbc-helper 0.7.5 → 0.7.6

data/CHANGELOG.markdown

@@ -1,3 +1,6 @@
+### 0.7.6 / 2012/08/26
+* Added FileMaker Pro connector (statonjr)
+
 ### 0.7.5 / 2012/07/28
 * `require 'jdbc-helper/sql'` is allowed in non-Java environments
 

data/README.markdown

@@ -1,12 +1,12 @@
 ```
-    _     _ _                 _          _                 
-   (_)   | | |               | |        | |                
-    _  __| | |__   ___ ______| |__   ___| |_ __   ___ _ __ 
+    _     _ _                 _          _
+   (_)   | | |               | |        | |
+    _  __| | |__   ___ ______| |__   ___| |_ __   ___ _ __
    | |/ _` | '_ \ / __|______| '_ \ / _ \ | '_ \ / _ \ '__|
-   | | (_| | |_) | (__       | | | |  __/ | |_) |  __/ |   
-   | |\__,_|_.__/ \___|      |_| |_|\___|_| .__/ \___|_|   
-  _/ |                                    | |              
- |__/                                     |_|              
+   | | (_| | |_) | (__       | | | |  __/ | |_) |  __/ |
+   | |\__,_|_.__/ \___|      |_| |_|\___|_| .__/ \___|_|
+  _/ |                                    | |
+ |__/                                     |_|
 ```
 
 # jdbc-helper
@@ -66,6 +66,7 @@ so that you don't have to specify lengthy class names and JDBC URLs.
 * PostgreSQL (`JDBCHelper::PostgreSQL`)
 * MS SQL Server (`JDBCHelper::MSSQL`)
 * Cassandra (`JDBCHelper::Cassandra`)
+* FileMaker Pro (`JDBCHelper::FileMaker`)
 
 ```ruby
 # MySQL shortcut connector
@@ -76,13 +77,16 @@ oc = JDBCHelper::Oracle.connect(host, user, password, service_name)
 
 # PostgreSQL shortcut connector
 pc = JDBCHelper::PostgreSQL.connect(host, user, password, db)
- 
+
 # MS SQL Server shortcut connector
 sc = JDBCHelper::MSSQL.connect(host, user, password, db)
 
 # Cassandra CQL3 connector
 cc = JDBCHelper::Cassandra.connect(host, keyspace)
 
+# FileMaker Pro shortcut connector
+fmp = JDBCHelper::FileMaker.connect(host, user, password, db)
+
 # Extra parameters
 mc = JDBCHelper::MySQL.connect(host, user, password, db,
        :rewriteBatchedStatements => true)
@@ -274,7 +278,7 @@ scope.update(:a => 'xyz')
 #### Invalid use of dynamic conditions
 
 TableWrapper object internally creates JDBC PreparedStatements.
-If you dynamically build many condition-strings as the following example, 
+If you dynamically build many condition-strings as the following example,
 it would soon fail because there will be too many open PreparedStatements.
 
 ```ruby
@@ -306,7 +310,7 @@ conn.function(:coalesce).call(nil, nil, 'king')
 # Working with IN/INOUT/OUT parameteres
 # Bind by ordinal number
 conn.procedure(:update_and_fetch_something).call(
-         100,                 # Input parameter 
+         100,                 # Input parameter
          ["value", String],   # Input/Output parameter
          Fixnum               # Output parameter
 )
@@ -335,8 +339,11 @@ seq.reset! 100
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
+## Contributors
+
+* [Larry Staton Jr.](https://github.com/statonjr)
+
 ## Copyright
 
 Copyright (c) 2011 Junegunn Choi. See LICENSE.txt for
 further details.
-

data/lib/jdbc-helper/connector/filemaker.rb

@@ -0,0 +1,24 @@
+# encoding: UTF-8
+# Larry Staton Jr. (larry@sweetpeasoftware.com)
+
+module JDBCHelper
+# Shortcut connector for FileMaker
+  module FileMaker
+    extend Connector
+
+    # @param [String] host
+    # @param [String] user
+    # @param [String] password
+    # @param [String] db
+    # @param [Hash] extra_params
+    # @return [JDBCHelper::Connection]
+    def self.connect(host, user, password, db, extra_params = {}, &block)
+      connect_impl :filemaker, {
+        :url      => "jdbc:filemaker://#{host}/#{db}",
+        :user     => user,
+        :password => password
+      }, extra_params, &block
+    end
+
+  end#FileMaker
+end#JDBCHelper

data/lib/jdbc-helper/connector.rb

@@ -32,4 +32,4 @@ require 'jdbc-helper/connector/mysql'
 require 'jdbc-helper/connector/postgresql'
 require 'jdbc-helper/connector/mssql'
 require 'jdbc-helper/connector/cassandra'
-
+require 'jdbc-helper/connector/filemaker'

data/lib/jdbc-helper/constants.rb

@@ -34,6 +34,9 @@ module Constants
       :cassandra    => {
         :driver     => 'org.apache.cassandra.cql.jdbc.CassandraDriver',
         :cqlVersion => '3.0.0',
+      },
+      :filemaker    => {
+        :driver     => 'com.filemaker.jdbc.Driver'
       }
     }
   end#Connector

data/lib/jdbc-helper/version.rb

@@ -1,3 +1,3 @@
 module JDBCHelper
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
 end

data/test/database.yml

@@ -26,3 +26,10 @@ sqlserver:
   url:       jdbc:sqlserver://localhost;databaseName=test;
   user:      test
   password:  test
+
+filemaker:
+  driver:    com.filemaker.jdbc.Driver
+  url:       jdbc:filemaker://localhost/test
+  database:  test
+  user:      test
+  password:  test

data/test/test_connectors.rb

@@ -101,6 +101,14 @@ class TestConnectors < Test::Unit::TestCase
         end
         assert @conn.closed?
         assert_equal 1, ret
+      when /filemaker/
+        host = conn_info['url'].match(%r{//([^/?]+)})[1]
+        db = conn_info['url'].match(%r{/([^/?]*?)(\?.*)?$})[1]
+
+        conn = JDBCHelper::FileMaker.connect(host, conn_info['user'], conn_info['password'], db)
+        assert conn.closed? == false
+        conn.close
+        assert conn.closed?
       end
     end
   end
@@ -199,4 +207,3 @@ class TestConnectors < Test::Unit::TestCase
     end
   end
 end
-

metadata

@@ -2,14 +2,14 @@
 name: jdbc-helper
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-07-28 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: insensitive_hash
@@ -107,6 +107,7 @@ files:
 - lib/jdbc-helper/connection/type_map.rb
 - lib/jdbc-helper/connector.rb
 - lib/jdbc-helper/connector/cassandra.rb
+- lib/jdbc-helper/connector/filemaker.rb
 - lib/jdbc-helper/connector/mssql.rb
 - lib/jdbc-helper/connector/mysql.rb
 - lib/jdbc-helper/connector/oracle.rb