ffi-czmq 0.0.4.pre → 0.0.5.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ae3da8a8b0f7ade4e7d0db93e5a6a76b347b944
-  data.tar.gz: 6891bf6422fa233a105f1e96a361cb2ada02c3e4
+  metadata.gz: d5f1304800ca80111e1b3696afa95c1316480a72
+  data.tar.gz: 30abadbe31a45023e1b61747c006d84adb5cbb55
 SHA512:
-  metadata.gz: 0299d7a17b6029c490febe4efe2dcdfa1f5de98558b07f0a3fc3d2e50ebf44bab77383222182121f537f4a23010d7b28f75130fc60cec355a208eb935830a7d9
-  data.tar.gz: ac9ef631cd95c8a6550a7d1798dfcb2a1b9e1f4383ef991ac16d5f5db06e5580a2710664998849d5f270529e65a32862a23d85ae6b8c70cf50aeac72965fbccd
+  metadata.gz: d8cf0191d87405e83e61f6dcc4c74121fa7efe1fb19c6682850489f8a3646ac41191e760511c3b5051dad4660ef5cd427b7cb6be4448c2245a786e3ba54b7c36
+  data.tar.gz: 6e854468d19cfdfa68269a73fb0400816fab221838519ca1d580c72fa0e8466cbec32184a3940e400241f1a259ce021b5ba6b1cd7e7a64c0301df32fed8c69e1

data/lib/czmq/libczmq.rb

@@ -8,6 +8,8 @@ module LibCZMQ
     klass.ffi_lib('libzmq', 'czmq')
   end
 
+  SAVE = /^save.*$/.freeze
+
   def czmq_class
     return @czmq_class if @czmq_class
     @czmq_class = "#{self.singleton_class.inspect.split('::').last[0...-1].downcase}".to_sym
@@ -29,7 +31,7 @@ module LibCZMQ
         instance.instance_variable_set(:@czmq_obj, czmq_obj)
         instance.instance_variable_set(:@owned_by_ruby, owned_by_ruby)
         if owned_by_ruby
-          instance.send :setup_finalizer
+          instance.setup_finalizer
         end
 
         if instance.method(:initialize).parameters.size > 0
@@ -58,7 +60,7 @@ module LibCZMQ
 
       instance.instance_variable_set(:@czmq_obj, czmq_obj)
       instance.instance_variable_set(:@owned_by_ruby, true)
-      instance.send :setup_finalizer
+      instance.setup_finalizer
 
       if instance.method(:initialize).parameters.size > 0
         instance.send :initialize, *args
@@ -108,7 +110,7 @@ module LibCZMQ
     end
 
     def setup_finalizer
-      ObjectSpace.define_finalizer(self, self.class.close_instance(@czmq_obj.address))
+      ObjectSpace.define_finalizer(self, self.class.close_instance(@czmq_obj))
     end
 
     private
@@ -118,14 +120,15 @@ module LibCZMQ
     end
 
     def self.close_instance(czmq_obj)
-      Proc.new do
+      ->(obj_id) do
         p = FFI::MemoryPointer.new(:pointer)
-        p.write_pointer(FFI::Pointer.new(czmq_obj))
+        p.write_pointer(czmq_obj)
         if #{czmq_class == :zsock}
           destructor(p, __FILE__, __LINE__)
         else
           destructor(p)
         end
+        true
       end
     end
     RUBY
@@ -184,7 +187,7 @@ module LibCZMQ
         result
       when :int
         case #{function.inspect}
-        when :send,/^save.*$/
+        when :send,SAVE
           result != -1 ||fail(IOError, CZMQ::Utils.error)
         else
           if #{czmq_class == :zsock}

data/lib/czmq/version.rb

@@ -1,3 +1,3 @@
 module CZMQ
-  VERSION = '0.0.4.pre'
+  VERSION = '0.0.5.pre'
 end

data/lib/czmq/zactor.rb

@@ -70,8 +70,8 @@ module CZMQ
       Zsock.wait(@czmq_obj)
     end
 
-    def signal(rc = 0)
-      Zsock.signal(@czmq_obj, rc)
+    def signal(uchar = 0)
+      Zsock.signal(@czmq_obj, uchar)
     end
   end
 end

data/lib/czmq/zpoller.rb

@@ -14,20 +14,18 @@ module CZMQ
     czmq_function :terminated,  :terminated,  [:pointer],             :bool
 
     def self.new_poller(*pollitems)
+      if pollitems.size < 2
+        fail ArgumentError, "wrong number of arguments (#{pollitems.size} for 2..n)"
+      end
+
       zsocks = []
       pollitems.each do |pollitem|
         zsocks << Zsock.convert(pollitem)
       end
-      case zsocks.size
-      when 0
-        fail ArgumentError, 'wrong number of arguments (0 for 1..n)'
-      when 1
-        new(zsocks.first, :pointer, nil)
-      else
-        first_sock = zsocks.delete(zsocks.first)
-        other_socks = ([ :pointer ] * zsocks.size).zip(zsocks).flatten
-        new(first_sock, *other_socks, :pointer, nil)
-      end
+
+      first_sock = zsocks.delete(zsocks.first)
+      other_socks = ([ :pointer ] * zsocks.size).zip(zsocks).flatten
+      new(first_sock, *other_socks, :pointer, nil)
     end
   end
 end

metadata

@@ -1,46 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: ffi-czmq
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre
+  version: 0.0.5.pre
 platform: ruby
 authors:
 - Hendrik
 - Beskow
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.5
-  name: ffi
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.5
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
-  name: bundler
-  prerelease: false
+        version: '1.7'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '1.7'
 description: czmq ffi wrapper
-email:
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -68,24 +68,24 @@ homepage: https://github.com/Asmod4n/ruby-ffi-czmq
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 2.4.1
-signing_key:
+signing_key: 
 specification_version: 4
 summary: czmq ffi wrapper
 test_files: []