ffi-rzmq 0.7.0 → 0.7.1

data/.gitignore

@@ -0,0 +1,3 @@
+*.rbc
+*.swp
+pkg

data/History.txt

@@ -1,3 +1,7 @@
+== 0.7.1 / 20110130
+  * Fixed 1.9.1 Binary Encoding bug when UTF8 set as default (Thanks schmurfy)
+  * Improved rubinius compat for specs
+  * Improved spec compatibility on linux
 == 0.7.0 / 20101222
   * Improved performance of calls to Socket#getsockopt. There are usually
     a lot of calls passing RCVMORE, so we now cache those buffers instead

data/Rakefile

@@ -4,9 +4,6 @@ rescue LoadError
   abort '### Please install the "bones" gem ###'
 end
 
-task :default => 'test:run'
-task 'gem:release' => 'test:run'
-
 namespace :win do
 
   desc 'Build and install gem under Windows. Mr Bones just has to break things using tar.'
@@ -16,8 +13,8 @@ namespace :win do
     rm_rf PKG_PATH
     system "gem build #{NAME}.gemspec"
     mkdir_p PKG_PATH
-    mv "#{NAME}-0.6.0.gem", PKG_PATH
-    system "gem install #{PKG_PATH}/#{NAME}-0.6.0.gem"
+    mv "#{NAME}-0.7.1.gem", PKG_PATH
+    system "gem install #{PKG_PATH}/#{NAME}-0.7.1.gem"
   end
 end
 

