qpid_proton 0.17.0 → 0.18.0

data/lib/codec/data.rb

@@ -82,13 +82,12 @@ module Qpid::Proton::Codec
 
     # Creates a new instance with the specified capacity.
     #
-    # @param capacity [Fixnum, Object] The initial capacity or content.
+    # @param capacity [Integer, Object] The initial capacity or content.
     #
     def initialize(capacity = 16)
-      if (!capacity.nil?) &&
-         (capacity.is_a?(Fixnum) ||
-          capacity.is_a?(Bignum))
-        @data = Cproton.pn_data(capacity)
+      # TODO aconway 2017-08-11: error prone, confusion between capacity and Integer content.
+      if capacity.is_a?(Integer)
+        @data = Cproton.pn_data(capacity.to_i)
         @free = true
       else
         @data = capacity
@@ -165,7 +164,7 @@ module Qpid::Proton::Codec
 
     # Returns the numeric type code of the current node.
     #
-    # @return [Fixnum] The current node type.
+    # @return [Integer] The current node type.
     # @return [nil] If there is no current node.
     #
     def type_code
@@ -173,10 +172,7 @@ module Qpid::Proton::Codec
       return (dtype == -1) ? nil : dtype
     end
 
-    # Return the type object for the current node
-    #
-    # @param [Fixnum] The object type.
-    #
+    # @return [Integer] The type object for the current node.
     # @see #type_code
     #
     def type
@@ -319,7 +315,7 @@ module Qpid::Proton::Codec
     # is the descriptor and may be of any type.
     #
     # @param described [Boolean] True if the array is described.
-    # @param element_type [Fixnum] The AMQP type for each element of the array.
+    # @param element_type [Integer] The AMQP type for each element of the array.
     #
     # @example
     #
@@ -489,7 +485,7 @@ module Qpid::Proton::Codec
 
     # Puts an unsigned byte value.
     #
-    # @param value [Fixnum] The unsigned byte value.
+    # @param value [Integer] The unsigned byte value.
     #
     def ubyte=(value)
       check(Cproton.pn_data_put_ubyte(@data, value))
@@ -498,7 +494,7 @@ module Qpid::Proton::Codec
     # If the current node is an unsigned byte, returns its value. Otherwise,
     # it returns 0.
     #
-    # @return [Fixnum] The unsigned byte value.
+    # @return [Integer] The unsigned byte value.
     #
     def ubyte
       Cproton.pn_data_get_ubyte(@data)
@@ -506,7 +502,7 @@ module Qpid::Proton::Codec
 
     # Puts a byte value.
     #
-    # @param value [Fixnum] The byte value.
+    # @param value [Integer] The byte value.
     #
     def byte=(value)
       check(Cproton.pn_data_put_byte(@data, value))
@@ -515,7 +511,7 @@ module Qpid::Proton::Codec
     # If the current node is an byte, returns its value. Otherwise,
     # it returns 0.
     #
-    # @return [Fixnum] The byte value.
+    # @return [Integer] The byte value.
     #
     def byte
       Cproton.pn_data_get_byte(@data)
@@ -523,7 +519,7 @@ module Qpid::Proton::Codec
 
     # Puts an unsigned short value.
     #
-    # @param value [Fixnum] The unsigned short value
+    # @param value [Integer] The unsigned short value
     #
     def ushort=(value)
       check(Cproton.pn_data_put_ushort(@data, value))
@@ -532,7 +528,7 @@ module Qpid::Proton::Codec
     # If the current node is an unsigned short, returns its value. Otherwise,
     # it returns 0.
     #
-    # @return [Fixnum] The unsigned short value.
+    # @return [Integer] The unsigned short value.
     #
     def ushort
       Cproton.pn_data_get_ushort(@data)
@@ -540,7 +536,7 @@ module Qpid::Proton::Codec
 
     # Puts a short value.
     #
-    # @param value [Fixnum] The short value.
+    # @param value [Integer] The short value.
     #
     def short=(value)
       check(Cproton.pn_data_put_short(@data, value))
@@ -549,7 +545,7 @@ module Qpid::Proton::Codec
     # If the current node is a short, returns its value. Otherwise,
     # returns a 0.
     #
