qpid_proton 0.4 → 0.5

data/lib/qpid_proton/messenger.rb

@@ -28,14 +28,6 @@ module Qpid
     #
     class Messenger
 
-      # Automatically accept every message as it is returned by #get
-      #
-      ACCEPT_MODE_AUTO = Cproton::PN_ACCEPT_MODE_AUTO
-
-      # Messages must be manually accepted or rejected using #accept
-      #
-      ACCEPT_MODE_MANUAL = Cproton::PN_ACCEPT_MODE_MANUAL
-
       include Qpid::Proton::ExceptionHandling
 
       # Creates a new +Messenger+.
@@ -54,7 +46,6 @@ module Qpid
 
       def self.finalize!(impl) # :nodoc:
         proc {
-          Cproton.pn_messenger_stop(impl)
           Cproton.pn_messenger_free(impl)
         }
       end
@@ -84,6 +75,14 @@ module Qpid
         Cproton.pn_messenger_get_timeout(@impl)
       end
 
+      def blocking
+        Cproton.pn_mesenger_is_blocking(@impl)
+      end
+
+      def blocking=(blocking)
+        Cproton.pn_messenger_set_blocking(@impl, blocking)
+      end
+
       # Reports whether an error occurred.
       #
       def error?
@@ -99,7 +98,7 @@ module Qpid
       # Returns the most recent error message.
       #
       def error
-        Cproton.pn_messenger_error(@impl)
+        Cproton.pn_error_text(Cproton.pn_messenger_error(@impl))
       end
 
       # Starts the +Messenger+, allowing it to begin sending and
@@ -116,6 +115,10 @@ module Qpid
         check_for_error(Cproton.pn_messenger_stop(@impl))
       end
 
+      def stopped
+        Cproton.pn_messenger_stopped(@impl)
+      end
+
       # Subscribes the +Messenger+ to a remote address.
       #
       def subscribe(address)
@@ -193,14 +196,17 @@ module Qpid
       def put(message)
         raise TypeError.new("invalid message: #{message}") if message.nil?
         raise ArgumentError.new("invalid message type: #{message.class}") unless message.kind_of?(Message)
+        # encode the message first
+        message.pre_encode
         check_for_error(Cproton.pn_messenger_put(@impl, message.impl))
+        return outgoing_tracker
       end
 
       # Sends all outgoing messages, blocking until the outgoing queue
       # is empty.
       #
-      def send
-        check_for_error(Cproton.pn_messenger_send(@impl))
+      def send(n = -1)
+        check_for_error(Cproton.pn_messenger_send(@impl, n))
       end
 
       # Gets a single message incoming message from the local queue.
@@ -213,9 +219,15 @@ module Qpid
       # * msg - the (optional) +Message+ instance to be used
       #
       def get(msg = nil)
-        msg = Qpid::Proton::Message.new if msg.nil?
-        check_for_error(Cproton.pn_messenger_get(@impl, msg.impl))
-        return msg
+        msg_impl = nil
+        if msg.nil? then
+          msg_impl = nil
+        else
+          msg_impl = msg.impl
+        end
+        check_for_error(Cproton.pn_messenger_get(@impl, msg_impl))
+        msg.post_decode unless msg.nil?
+        return incoming_tracker
       end
 
       # Receives up to the specified number of messages, blocking until at least
@@ -223,12 +235,24 @@ module Qpid
       #
       # Options ====
       #
-      # * max - the maximum number of messages to receive
+      # * limit - the maximum number of messages to receive
       #
-      def receive(max)
-        raise TypeError.new("invalid max: #{max}") if max.nil? || max.to_i.zero?
-        raise RangeError.new("negative max: #{max}") if max < 0
-        check_for_error(Cproton.pn_messenger_recv(@impl, max))
+      def receive(limit = -1)
+        check_for_error(Cproton.pn_messenger_recv(@impl, limit))
+      end
+
+      def receiving
+        Cproton.pn_messenger_receiving(@impl)
+      end
+
+      def work(timeout=-1)
+        err = Cproton.pn_messenger_work(@impl, timeout)
+        if (err == Cproton::PN_TIMEOUT) then
+          return false
+        else
+          check_for_error(err)
+          return true
+        end
       end
 
       # Returns the number messages in the outgoing queue that have not been
@@ -262,28 +286,6 @@ module Qpid
         Qpid::Proton::Tracker.new(impl)
       end
 
-      # Set the accept mode for the Messenger. See #ACCEPT_MODE_AUTO and
-      # #ACCEPT_MODE_MANUAL for more details
-      #
-      # ==== Options
-      #
-      # * mode - the acceptance mode
-      #
-      # ==== Examples
-      #
-      #  @messenger.accept_mode = Qpid::Proton::Messenger::ACCEPT_MODE_AUTO
-      #
-      def accept_mode=(mode)
-        raise TypeError.new("Invalid mode: #{mode}") unless valid_mode?(mode)
-        Cproton.pn_messenger_set_accept_mode(@impl, mode)
-      end
-
-      # Returns the current acceptance mode for the Messenger.
-      #
-      def accept_mode
-        Cproton.pn_messenger_get_accept_mode(@impl)
-      end
-
       # Accepts the incoming message identified by the tracker.
       #
       # ==== Options
@@ -291,9 +293,14 @@ module Qpid
       # * tracker - the tracker
       # * flag - the flag
       #
-      def accept(tracker, flag)
-        raise TypeError.new("invalid tracker: #{tracker}") unless valid_tracker?(tracker)
-        raise TypeError.new("invalid flag: #{flag}") unless Qpid::Proton::Tracker.valid_flag?(flag)
+      def accept(tracker = nil)
+        raise TypeError.new("invalid tracker: #{tracker}") unless tracker.nil? or valid_tracker?(tracker)
+        if tracker.nil? then
+          tracker = self.incoming_tracker
+          flag = Cproton::PN_CUMULATIVE
+        else
+          flag = 0
+        end
         check_for_error(Cproton.pn_messenger_accept(@impl, tracker.impl, flag))
       end
 
@@ -304,8 +311,14 @@ module Qpid
       # * tracker - the tracker
       # * flag - the flag
       #
-      def reject(tracker, flag)
-        raise TypeError.new("invalid tracker: #{tracker}") unless valid_tracker?(tracker)
+      def reject(tracker)
+        raise TypeError.new("invalid tracker: #{tracker}") unless tracker.nil? or valid_tracker?(tracker)
+        if tracker.nil? then
+          tracker = self.incoming_tracker
+          flag = Cproton::PN_CUMULATIVE
+        else
+          flag = 0
+        end
         check_for_error(Cproton.pn_messenger_reject(@impl, tracker.impl, flag))
       end
 
@@ -384,10 +397,6 @@ module Qpid
         !tracker.nil? && tracker.is_a?(Qpid::Proton::Tracker)
       end
 
-      def valid_mode?(mode)
-        [ACCEPT_MODE_AUTO, ACCEPT_MODE_MANUAL].include?(mode)
-      end
-
       def valid_window?(window)
         !window.nil? && [Float, Fixnum].include?(window.class)
       end

metadata

@@ -1,26 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: qpid_proton
 version: !ruby/object:Gem::Version
-  version: '0.4'
-  prerelease: 
+  version: '0.5'
 platform: ruby
 authors:
 - Darryl L. Pierce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies: []
-description: ! 'Proton is a high performance, lightweight messaging library. It can
-  be used in
-
+description: |
+  Proton is a high performance, lightweight messaging library. It can be used in
   the widest range of messaging applications including brokers, client libraries,
-
   routers, bridges, proxies, and more. Proton is based on the AMQP 1.0 messaging
-
   standard.
-
-'
 email:
 - proton@qpid.apache.org
 executables: []
@@ -34,37 +28,40 @@ files:
 - ext/cproton/extconf.rb
 - ext/cproton/cproton.c
 - lib/qpid_proton.rb
+- lib/qpid_proton/tracker_status.rb
+- lib/qpid_proton/described.rb
+- lib/qpid_proton/tracker.rb
+- lib/qpid_proton/hash.rb
 - lib/qpid_proton/subscription.rb
+- lib/qpid_proton/message.rb
+- lib/qpid_proton/message_format.rb
 - lib/qpid_proton/messenger.rb
-- lib/qpid_proton/tracker.rb
 - lib/qpid_proton/exception_handling.rb
-- lib/qpid_proton/message_format.rb
-- lib/qpid_proton/message.rb
-- lib/qpid_proton/exceptions.rb
 - lib/qpid_proton/data.rb
-- lib/qpid_proton/tracker_status.rb
+- lib/qpid_proton/array.rb
+- lib/qpid_proton/exceptions.rb
+- lib/qpid_proton/mapping.rb
 homepage: http://qpid.apache.org/proton
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby language bindings for the Qpid Proton messaging framework
 test_files: []