ffi-czmq 0.0.7.pre → 0.0.8.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27c3d116890c180b233e29d07077c334009e1931
-  data.tar.gz: a6cfaf1fc279b43df57a6a9a9cbad47ae997882c
+  metadata.gz: 1ee32b12e0f81bc60c2dd069a43e1bc86644f296
+  data.tar.gz: f3ec35a8b9254d33e36ca0b0d2fac0b8423c9126
 SHA512:
-  metadata.gz: e94aa080d6126957a6b05e391cc3ca9b9af44050ad5b880dc3713c3f23aee6708111a4e4a9e52d79db70f6602d7d46f587ba8e181a0e16d38ea168c8d7991287
-  data.tar.gz: 18ca0db72fa54aa6e72ed253c6cadfece7ad9c54719f9393c75ec2576543edfba238ccd00ae605ceaf4ccdf645fb38e016a2bcaf306f040efafeebebc0db049c
+  metadata.gz: 834505429bdbc0b2d363d844e6c60fe80c72c50586187e2a173462b92065d630b6aa7f64d5ea7b90e2d7ccda82e4a0cd2e763b1fc19c955dbc90548b5db4bd0b
+  data.tar.gz: da136c3aaf401986566335ffe508aef85f20e3ec00eb9d49103fde2758c3eab8f2b4395e5026a2ba64035851ce60b4d14a7f611a72231d52a99b4878792a8bd5

data/LICENSE

@@ -1,201 +1,201 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2014 Hendrik Beskow
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2014 Hendrik Beskow
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -1,4 +1,4 @@
-ruby-ffi-czmq
-=============
-
-Installation instructions: https://github.com/zeromq/czmq#building-and-installing
+ruby-ffi-czmq
+=============
+
+Installation instructions: https://github.com/zeromq/czmq#building-and-installing

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('libzmq', 'czmq')
+    klass.ffi_lib(:libzmq, :czmq)
   end
 
   SAVE = /^save.*$/.freeze
@@ -42,7 +42,7 @@ module LibCZMQ
 
         instance
       else
-        fail ArgumentError, "Didn't pass a valid Pointer"
+        fail ArgumentError, "Didn't pass a valid Pointer", caller
       end
     end
 
@@ -56,7 +56,7 @@ module LibCZMQ
         czmq_obj = instance.class.constructor(*args)
       end
 
-      !czmq_obj.null? ||fail("Cannot allocate #{czmq_class} because of #{CZMQ::Utils.error}")
+      !czmq_obj.null? ||fail(RuntimeError, "Cannot allocate #{czmq_class} because of #{CZMQ::Utils.error}", caller)
 
       instance.instance_variable_set(:@czmq_obj, czmq_obj)
       instance.instance_variable_set(:@owned_by_ruby, true)
@@ -178,22 +178,22 @@ module LibCZMQ
         end
 
       else
-        fail "#{czmq_class} is not initialized"
+        fail RuntimeError, "#{czmq_class} is not initialized", caller
       end
 
       case #{returns.inspect}
       when :pointer
-        !result.null? ||fail(CZMQ::Utils.error)
+        !result.null? ||fail(RuntimeError, CZMQ::Utils.error, caller)
         result
       when :int
         case #{function.inspect}
         when :send,SAVE
-          result != -1 ||fail(IOError, CZMQ::Utils.error)
+          result != -1 ||fail(IOError, CZMQ::Utils.error, caller)
         else
           if #{czmq_class == :zsock}
-            result != -1 ||fail(IOError, CZMQ::Utils.error)
+            result != -1 ||fail(IOError, CZMQ::Utils.error, caller)
           else
-            result != -1 ||fail(CZMQ::Utils.error)
+            result != -1 ||fail(RuntimeError, CZMQ::Utils.error, caller)
           end
         end
         result

data/lib/czmq/sock_type.rb

@@ -42,7 +42,7 @@ module CZMQ
 
           return new code if code
 
-          fail ArgumentError, "Can't coerce #{object.class}(#{object}) to #{self}"
+          fail ArgumentError, "Can't coerce #{object.class}(#{object}) to #{self}", caller
         end
         alias_method :[], :coerce
 