-    # @return [Fixnum] The short value.
+    # @return [Integer] The short value.
     #
     def short
       Cproton.pn_data_get_short(@data)
@@ -557,7 +553,7 @@ module Qpid::Proton::Codec
 
     # Puts an unsigned integer value.
     #
-    # @param value [Fixnum] the unsigned integer value
+    # @param value [Integer] the unsigned integer value
     #
     def uint=(value)
       raise TypeError if value.nil?
@@ -568,7 +564,7 @@ module Qpid::Proton::Codec
     # If the current node is an unsigned int, returns its value. Otherwise,
     # returns 0.
     #
-    # @return [Fixnum] The unsigned integer value.
+    # @return [Integer] The unsigned integer value.
     #
     def uint
       Cproton.pn_data_get_uint(@data)
@@ -586,7 +582,7 @@ module Qpid::Proton::Codec
     # If the current node is an integer, returns its value. Otherwise,
     # returns 0.
     #
-    # @return [Fixnum] The integer value.
+    # @return [Integer] The integer value.
     #
     def int
       Cproton.pn_data_get_int(@data)
@@ -594,7 +590,7 @@ module Qpid::Proton::Codec
 
     # Puts a character value.
     #
-    # @param value [Fixnum] The character value.
+    # @param value [Integer] The character value.
     #
     def char=(value)
       check(Cproton.pn_data_put_char(@data, value))
@@ -603,7 +599,7 @@ module Qpid::Proton::Codec
     # If the current node is a character, returns its value. Otherwise,
     # returns 0.
     #
-    # @return [Fixnum] The character value.
+    # @return [Integer] The character value.
     #
     def char
       Cproton.pn_data_get_char(@data)
@@ -611,7 +607,7 @@ module Qpid::Proton::Codec
 
     # Puts an unsigned long value.
     #
-    # @param value [Fixnum] The unsigned long value.
+    # @param value [Integer] The unsigned long value.
     #
     def ulong=(value)
       raise TypeError if value.nil?
@@ -622,7 +618,7 @@ module Qpid::Proton::Codec
     # If the current node is an unsigned long, returns its value. Otherwise,
     # returns 0.
     #
-    # @return [Fixnum] The unsigned long value.
+    # @return [Integer] The unsigned long value.
     #
     def ulong
       Cproton.pn_data_get_ulong(@data)
@@ -630,7 +626,7 @@ module Qpid::Proton::Codec
 
     # Puts a long value.
     #
-    # @param value [Fixnum] The long value.
+    # @param value [Integer] The long value.
     #
     def long=(value)
       check(Cproton.pn_data_put_long(@data, value))
@@ -638,14 +634,14 @@ module Qpid::Proton::Codec
 
     # If the current node is a long, returns its value. Otherwise, returns 0.
     #
-    # @return [Fixnum] The long value.
+    # @return [Integer] The long value.
     def long
       Cproton.pn_data_get_long(@data)
     end
 
     # Puts a timestamp value.
     #
-    # @param value [Fixnum] The timestamp value.
+    # @param value [Integer] The timestamp value.
     #
     def timestamp=(value)
       value = value.to_i if (!value.nil? && value.is_a?(Time))
@@ -655,7 +651,7 @@ module Qpid::Proton::Codec
     # If the current node is a timestamp, returns its value. Otherwise,
     # returns 0.
     #
-    # @return [Fixnum] The timestamp value.
+    # @return [Integer] The timestamp value.
     #
     def timestamp
       Cproton.pn_data_get_timestamp(@data)
@@ -697,7 +693,7 @@ module Qpid::Proton::Codec
 
     # Puts a decimal32 value.
     #
-    # @param value [Fixnum] The decimal32 value.
+    # @param value [Integer] The decimal32 value.
     #
     def decimal32=(value)
       check(Cproton.pn_data_put_decimal32(@data, value))
@@ -706,7 +702,7 @@ module Qpid::Proton::Codec
     # If the current node is a decimal32, returns its value. Otherwise,
     # returns 0.
     #
-    # @return [Fixnum] The decimal32 value.
+    # @return [Integer] The decimal32 value.
     #
     def decimal32
       Cproton.pn_data_get_decimal32(@data)
@@ -714,7 +710,7 @@ module Qpid::Proton::Codec
 
     # Puts a decimal64 value.
     #
