rabbitmq 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 412b293a10015443e4a02fbe1775a51e5fda11b7
-  data.tar.gz: dcc35e673f49775c6c3f3c940e04c6b1fbc26def
+  metadata.gz: eb846b463a46e8d88e17f6ee64caab80faa6b1b5
+  data.tar.gz: 7f4107feb512e7aa9abae32264536623453baa6e
 SHA512:
-  metadata.gz: 8f755148f80b5ab2c89ed044528ccf286455654e71ff66e9b872d80818d2700951f0c73486de53adb24a27ece0cbbd2c225ed1dc5f599cac662770bdd7c19628
-  data.tar.gz: a792ac40dd95400fe151e510f188b87f6dff9e138e3c8c170fe8002a091d053b8426ee95274b1876381e0aeafec6581c142afcb3b1549f4232d64aff55147585
+  metadata.gz: 1ea282404a15b85ce764bd989e12f14bc2b7f2d604d57351fc5545eae25de47531bb9ab5661aab657ecd0f428f8bf6c0c5b4b8a46ea29a5263ae8b5fa35f3124
+  data.tar.gz: 6b22c1156bec01feaf4cec670ad2222011680485db27110818f3fc12a7909698ceb9109029de4f7dc14668a3d630e2d622af06b805b3291ac4ae3fefdd78373a

data/lib/rabbitmq/channel.rb

@@ -58,7 +58,7 @@ module RabbitMQ
     end
     
     private def rpc(request_type, params=[{}], response_type)
-      @connection.send_request(@id, request_type, params.last)
+      @connection.send_request(@id, request_type, params.last || {})
       if response_type
         @connection.fetch_response(@id, response_type)
       else
@@ -223,9 +223,9 @@ module RabbitMQ
     end
     
     def basic_publish(body, exchange, routing_key, **opts)
-      body        = FFI::Bytes.from_s(body, true)
-      exchange    = FFI::Bytes.from_s(exchange, true)
-      routing_key = FFI::Bytes.from_s(routing_key, true)
+      body        = FFI::Bytes.from_s(body)
+      exchange    = FFI::Bytes.from_s(exchange)
+      routing_key = FFI::Bytes.from_s(routing_key)
       properties  = FFI::BasicProperties.new.apply(
         content_type:       opts.fetch(:content_type,     nil),
         content_encoding:   opts.fetch(:content_encoding, nil),
@@ -252,6 +252,9 @@ module RabbitMQ
           body
         )
       
+      body.free!
+      exchange.free!
+      routing_key.free!
       properties.free!
       true
     end

data/lib/rabbitmq/connection.rb

@@ -12,6 +12,8 @@ module RabbitMQ
       @event_handlers    = Hash.new { |h,k| h[k] = {} }
       @incoming_events   = Hash.new { |h,k| h[k] = {} }
       
+      @frame = FFI::Frame.new
+      
       create_socket!
       
       @finalizer = self.class.send :create_finalizer_for, @ptr
@@ -255,7 +257,7 @@ module RabbitMQ
     
     # Return the next available frame, or nil if time expired.
     private def fetch_next_frame(timeout=0, start=Time.now)
-      frame  = FFI::Frame.new
+      frame = @frame
       
       # Try fetching the next frame without a blocking call.
       status = FFI.amqp_simple_wait_frame_noblock(@ptr, frame, FFI::Timeval.zero)

data/lib/rabbitmq/ffi/ext.rb

@@ -33,17 +33,13 @@ module RabbitMQ
         clear
       end
       
-      def self.from_s(str, borrow=false)
-        if borrow
-          FFI.amqp_cstring_bytes(str)
-        else
-          size = str.bytesize
-          bytes = FFI.amqp_bytes_malloc(size)
-          
-          bytes[:bytes].write_string(str)
-          bytes[:len] = size
-          bytes
-        end
+      def self.from_s(str)
+        size = str.bytesize
+        bytes = FFI.amqp_bytes_malloc(size)
+        
+        bytes[:bytes].write_string(str)
+        bytes[:len] = size
+        bytes
       end
     end
     
@@ -80,10 +76,10 @@ module RabbitMQ
         clear
       end
       
-      def self.from(value, borrow=false)
+      def self.from(value)
         obj = new
         obj[:kind], obj[:value] = case value
-        when String; [:bytes, FieldValueValue.new(Bytes.from_s(value, borrow).pointer)]
+        when String; [:bytes, FieldValueValue.new(Bytes.from_s(value).pointer)]
         else raise NotImplementedError
         end
         obj
@@ -119,13 +115,13 @@ module RabbitMQ
         clear
       end
       
-      def self.from(params, borrow=false)
+      def self.from(params)
         size      = params.size
         entry_ptr = Util.mem_ptr(size * FFI::TableEntry.size, release: false)
         params.each_with_index do |param, idx|
           entry = FFI::TableEntry.new(entry_ptr + idx * FFI::TableEntry.size)
-          entry[:key]   = FFI::Bytes.from_s(param.first.to_s, borrow)
-          entry[:value] = FFI::FieldValue.from(param.last, borrow)
+          entry[:key]   = FFI::Bytes.from_s(param.first.to_s)
+          entry[:value] = FFI::FieldValue.from(param.last)
         end
         
         obj = new
@@ -179,12 +175,12 @@ module RabbitMQ
     end
     
     module MethodClassMixin
-      def apply(borrow=false, **params)
+      def apply(**params)
         params.each do |key, value|
           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)
+          when String; value = FFI::Bytes.from_s(value)
+          when Hash;   value = FFI::Table.from(value)
           end
           key_applied_hook(key)
           self[key] = value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Joe McIlvain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi