qpid_messaging 0.20.0 → 0.20.2

data/Rakefile

@@ -33,6 +33,7 @@ require "rdoc/task"
 require "rake/testtask"
 
 require "cucumber/rake/task"
+require "rspec/core/rake_task"
 
 CLOBBER.include("pkg")
 
@@ -55,6 +56,44 @@ 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,9 +29,7 @@ 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,
-                                                :delete => :always)
+  response_queue = Qpid::Messaging::Address.new("#response-queue;{create:always}")
   receiver = session.create_receiver response_queue
 
   ["Twas brillig, and the slithy toves",

data/ext/cqpid/extconf.rb

@@ -26,9 +26,10 @@
 require 'mkmf'
 
 # Setup the build environment.
-$CFLAGS = "-fPIC -fno-inline -x c++"
+$CFLAGS = "-fPIC -fno-inline -x c++ -lstdc++"
 
 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 name "create-receiver-test" and subject "foo" and option "create" set to "always" and "delete" set to "always"
+    And an Address with the string "create-receiver-test;{create: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 name "my-queue" and subject "my-subject" and option "create" set to "always"
+    And an Address with the string "my-queue/my-subject;{create:always}"
     Then creating a sender with an Address succeeds

data/features/step_definitions/address_steps.rb

@@ -17,15 +17,6 @@
 # under the License.
 #
 
-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
+Given /^an Address with the string "(.*?)"$/ do |address|
+  @address = Qpid::Messaging::Address.new "#{address}"
 end

data/lib/qpid_messaging/address.rb

@@ -70,26 +70,18 @@ module Qpid
     #
     class Address
 
-      # Creates a new +Address+ object.
+      # Creates a new +Address+ object from an address string.
       #
       # ==== Options
       #
-      # * 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.
+      # * address - the address string
       #
       # ==== Examples
       #
-      #   addr = Qpid::Messaging::Address.new "my-queue"
-      #   addr = Qpid::Messaging::Address.new "my-queue", "testing", :create => :always
+      #   addr = Qpid::Messaging::Address.new "my-queue;{create:always}"
       #
-      def initialize(name, subject, options = {}, _type = "", address_impl = nil)
-        @address_impl = address_impl || Cqpid::Address.new(name, subject, convert_options(options), _type)
+      def initialize(address, address_impl = nil)
+        @address_impl = address_impl || Cqpid::Address.new(address)
       end
 
       def address_impl # :nodoc:

data/lib/qpid_messaging/encoding.rb

@@ -23,35 +23,52 @@ module Qpid
 
     # Encodes the supplied content into the given message.
     def self.encode content, message, encoding = nil
-      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
+      Cqpid::encode content, message.message_impl, encoding
     end
 
     # Decodes and returns the message's content.
     def self.decode(message, content_type = nil)
-      content_type = message.content_type unless content_type
+      content_type = message.content_type if content_type.nil?
 
       case content_type
         when "amqp/map"
-          Cqpid.decodeMap message.message_impl
+          return Cqpid.decodeMap message.message_impl
         when "amqp/list"
-          Cqpid.decodeList message.message_impl
+          return 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+
+      # * address - an instance of +Address+, or an address string
       #
       # ==== Examples
       #
       #   msg.reply_to = Qpid:Messaging::Address.new "my-responses"
+      #   msg.reply_to = "my-feed/responses"
       #
       def reply_to=(address)
-        raise ArgumentError, "Agument must be an Address" unless address.is_a? Qpid::Messaging::Address
+        address = Qpid::Messaging::Address.new "#{address}" if !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, nil, nil, nil, address_impl) if address_impl
+        Qpid::Messaging::Address.new(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, value.to_s); end
+      def []=(key, value)
+        @message_impl.setProperty(key.to_s,
+                                  Qpid::Messaging.stringify(value))
+      end
 
       # Sets the content for the +Message+.
       #
@@ -309,18 +309,12 @@ module Qpid
       #
       def content=(content)
         content_type = nil
-        @content = content
+        @content = Qpid::Messaging.stringify(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

@@ -23,7 +23,7 @@ module Qpid #:nodoc:
 
     NUMBERS = [MAJOR = 0,
                MINOR = 20,
-               BUILD = 0]
+               BUILD = 2]
   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/connection_spec.rb

@@ -37,7 +37,7 @@ module Qpid
           connection = Qpid::Messaging::Connection.new :options => {:username => "foo"}
 
           connection.options.should include("username")
-        }.should_not raise_error
+        }.to_not raise_error
       end
 
       it "returns the underlying implementation" do

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", ""
+        address = Qpid::Messaging::Address.new "my-queue;{create:always}"
 
         @message.reply_to = address
 
@@ -45,6 +45,19 @@ 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-queu", "", :create => :always
+        address = Qpid::Messaging::Address.new "my-queue;{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.20.0
+  version: 0.20.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies: []
 description: Qpid is an enterprise messaging framework.
 email: dev@qpid.apache.org
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Qpid is an enterprise messaging framework.