net-tns 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d83e49611fcd37883b8e3a315b387fd7ff5d45b0
-  data.tar.gz: 4725b36fb5c5d58179cbe6f136f79e4c94bb4b87
+  metadata.gz: ae395e30d483af200c9eda9c522288af1cdad4e1
+  data.tar.gz: e4399ebb1818042b98d92b8e18e54de0e0b79d12
 SHA512:
-  metadata.gz: 1a0315c84d50fbb96f4e813cf5f67a6f65f37429e05027d56c81dac71e35fed4f1a0af0f192e3c47ee571761e360b19deeec050b514f271182f35727c49622fa
-  data.tar.gz: 833468e8dda81b69b049672ed6fb131d727ac3436c61e29f9111133615533656cae947cbdc8bde727b1bad32d930c0d3ede228517e31738bd65dfde29c4c8a0e
+  metadata.gz: 9bc129315cca6f165f1fdecbb211b436034fdb8606083b7e5d1d1ae80a4bafe87447e1463f1a21042afdb68e8b016b6bb392955f0b7f83165924db4d18840a7c
+  data.tar.gz: f17cdca07bcc38a3199b30ded2eb9fe1384c892d43c8ff2d8865e746e1e8ff116763715cfde565ae339e8422670541a498333defaebd627ab86bdc7c9c57987f

data/lib/net/tns/client.rb

@@ -10,7 +10,7 @@ module Net
           return true
         rescue Exceptions::ConnectionClosed
           return false
-        rescue Exceptions::TnsException
+        rescue Exceptions::TNSException
           return true
         ensure
           conn.close_socket() unless conn.nil?

data/lib/net/tns/connection.rb

@@ -7,16 +7,17 @@ module Net
       attr_reader :tns_protocol_version
 
       def initialize(opts={})
-        opts = {
-          :port => 1521,
-        }.merge(opts)
-
         @socket = nil
-        @socket_opts = {}
-        socket_opts_keys = [:host, :port, :get_socket_callback, :close_socket_callback]
-        socket_opts_keys.each {|key| @socket_opts[key] = opts.delete(key) if opts.has_key?(key)}
+
+        @host = opts.delete(:host)
+        @port = opts.delete(:port) || 1521
+        @new_socket_proc = opts.delete(:new_socket_proc)
 
         raise ArgumentError.new("Unrecognized options: #{opts.keys}") unless opts.empty?
+
+        if @host.nil? == @new_socket_proc.nil?
+          raise ArgumentError.new("Invalid socket options. Need :host and :port, OR :new_socket_proc")
+        end
       end
 
       # This is a low-level function to directly open a socket for this connection.
@@ -26,19 +27,15 @@ module Net
         Net::TNS.logger.debug("Connection#open_socket called")
         close_socket()
 
-        if (host = @socket_opts[:host]) && (port = @socket_opts[:port])
-          if @socket_opts.has_key?(:get_socket_callback) || @socket_opts.has_key?(:close_socket_callback)
-            raise ArgumentError.new("Cannot specify :host/:port with :get_socket_callback/:close_socket_callback")
-          end
-
+        if @host
           require "socket"
-          Net::TNS.logger.info("Creating new TCPSocket for #{host}:#{port}")
-          @socket = TCPSocket.new(host, port)
-        elsif socket_cb = @socket_opts[:get_socket_callback]
-          Net::TNS.logger.info("Calling get-socket callback for new socket")
-          @socket = socket_cb.call()
+          Net::TNS.logger.info("Creating new TCPSocket for #{@host}:#{@port}")
+          @socket = TCPSocket.new(@host, @port)
+        elsif @new_socket_proc
+          Net::TNS.logger.info("Calling new-socket proc for new socket")
+          @socket = @new_socket_proc.call()
         else
-          raise ArgumentError.new("No valid options for socket creation. Need :host and :port, or :get_socket_callback (:close_socket_callback optional)")
+          raise ArgumentError.new("Invalid socket options")
         end
 
         return
@@ -50,16 +47,9 @@ module Net
       def close_socket
         Net::TNS.logger.debug("Connection#close_socket called")
         begin
-          unless @socket.nil?
-            if close_cb = @socket_opts[:close_socket_callback]
-              Net::TNS.logger.info("Calling close-socket callback to close socket")
-              close_cb.call(@socket)
-            else
-              unless @socket.closed?
-                Net::TNS.logger.info("Closing socket")
-                @socket.close
-              end
-            end
+          unless @socket.nil? or @socket.closed?
+            Net::TNS.logger.info("Closing socket")
+            @socket.close
           end
         ensure
           @socket = nil
@@ -140,7 +130,7 @@ module Net
 
       def resend_last_tns_packet
         if @tns_last_sent_packet.nil?
-          raise Exceptions::TnsException.new( "Resend received without a packet to resend" )
+          raise Exceptions::TNSException.new( "Resend received without a packet to resend" )
         end
         send_tns_packet( @tns_last_sent_packet )
       end
@@ -154,7 +144,7 @@ module Net
       # @return [Net::TNS::Packet]
       # @raise [Net::TNS::Exceptions::RefuseMessageReceived] If the other side
       #   sent TNS refuse message.
