qpid_messaging 0.18.4 → 0.18.5

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

@@ -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 = 18,
-               BUILD = 4]
+               BUILD = 5]
   end
 
   VERSION = Version::NUMBERS.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qpid_messaging
 version: !ruby/object:Gem::Version
-  version: 0.18.4
+  version: 0.18.5
   prerelease: 
 platform: ruby
 authors: