connectator 0.0.6 → 0.0.7

data/lib/connectator.rb

@@ -2,13 +2,16 @@ require 'dbi'
 require 'timeout'
 require 'ostruct'
 
+require_relative 'connectator/factory'
+require_relative 'connectator/pinger'
+require_relative 'connectator/dbi_proxy'
+require_relative 'connectator/using_dbi_proxy'
+
 require_relative 'connectator/base/connection'
-require_relative 'connectator/base/dbi_proxy'
 require_relative 'connectator/db2/connection'
 require_relative 'connectator/mysql/connection'
 require_relative 'connectator/oracle/connection'
 require_relative 'connectator/sql/connection'
 require_relative 'connectator/sql/connection/server_instance_string'
 require_relative 'connectator/sybase/connection'
-require_relative 'connectator/factory'
-require_relative 'connectator/pinger'
+

data/lib/connectator/base/connection.rb

@@ -60,11 +60,11 @@ module Connectator
       end
       
       def new_system_connection_proxy
-        DBIProxy.new(open)
+        raise 'Abstract Method'
       end
 
       def open
-        DBI.connect(connection_string)
+        raise 'Abstract Method'
       end
 
       def connection_params_list

data/lib/connectator/db2/connection.rb

@@ -1,11 +1,12 @@
 module Connectator
   module DB2
     class Connection < Base::Connection
+      include UsingDBIProxy
       
       def initialize(opts = {})
-        connection_params.database = opts[:database]
         connection_params.driver   = 'DB2' 
         connection_params.protocol = 'TCPIP'
+        connection_params.database = opts[:database]
         super(opts)
       end
       
@@ -20,7 +21,7 @@ module Connectator
          "DRIVER"      => connection_params.driver,
          "PROTOCOL"    => connection_params.protocol,
          "HOSTNAME"    => connection_params.server,
-         "Port"        => connection_params.port,
+         "PORT"        => connection_params.port,
          "DATABASE"    => connection_params.database,
          "UID"         => connection_params.username,
          "PWD"         => connection_params.password

data/lib/connectator/dbi_proxy.rb

@@ -0,0 +1,31 @@
+module Connectator
+  class DBIProxy
+
+    def initialize(connection)
+      @connection = connection
+    end
+
+    def connection
+      @connection
+    end
+
+    def close
+      connection.disconnect
+    end
+
+    # Do not use this method on queries that return lots of data
+    # because it would use a lot of memory.
+    def select_all_to_hash(query)
+      result = []
+      sth = connection.execute(query)
+      sth.fetch_hash do |row|
+        result << row
+      end
+      result
+    end
+
+    def method_missing(method, *args, &blk)
+      connection.send(method, *args, &blk)
+    end
+  end
+end

data/lib/connectator/mysql/connection.rb

@@ -1,6 +1,7 @@
 module Connectator
   module Mysql 
     class Connection < Base::Connection
+      include UsingDBIProxy
 
       def initialize(opts = {})
         connection_params.driver   = 'MySQL'

data/lib/connectator/oracle/connection.rb

@@ -1,6 +1,7 @@
 module Connectator
   module Oracle
     class Connection < Base::Connection
+      include UsingDBIProxy
       
       def connection_string
         "DBI:OCI8://#{connection_params.server}:#{connection_params.port}/#{connection_params.instance}"

data/lib/connectator/sql/connection.rb

@@ -1,6 +1,7 @@
 module Connectator
   module Sql
     class Connection < Base::Connection
+      include UsingDBIProxy
     
       def initialize(opts = {})
         connection_params.driver      = 'FreeTDS' 
@@ -24,7 +25,7 @@ module Connectator
          "DRIVER"      => connection_params.driver,
          "TDS_Version" => connection_params.tds_version,
          "SERVER"      => server_instance_string,
-         "Port"        => connection_params.port,
+         "PORT"        => connection_params.port,
          "DATABASE"    => connection_params.database,
          "UID"         => connection_params.username,
          "PWD"         => connection_params.password

data/lib/connectator/sybase/connection.rb

@@ -1,6 +1,7 @@
 module Connectator
   module Sybase 
     class Connection < Base::Connection
+      include UsingDBIProxy
 
       def initialize(opts = {})
         connection_params.driver      = 'FreeTDS' 
@@ -20,7 +21,7 @@ module Connectator
          "DRIVER"      => connection_params.driver,
          "TDS_Version" => connection_params.tds_version,
          "SERVER"      => connection_params.server,
-         "Port"        => connection_params.port,
+         "PORT"        => connection_params.port,
          "DATABASE"    => connection_params.database,
          "UID"         => connection_params.username,
          "PWD"         => connection_params.password

data/lib/connectator/using_dbi_proxy.rb