data/ffi-rzmq.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi-rzmq}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Remes"]
-  s.date = %q{2010-12-22}
+  s.date = %q{2011-01-30}
   s.description = %q{This gem wraps the ZeroMQ networking library using the ruby FFI (foreign
 function interface). It's a pure ruby wrapper so this gem can be loaded
 and run by any ruby runtime that supports FFI. That's all of them:

data/lib/ffi-rzmq/context.rb

@@ -41,7 +41,7 @@ module ZMQ
       @sockets = []
       @context = LibZMQ.zmq_init io_threads
       @pointer = @context
-      error_check ZMQ_INIT_STR, @context.null? ? 1 : 0
+      error_check ZMQ_INIT_STR, (@context.nil? || @context.null?) ? 1 : 0
 
       define_finalizer
     end

data/lib/ffi-rzmq/message.rb

@@ -114,7 +114,8 @@ module ZMQ
     # called multiple times on the same instance. 
     #
     def copy_in_string string
-      copy_in_bytes string, string.size if string
+      string_size = string.respond_to?(:bytesize) ? string.bytesize : string.size
+      copy_in_bytes string, string_size if string
     end
 
     # Makes a copy of +len+ bytes from the ruby string +bytes+. Library

data/spec/message_spec.rb

@@ -21,6 +21,14 @@ module ZMQ
         lambda { message.copy_in_string("new text") }.should raise_error(MessageError)
       end
     end
+    
+    context "when copying binary data" do
+      it "should find the correct length by ignoring encoding" do
+        message = Message.new
+        message.copy_in_string("\x83\x6e\x04\x00\x00\x44\xd1\x81")
+        message.size.should == 8
+      end
+    end
 
   end # describe Message
   

data/spec/socket_spec.rb

@@ -12,7 +12,7 @@ module ZMQ
 
 
       it "should raise an error for a nil context" do
-        lambda { Socket.new(FFI::Pointer::NULL, ZMQ::REQ) }.should raise_exception(ZMQ::ContextError)
+        lambda { Socket.new(FFI::Pointer.new(0), ZMQ::REQ) }.should raise_exception(ZMQ::ContextError)
       end
 
       [ZMQ::REQ, ZMQ::REP, ZMQ::XREQ, ZMQ::XREP, ZMQ::PUB, ZMQ::SUB, ZMQ::PUSH, ZMQ::PULL, ZMQ::PAIR].each do |socket_type|
@@ -369,9 +369,14 @@ module ZMQ
               attach_function :getsockopt, [:int, :int, :int, :pointer, :pointer], :int
             end # module LibC
             
-            # these 2 hex constants were taken from OSX; may differ on other platforms
-            so_rcvbuf = 0x1002
-            sol_socket = 0xffff
+            if RUBY_PLATFORM =~ /linux/ || (RUBY_PLATFORM == 'java' && `uname` =~ /linux/i)
+              so_rcvbuf =  8 
+              sol_socket = 1
+            else #OSX
+              so_rcvbuf =  0x1002
+              sol_socket = 0xffff
+            end
+
             socklen_size = FFI::MemoryPointer.new :uint32
             socklen_size.write_int 8
             rcvbuf = FFI::MemoryPointer.new :int64

data/version.txt

@@ -1 +1 @@
-0.7.0
+0.7.1

metadata

@@ -1,37 +1,29 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-rzmq
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 0
-  version: 0.7.0
+  prerelease: 
+  version: 0.7.1
 platform: ruby
 authors: 
-- Chuck Remes
+  - Chuck Remes
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 -06:00
+date: 2011-01-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bones
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 5
-        - 4
-        version: 3.5.4
-  type: :development
-  version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: bones
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 3.6.2
+    type: :development
+    version_requirements: *id001
 description: |-
   This gem wraps the ZeroMQ networking library using the ruby FFI (foreign
   function interface). It's a pure ruby wrapper so this gem can be loaded
@@ -50,73 +42,69 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- README.rdoc
-- examples/README.rdoc
-- version.txt
+  - History.txt
+  - README.rdoc
+  - examples/README.rdoc
 files: 
-- .bnsignore
-- History.txt
-- README.rdoc
-- Rakefile
-- examples/README.rdoc
-- examples/local_lat.rb
-- examples/local_lat_poll.rb
-- examples/local_lat_zerocopy.rb
-- examples/local_throughput.rb
-- examples/publish_subscribe.rb
-- examples/remote_lat.rb
-- examples/remote_lat_zerocopy.rb
-- examples/remote_throughput.rb
-- examples/reqrep_poll.rb
-- examples/request_response.rb
-- ffi-rzmq.gemspec
-- lib/ffi-rzmq.rb
-- lib/ffi-rzmq/context.rb
-- lib/ffi-rzmq/exceptions.rb
-- lib/ffi-rzmq/message.rb
-- lib/ffi-rzmq/poll.rb
-- lib/ffi-rzmq/poll_items.rb
-- lib/ffi-rzmq/socket.rb
-- lib/ffi-rzmq/wrapper.rb
-- lib/ffi-rzmq/zmq.rb
-- spec/context_spec.rb
-- spec/message_spec.rb
-- spec/pushpull_spec.rb
-- spec/reqrep_spec.rb
-- spec/socket_spec.rb
-- spec/spec_helper.rb
-- version.txt
+  - .bnsignore
+  - .gitignore
+  - History.txt
+  - README.rdoc
+  - Rakefile
+  - examples/README.rdoc
+  - examples/local_lat.rb
+  - examples/local_lat_poll.rb
+  - examples/local_lat_zerocopy.rb
+  - examples/local_throughput.rb
+  - examples/publish_subscribe.rb
+  - examples/remote_lat.rb
+  - examples/remote_lat_zerocopy.rb
+  - examples/remote_throughput.rb
+  - examples/reqrep_poll.rb
+  - examples/request_response.rb
+  - ffi-rzmq.gemspec
+  - lib/ffi-rzmq.rb
+  - lib/ffi-rzmq/context.rb
+  - lib/ffi-rzmq/exceptions.rb
+  - lib/ffi-rzmq/message.rb
+  - lib/ffi-rzmq/poll.rb
+  - lib/ffi-rzmq/poll_items.rb
+  - lib/ffi-rzmq/socket.rb
+  - lib/ffi-rzmq/wrapper.rb
+  - lib/ffi-rzmq/zmq.rb
+  - spec/context_spec.rb
+  - spec/message_spec.rb
+  - spec/pushpull_spec.rb
+  - spec/reqrep_spec.rb
+  - spec/socket_spec.rb
+  - spec/spec_helper.rb
+  - version.txt
 has_rdoc: true
 homepage: http://github.com/chuckremes/ffi-rzmq
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+  - --main
+  - README.rdoc
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: ffi-rzmq
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: This gem wraps the ZeroMQ networking library using the ruby FFI (foreign function interface).