data/lib/czmq/utils.rb

@@ -5,7 +5,7 @@ module CZMQ
     HEXY = 'H*'.freeze
     extend FFI::Library
 
-    ffi_lib 'czmq', 'libzmq'
+    ffi_lib :libzmq, :czmq
 
     attach_function :zmq_version,   :zmq_version,     [:buffer_in, :buffer_in, :buffer_in], :void,    blocking: true
     attach_function :zsys_version,  :zsys_version,    [:buffer_in, :buffer_in, :buffer_in], :void,    blocking: true
@@ -44,7 +44,7 @@ module CZMQ
       end
 
       def bin2hex(bytes)
-        bytes.unpack(HEXY).first
+        bytes.to_str.unpack(HEXY).first
       end
 
       def hex2bin(hex)

data/lib/czmq/version.rb

@@ -1,3 +1,3 @@
 module CZMQ
-  VERSION = '0.0.7.pre'
+  VERSION = Gem::Version.new('0.0.8.pre')
 end

data/lib/czmq/zcert.rb

@@ -28,7 +28,7 @@ if CZMQ::Utils.has_curve
 
           return cert.to_zcert
         else
-          fail ArgumentError, "#{cert.class} is not a CZMQ::Zcert"
+          fail ArgumentError, "#{cert.class} is not a CZMQ::Zcert", caller
         end
       end
 
@@ -36,7 +36,7 @@ if CZMQ::Utils.has_curve
         unless (zcert = load_zcert(filename)).null?
           new_from_czmq_obj(zcert)
         else
-          fail IOError, Utils.error
+          fail IOError, Utils.error, caller
         end
       end
 

data/lib/czmq/zconfig.rb

@@ -29,7 +29,7 @@ module CZMQ
       unless (zconfig = load_zconfig(filename)).null?
         new_from_czmq_obj(zconfig)
       else
-        fail IOError, Utils.error
+        fail IOError, Utils.error, caller
       end
     end
 
@@ -54,7 +54,7 @@ module CZMQ
       unless (zconfig = locate_zconfig(path)).null?
         self.class.new_from_czmq_obj(zconfig, nil)
       else
-        fail Utils.error
+        fail RuntimeError, Utils.error, caller
       end
     end
 
@@ -62,7 +62,7 @@ module CZMQ
       unless (zconfig = zconfig_at_depth(level)).null?
         self.class.new_from_czmq_obj(zconfig, nil)
       else
-        fail Utils.error
+        fail RuntimeError, Utils.error, caller
       end
     end
   end

data/lib/czmq/zframe.rb

@@ -30,7 +30,7 @@ module CZMQ
       unless (zframe = new_empty_zframe).null?
         new_from_czmq_obj(zframe)
       else
-        fail Utils.error
+        fail RuntimeError, Utils.error, caller
       end
     end
 
@@ -43,14 +43,14 @@ module CZMQ
 
         return frame.to_zframe
       else
-        fail ArgumentError, "#{frame.class} is not a CZMQ::Zframe"
+        fail ArgumentError, "#{frame.class} is not a CZMQ::Zframe", caller
       end
     end
 
     def dup
       self.class.new_from_czmq_obj(dup_zframe)
     end
-    
+
     def more?
       more & MORE > 0
     end
@@ -77,7 +77,7 @@ module CZMQ
       unless (zframe = recv_zframe(zsock)).null?
         new_from_czmq_obj(zframe)
       else
-        fail IOError, Utils.error
+        fail IOError, Utils.error, caller
       end
     end
   end

data/lib/czmq/zmsg.rb

@@ -5,7 +5,7 @@ require_relative 'utils'
 
 module CZMQ
   class Zmsg
-    INTF = '%d'.freeze
+    INTF = '%zd'.freeze
     include Enumerable
     extend ::LibCZMQ
 
@@ -55,8 +55,8 @@ module CZMQ
         append_zframe(data)
       when String
         add_string(data)
-      when Integer
-        add_zstrf(INTF, :long, data)
+      when Fixnum
+        add_zstrf(INTF, :ssize_t, data)
       when NilClass
         add_mem(data, 0)
       else
@@ -75,7 +75,7 @@ module CZMQ
         elsif data.nil?
           add_mem(nil, 0)
         else
-          fail ArgumentError, 'Unknown data type'
+          fail ArgumentError, 'Unknown data type', caller
         end
       end
       self
@@ -91,8 +91,8 @@ module CZMQ
         prepend_zframe(data)
       when String
         push_string(data)
-      when Integer
-        push_zstrf(INTF, :long, data)
+      when Fixnum
+        push_zstrf(INTF, :ssize_t, data)
       when NilClass
         push_mem(data, 0)
       else
@@ -111,7 +111,7 @@ module CZMQ
         elsif data.nil?
           push_mem(nil, 0)
         else
-          fail ArgumentError, 'Unknown data type'
+          fail ArgumentError, 'Unknown data type', caller
         end
       end
       self
@@ -151,7 +151,7 @@ module CZMQ
       unless (zmsg = recv_zmsg(zsock)).null?
         new_from_czmq_obj(zmsg)
       else
-        fail IOError, Utils.error
+        fail IOError, Utils.error, caller
       end
     end
 
@@ -159,7 +159,7 @@ module CZMQ
       buffer = FFI::MemoryPointer.new(:pointer)
       size = encode_zmsg(buffer)
       bPtr = buffer.read_pointer()
-      bPtr.null? ? fail(Utils.error) : bPtr.read_bytes(size)
+      bPtr.null? ? fail(RuntimeError, Utils.error, caller) : bPtr.read_bytes(size)
     end
 
     def self.decode(bytes)

data/lib/czmq/zpoller.rb

@@ -15,7 +15,7 @@ module CZMQ
 
     def self.new_poller(*pollitems)
       if pollitems.size < 2
-        fail ArgumentError, "wrong number of arguments (#{pollitems.size} for 2..n)"
+        fail ArgumentError, "wrong number of arguments (#{pollitems.size} for 2..n)", caller
       end
 
       zsocks = []

data/lib/czmq/zsock.rb

@@ -36,7 +36,7 @@ module CZMQ
 
         return czmq_obj.to_zactor
       else
-        fail ArgumentError, "#{czmq_obj.class} is not a CZMQ::Zsock or CZMQ::Zactor"
+        fail ArgumentError, "#{czmq_obj.class} is not a CZMQ::Zsock or CZMQ::Zactor", caller
       end
     end
 
@@ -88,7 +88,7 @@ module CZMQ
     def method_missing(meth, *args, &blk)
       if args.length == 1 &&
          meth.to_s =~ SET_SOCKOPT &&
-         (args.first.is_a?(Integer) || args.first.is_a?(String))
+         (args.first.is_a?(Fixnum) || args.first.is_a?(String))
         begin
 
           self.class.instance_eval <<-RUBY, __FILE__, __LINE__
@@ -99,7 +99,7 @@ module CZMQ
           super
         else
 
-          if args.first.is_a?(Integer)
+          if args.first.is_a?(Fixnum)
             self.class.class_eval <<-RUBY, __FILE__, __LINE__
             def #{meth.to_s}(arg)
               self.class.#{meth.to_s}(@czmq_obj, :int, arg)

data/lib/czmq/zsys.rb

@@ -5,6 +5,7 @@ module CZMQ
     extend ::LibCZMQ
 
     czmq_function :init,            :init,            [],         :pointer
+    czmq_function :shutdown,        :shutdown,        [],         :void
     czmq_function :handler_set,     :handler_set,     [:pointer], :void
     czmq_function :handler_reset,   :handler_reset,   [],         :void
     czmq_function :set_io_threads,  :set_io_threads,  [:size_t],  :void

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-czmq
 version: !ruby/object:Gem::Version
-  version: 0.0.7.pre
+  version: 0.0.8.pre
 platform: ruby
 authors:
 - Hendrik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: czmq ffi wrapper