-    # @param value [Fixnum] The decimal64 value.
+    # @param value [Integer] The decimal64 value.
     #
     def decimal64=(value)
       check(Cproton.pn_data_put_decimal64(@data, value))
@@ -723,7 +719,7 @@ module Qpid::Proton::Codec
     # If the current node is a decimal64, returns its value. Otherwise,
     # it returns 0.
     #
-    # @return [Fixnum] The decimal64 value.
+    # @return [Integer] The decimal64 value.
     #
     def decimal64
       Cproton.pn_data_get_decimal64(@data)
@@ -731,7 +727,7 @@ module Qpid::Proton::Codec
 
     # Puts a decimal128 value.
     #
-    # @param value [Fixnum] The decimal128 value.
+    # @param value [Integer] The decimal128 value.
     #
     def decimal128=(value)
       raise TypeError, "invalid decimal128 value: #{value}" if value.nil?
@@ -744,7 +740,7 @@ module Qpid::Proton::Codec
     # If the current node is a decimal128, returns its value. Otherwise,
     # returns 0.
     #
-    # @return [Fixnum] The decimal128 value.
+    # @return [Integer] The decimal128 value.
     #
     def decimal128
       value = ""

data/lib/codec/mapping.rb

@@ -34,7 +34,7 @@ module Qpid::Proton::Codec
     #
     # * code    - the AMQP code for this type
     # * name    - the AMQP name for this type
-    # * klasses - the Ruby classes for this type
+    # * klasses - native Ruby classes that are mapped to this AMQP type
     # * getter  - overrides the get method for the type
     def initialize(code, name, klasses = nil, getter = nil)
 
@@ -77,7 +77,7 @@ module Qpid::Proton::Codec
     end
 
     def self.for_class(klass) # :nodoc:
-      @@by_class[klass]
+      klass and (@@by_class[klass] or self.for_class(klass.superclass))
     end
 
     def self.for_code(code)
@@ -96,7 +96,7 @@ module Qpid::Proton::Codec
   INT        = Mapping.new(Cproton::PN_INT, "int")
   CHAR       = Mapping.new(Cproton::PN_CHAR, "char")
   ULONG      = Mapping.new(Cproton::PN_ULONG, "ulong")
-  LONG       = Mapping.new(Cproton::PN_LONG, "long", [Fixnum, Bignum])
+  LONG       = Mapping.new(Cproton::PN_LONG, "long", [Integer])
   TIMESTAMP  = Mapping.new(Cproton::PN_TIMESTAMP, "timestamp", [Date, Time])
   FLOAT      = Mapping.new(Cproton::PN_FLOAT, "float")
   DOUBLE     = Mapping.new(Cproton::PN_DOUBLE, "double", [Float])

data/lib/core/connection.rb

@@ -19,7 +19,7 @@
 
 module Qpid::Proton
 
-  # A Connection option has at most one Qpid::Proton::Transport instance.
+  # A Connection has at most one Qpid::Proton::Transport instance.
   #
   class Connection < Endpoint
 
@@ -35,6 +35,15 @@ module Qpid::Proton
     #
     proton_accessor :hostname
 
+    # @!attribute user
+    #   The user name for authentication.
+    #
+    #   @return [String] the user name
+    proton_accessor :user
+
+    # @private
+    proton_writer :password
+
     # @private
     proton_reader :attachments
 
@@ -224,7 +233,7 @@ module Qpid::Proton
     # @see Endpoint#LOCAL_CLOSED
     # @see Endpoint#LOCAL_MASK
     #
-    # @return [Fixnum] The state flags.
+    # @return [Integer] The state flags.
     #
     def state
       Cproton.pn_connection_state(@impl)
@@ -248,7 +257,7 @@ module Qpid::Proton
     # remote flags, then a match occurs if a*any* of the local or remote flags
     # are set, respectively.
     #
-    # @param mask [Fixnum] The state mask to be matched.
+    # @param mask [Integer] The state mask to be matched.
     #
     # @return [Session] The first matching session, or nil if none matched.
     #
@@ -272,7 +281,7 @@ module Qpid::Proton
     # then a match occurs if *any* of the local ore remote flags are set,
     # respectively.
     #
