qpid_proton 0.21.0 → 0.22.0

data/lib/core/transport.rb

@@ -170,6 +170,7 @@ module Qpid::Proton
     # Creates a new transport instance.
     def initialize(impl = Cproton.pn_transport)
       @impl = impl
+      @ssl = nil
       self.class.store_instance(self, :pn_transport_attachments)
     end
 

data/lib/core/uri.rb

@@ -43,19 +43,16 @@ module Qpid::Proton
 
   public
 
-  # Convert +s+ to a {URI::AMQP} or {URI::AMQPS} object
+  # Convert +s+ to an amqp: or amqps: URI
   #
-  # Shortcut strings like "host:port" are allowed: an "amqp://" prefix is added if +s+ does
-  # not already look like an 'amqp:', 'amqps:' URI.
-  #
-  # @note this does not give the same result as a standard URI parser in all cases.
-  #  For standard conversion to a URI use: {#URI}(s)
+  # This does not give the same result as the standard URI parser in all cases.
+  # Short-cut strings like "host:port" are allowed, an "amqp://" prefix is added if +s+ does
+  # not already look like an 'amqp:' or 'amqps:' URI.
   #
   # @param s [String,URI] String to convert to a URI, or a URI object.
-  #  A URI object with no scheme will be converted to {URI::AMQP}
-  # @return [URI::AMQP] A valid {URI::AMQP} or {URI::AMQPS} object
-  # @raise [BadURIError] s is a URI object with a non-AMQP scheme
-  # @raise [InvalidURIError] s cannot be parsed as a URI or shortcut
+  # @return [URI] A valid AMQP or AMQPS URI
+  # @raise [URI::BadURIError] s is a URI object with a non-AMQP scheme
+  # @raise [URI::InvalidURIError] s cannot be parsed as a URI or shortcut
   # @raise [::ArgumentError] s is not a string or URI
   #
   def self.uri(s)
@@ -75,5 +72,7 @@ module Qpid::Proton
       else DEFAULT_URI_PARSER.parse("amqp://#{s}")            # Treat as a bare host:port/path string
       end
     end
+  rescue =>e
+    raise e.class, "#{self}.#{__method__}(#{s.inspect}): #{e}"
   end
 end

data/lib/core/work_queue.rb

@@ -0,0 +1,76 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Qpid::Proton
+
+  # A thread-safe queue of work for multi-threaded programs.
+  #
+  # Instances of {Connection} and objects associated with it ({Session}, {Sender},
+  # {Receiver}, {Delivery}, {Tracker}) are not thread-safe and must be
+  # used correctly when multiple threads call {Container#run}
+  #
+  # Calls to {MessagingHandler} methods by the {Container} are automatically
+  # serialized for each connection instance. Other threads may have code
+  # similarly serialized by adding it to the {Connection#work_queue} for the
+  # connection.  Each object related to a {Connection} also provides a
+  # +work_queue+ method.
+  #
+  class WorkQueue
+
+    # Add code to be executed in series with other {Container} operations on the
+    # work queue's owner. The code will be executed as soon as possible.
+    #
+    # @note Thread Safe: may be called in any thread.
+    # @param non_block [Boolean] if true raise {ThreadError} if the operation would block.
+    # @yield [ ] the block will be invoked with no parameters in the {WorkQueue} context,
+    #  which may be a different thread.
+    # @return [void]
+    # @raise [ThreadError] if +non_block+ is true and the operation would block
+    # @raise [EOFError] if the queue is closed and cannot accept more work
+    def add(non_block=false, &block)
+      @schedule.add(Time.at(0), non_block, &block)
+      @container.send :wake
+    end
+
+    # Schedule code to be executed after +delay+ seconds in series with other
+    # {Container} operations on the work queue's owner.
+    #
+    # Work scheduled for after the {WorkQueue} has closed will be silently dropped.
+    #
+    # @note (see #add)
+    # @param delay delay in seconds until the block is added to the queue.
+    # @param (see #add)
+    # @yield (see #add)
+    # @return [void]
+    # @raise (see #add)
+    def schedule(delay, non_block=false, &block)
+      @schedule.add(Time.now + delay, non_block, &block)
+      @container.send :wake
+    end
+
+    private
+
+    def initialize(container)
+      @schedule = Schedule.new
+      @container = container
+    end
+
+    def close() @schedule.close; end
+    def process(now) @schedule.process(now); end
+    def next_tick() @schedule.next_tick; end
+  end
+end

data/lib/qpid_proton.rb

@@ -26,6 +26,7 @@ rescue LoadError
   require "kconv"               # Ruby < 1.9
 end
 