@@ -0,0 +1,18 @@
+# Include this module in any connection that you want to use
+# DBI and the DBIProxy
+
+module Connectator
+  module UsingDBIProxy
+
+    private
+
+    def new_system_connection_proxy
+      DBIProxy.new(open)
+    end
+
+    def open
+      DBI.connect(connection_string)
+    end
+  end
+end
+

data/spec/connectator/db2/connection_spec.rb

@@ -26,6 +26,18 @@ describe Connectator::DB2::Connection do
     Then { connection.connection_params.database.should     == 'ABCDEFG'  }
 
     Then { connection.connection_string.should == 
-           'DBI:ODBC:DRIVER=DB2;PROTOCOL=TCPIP;HOSTNAME=Server;Port=Port;DATABASE=ABCDEFG;UID=User;PWD=Pass' }
+           'DBI:ODBC:DRIVER=DB2;PROTOCOL=TCPIP;HOSTNAME=Server;PORT=Port;DATABASE=ABCDEFG;UID=User;PWD=Pass' }
+
+    Then { connection.send(:connection_params_hash).should == 
+      {
+       "DRIVER"      => 'DB2',
+       "PROTOCOL"    => 'TCPIP',
+       "HOSTNAME"    => 'Server',
+       "PORT"        => 'Port',
+       "DATABASE"    => 'ABCDEFG',
+       "UID"         => 'User',
+       "PWD"         => 'Pass'
+      }
+    }
   end
 end

data/spec/connectator/sql/connection_spec.rb

@@ -24,13 +24,14 @@ describe Connectator::Sql::Connection do
     Then { connection.connection_params.database.should     == 'master'   }
 
     Then { connection.connection_string.should ==
-          "DBI:ODBC:DRIVER=FreeTDS;TDS_Version=8.0;SERVER=Server;Port=Port;DATABASE=master;UID=User;PWD=Pass"  }
+          "DBI:ODBC:DRIVER=FreeTDS;TDS_Version=8.0;SERVER=Server;PORT=Port;DATABASE=master;UID=User;PWD=Pass"  }
+
     Then { connection.send(:connection_params_hash).should == 
       {
        "DRIVER"      => 'FreeTDS',
        "TDS_Version" => '8.0',
        "SERVER"      => 'Server',
-       "Port"        => 'Port',
+       "PORT"        => 'Port',
        "DATABASE"    => 'master',
        "UID"         => 'User',
        "PWD"         => 'Pass'

data/spec/connectator/sybase/connection_spec.rb

@@ -24,14 +24,14 @@ describe Connectator::Sybase::Connection do
     Then { connection.connection_params.database.should     == 'master'   }
 
     Then { connection.connection_string.should ==
-          "DBI:ODBC:DRIVER=FreeTDS;TDS_Version=5.0;SERVER=Server;Port=Port;DATABASE=master;UID=User;PWD=Pass"  }
+          "DBI:ODBC:DRIVER=FreeTDS;TDS_Version=5.0;SERVER=Server;PORT=Port;DATABASE=master;UID=User;PWD=Pass"  }
 
     Then { connection.send(:connection_params_hash).should == 
       {
        "DRIVER"      => 'FreeTDS',
        "TDS_Version" => '5.0',
        "SERVER"      => 'Server',
-       "Port"        => 'Port',
+       "PORT"        => 'Port',
        "DATABASE"    => 'master',
        "UID"         => 'User',
        "PWD"         => 'Pass'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: connectator
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.5
-- !ruby/object:Gem::Dependency
-  name: ruby-oci8
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -132,9 +116,10 @@ extra_rdoc_files: []
 files:
 - lib/connectator.rb
 - lib/connectator/factory.rb
+- lib/connectator/dbi_proxy.rb
+- lib/connectator/using_dbi_proxy.rb
 - lib/connectator/oracle/connection.rb
 - lib/connectator/base/connection.rb
-- lib/connectator/base/dbi_proxy.rb
 - lib/connectator/pinger.rb
 - lib/connectator/db2/connection.rb
 - lib/connectator/sybase/connection.rb
@@ -165,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4490405009583718652
+      hash: 3410537790936780615
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/connectator/base/dbi_proxy.rb

@@ -1,33 +0,0 @@
-module Connectator
-  module Base
-    class DBIProxy
-
-      def initialize(connection)
-        @connection = connection
-      end
-
-      def connection
-        @connection
-      end
-
-      def close
-        connection.disconnect
-      end
-
-      # Do not use this method on queries that return lots of data
-      # because it would use a lot of memory.
-      def select_all_to_hash(query)
-        result = []
-        sth = connection.execute(query)
-        sth.fetch_hash do |row|
-          result << row
-        end
-        result
-      end
-
-      def method_missing(method, *args, &blk)
-        connection.send(method, *args, &blk)
-      end
-    end
-  end
-end