qpid_proton 0.22.0 → 0.23.0

data/tests/test_delivery.rb

@@ -107,4 +107,12 @@ class TestDelivery < MiniTest::Test
     assert_equal ["accept", "reject", "release-really", "release", "modify", "modify-empty", "modify-nil", "reject-raise", "release-raise"], rh.received
     assert_empty sh.unsettled
   end
+
+  def test_names
+    names = ["accepted", "rejected", "released", "modified"]
+    states = names.collect { |n| Disposition.const_get(n.upcase) }
+    assert_equal names, states.collect { |s| Disposition::name_of(s) }
+    assert_equal names, states.collect { |s| Disposition::State::name_of(s) }
+    assert_equal names, states.collect { |s| Transfer::name_of(s) }
+  end
 end

data/tests/test_interop.rb

@@ -22,7 +22,7 @@ class InteropTest < MiniTest::Test
 
   # Walk up the directory tree to find the tests directory.
   def get_data(name)
-    path = File.join(File.dirname(__FILE__), "../../../../tests/interop/#{name}.amqp")
+    path = File.join(File.dirname(__FILE__), "../../tests/interop/#{name}.amqp")
     raise "Can't find test/interop directory from #{__FILE__}" unless File.exist?(path)
     File.open(path, "rb") { |f| f.read }
   end

data/tests/test_tools.rb

@@ -150,8 +150,8 @@ end
 class ServerContainer < Qpid::Proton::Container
   include Qpid::Proton
 
-  def initialize(id=nil, listener_opts=nil, n=1)
-    super id
+  def initialize(id=nil, listener_opts=nil, n=1, handler=nil)
+    super handler, id
     @listener = listen_io(TCPServer.open(0), ListenOnceHandler.new(listener_opts, n))
   end
 
@@ -162,7 +162,7 @@ class ServerContainer < Qpid::Proton::Container
 end
 
 class ServerContainerThread < ServerContainer
-  def initialize(id=nil, listener_opts=nil, n=1)
+  def initialize(*args)
     super
     @thread = Thread.new { run }
   end

data/tests/test_utils.rb

@@ -0,0 +1,63 @@
+# 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.
+
+require 'test_tools'
+require 'minitest/unit'
+
+class UtilsTest < MiniTest::Test
+  include Qpid::Proton
+
+  # Make sure Schedule puts tasks in proper order.
+  def test_schedule_empty
+    s = Schedule.new
+    assert_empty s
+    assert_nil s.next_tick
+    assert_nil s.pop(nil)
+  end
+
+  def test_schedule_insert_pop
+    s = Schedule.new
+    [3,5,4].each { |i| s.insert(Time.at(i), i) }
+    assert_equal Time.at(3), s.next_tick
+    assert_nil s.pop(Time.at(2))
+    assert_equal [3,4], [s.pop(Time.at(4)), s.pop(Time.at(4))]
+    refute_empty s
+    assert_nil s.pop(Time.at(4.9))
+    assert_equal Time.at(5), s.next_tick
+    assert_equal 5, s.pop(Time.at(5))
+    assert_empty s
+  end
+
+  # Make sure we sort by time and don't change order if same time
+  def test_schedule_sort
+    s = Schedule.new
+    [4.0, 3, 5, 1, 4.1, 4.2 ].each { |n| s.insert(Time.at(n.to_i), n) }
+    [1, 3, 4.0, 4.1, 4.2].each { |n| assert_equal n, s.pop(Time.at(4)) }
+    refute_empty s              # Not empty but nothing due until time 5
+    assert_equal Time.at(5), s.next_tick
+    assert_nil s.pop(Time.at(4))
+    assert_equal 5, s.pop(Time.at(5))
+  end
+
+  def test_schedule_clear
+    s = Schedule.new
+    [3, 5].each { |n| s.insert(Time.at(n.to_i), n) }
+    refute_empty s
+    s.clear
+    assert_empty s
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qpid_proton
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Darryl L. Pierce
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies: []
 description: |
   Proton is a high performance, lightweight messaging library. It can be used in
