io_splice 4.0.0 → 4.1.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v4.0.0.GIT
+DEF_VER=v4.1.0.GIT
 
 LF='
 '

data/io_splice.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{qrp}
   s.test_files = Dir['test/test_*.rb']
   s.add_development_dependency('wrongdoc', '~> 1.5')
+  s.add_development_dependency('rack', '~> 1.2')
 
   # s.licenses = %w(LGPL) # accessor not compatible with older RubyGems
 end

data/lib/io/splice.rb

@@ -25,6 +25,11 @@ module IO::Splice
     n
   end
 
+  def self.need_open?(obj) # :nodoc:
+    return false if obj.respond_to?(:to_io)
+    obj.respond_to?(:to_path) || obj.kind_of?(String)
+  end
+
   # copies the contents of the IO object given by +src+ to +dst+
   # If +len+ is specified, then only +len+ bytes are copied and
   # +EOFError+ is raised if fewer than +len+ bytes could be copied.
@@ -36,10 +41,10 @@ module IO::Splice
   # objects with no underlying file descriptor (e.g. StringIO).
   def self.copy_stream(src, dst, len = nil, src_offset = nil)
     close = []
-    src.kind_of?(String) and close << (src = File.open(src))
-    dst.kind_of?(String) and close << (dst = File.open(dst, "w"))
-    src, dst = src.to_io, dst.to_io
+    need_open?(src) and close << (src = File.open(src))
+    need_open?(dst) and close << (dst = File.open(dst, "w"))
     rv = len
+    src, dst = src.to_io, dst.to_io
 
     if src.stat.pipe? || dst.stat.pipe?
       if len

data/test/test_rack_file_compat.rb

@@ -0,0 +1,31 @@
+# -*- encoding: binary -*-
+require "rack"
+require "test/unit"
+require "socket"
+require "io/splice"
+
+class TestRackFileCompat < Test::Unit::TestCase
+  def setup
+    @app = Rack::File.new(File.dirname(__FILE__))
+    @req = Rack::MockRequest.new(@app)
+    @base_file = File.basename(__FILE__)
+    @r, @w = UNIXSocket.pair
+  end
+
+  def teardown
+    [ @r, @w ].each { |io| io.closed? or io.close }
+  end
+
+  def test_get_rack_file
+    env = Rack::MockRequest.env_for "http://example.com/#@base_file"
+    status, headers, body = @app.call(env)
+    assert_equal 200, status.to_i
+    headers.each { |k,v|
+      assert_instance_of String, k.to_str
+      assert_instance_of String, v.to_str
+    }
+    thr = Thread.new { @r.read(File.size(__FILE__)) }
+    assert_equal File.size(__FILE__), IO::Splice.copy_stream(body, @w)
+    assert_equal File.read(__FILE__), thr.value
+  end
+end if IO.respond_to?(:copy_stream)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: io_splice
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: 
   segments: 
   - 4
+  - 1
   - 0
-  - 0
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors: 
 - Ruby io_splice hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 Z
+date: 2011-05-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wrongdoc
@@ -32,6 +32,21 @@ dependencies:
         version: "1.5"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
+  type: :development
+  version_requirements: *id002
 description: |-
   The splice family of Linux system calls can transfer data between file
   descriptors without the need to copy data into userspace.  Instead of a
@@ -80,6 +95,7 @@ files:
 - test/test_io_splice.rb
 - test/test_io_splice_eintr.rb
 - test/test_io_splice_in_full.rb
+- test/test_rack_file_compat.rb
 homepage: http://bogomips.org/ruby_io_splice/
 licenses: []
 
@@ -112,11 +128,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: qrp
-rubygems_version: 1.8.1
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: zero-copy pipe I/O for Linux and Ruby
 test_files: 
+- test/test_rack_file_compat.rb
 - test/test_io_splice_in_full.rb
 - test/test_io_splice.rb
 - test/test_copy_stream.rb