-      # @raise [Net::TNS::Exceptions::TnsException] If another unexpected
+      # @raise [Net::TNS::Exceptions::TNSException] If another unexpected
       #   state or action occurs.
       def receive_tns_packet( waiting_for_error_message = false )
         # This is structured as a loop in order to handle messages (e.g. Resends)
@@ -167,7 +157,7 @@ module Net
 
           receive_count += 1
           if ( receive_count >= 3 )
-            raise Exceptions::TnsException.new( "Maximum receive attempts exceeded - too many Resends received." )
+            raise Exceptions::TNSException.new( "Maximum receive attempts exceeded - too many Resends received." )
           end
 
           # Try to receive a TNS packet

data/lib/net/tns/exceptions.rb

@@ -1,22 +1,22 @@
 module Net::TNS
   module Exceptions
-    class TnsException < StandardError
+    class TNSException < StandardError
     end
 
-    class ProtocolException < TnsException
+    class ProtocolException < TNSException
     end
 
 
-    class ReceiveTimeoutExceeded < TnsException
+    class ReceiveTimeoutExceeded < TNSException
     end
 
-    class ConnectionClosed < TnsException
+    class ConnectionClosed < TNSException
     end
 
-    class RefuseMessageReceived < TnsException
+    class RefuseMessageReceived < TNSException
     end
 
-    class RedirectMessageReceived < TnsException
+    class RedirectMessageReceived < TNSException
       attr_reader :new_port
       attr_reader :new_host
 

data/lib/net/tns/gem_version.rb

@@ -1,5 +1,5 @@
 module Net
   module TNS
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/lib/net/tns/packet.rb

@@ -58,7 +58,11 @@ module Net
         packet_raw = header_raw + payload_raw
 
         unless payload_class = @@tns_packet_classes[ header.packet_type ]
-          raise Net::TNS::Exceptions::TnsException.new( "Unknown TNS packet type: #{header.packet_type}" )
+          raise Net::TNS::Exceptions::TNSException.new( "Unknown TNS packet type: #{header.packet_type}" )
+        end
+
+        unless packet_raw.length == header.packet_length
+          raise Net::TNS::Exceptions::ProtocolException
         end
 
         new_packet = payload_class.read( packet_raw )

data/lib/net/tti/client.rb

@@ -6,7 +6,7 @@ module Net
     class Client
       def connect(opts={})
         socket_opts = {}
-        socket_opts_keys = [:host, :port]
+        socket_opts_keys = [:host, :port, :new_socket_proc]
         socket_opts_keys.each {|key| socket_opts[key] = opts.delete(key) if opts.has_key?(key)}
 
         connect_opts = {}
@@ -28,14 +28,14 @@ module Net
       end
 
       def authenticate( username, password )
-        pre_auth_request = get_pre_auth_request( username )
+        begin
+          pre_auth_request = get_pre_auth_request( username )
 
-        pre_auth_response_raw = @tti_conn.send_and_receive(pre_auth_request)
-        pre_auth_response = PreAuthenticationResponse.read(pre_auth_response_raw)
+          pre_auth_response_raw = @tti_conn.send_and_receive(pre_auth_request)
+          pre_auth_response = PreAuthenticationResponse.read(pre_auth_response_raw)
 
-        auth_request = get_auth_request(username, password, pre_auth_response)
+          auth_request = get_auth_request(username, password, pre_auth_response)
 
-        begin
           @tti_conn.send_and_receive(auth_request)
         rescue Exceptions::ErrorMessageReceived => error
           case error.error_code

data/lib/net/tti/connection.rb

@@ -79,7 +79,7 @@ module Net
         while ( true )
           receive_count += 1
           if ( receive_count >= 3 )
-            raise Exceptions::TnsException.new( "Maximum receive attempts exceeded - too many Markers received." )
+            raise Exceptions::TNSException.new( "Maximum receive attempts exceeded - too many Markers received." )
           end
 
           Net::TTI.logger.debug("Attempting to receive packet (try ##{receive_count})")

data/lib/net/tti/message.rb

@@ -34,7 +34,7 @@ module Net
         ttc_code = raw_message[0].unpack("C").first
 
         unless message_class = @@ttc_classes[ ttc_code ]
-          raise Net::TNS::Exceptions::TnsException.new( "Unknown TTC code: #{ttc_code}" )
+          raise Net::TNS::Exceptions::TNSException.new( "Unknown TTC code: #{ttc_code}" )
         end
 
         new_message = message_class.new
@@ -47,4 +47,4 @@ module Net
 end
 
 require "pathname"
-Dir.glob("#{Pathname.new(__FILE__).dirname}/messages/**/*.rb") { |file| require file }
+Dir.glob("#{Pathname.new(__FILE__).dirname}/messages/*.rb") { |file| require file }

data/lib/net/tti/messages/function_call.rb

@@ -44,3 +44,6 @@ module Net
     end
   end
 end
+
+require "pathname"
+Dir.glob("#{Pathname.new(__FILE__).dirname}/function_calls/*.rb") { |file| require file }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-tns
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Woodbury
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata