rabbitmq 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6084d87d4d4379929fbae34f8a6d7e8f979f176
-  data.tar.gz: 6312eaee4b20b758986c03fa8e448f763e03cb61
+  metadata.gz: 7ea9090c210d60db3bf5571f6408f9a91a9fe158
+  data.tar.gz: b5c814e43a019e30bd803216b258f90c29510e6e
 SHA512:
-  metadata.gz: 0de8d7059d8117341d3605ce4f58463fb912dc581572821cd9b3bcc80f82b3a5cb0ecfc5c3540dae0c6aeea1071027e4d6bc366ae651e04a76d9c60b788e836f
-  data.tar.gz: e09ce58387e226cd673b51a32934cb8456ba9eaddb00031cafddb7fafa84ea8acbd5657789645eb3388954c24072cf6a25b8e564f38071a7b3a60f2c91e0961d
+  metadata.gz: 26478dc891d275f8a8fe7b2ce5112974ce0c7d2fc7c54a7edbd9f2fe15ceb33a13193c8b2dacd12423840beb577aa772bd0091cfd2f1af88e6f9af305dd2fd50
+  data.tar.gz: 9d0dd89cbe2170c473f89f5f2e137df725187401a2ff29165828c475b7b56dfc6b5dd204c085442837e7c41bf3fcea945c176218cc1d140546e44dd8eda46327

data/lib/rabbitmq/channel.rb

@@ -227,20 +227,19 @@ module RabbitMQ
       exchange    = FFI::Bytes.from_s(exchange, true)
       routing_key = FFI::Bytes.from_s(routing_key, true)
       properties  = FFI::BasicProperties.new.apply(
-        content_type:       opts.fetch(:content_type,     "application/octet-stream"),
-        content_encoding:   opts.fetch(:content_encoding, ""),
-        headers:            opts.fetch(:headers,          {}),
-        delivery_mode:     (opts.fetch(:persistent,    false) ? :persistent : :nonpersistent),
-        priority:           opts.fetch(:priority,          0),
-        correlation_id:     opts.fetch(:correlation_id,   ""),
-        reply_to:           opts.fetch(:reply_to,         ""),
-        expiration:         opts.fetch(:expiration,       ""),
-        message_id:         opts.fetch(:message_id,       ""),
-        timestamp:          opts.fetch(:timestamp,         0),
-        type:               opts.fetch(:type,             ""),
-        user_id:            opts.fetch(:user_id,          ""),
-        app_id:             opts.fetch(:app_id,           ""),
-        cluster_id:         opts.fetch(:cluster_id,       "")
+        content_type:       opts.fetch(:content_type,     nil),
+        content_encoding:   opts.fetch(:content_encoding, nil),
+        headers:            opts.fetch(:headers,           {}),
+        delivery_mode:     (opts.fetch(:persistent,     false) ? :persistent : :nonpersistent),
+        priority:           opts.fetch(:priority,           0),
+        correlation_id:     opts.fetch(:correlation_id,   nil),
+        reply_to:           opts.fetch(:reply_to,         nil),
+        expiration:         opts.fetch(:expiration,       nil),
+        message_id:         opts.fetch(:message_id,       nil),
+        timestamp:          opts.fetch(:timestamp,          0),
+        type:               opts.fetch(:type,             nil),
+        app_id:             opts.fetch(:app_id,           nil),
+        cluster_id:         opts.fetch(:cluster_id,       nil)
       )
       
       Util.error_check :"publishing a message",

data/lib/rabbitmq/ffi.rb

@@ -696,6 +696,23 @@ module RabbitMQ
                :user_id,          Bytes,
                :app_id,           Bytes,
                :cluster_id,       Bytes
+        
+        FLAGS = {
+          content_type:     (1 << 15),
+          content_encoding: (1 << 14),
+          headers:          (1 << 13),
+          delivery_mode:    (1 << 12),
+          priority:         (1 << 11),
+          correlation_id:   (1 << 10),
+          reply_to:         (1 << 9),
+          expiration:       (1 << 8),
+          message_id:       (1 << 7),
+          timestamp:        (1 << 6),
+          type:             (1 << 5),
+          user_id:          (1 << 4),
+          app_id:           (1 << 3),
+          cluster_id:       (1 << 2),
+        }
       end
       
       attach_function :amqp_channel_open,     [ConnectionState, Channel],                                                             ChannelOpenOk.ptr,     **opts

data/lib/rabbitmq/ffi/ext.rb

@@ -181,11 +181,12 @@ module RabbitMQ
     module MethodClassMixin
       def apply(borrow=false, **params)
         params.each do |key, value|
-          next if key == :dummy
+          next if value.nil? || !writable_key?(key)
           case value
           when String; value = FFI::Bytes.from_s(value, borrow)
           when Hash;   value = FFI::Table.from(value, borrow)
           end
+          key_applied_hook(key)
           self[key] = value
         end
         self
@@ -194,7 +195,7 @@ module RabbitMQ
       def to_h(free=false)
         result = {}
         self.members.each do |key| [key, self[key]]
-          next if key == :dummy
+          next unless readable_key?(key)
           value = self[key]
           case value
           when FFI::Bytes; value = value.to_s(free)
@@ -219,12 +220,43 @@ module RabbitMQ
         end
         clear
       end
+      
+      def key_applied_hook(key)
+        # do nothing here
+      end
+      
+      def readable_key?(key)
+        key != :dummy
+      end
+      
+      def writable_key?(key)
+        key != :dummy
+      end
     end
     
     Method::MethodClasses.each { |_, kls| kls.send(:include, MethodClassMixin) }
     
     BasicProperties.send(:include, MethodClassMixin)
     
+    class BasicProperties
+      def key_applied_hook(key)
+        flag_bit = FLAGS[key]
+        return unless flag_bit
+        self[:_flags] = (self[:_flags] | flag_bit)
+      end
+      
+      def readable_key?(key)
+        return false if key == :_flags
+        flag_bit = FLAGS[key]
+        return true unless flag_bit
+        return (flag_bit & self[:_flags]) != 0
+      end
+      
+      def writable_key?(key)
+        true
+      end
+    end
+    
     class FramePayloadProperties
       def decoded
         BasicProperties.new(self[:decoded])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Joe McIlvain