ffi-czmq 0.0.2.pre → 0.0.3.pre

data/lib/czmq/libczmq.rb

@@ -5,7 +5,7 @@ require_relative 'sock_type'
 module LibCZMQ
   def self.extended(klass)
     klass.extend FFI::Library
-    klass.ffi_lib('czmq', 'libzmq')
+    klass.ffi_lib('libzmq', 'czmq')
   end
 
   def czmq_class
@@ -28,7 +28,9 @@ module LibCZMQ
 
         instance.instance_variable_set(:@czmq_obj, czmq_obj)
         instance.instance_variable_set(:@owned_by_ruby, owned_by_ruby)
-        instance.send :setup_finalizer
+        if owned_by_ruby
+          instance.send :setup_finalizer
+        end
 
         if instance.method(:initialize).parameters.size > 0
           instance.send :initialize, czmq_obj
@@ -56,8 +58,8 @@ module LibCZMQ
 
       instance.instance_variable_set(:@czmq_obj, czmq_obj)
       instance.instance_variable_set(:@owned_by_ruby, true)
-
       instance.send :setup_finalizer
+
       if instance.method(:initialize).parameters.size > 0
         instance.send :initialize, *args
       else
@@ -89,15 +91,12 @@ module LibCZMQ
       remove_finalizer
 
       if @owned_by_ruby
-        if CZMQ::Utils.check_for_pointer(@czmq_obj)
-          FFI::MemoryPointer.new(:pointer) do |p|
-            p.write_pointer(@czmq_obj)
-            if #{czmq_class == :zsock}
-              self.class.destructor(p, __FILE__, __LINE__)
-            else
-              self.class.destructor(p)
-            end
-          end
+        p = FFI::MemoryPointer.new(:pointer)
+        p.write_pointer(@czmq_obj)
+        if #{czmq_class == :zsock}
+          self.class.destructor(p, __FILE__, __LINE__)
+        else
+          self.class.destructor(p)
         end
       end
 
@@ -108,22 +107,25 @@ module LibCZMQ
       true
     end
 
-    private
-
     def setup_finalizer
-      if @owned_by_ruby
-        at_exit { destructor }
-      end
-      ObjectSpace.define_finalizer(self, self.class.close_instance(self))
+      ObjectSpace.define_finalizer(self, self.class.close_instance(@czmq_obj.address))
     end
 
+    private
+
     def remove_finalizer
       ObjectSpace.undefine_finalizer self
     end
 
-    def self.close_instance(selfie)
+    def self.close_instance(czmq_obj)
       Proc.new do
-        selfie.destructor
+        p = FFI::MemoryPointer.new(:pointer)
+        p.write_pointer(czmq_obj)
+        if #{czmq_class == :zsock}
+          destructor(p, __FILE__, __LINE__)
+        else
+          destructor(p)
+        end
       end
     end
     RUBY
@@ -149,6 +151,7 @@ module LibCZMQ
 
           unless(#{czmq_class == :zframe} && args.last & CZMQ::Zframe::REUSE > 0)
             z_obj.instance_variable_set(:@owned_by_ruby, nil)
+            z_obj.destructor
           end
         when :insert, :append, :prepend
           if args.first.instance_variable_get(:@owned_by_ruby)
@@ -162,6 +165,7 @@ module LibCZMQ
           result = self.class.#{name}(@czmq_obj, czmq_obj)
 
           z_obj.instance_variable_set(:@owned_by_ruby, nil)
+          z_obj.destructor
         when :reload
           czmq_obj = FFI::MemoryPointer.new(:pointer)
           czmq_obj.write_pointer(@czmq_obj)

data/lib/czmq/version.rb

@@ -1,3 +1,3 @@
 module CZMQ
-  VERSION = '0.0.2.pre'
+  VERSION = '0.0.3.pre'
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ffi-czmq
 version: !ruby/object:Gem::Version
-  version: 0.0.2.pre
+  version: 0.0.3.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Hendrik
@@ -9,34 +10,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 1.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 1.9.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.4
 description: czmq ffi wrapper
@@ -45,47 +50,48 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.md
+- LICENSE
+- lib/ffi-czmq.rb
 - lib/czmq.rb
-- lib/czmq/libczmq.rb
-- lib/czmq/sock_type.rb
-- lib/czmq/utils.rb
-- lib/czmq/version.rb
-- lib/czmq/zactor.rb
+- lib/czmq/zmsg.rb
+- lib/czmq/ziflist.rb
 - lib/czmq/zcert.rb
+- lib/czmq/zsock.rb
+- lib/czmq/zactor.rb
+- lib/czmq/zsys.rb
+- lib/czmq/sock_type.rb
 - lib/czmq/zcertstore.rb
-- lib/czmq/zconfig.rb
+- lib/czmq/version.rb
 - lib/czmq/zframe.rb
-- lib/czmq/ziflist.rb
 - lib/czmq/zloop.rb
-- lib/czmq/zmsg.rb
+- lib/czmq/zconfig.rb
 - lib/czmq/zpoller.rb
-- lib/czmq/zsock.rb
-- lib/czmq/zsys.rb
-- lib/ffi-czmq.rb
+- lib/czmq/libczmq.rb
+- lib/czmq/utils.rb
 homepage: https://github.com/Asmod4n/ruby-ffi-czmq
 licenses:
 - Apache-2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">"
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: czmq ffi wrapper
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 552c8d88ce927fad7ac3a633ca63ee747f783efc
-  data.tar.gz: 5fa75ca3f5ebb2c7944a80cb5fcc963a4e4813cb
-SHA512:
-  metadata.gz: 1e34228e7d123a5bd5935c60b90e6acecb6dfeedecc569fe6f0f9970d4f431cab8d8e504d13905f23e3038d40211b1cd9e6574d4f946adffe7a252c85f1cd62b
-  data.tar.gz: 42e394a43c94781e9b25d2a139a341ed2cc450c629375b9d6e5cd00d8ce750567695618e47a60d78b4461aee6728fb75b813bd58cc7c973923a3e376961c5414