tiny_tds 0.3.1 → 0.3.2

data/CHANGELOG

@@ -1,4 +1,9 @@
 
+* 0.3.2 *
+
+* Small changes while testing JRuby. Using options hash for connect vs many args.
+
+
 * 0.3.1 *
 
 * Fix bad gem build.

data/README.rdoc

@@ -15,7 +15,7 @@ The API is simple and consists of these classes:
 
 == Install
 
-Installing with rubygems should just work. TinyTds is tested on ruby version 1.8.6, 1.8.7, 1.9.1, 1.9.2 as well as REE.
+Installing with rubygems should just work. TinyTds is tested on ruby version 1.8.6, 1.8.7, 1.9.1, 1.9.2 as well as REE & JRuby.
 
     $ gem install tiny_tds
 
@@ -174,7 +174,7 @@ By default row caching is turned on because the SQL Server adapter for ActiveRec
 
 
 
-== Using TinyTds With the ActiveRecord SQL Server adapter.
+== Using TinyTds With Rails & The ActiveRecord SQL Server adapter.
 
 As of version 2.3.11 & 3.0.3 of the adapter, you can specify a :dblib mode in database.yml and use TinyTds as the low level connection mode. Make sure to add a :dataserver option to that matches the name in your freetds.conf file. The SQL Server adapter can be found using the link below. Also included is a direct link to the wiki article covering common questions when using TinyTds as the low level connection mode for the adapter.
 

data/ext/tiny_tds/client.c

@@ -5,6 +5,7 @@
 
 VALUE cTinyTdsClient;
 extern VALUE mTinyTds, cTinyTdsError;
+static ID sym_username, sym_password, sym_dataserver, sym_database, sym_appname, sym_tds_version, sym_login_timeout, sym_timeout, sym_encoding;
 static ID intern_source_eql, intern_severity_eql, intern_db_error_number_eql, intern_os_error_number_eql;
 static ID intern_new, intern_dup, intern_transpose_iconv_encoding, intern_local_offset, intern_gsub;
 VALUE opt_escape_regex, opt_escape_dblquote;
@@ -210,7 +211,19 @@ static VALUE rb_tinytds_return_code(VALUE self) {
 
 // TinyTds::Client (protected) 
 
-static VALUE rb_tinytds_connect(VALUE self, VALUE user, VALUE pass, VALUE dataserver, VALUE database, VALUE app, VALUE version, VALUE ltimeout, VALUE timeout, VALUE charset) {
+static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
+  /* Parsing options hash to local vars. */
+  VALUE user, pass, dataserver, database, app, version, ltimeout, timeout, charset;
+  user = rb_hash_aref(opts, sym_username);
+  pass = rb_hash_aref(opts, sym_password);
+  dataserver = rb_hash_aref(opts, sym_dataserver);
+  database = rb_hash_aref(opts, sym_database);
+  app = rb_hash_aref(opts, sym_appname);
+  version = rb_hash_aref(opts, sym_tds_version);
+  ltimeout = rb_hash_aref(opts, sym_login_timeout);
+  timeout = rb_hash_aref(opts, sym_timeout);
+  charset = rb_hash_aref(opts, sym_encoding);
+  /* Dealing with options. */
   if (dbinit() == FAIL) {
     rb_raise(cTinyTdsError, "failed dbinit() function");
     return self;
@@ -265,7 +278,17 @@ void init_tinytds_client() {
   rb_define_method(cTinyTdsClient, "escape", rb_tinytds_escape, 1);
   rb_define_method(cTinyTdsClient, "return_code", rb_tinytds_return_code, 0);
   /* Define TinyTds::Client Protected Methods */
-  rb_define_protected_method(cTinyTdsClient, "connect", rb_tinytds_connect, 9);
+  rb_define_protected_method(cTinyTdsClient, "connect", rb_tinytds_connect, 1);
+  /* Symbols For Connect */
+  sym_username = ID2SYM(rb_intern("username"));
+  sym_password = ID2SYM(rb_intern("password"));
+  sym_dataserver = ID2SYM(rb_intern("dataserver"));
+  sym_database = ID2SYM(rb_intern("database"));
+  sym_appname = ID2SYM(rb_intern("appname"));
+  sym_tds_version = ID2SYM(rb_intern("tds_version"));
+  sym_login_timeout = ID2SYM(rb_intern("login_timeout"));
+  sym_timeout = ID2SYM(rb_intern("timeout"));
+  sym_encoding = ID2SYM(rb_intern("encoding"));
   /* Intern TinyTds::Error Accessors */
   intern_source_eql = rb_intern("source=");
   intern_severity_eql = rb_intern("severity=");

data/lib/tiny_tds.rb

@@ -15,5 +15,5 @@ require 'tiny_tds/tiny_tds'
 #
 # Tiny Ruby Wrapper For FreeTDS Using DB-Library
 module TinyTds
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/tiny_tds/client.rb

@@ -47,18 +47,14 @@ module TinyTds
 
 
     def initialize(opts={})
+      raise ArgumentError, 'missing :username option' if opts[:username].nil? || opts[:username].empty?
       @query_options = @@default_query_options.dup
-      user       = opts[:username]
-      pass       = opts[:password]
-      dataserver = opts[:dataserver]
-      database   = opts[:database]
-      appname    = opts[:appname] || 'TinyTds'
-      version    = TDS_VERSIONS_SETTERS[opts[:tds_version].to_s] || TDS_VERSIONS_SETTERS['80']
-      ltimeout   = opts[:login_timeout] || 60
-      timeout    = opts[:timeout] || 5
-      encoding   = (opts[:encoding].nil? || opts[:encoding].downcase == 'utf8') ? 'UTF-8' : opts[:encoding].upcase
-      raise ArgumentError, 'missing :username option' if user.nil? || user.empty?
-      connect(user, pass, dataserver, database, appname, version, ltimeout, timeout, encoding)
+      opts[:appname] ||= 'TinyTds'
+      opts[:tds_version] = TDS_VERSIONS_SETTERS[opts[:tds_version].to_s] || TDS_VERSIONS_SETTERS['80']
+      opts[:login_timeout] ||= 60
+      opts[:timeout] ||= 5
+      opts[:encoding] = (opts[:encoding].nil? || opts[:encoding].downcase == 'utf8') ? 'UTF-8' : opts[:encoding].upcase
+      connect(opts)
     end
     
     def tds_version_info

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tiny_tds
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Ken Collins
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 -05:00
+date: 2011-01-17 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: TinyTds - A modern, simple and fast FreeTDS library for Ruby using DB-Library.