@@ -23,9 +23,7 @@ extensions:
 - ext/cproton/extconf.rb
 extra_rdoc_files: []
 files:
-- ChangeLog
-- LICENSE
-- TODO
+- LICENSE.txt
 - examples/README.md
 - examples/broker.rb
 - examples/client.rb
@@ -36,15 +34,15 @@ files:
 - examples/server.rb
 - examples/simple_recv.rb
 - examples/simple_send.rb
-- examples/ssl_certs/README.txt
-- examples/ssl_certs/tclient-certificate.p12
-- examples/ssl_certs/tclient-certificate.pem
-- examples/ssl_certs/tclient-full.p12
-- examples/ssl_certs/tclient-private-key.pem
-- examples/ssl_certs/tserver-certificate.p12
-- examples/ssl_certs/tserver-certificate.pem
-- examples/ssl_certs/tserver-full.p12
-- examples/ssl_certs/tserver-private-key.pem
+- examples/ssl-certs/README.txt
+- examples/ssl-certs/tclient-certificate.p12
+- examples/ssl-certs/tclient-certificate.pem
+- examples/ssl-certs/tclient-full.p12
+- examples/ssl-certs/tclient-private-key.pem
+- examples/ssl-certs/tserver-certificate.p12
+- examples/ssl-certs/tserver-certificate.pem
+- examples/ssl-certs/tserver-full.p12
+- examples/ssl-certs/tserver-private-key.pem
 - examples/ssl_send.rb
 - ext/cproton/cproton.c
 - ext/cproton/extconf.rb
@@ -93,21 +91,21 @@ files:
 - lib/util/schedule.rb
 - lib/util/version.rb
 - lib/util/wrapper.rb
-- tests/old_examples/broker.rb
-- tests/old_examples/client.rb
-- tests/old_examples/direct_recv.rb
-- tests/old_examples/direct_send.rb
-- tests/old_examples/helloworld.rb
-- tests/old_examples/helloworld_direct.rb
-- tests/old_examples/lib/debugging.rb
-- tests/old_examples/lib/driver.rb
-- tests/old_examples/lib/qpid_examples.rb
-- tests/old_examples/lib/selectable.rb
-- tests/old_examples/lib/send_and_receive.rb
-- tests/old_examples/old_example_test.rb
-- tests/old_examples/server.rb
-- tests/old_examples/simple_recv.rb
-- tests/old_examples/simple_send.rb
+- tests/old-examples/broker.rb
+- tests/old-examples/client.rb
+- tests/old-examples/direct_recv.rb
+- tests/old-examples/direct_send.rb
+- tests/old-examples/helloworld.rb
+- tests/old-examples/helloworld_direct.rb
+- tests/old-examples/lib/debugging.rb
+- tests/old-examples/lib/driver.rb
+- tests/old-examples/lib/qpid_examples.rb
+- tests/old-examples/lib/selectable.rb
+- tests/old-examples/lib/send_and_receive.rb
+- tests/old-examples/old_example_test.rb
+- tests/old-examples/server.rb
+- tests/old-examples/simple_recv.rb
+- tests/old-examples/simple_send.rb
 - tests/test_connection_driver.rb
 - tests/test_container.rb
 - tests/test_container_sasl.rb
@@ -118,6 +116,7 @@ files:
 - tests/test_old_adapter.rb
 - tests/test_tools.rb
 - tests/test_uri.rb
+- tests/test_utils.rb
 homepage: http://qpid.apache.org/proton
 licenses:
 - Apache-2.0

data/ChangeLog