+# @api qpid
 # Qpid is the top level module for the Qpid project http://qpid.apache.org
 # Definitions for this library are in module {Qpid::Proton}
 module Qpid
@@ -43,8 +44,8 @@ require "core/exceptions"
 require "util/deprecation"
 require "util/version"
 require "util/error_handler"
+require "util/schedule"
 require "util/wrapper"
-require "util/timeout"
 
 # Types
 require "types/type"
@@ -93,10 +94,3 @@ require "core/container"
 require "handler/reactor_messaging_adapter"
 require "handler/messaging_handler" # Keep original name for compatibility
 require "reactor/container"
-
-# DEPRECATED Messenger API classes
-require "messenger/subscription"
-require "messenger/tracker_status"
-require "messenger/tracker"
-require "messenger/messenger"
-

data/lib/types/array.rb

@@ -49,6 +49,7 @@ module Qpid::Proton
       # @param descriptor [Object] Optional array descriptor
       def initialize(type, elements=nil, descriptor=nil)
         @type, @descriptor = type, descriptor
+        @proton_array_header = nil
         raise ArgumentError, "no type specified for array" if @type.nil?
         super elements if elements
       end

data/lib/types/hash.rb

@@ -37,14 +37,3 @@ class Hash # :nodoc:
   end
 end
 
-module Qpid::Proton::Types
-  # @private
-  def self.symbol_keys(h)
-    h && h.reduce({}) { |x, (k, v)| x[k.to_sym] = v; x }
-  end
-
-  # @private
-  def self.symbol_array(a)
-    a && UniformArray.new(SYMBOL, a.collect { |v| v.to_sym })
-  end
-end

data/lib/util/schedule.rb

@@ -0,0 +1,79 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Qpid::Proton
+
+  # @private
+  module TimeCompare
+    # t1 <= t2, where nil is treated as "distant future"
+    def before_eq(t1, t2) (t1 && t2) ? (t1 <= t2) : t1; end
+
+    # min(t1, t2) where nil is treated as "distant future"
+    def earliest(t1, t2) before_eq(t1, t2) ? t1 :  t2; end
+  end
+
+  # @private
+  # A sorted, thread-safe list of scheduled Proc.
+  # Note: calls to #process are always serialized, but calls to #add may be concurrent.
+  class Schedule
+    include TimeCompare
+    Item = Struct.new(:time, :proc)
+
+    def initialize()
+      @lock = Mutex.new
+      @items = []
+      @closed = false
+    end
+
+    def next_tick()
+      @lock.synchronize { @items.first.time unless @items.empty? }
+    end
+
+    # @return true if the Schedule was previously empty
+    # @raise EOFError if schedule is closed
+    # @raise ThreadError if +non_block+ and operation would block
+    def add(time, non_block=false, &proc)
+      # non_block ignored for now, but we may implement a bounded schedule in future.
+      @lock.synchronize do
+        raise EOFError if @closed
+        if at = (0...@items.size).bsearch { |i| @items[i].time > time }
+          @items.insert(at, Item.new(time, proc))
+        else
+          @items << Item.new(time, proc)
+        end
+        return @items.size == 1
+      end
+    end
+
+    # @return true if the Schedule became empty as a result of this call
+    def process(now)
+      due = []
+      empty = @lock.synchronize do
+        due << @items.shift while (!@items.empty? && before_eq(@items.first.time, now))
+        @items.empty?
+      end
+      due.each { |i| i.proc.call() }
+      return empty && !due.empty?
+    end
+
+    # #add raises EOFError after #close.
+    # #process can still be called to drain the schedule.
+    def close()
+      @lock.synchronize { @closed = true }
+    end
+  end
+end

data/lib/util/wrapper.rb

@@ -115,6 +115,10 @@ module Qpid::Proton
     end
 
     # @private
+    #
+    # Instance methods to include in classes that wrap pn_object types
+    # that support pn_inspect etc. Automatically extends SWIGClassHelper
+    #
     module Wrapper
 
       def self.included(base)

data/tests/old_examples/old_example_test.rb

@@ -52,14 +52,6 @@ class OldExampleTest < MiniTest::Test
     assert_output want, ["simple_recv.rb", "-a", make_url($port, __method__)]
   end
 
-  def test_smoke
-    url = "127.0.0.1:#{unused_port}"
-    recv = run_script("recv.rb", "~#{url}")
-    recv.readline               # Wait for "Listening"
-    assert_output("Status: ACCEPTED", ["send.rb", url])
-    assert_equal "Got: Hello World!", recv.read.strip
-  end
-
   def test_client_server
     want =  <<EOS
 -> Twas brillig, and the slithy toves