celluloid-io 0.15.0 → 0.16.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7054267bfa2e212426bcac0f1c76f3f33e36c9f6
-  data.tar.gz: eac6073ef151b759661a56ddaffc46238099220b
+  metadata.gz: 8ef8df712ab13d7a2adca88bc42781b256074996
+  data.tar.gz: edb9143049e62e5484f17ea870539a55af137ec7
 SHA512:
-  metadata.gz: c24b46c7b0463ae27d31f464c3c21f48630591062470170fc1c11b30cc6728fab0946ef828fb1ec9b3547fac5280e338c6e77e7f3286eff67dcf3afeb25986a9
-  data.tar.gz: 92d995f93dc0368a278c803c52d08e4c399624b83a56a654b240b76771b186ecbee54c4a92a0d5038648ecf9f1ff6926faa063a07abce3392e756e505492c68d
+  metadata.gz: f5965bae29ff210224fd7293f22a209e8582bd2c25bc2abbd83753609d473b90b910bc23b965ae5f945851898e113ae06bf31112f6525a3742e1ff3655ac7b40
+  data.tar.gz: 93eee2a93b600f5e5a9851e6678c22049dd5dc2b844440bb68fb6ade354287158e6aeba5e78b136317856ac83b162fe195b65ea2c9da57d56b4f2c2721838b26

data/.travis.yml

@@ -2,16 +2,18 @@ script: rake ci
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ruby-head
-  - jruby-19mode
-  - rbx-19mode
+  - jruby
   - jruby-head
+  - rbx
 
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: jruby
     - rvm: jruby-head
-    - rvm: rbx-19mode
+    - rvm: rbx
 
 notifications:
   irc: "irc.freenode.org#celluloid"

data/CHANGES.md

@@ -1,3 +1,7 @@
+HEAD
+----
+* Celluloid::IO.copy_stream support (uses a background thread)
+
 0.15.0 (2013-09-04)
 -------------------
 * Improved DNS resolver with less NIH and more Ruby stdlib goodness

data/celluloid-io.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'celluloid', '>= 0.15.0'
-  gem.add_dependency 'nio4r',     '>= 0.5.0'
+  gem.add_dependency 'celluloid', '>= 0.16.0.pre'
+  gem.add_dependency 'nio4r',     '>= 1.0.0'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/lib/celluloid/io/stream.rb

@@ -16,12 +16,9 @@ module Celluloid
       # See IO#sync for full details.
       attr_accessor :sync
 
-      # Default size to read from or write to the stream for buffer operations
-      BLOCK_SIZE = 1024*16
-
       def initialize
         @eof  = false
-        @sync = true # FIXME: hax
+        @sync = true
         @read_buffer = ''.force_encoding(Encoding::ASCII_8BIT)
         @write_buffer = ''.force_encoding(Encoding::ASCII_8BIT)
 
@@ -344,7 +341,6 @@ module Celluloid
       def do_write(s)
         @write_buffer << s
         @write_buffer.force_encoding(Encoding::BINARY)
-        @sync ||= false
 
         if @sync or @write_buffer.size > BLOCK_SIZE or idx = @write_buffer.rindex($/)
           remain = idx ? idx + $/.size : @write_buffer.length

data/lib/celluloid/io/udp_socket.rb

@@ -3,10 +3,10 @@ module Celluloid
     # UDPSockets with combined blocking and evented support
     class UDPSocket
       extend Forwardable
-      def_delegators :@socket, :bind, :send, :recvfrom_nonblock, :close, :closed?
+      def_delegators :@socket, :bind, :connect, :send, :recvfrom_nonblock, :close, :closed?
 
-      def initialize
-        @socket = ::UDPSocket.new
+      def initialize(address_family = ::Socket::AF_INET)
+        @socket = ::UDPSocket.new(address_family)
       end
 
       # Wait until the socket is readable

data/lib/celluloid/io/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
   module IO
-    VERSION = "0.15.0"
+    VERSION = "0.16.0.pre"
   end
 end

data/lib/celluloid/io.rb

@@ -18,6 +18,9 @@ require 'celluloid/io/ssl_socket'
 module Celluloid
   # Actors with evented IO support
   module IO
+    # Default size to read from or write to the stream for buffer operations
+    BLOCK_SIZE = 1024 * 16
+
     def self.included(klass)
       klass.send :include, Celluloid
       klass.mailbox_class Celluloid::IO::Mailbox
@@ -27,6 +30,21 @@ module Celluloid
       actor = Thread.current[:celluloid_actor]
       actor && actor.mailbox.is_a?(Celluloid::IO::Mailbox)
     end
+  
+    def self.try_convert(src)
+      ::IO.try_convert(src)
+    end
+
+    def self.copy_stream(src, dst, copy_length = nil, src_offset = nil)
+      raise NotImplementedError, "length/offset not supported" if copy_length || src_offset
+
+      src, dst = try_convert(src), try_convert(dst)
+
+      # FIXME: this always goes through the reactor, and can block on file I/O
+      while data = src.read(BLOCK_SIZE)
+        dst << data
+      end
+    end
 
     def wait_readable(io)
       io = io.to_io

data/spec/celluloid/io_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Celluloid::IO do
+  context "copy_stream" do
+    let(:host) { "127.0.0.1" }
+    let(:port) { 23456 }
+
+    it "copies streams from Celluloid::IO sockets" do
+      server = described_class::TCPServer.new(host, port)
+      client = ::TCPSocket.new(host, port)
+      peer   = server.accept
+      expect(peer).to be_a described_class::TCPSocket
+
+      my_own_bits = File.read(__FILE__)
+      file = File.open(__FILE__, 'r')
+
+      described_class.copy_stream(file, peer)
+      expect(client.read(file.stat.size)).to eq my_own_bits
+    end
+  end
+end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-io
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0.pre
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0.pre
 - !ruby/object:Gem::Dependency
   name: nio4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: benchmark_suite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
 description: Evented IO for Celluloid actors
@@ -115,10 +115,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - Guardfile
@@ -156,6 +156,7 @@ files:
 - spec/celluloid/io/udp_socket_spec.rb
 - spec/celluloid/io/unix_server_spec.rb
 - spec/celluloid/io/unix_socket_spec.rb
+- spec/celluloid/io_spec.rb
 - spec/fixtures/client.crt
 - spec/fixtures/client.key
 - spec/fixtures/server.crt
@@ -173,17 +174,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Celluloid::IO allows you to monitor multiple IO objects within a Celluloid
@@ -199,6 +200,7 @@ test_files:
 - spec/celluloid/io/udp_socket_spec.rb
 - spec/celluloid/io/unix_server_spec.rb
 - spec/celluloid/io/unix_socket_spec.rb
+- spec/celluloid/io_spec.rb
 - spec/fixtures/client.crt
 - spec/fixtures/client.key
 - spec/fixtures/server.crt