-    # @param mask [Fixnum] The state mask to be matched.
+    # @param mask [Integer] The state mask to be matched.
     #
     # @return [Link] The first matching link, or nil if none matched.
     #
@@ -307,7 +316,7 @@ module Qpid::Proton
 
     # Returns the code for a connection error.
     #
-    # @return [Fixnum] The error code.
+    # @return [Integer] The error code.
     #
     def error
       Cproton.pn_error_code(Cproton.pn_connection_error(@impl))

data/lib/core/delivery.rb

@@ -104,7 +104,7 @@ module Qpid::Proton
 
     # @!attribute [r] pending
     #
-    # @return [Fixnum] Return the amount of pending message data for the
+    # @return [Integer] Return the amount of pending message data for the
     # delivery.
     #
     proton_caller :pending

data/lib/core/disposition.rb

@@ -62,13 +62,13 @@ module Qpid::Proton
 
     # @!attribute section_number
     #
-    # @return [Fixnum] The section number of the disposition.
+    # @return [Integer] The section number of the disposition.
     #
     proton_accessor :section_number
 
     # @!attribute section_offset
     #
-    #  @return [Fixnum] The section offset of the disposition.
+    #  @return [Integer] The section offset of the disposition.
     #
     proton_accessor :section_offset
 

data/lib/core/link.rb

@@ -113,7 +113,7 @@ module Qpid::Proton
     # the link until enough credit is obtained from the receiver to send them
     # over the wire. In this case the balance reported will go negative.
     #
-    # @return [Fixnum] The credit balance.
+    # @return [Integer] The credit balance.
     #
     # @see #flow
     #
@@ -130,7 +130,7 @@ module Qpid::Proton
     # @see #queued
     # @see #credit
     #
-    # @return [Fixnum] The remove view of the credit.
+    # @return [Integer] The remove view of the credit.
     #
     proton_caller :remote_credit
 
@@ -142,7 +142,7 @@ module Qpid::Proton
     # deliveries that might be able to be sent if sufficient credit were issued
     # by the receiving link endpoint.
     #
-    # @return [Fixnum] The available deliveries hint.
+    # @return [Integer] The available deliveries hint.
     #
     # @see Sender#offered
     #
@@ -156,7 +156,7 @@ module Qpid::Proton
     # be insufficient credit to send them to the receiver, or they simply may
     # not have yet had a chance to be written to the wire.
     #
-    # @return [Fixnum] The number of queued deliveries.
+    # @return [Integer] The number of queued deliveries.
     #
     # @see #credit
     #
@@ -203,7 +203,7 @@ module Qpid::Proton
     # When invoked on a Receiver, this operation will return and reset the
     # number of credits the sender has released back to it.
     #
-    # @return [Fixnum] The number of credits drained.
+    # @return [Integer] The number of credits drained.
     #
     proton_caller :drained
 
@@ -243,7 +243,7 @@ module Qpid::Proton
 
     # Returns the next link that matches the given state mask.
     #
-    # @param state_mask [Fixnum] The state mask.
+    # @param state_mask [Integer] The state mask.
     #
     # @return [Sender, Receiver] The next link.
     #
@@ -328,7 +328,7 @@ module Qpid::Proton
 
     # Sets the local sender settle mode.
     #
-    # @param mode [Fixnum] The settle mode.
+    # @param mode [Integer] The settle mode.
     #
     # @see #SND_UNSETTLED
     # @see #SND_SETTLED
@@ -340,7 +340,7 @@ module Qpid::Proton
 
     # Returns the local sender settle mode.
     #
-    # @return [Fixnum] The local sender settle mode.
+    # @return [Integer] The local sender settle mode.
     #
     # @see #snd_settle_mode
     #
@@ -350,7 +350,7 @@ module Qpid::Proton
 
     # Sets the local receiver settle mode.
     #
-    # @param mode [Fixnum] The settle mode.
+    # @param mode [Integer] The settle mode.
     #
     # @see #RCV_FIRST
     # @see #RCV_SECOND
@@ -361,7 +361,7 @@ module Qpid::Proton
 
     # Returns the local receiver settle mode.
     #
-    # @return [Fixnum] The local receiver settle mode.
+    # @return [Integer] The local receiver settle mode.
     #
     def rcv_settle_mode
       Cproton.pn_link_rcv_settle_mode(@impl)