@@ -1,185 +0,0 @@
-
-version 0.17.0:
-
-version 0.16.0:
-	* PROTON-1350 PROTON-1351: Introduce proton-c core library - Created new core proton library qpid-proton-core which only contains   protocol processsing and no IO. - Rearranged source tree to separate core protocol code and io/reactor/extra code - Rearranged code so that compiler dependent code is isolated and platform (OS)   dependent code is isolated
-
-version 0.15.0:
-	* PROTON-1282: Seg Fault in Ruby Messenger pn_messenger_free
-
-version 0.14.0:
-
-version 0.13.1:
-
-version 0.13.0:
-
-version 0.12.2:
-
-version 0.12.1:
-
-version 0.12.0:
-	* PROTON-1059: ruby binding broken in 0.11 release and on master
-	* PROTON-949: fix proton build with ccache swig
-
-version 0.11.1:
-	* PROTON-1059: ruby binding broken in 0.11 release and on master
-
-version 0.11.0:
-	* PROTON-949: fix proton build with ccache swig
-
-version 0.10:
-	* PROTON-904: No longer need to include libuuid header
-	* PROTON-781: Update CMake to install new Ruby packages.
-	* PROTON-781: Added the set of LinkOption classes to Ruby.
-	* PROTON-781: Added support for reactors to the Ruby Endpoint class.
-	* PROTON-781: Added Container to the Ruby reactive APIs.
-	* PROTON-781: Added SessionPerConnection to the Ruby reactive APIs.
-	* PROTON-781: Added Backoff to the Ruby reactive APIs.
-	* PROTON-781: Added Connector to the Ruby reactive APIs.
-	* PROTON-781: Added URLs to the Ruby reactive APIs.
-	* PROTON-781: Added the URL class to the Ruby core APIs.
-	* PROTON-781: Added Reactor and Task to the ClassWrapper
-	* PROTON-781: Added the Reactor mixin to the Ruby reactive APIs.
-	* PROTON-781: Added the Handler mixin to the Ruby reactive APIs.
-	* PROTON-781: Added the Timeout mixin to the Ruby APIs.
-	* PROTON-781: Added GlobalOverrides to the Ruby reactive APIs.
-	* PROTON-781: Added SSLConfig to the Ruby reactive APIs.
-	* PROTON-781: Added reactor support to the Ruby Event class.
-	* PROTON-781: Added the Reactor class to the Ruby reactor APIs.
-	* PROTON-781: Added Acceptor to the Ruby reactive APIs.
-	* PROTON-781: Added the Task class to the Ruby reactor APIs.
-	* PROTON-781: Added MessagingHandler to the Ruby reactive APIs.
-	* PROTON-781: Added OutgoingMessageHandler to the Ruby reactive APIs.
-	* PROTON-781: Added IncomingMessageHandler to the Ruby reactive APIs.
-	* PROTON-781: Added the BaseHandler class to the Ruby reactive APIs.
-	* PROTON-781: Added the CFlowController class to the Ruby reactive APIs.
-	* PROTON-781: Added EndpointStateHandler to the Ruby reactive APIs.
-	* PROTON-781: Added the Acking mixin to the Ruby reactive APIs.
-	* PROTON-781: Refactored the Ruby Selectable class.
-	* PROTON-781: Repackaged the Ruby Selectable class to Qpid::Proton.
-	* PROTON-781: Deleted the Ruby Filter mixin.
-	* PROTON-781: Added the WrappedHandler class to the Ruby reactor APIs.
-	* PROTON-799: Update CMake INSTALL for 81a5449
-	* PROTON-914: Fix for getting the SSL peer hostname in Ruby.
-	* PROTON-898: Update Ruby bindings to use pn_selectable_get_fd
-	* PROTON-799: Test for the Wrapper and rbkey system
-	* PROTON-799: Adjusted the Ruby error macro
-	* PROTON-799: Added yardopts
-	* PROTON-799: Added the Event classes to the Ruby engine APIs.
-	* PROTON-799: Added the ClassWrapper mixin for the Ruby engine APIs.
-	* PROTON-799: Added the Transport class to the Ruby engine APIs.
-	* PROTON-799: Added the SSL classes to the Ruby engine APIs.
-	* PROTON-799: Added the SASL class to the Ruby engine APIs.
-	* PROTON-799: Added the SASLError and TransportError errors to Ruby.
-	* PROTON-799: Added the Connection class to the Ruby engine APIs.
-	* PROTON-799: Added the Receiver class to the Ruby engine APIs.
-	* PROTON-799: Added the Sender class to the Ruby engine APIs.
-	* PROTON-799: Added the Link class to the Ruby engine APIs.
-	* PROTON-799: Added the Delivery class to the Ruby engine APIs.
-	* PROTON-799: Added the Disposition class to the Ruby engine APIs.
-	* PROTON-799: Added the Terminus class to the Ruby engine APIs.
-	* PROTON-799: Added the Session class to the Ruby engine APIs.
-	* PROTON-799: Added the Endpoint class to the Ruby engine APIs.
-	* PROTON-799: Added the Wrapper mixin to the Ruby engine APIs.
-	* PROTON-799: Added the Condition class to the Ruby engine APIs.
-	* PROTON-799: Added the UUID mixin for the Ruby reactive APIs.
-	* PROTON-799: Created a utility module for the Ruby Engine APIs.
-	* PROTON-799: Added the Collector class to the Ruby engine APIs.
-	* PROTON-799: Added the pn_rbkey_t type to the Ruby APIs.
-	* PROTON-799: Created a wrapper helper module for Ruby bindings.
-	* PROTON-799: Added a constants value mixin to the Ruby bindings.
-	* PROTON-799: Added the object/object= methods to Ruby Data class
-	* PROTON-799: Updated the Ruby namespaces.
-	* PROTON-799: Rearranged Ruby library.
-	* PROTON-883: Fixed using a pointer value as a size - It's not clear to me how the warning message this caused went ignored - It's also not clear to me why this error passed the tests without   crashing, probably the ruby tests need improving.
-	* PROTON-883: Wrap pn_transport_peek for Ruby.
-	* PROTON-873: Replaced send with __send__ in Ruby Mapping class
-
-version 0.9.1:
-
-version 0.9:
-	* PROTON-822: removed some references I missed in my prior purge of deprecated message cruft
-	* PROTON-822: removed deprecated message save/load as it has been deprecated for a while now and was also the cause of a valgrind error
-	* PROTON-775: Ensure that annotation keys in Ruby are encoded as symbols.
-	* PROTON-737: add missing PN_STATE_ERR error to ruby
-	* PROTON-765: Fix Ruby's support for 64-bit values on 32-bit systems
-	* PROTON-755: Changed how the Data rspec test sets a single random character.
-	* PROTON-755: Add SecureRandom for use by Ruby 1.8 tests
-	* PROTON-755: Updated rspec tests to use the newer expect syntax
-	* PROTON-752: Release the GIL on blocking calls in Ruby.
-	* PROTON-736: Tweaked how Ruby 1.8 determines if a string is UTF-8
-	* PROTON-752: Provide a non-blocking means to receive messages in Ruby.
-	* PROTON-747: Around wrappers for Ruby Messenger methods that raise errors
-	* PROTON-736: Replace missed force_encoding with encode
-	* PROTON-743: Provide a means to clear errors in a Ruby Messenger.
-	* PROTON-746: Fix encoding a Ruby symbol into a message body.
-	* PROTON-736: Default Ruby 1.8 encoding to be binary unless explicit
-	* PROTON-736: Created the UTFString and BinaryString classes for Ruby.
-	* PROTON-739: Add TTL to Ruby Messenger subscribe method.
-	* PROTON-736: Only encode Ruby strings as UTF-8 if it says it's UTF-8
-	* PROTON-736: Ruby Message does not return all content.
-
-version 0.8:
-	* PROTON-693: Python Url class to wrap C function pni_parse_url
-	* PROTON-651: remove the extraineous 'PN_' if under the proton namespace.
-	* PROTON-651: added version constants for python, php, and ruby bindings
-	* PROTON-615: Fix binding dependencies
-	* PROTON-549: fixed warnings from ruby binding
-	* PROTON-531: Removed Selectable.killable? from Ruby bindings
-	* PROTON-531: Created the Selectable class for Ruby.
-	* PROTON-531: Expose the passive mode in Ruby bindings.
-
-version 0.7:
-	* PROTON-550: Fail build if Ruby is enabled but missing dependencies.
-	* PROTON-551: Fixed a typo in the Ruby Messenger blocking call.
-	* PROTON-538: more readme fixes and install tweaks
-	* PROTON-538: fixed install to not use irregular paths, marked a lot of noisy variables as advanced, removed extra level of caching from cmake variables that had confusing effects, updated the readme to match what the build actually does
-	* PROTON-445: Dynamic languages honor CMAKE_INSTALL_PREFIX
-
-version 0.6:
-	* PROTON-482: Fix the Ruby install directory.
-	* PROTON-479: Fixed typo in status
-	* PROTON-479: Added PENDING status to Ruby Trackers
-	* PROTON-260   Improve API rdoc comments for Ruby.
-	* PROTON-464: Install Ruby bindings to install prefix if specified.
-	* PROTON-456: Added password property to Ruby Messenger class.
-	* PROTON-455: Added rewrite method to Ruby Messenger class.
-	* PROTON-454: Added the route method to Ruby's Messenger class.
-	* PROTON-452: Expose the Messenger interrupt method in Ruby.
-	* PROTON-450: Use random ports for Ruby Rspec tests.
-	* PROTON-448: Backing out the Ruby data change.
-	* PROTON-448: Added missed ChangeLog entry
-	* PROTON-448: Added support for Data encode/decode to Ruby Swig.
-	* PROTON-431: Fixed the Ruby spec tests.
-	* PROTON-273: Removed the content Rspec test for Ruby.
-	* PROTON-427: Removed the flag argument from Messenger.settle
-
-version 0.5:
-	* PROTON-406: Fix installing the Ruby bindings.
-	* PROTON-399: Ruby bindings now install with the rest of Proton.
-	* PROTON-369: Add the properties= method to Ruby Message.
-	* PROTON-380: Added the body property to Ruby Message class.
-	* PROTON-379: Added annotations property to Ruby Message class.
-	* PROTON-381: Fixed encoding a Ruby symbol into a Data object.
-	* PROTON-378: Add instructions property to Ruby Message class.
-	* PROTON-369: Ruby Message.clear clears out properties
-	* PROTON-377: Ruby automatically encodes an instance of Time.
-	* PROTON-376: Fix how a ::hash is automatically added to Data in Ruby
-	* PROTON-369: Add properties field to Qpid:Proton::Message
-	* PROTON-341: Update the Ruby interop tests.
-	* PROTON-322: Extend the Ruby Hash class to work with the Data class.
-	* PROTON-322: Extended the Ruby Array class to work with the Data class.
-	* PROTON-306: Fixes to the Ruby list helper type for Data.
-	* PROTON-304: Removed accept mode from the Ruby bindings.
-	* PROTON-227: Added missing elements to the Rdoc for qpid::proton::Data
-	* PROTON-215: Added ruby interop test.
-	* PROTON-227: Created the Data class for the Ruby bindings.
-
-version 0.4:
-
-version 0.3:
-	* PROTON-188: applied modified patch
-
-version 0.2:
-
-version 0.1:

data/TODO

@@ -1,8 +0,0 @@
-Proton Ruby bindings TODO List
-========================================================================
-
-You can find the list of bugs and enhacements to be fixed at:
-
-  https://issues.apache.org/jira/issues/?jql=project%20%3D%20PROTON%20AND%20status%20in%20(Open%2C%20%22In%20Progress%22%2C%20Reopened)%20AND%20component%20%3D%20ruby-binding
-
-