rabbitmq 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bfa34be8651dfe3efcfeb6f154a75f737019936
-  data.tar.gz: 1586b65b879349e5240aebec45551cd0631b6939
+  metadata.gz: 3682bae0564eed99f1fd3ddf9c7c1d8d09705e6b
+  data.tar.gz: 8dae54b8f8606e465da48509a85e7472d3ccff9f
 SHA512:
-  metadata.gz: 7f0fae5f4d1ed711a1a3b8b0c7cc2385cc5b4318b66954cd3f1077c15367320337877d12e7e96da56811926190a012320b5bddcafd1c5015b9399b74ce4d9139
-  data.tar.gz: bbc35a0b0f0fbb85cbb78c767ecca4379b7bb1f93c7686f4ab5cd9447845a213436e0c90c2e4f95211c652dce9786b23a0b3224a2d03ab3379c5ce37a9a7ab2f
+  metadata.gz: 8eaf39f8a7f9f6f0d5c9b080ff1f320f3cf7bd025f9a65f70dc923cc7af204353af9635772c13b0a1a1890736aa318d7d9d8a543715cf545a22c8a019eb07966
+  data.tar.gz: 9cef2f9e99f3548bf626fb68a4c7173915738e460ad4bc2c16174b0eaa713d9917cfd86760e066e8ca8dfb8a6983033be83fc24ecb1fc155712c1e4e1718fa05

data/lib/rabbitmq/channel.rb

@@ -222,6 +222,18 @@ module RabbitMQ
       fetch_response :tx_rollback_ok
     end
     
+    ##
+    # Confirm mode operations
+    
+    def confirm_select
+      send_request :confirm_select
+      fetch_response :confirm_select_ok
+    end
+    
+    def fetch_confirm
+      fetch_response [:basic_ack, :basic_nack, :basic_reject]
+    end
+    
     ##
     # Message operations
     

data/lib/rabbitmq/ffi/error.rb

@@ -3,7 +3,7 @@ module RabbitMQ
   module FFI
     
     class Error < RuntimeError
-      def initialize message=nil
+      def initialize(message=nil)
         @message = message
       end
       

data/lib/rabbitmq/ffi/ext.rb

@@ -4,6 +4,7 @@ require_relative 'ext/bytes'
 
 require_relative 'ext/connection_info'
 require_relative 'ext/field_value'
+require_relative 'ext/array'
 require_relative 'ext/table'
 
 require_relative 'ext/method'

data/lib/rabbitmq/ffi/ext/array.rb

@@ -0,0 +1,46 @@
+
+module RabbitMQ
+  module FFI
+    
+    class Array
+      include Enumerable
+      
+      def each(*a, &b)
+        entry_ptr = self[:entries]
+        entries   = self[:num_entries].times.map do |i|
+          FFI::FieldValue.new(entry_ptr + i * FFI::FieldValue.size)
+        end
+        entries.each(*a, &b)
+      end
+      
+      def to_a(free=false)
+        result = self.map do |item|
+          item.to_value(free)
+        end
+        
+        clear if free
+        result
+      end
+      
+      def free!
+        self.each(&:free!)
+        FFI.free(self[:entries])
+        clear
+      end
+      
+      def self.from_a(items)
+        size      = items.size
+        entry_ptr = Util.mem_ptr(size * FFI::FieldValue.size, release: false)
+        items.each_with_index do |item, idx|
+          FFI::FieldValue.new(entry_ptr + idx * FFI::FieldValue.size).apply(item)
+        end
+        
+        obj = new
+        obj[:num_entries] = size
+        obj[:entries]     = entry_ptr
+        obj
+      end
+    end
+    
+  end
+end

data/lib/rabbitmq/ffi/ext/field_value.rb

@@ -19,8 +19,7 @@ module RabbitMQ
         when :utf8;      value.to_s(free).force_encoding(Encoding::UTF_8)
         when :timestamp; Time.at(value / 1000.0)
         when :table;     value.to_h(free)
-        when :array;     value.to_array_not_yet_implemented!
-        when :decimal;   value.to_value_not_yet_implemented!
+        when :array;     value.to_a(free)
         else value
         end
         
@@ -29,19 +28,30 @@ module RabbitMQ
       end
       
       def free!
-        kind   = self[:kind]
-        value  = self[:value][value_member(kind)]
+        kind  = self[:kind]
+        value = self[:value][value_member(kind)]
         value.free! if value.respond_to? :free!
-        clear
+        self
       end
       
-      def self.from(value)
-        obj = new
-        obj[:kind], obj[:value] = case value
-        when String; [:bytes, FieldValueValue.new(Bytes.from_s(value).pointer)]
-        else raise NotImplementedError
+      def apply(value)
+        self[:kind], self[:value] = case value
+        when ::String; [:bytes, FieldValueValue.new(Bytes.from_s(value).pointer)]
+        when ::Symbol; [:bytes, FieldValueValue.new(Bytes.from_s(value.to_s).pointer)]
+        when ::Array;  [:array, FieldValueValue.new(Array.from_a(value).pointer)]
+        when ::Hash;   [:table, FieldValueValue.new(Table.from(value).pointer)]
+        when ::Fixnum; [:i64,       (v=FieldValueValue.new; v[:i64]=value; v)]
+        when ::Float;  [:f64,       (v=FieldValueValue.new; v[:f64]=value; v)]
+        when ::Time;   [:timestamp, (v=FieldValueValue.new; v[:u64]=value.to_i*1000; v)]
+        when true;     [:boolean,   (v=FieldValueValue.new; v[:boolean]=true; v)]
+        when false;    [:boolean,   (v=FieldValueValue.new; v[:boolean]=false; v)]
+        else raise NotImplementedError, "#{self.class}.from(#<#{value.class}>)"
         end
-        obj
+        self
+      end
+      
+      def self.from(value)
+        new.apply(value)
       end
     end
     

data/lib/rabbitmq/ffi/ext/table.rb

@@ -23,7 +23,7 @@ module RabbitMQ
       end
       
       def free!
-        self.each do
+        self.each do |entry|
           entry[:key].free!
           entry[:value].free!
         end

data/lib/rabbitmq/util.rb

@@ -10,30 +10,30 @@ module RabbitMQ
       lowercase_name.to_s.gsub(/((?:\A\w)|(?:_\w))/) { |x| x[-1].upcase }
     end
     
-    def error_check action, status
+    def error_check(action, status)
       return if status == :ok
       raise RabbitMQ::FFI::Error.lookup(status), "while #{action}"
     end
     
-    def null_check action, obj
+    def null_check(action, obj)
       return unless obj.nil?
       raise RabbitMQ::FFI::Error, "while #{action} - got unexpected null"
     end
     
-    def mem_ptr size, count: 1, clear: true, release: true
+    def mem_ptr(size, count: 1, clear: true, release: true)
       ptr = ::FFI::MemoryPointer.new(size, count, clear)
       ptr.autorelease = false unless release
       ptr
     end
     
-    def strdup_ptr str, **kwargs
+    def strdup_ptr(str, **kwargs)
       str = str + "\x00"
       ptr = mem_ptr(str.bytesize, **kwargs)
       ptr.write_string(str)
       ptr
     end
     
-    def connection_info url=nil, **overrides
+    def connection_info(url=nil, **overrides)
       info = FFI::ConnectionInfo.new
       FFI.amqp_default_connection_info(info)
       result = info.to_h

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Joe McIlvain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -131,6 +131,7 @@ files:
 - lib/rabbitmq/ffi.rb
 - lib/rabbitmq/ffi/error.rb
 - lib/rabbitmq/ffi/ext.rb
+- lib/rabbitmq/ffi/ext/array.rb
 - lib/rabbitmq/ffi/ext/basic_properties.rb
 - lib/rabbitmq/ffi/ext/bytes.rb
 - lib/rabbitmq/ffi/ext/connection_info.rb