qpid_messaging 0.18.5 → 0.20.0

data/README.rdoc

@@ -3,7 +3,7 @@
 Qpid is an cross-platform enterprise messaging system based on the open-source
 AMQP protocol.
 
-Version :: 0.18.0
+Version :: 0.20.0
 
 = Links
 

data/Rakefile

@@ -33,7 +33,6 @@ require "rdoc/task"
 require "rake/testtask"
 
 require "cucumber/rake/task"
-require "rspec/core/rake_task"
 
 CLOBBER.include("pkg")
 
@@ -56,44 +55,6 @@ task :default => :test
 desc "Runs all tests."
 task :test => :"test:all"
 
-#---------------
-# Testing tasks.
-#---------------
-
-namespace :test do
-
-  desc "Run RSpec tests."
-  RSpec::Core::RakeTask.new do |t|
-    t.ruby_opts = ['-rtest/unit']
-    t.rcov       = false
-    t.rcov_opts  = [
-                    '--exclude', 'lib\/qpid_messaging.rb,spec\/,lib\/ruby',
-                   ]
-  end
-
-  desc "Run all tests (default)."
-  task :all => [:spec, :features]
-
-  Cucumber::Rake::Task.new(:features) do |t|
-    t.libs          = ["lib", "ext/nonblockio"]
-    t.cucumber_opts = "--format progress"
-  end
-
-end
-
-#---------------------
-# Documentation tasks.
-#---------------------
-
-Rake::RDocTask.new(:rdoc => "rdoc",
-                   :clobber_rdoc => "rdoc:clean",
-                   :rerdoc => "rdoc:force") do |rd|
-  rd.main    = "README.rdoc"
-  rd.options << "--all"
-  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-  rd.title = "Qpid Messaging Documentation"
-end
-
 #-----------------
 # Package the gem.
 #-----------------

data/examples/client.rb

@@ -29,7 +29,9 @@ if __FILE__ == $0
   connection.open
   session = connection.create_session
   sender = session.create_sender "service_queue"
-  response_queue = Qpid::Messaging::Address.new("#response-queue;{create:always}")
+  response_queue = Qpid::Messaging::Address.new("#response-queue", "",
+                                                :create => :always,
+                                                :delete => :always)
   receiver = session.create_receiver response_queue
 
   ["Twas brillig, and the slithy toves",

data/ext/cqpid/cqpid.cpp

@@ -1859,12 +1859,6 @@ static VALUE mCqpid;
 
 
 
-struct mystr
-{
-  size_t len;
-  const char *ptr;
-};
-
 #include <qpid/messaging/exceptions.h>
 #include <qpid/messaging/Address.h>
 #include <qpid/messaging/Connection.h>
@@ -2000,9 +1994,6 @@ SWIG_From_std_string  (const std::string& s)
   return SWIG_FromCharPtrAndSize(s.data(), s.size());
 }
 
-SWIGINTERN qpid::messaging::Duration qpid_messaging_Duration___mul__(qpid::messaging::Duration *self,uint64_t multiplier){
-         return qpid::messaging::Duration(self->getMilliseconds() * multiplier);
-    }
 
 SWIGINTERNINLINE VALUE
 SWIG_From_bool  (bool value)
@@ -2135,6 +2126,13 @@ SWIG_AsVal_bool (VALUE obj, bool *val)
 }
 
 
+SWIGINTERNINLINE VALUE 
+SWIG_FromCharPtr(const char *cptr)
+{ 
+  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
+}
+
+
   #define SWIG_From_long   LONG2NUM 
 
 
@@ -2151,12 +2149,6 @@ SWIG_From_size_t  (size_t value)
   return SWIG_From_unsigned_SS_long  (static_cast< unsigned long >(value));
 }
 
-SWIGINTERN mystr qpid_messaging_Message_getContentPtr(qpid::messaging::Message *self){
-    mystr s;
-    s.ptr = self->getContentPtr();
-    s.len = self->getContentSize();
-    return s;
-  }
 
 
 
@@ -3169,45 +3161,6 @@ _wrap_Duration_MINUTE_get(VALUE self) {
 }
 
 
-SWIGINTERN VALUE
-_wrap_Duration___mul__(int argc, VALUE *argv, VALUE self) {
-  qpid::messaging::Duration *arg1 = (qpid::messaging::Duration *) 0 ;
-  uint64_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  SwigValueWrapper< qpid::messaging::Duration > result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_qpid__messaging__Duration, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "qpid::messaging::Duration *","__mul__", 1, self )); 
-  }
-  arg1 = reinterpret_cast< qpid::messaging::Duration * >(argp1);
-  {
-    if (TYPE(argv[0]) == T_BIGNUM)
-    arg2 = NUM2ULL(argv[0]);
-    else
-    arg2 = (uint64_t) FIX2ULONG(argv[0]);
-  }
-  {
-    try {
-      result = qpid_messaging_Duration___mul__(arg1,arg2);
-    }
-    catch (qpid::messaging::MessagingException& mex) {
-      static VALUE merror = rb_define_class("MessagingError", rb_eStandardError);
-      rb_raise(merror, mex.what());
-    }
-  }
-  vresult = SWIG_NewPointerObj((new qpid::messaging::Duration(static_cast< const qpid::messaging::Duration& >(result))), SWIGTYPE_p_qpid__messaging__Duration, SWIG_POINTER_OWN |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
 SWIGINTERN void
 free_qpid_messaging_Duration(qpid::messaging::Duration *arg1) {
     delete arg1;
@@ -4633,6 +4586,38 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_Message_getContentPtr(int argc, VALUE *argv, VALUE self) {
+  qpid::messaging::Message *arg1 = (qpid::messaging::Message *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  char *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_qpid__messaging__Message, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "qpid::messaging::Message const *","getContentPtr", 1, self )); 
+  }
+  arg1 = reinterpret_cast< qpid::messaging::Message * >(argp1);
+  {
+    try {
+      result = (char *)((qpid::messaging::Message const *)arg1)->getContentPtr();
+    }
+    catch (qpid::messaging::MessagingException& mex) {
+      static VALUE merror = rb_define_class("MessagingError", rb_eStandardError);
+      rb_raise(merror, mex.what());
+    }
+  }
+  vresult = SWIG_FromCharPtr((const char *)result);
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_Message_getContentSize(int argc, VALUE *argv, VALUE self) {
   qpid::messaging::Message *arg1 = (qpid::messaging::Message *) 0 ;
@@ -4719,40 +4704,6 @@ fail:
 }
 
 
-SWIGINTERN VALUE
-_wrap_Message_getContentPtr(int argc, VALUE *argv, VALUE self) {
-  qpid::messaging::Message *arg1 = (qpid::messaging::Message *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  mystr result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_qpid__messaging__Message, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "qpid::messaging::Message *","getContentPtr", 1, self )); 
-  }
-  arg1 = reinterpret_cast< qpid::messaging::Message * >(argp1);
-  {
-    try {
-      result = qpid_messaging_Message_getContentPtr(arg1);
-    }
-    catch (qpid::messaging::MessagingException& mex) {
-      static VALUE merror = rb_define_class("MessagingError", rb_eStandardError);
-      rb_raise(merror, mex.what());
-    }
-  }
-  {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_FromCharPtrAndSize((&result)->ptr, (&result)->len));
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
 static swig_class SwigClassEncodingException;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
@@ -9812,7 +9763,6 @@ SWIGEXPORT void Init_cqpid(void) {
   rb_define_singleton_method(SwigClassDuration.klass, "IMMEDIATE", VALUEFUNC(_wrap_Duration_IMMEDIATE_get), 0);
   rb_define_singleton_method(SwigClassDuration.klass, "SECOND", VALUEFUNC(_wrap_Duration_SECOND_get), 0);
   rb_define_singleton_method(SwigClassDuration.klass, "MINUTE", VALUEFUNC(_wrap_Duration_MINUTE_get), 0);
-  rb_define_method(SwigClassDuration.klass, "*", VALUEFUNC(_wrap_Duration___mul__), -1);
   SwigClassDuration.mark = 0;
   SwigClassDuration.destroy = (void (*)(void *)) free_qpid_messaging_Duration;
   SwigClassDuration.trackObjects = 0;
@@ -9846,9 +9796,9 @@ SWIGEXPORT void Init_cqpid(void) {
   rb_define_method(SwigClassMessage.klass, "getProperties", VALUEFUNC(_wrap_Message_getProperties), -1);
   rb_define_method(SwigClassMessage.klass, "setContent", VALUEFUNC(_wrap_Message_setContent), -1);
   rb_define_method(SwigClassMessage.klass, "getContent", VALUEFUNC(_wrap_Message_getContent), -1);
+  rb_define_method(SwigClassMessage.klass, "getContentPtr", VALUEFUNC(_wrap_Message_getContentPtr), -1);
   rb_define_method(SwigClassMessage.klass, "getContentSize", VALUEFUNC(_wrap_Message_getContentSize), -1);
   rb_define_method(SwigClassMessage.klass, "setProperty", VALUEFUNC(_wrap_Message_setProperty), -1);
-  rb_define_method(SwigClassMessage.klass, "getContentPtr", VALUEFUNC(_wrap_Message_getContentPtr), -1);
   SwigClassMessage.mark = 0;
   SwigClassMessage.destroy = (void (*)(void *)) free_qpid_messaging_Message;
   SwigClassMessage.trackObjects = 0;

data/ext/cqpid/extconf.rb

@@ -26,10 +26,9 @@
 require 'mkmf'
 
 # Setup the build environment.
-$CFLAGS = "-fPIC -fno-inline -x c++ -lstdc++"
+$CFLAGS = "-fPIC -fno-inline -x c++"
 
 REQUIRED_LIBRARIES = [
-                      'stdc++',
                       'qpidclient',
                       'qpidcommon',
                       'qpidmessaging',

data/features/creating_a_receiver.feature

@@ -25,5 +25,5 @@ Feature: Creating a receiver
 
   Scenario: Using an Address object
     Given an open session
-    And an Address with the string "create-receiver-test;{create:always}"
+    And an Address with the name "create-receiver-test" and subject "foo" and option "create" set to "always" and "delete" set to "always"
     Then creating a receiver with an Address succeeds

data/features/creating_a_sender.feature

@@ -21,5 +21,5 @@ Feature: Creating a sender
 
   Scenario: Using an Address object
     Given an open session
-    And an Address with the string "my-queue/my-subject;{create:always}"
+    And an Address with the name "my-queue" and subject "my-subject" and option "create" set to "always"
     Then creating a sender with an Address succeeds

data/features/step_definitions/address_steps.rb

@@ -17,6 +17,15 @@
 # under the License.
 #
 
-Given /^an Address with the string "(.*?)"$/ do |address|
-  @address = Qpid::Messaging::Address.new "#{address}"
+Given /^an Address with the name "([^"]*)" and subject "([^"]*)" and option "([^"]*)" set to "([^"]*)"$/ do |name, subject, key, value|
+  options = Hash.new
+  options["#{key}"] = "#{value}"
+  @address = Qpid::Messaging::Address.new "#{name}", "#{subject}", options
+end
+
+Given /^an Address with the name "([^"]*)" and subject "([^"]*)" and option "([^"]*)" set to "([^"]*)" and "([^"]*)" set to "([^"]*)"$/ do |name, subject, key1, value1, key2, value2|
+  options = Hash.new
+  options["#{key1}"] = "#{value1}"
+  options["#{key2}"] = "#{value2}"
+  @address = Qpid::Messaging::Address.new "#{name}", "#{subject}", options
 end

data/lib/qpid_messaging/address.rb

@@ -70,18 +70,26 @@ module Qpid
     #
     class Address
 
-      # Creates a new +Address+ object from an address string.
+      # Creates a new +Address+ object.
       #
       # ==== Options
       #
-      # * address - the address string
+      # * name - The name for the +Address+.
+      # * subject - The subject for the +Address+
+      # * :create - See the class documentation.
+      # * :assert - See the class documentation.
+      # * :delete - See the class documentation.
+      # * :node   - See the class documentation.
+      # * :link   - See the class documentation.
+      # * :mode   - See the class documentation.
       #
       # ==== Examples
       #
-      #   addr = Qpid::Messaging::Address.new "my-queue;{create:always}"
+      #   addr = Qpid::Messaging::Address.new "my-queue"
+      #   addr = Qpid::Messaging::Address.new "my-queue", "testing", :create => :always
       #
-      def initialize(address, address_impl = nil)
-        @address_impl = address_impl || Cqpid::Address.new(address)
+      def initialize(name, subject, options = {}, _type = "", address_impl = nil)
+        @address_impl = address_impl || Cqpid::Address.new(name, subject, convert_options(options), _type)
       end
 
       def address_impl # :nodoc:

data/lib/qpid_messaging/encoding.rb

@@ -23,52 +23,35 @@ module Qpid
 
     # Encodes the supplied content into the given message.
     def self.encode content, message, encoding = nil
-      Cqpid::encode content, message.message_impl, encoding
+      prepared = content
+      case content
+      when Hash
+        prepared = {}
+        content.each_pair do |key,value|
+          prepared[key.to_s] = value.to_s
+        end
+        Cqpid::encode prepared, message.message_impl
+      when Array
+        prepared = []
+        content.each {|value| prepared << value.to_s}
+        Cqpid::encode prepared, message.message_impl
+      end
     end
 
     # Decodes and returns the message's content.
     def self.decode(message, content_type = nil)
-      content_type = message.content_type if content_type.nil?
+      content_type = message.content_type unless content_type
 
       case content_type
         when "amqp/map"
-          return Cqpid.decodeMap message.message_impl
+          Cqpid.decodeMap message.message_impl
         when "amqp/list"
-          return Cqpid.decodeList message.message_impl
+          Cqpid.decodeList message.message_impl
       end
 
       message.content
     end
 
-    # Takes as input any type and converts anything that's a symbol
-    # into a string.
-    def self.stringify(value)
-      # set the default value
-      result = value
-
-      case value
-
-      when Symbol
-        result = value.to_s
-
-      when Hash
-        result = {}
-        value.each_pair do |key, value|
-          result[stringify(key)] = stringify(value)
-        end
-
-      when Array
-        result = []
-        value.each do |element|
-          result  << stringify(element)
-        end
-
-      end
-
-      return result
-
-    end
-
   end
 
 end

data/lib/qpid_messaging/message.rb

@@ -51,18 +51,18 @@ module Qpid
 
       # Sets the address to which replies should be sent for the +Message+.
       #
+      # *NOTE:* The address must be an instance of Address.
+      #
       # ==== Options
       #
-      # * address - an instance of +Address+, or an address string
+      # * address - an instance of +Address+
       #
       # ==== Examples
       #
       #   msg.reply_to = Qpid:Messaging::Address.new "my-responses"
-      #   msg.reply_to = "my-feed/responses"
       #
       def reply_to=(address)
-        address = Qpid::Messaging::Address.new "#{address}" if !address.is_a? Qpid::Messaging::Address
-
+        raise ArgumentError, "Agument must be an Address" unless address.is_a? Qpid::Messaging::Address
         @message_impl.setReplyTo address.address_impl
       end
 
@@ -71,7 +71,7 @@ module Qpid
       def reply_to
         address_impl = @message_impl.getReplyTo
         # only return an address if a reply to was specified
-        Qpid::Messaging::Address.new(nil, address_impl) if address_impl
+        Qpid::Messaging::Address.new(nil, nil, nil, nil, address_impl) if address_impl
       end
 
       # Sets the subject for the +Message+.
@@ -283,14 +283,14 @@ module Qpid
 
       # Assigns a value to the named property.
       #
+      # *NOTE:* Both the key or the value may be a symbol, but they will
+      # both be converted to a +String+ for ease of transport.
+      #
       # ==== Options
       #
       # * name - the property name
       # * value - the property value
-      def []=(key, value)
-        @message_impl.setProperty(key.to_s,
-                                  Qpid::Messaging.stringify(value))
-      end
+      def []=(key, value); @message_impl.setProperty(key.to_s, value.to_s); end
 
       # Sets the content for the +Message+.
       #
@@ -309,12 +309,18 @@ module Qpid
       #
       def content=(content)
         content_type = nil
-        @content = Qpid::Messaging.stringify(content)
+        @content = content
         case @content
         when Hash
           content_type = "amqp/map"
+          new_content  = {}
+          content.each_pair{|key, value| new_content[key.to_s] = value.to_s}
+          @content = new_content
         when Array
+          new_content  = []
           content_type = "amqp/list"
+          content.each {|element| new_content << element.to_s}
+          @content = new_content
         end
         if content_type.nil?
           @message_impl.setContent @content

data/lib/qpid_messaging/version.rb

@@ -22,8 +22,8 @@ module Qpid #:nodoc:
   module Version
 
     NUMBERS = [MAJOR = 0,
-               MINOR = 18,
-               BUILD = 5]
+               MINOR = 20,
+               BUILD = 0]
   end
 
   VERSION = Version::NUMBERS.join('.')

data/spec/qpid_messaging/address_spec.rb

@@ -26,7 +26,7 @@ module Qpid
     describe Address do
 
       before(:each) do
-        @address = Qpid::Messaging::Address.new "my-name/my-subject;{create:always}"
+        @address = Qpid::Messaging::Address.new "my-name", "my-subject", :create => :always
       end
 
       it "stores the name, subject and options when created" do
@@ -72,7 +72,7 @@ module Qpid
       end
 
       it "can return a string representation" do
-        address = Qpid::Messaging::Address.new "foo/bar:{create:always,link:durable}"
+        address = Qpid::Messaging::Address.new "foo", "bar", :create => :always, :link => :durable
         result = address.to_s
 
         result.should =~ /foo\/bar/

data/spec/qpid_messaging/message_spec.rb

@@ -36,7 +36,7 @@ module Qpid
       end
 
       it "can set the reply to address" do
-        address = Qpid::Messaging::Address.new "my-queue;{create:always}"
+        address = Qpid::Messaging::Address.new "my-queue", ""
 
         @message.reply_to = address
 
@@ -45,19 +45,6 @@ module Qpid
         reply_to.name.should == address.name
       end
 
-      it "can set the reply to from an address string" do
-        name = "my-queue"
-        subject = "responses"
-        address = "#{name}/#{subject}"
-
-        @message.reply_to = address
-
-        reply_to = @message.reply_to
-
-        reply_to.name.should == name
-        reply_to.subject.should == subject
-      end
-
       it "should store the content when created" do
         content = @message.content
 

data/spec/qpid_messaging/session_spec.rb

@@ -46,7 +46,7 @@ module Qpid
       end
 
       it "creates a Sender from an Address" do
-        address = Qpid::Messaging::Address.new "my-queue;{create:always}"
+        address = Qpid::Messaging::Address.new "my-queu", "", :create => :always
 
         @session_impl.should_receive(:createSender).
           with(address.address_impl).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qpid_messaging
 version: !ruby/object:Gem::Version
-  version: 0.18.5
+  version: 0.20.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies: []
 description: Qpid is an enterprise messaging framework.
 email: dev@qpid.apache.org