celluloid-io 0.10.0 → 0.11.0

data/.travis.yml

@@ -1,3 +1,4 @@
+script: rake ci
 rvm:
   - 1.9.3
   - ruby-head
@@ -8,3 +9,6 @@ rvm:
 
 # See https://github.com/rubinius/rubinius/issues/1611
 #  - rbx-19mode
+
+notifications:
+  irc: "irc.freenode.org#celluloid"

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.11.0
+------
+* "Unofficial" SSL support (via nio4r 0.4.0)
+
 0.10.0
 ------
 * Read/write operations are now atomic across tasks

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'celluloid', :git => 'git://github.com/celluloid/celluloid'
+#gem 'celluloid', :git => 'git://github.com/celluloid/celluloid'
 
 # Specify your gem's dependencies in celluloid-io.gemspec
 gemspec

data/README.md

@@ -130,10 +130,9 @@ classes instead of the core Ruby TCPSocket and TCPServer classes.
 Status
 ------
 
-The rudiments of TCPServer and TCPSocket are in place and ready to use.
-Several methods are still missing. Making new connections with
-Celluloid::IO::TCPSocket.new works, however it presently does blocking DNS
-resolution and connect so it can stall the reactor loop.
+The rudiments of TCPServer and TCPSocket are in place and ready to use. It is now
+fully nonblocking, including DNS resolution, which effectively makes Celluloid::IO
+feature complete as a nonblocking I/O system.
 
 Basic UDPSocket support is in place. On JRuby, recvfrom makes a blocking call
 as the underlying recvfrom_nonblock call is not supported by JRuby.

data/Rakefile

@@ -3,3 +3,4 @@ require 'bundler/gem_tasks'
 Dir["tasks/**/*.task"].each { |task| load task }
 
 task :default => :spec
+task :ci      => %w(spec benchmark)

data/benchmarks/actor.rb

@@ -25,7 +25,9 @@ end
 Benchmark.ips do |ips|
   ips.report("spawn")       { ExampleActor.new.terminate }
   ips.report("calls")       { example_actor.example_method }
-  ips.report("async calls") { example_actor.example_method! }
+  
+  # FIXME: deadlock?! o_O
+  ips.report("async calls") { example_actor.example_method! } unless RUBY_ENGINE == 'ruby'
   
   ips.report("messages") do |n|
     latch_in << n

data/celluloid-io.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Celluloid::IO::VERSION
 
-  gem.add_dependency 'celluloid', '~> 0.10.0'
-  gem.add_dependency 'nio4r',     '>= 0.3.1'
+  gem.add_dependency 'celluloid', '~> 0.11.0'
+  gem.add_dependency 'nio4r',     '>= 0.4.0'
   
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/lib/celluloid/io/common_methods.rb

@@ -61,22 +61,32 @@ module Celluloid
         Actor.current.signal(self)
       end
 
-      def read(length, buffer = nil)
+      def read(length = nil, buffer = nil)
         buffer ||= ''
         remaining = length
 
         acquire_ownership :r
         begin
-          until remaining.zero?
-            begin
-              str = readpartial(remaining)
-            rescue EOFError
-              return if length == remaining
-              return buffer
+          if length
+            until remaining.zero?
+              begin
+                str = readpartial(remaining)
+              rescue EOFError
+                return if length == remaining
+                return buffer
+              end
+
+              buffer << str
+              remaining -= str.length
+            end
+          else
+            while true
+              begin
+                buffer << read_nonblock(Socket::SO_RCVBUF)
+              rescue Errno::EAGAIN, EOFError
+                return buffer
+              end
             end
-
-            buffer << str
-            remaining -= str.length
           end
         ensure
           release_ownership :r

data/lib/celluloid/io/dns_resolver.rb

@@ -68,7 +68,10 @@ module Celluloid
         response = Resolv::DNS::Message.decode(data)
         
         addrs = []
-        response.each_answer { |name, ttl, value| addrs << value.address }
+        # The answer might include IN::CNAME entries so filters them out
+        # to include IN::A & IN::AAAA entries only.
+        response.each_answer { |name, ttl, value| addrs << (value.respond_to?(:address) ? value.address : nil) }
+        addrs.compact!
         
         return if addrs.empty?
         return addrs.first if addrs.size == 1

data/lib/celluloid/io/mailbox.rb

@@ -19,7 +19,8 @@ module Celluloid
           @reactor.wakeup unless current_actor && current_actor.mailbox == self
         rescue IOError
           raise MailboxError, "dead recipient"
-        ensure @mutex.unlock
+        ensure
+          @mutex.unlock rescue nil
         end
         nil
       end
@@ -33,14 +34,15 @@ module Celluloid
           @reactor.wakeup unless current_actor && current_actor.mailbox == self
         rescue IOError
           # Silently fail if messages are sent to dead actors
-        ensure @mutex.unlock
+        ensure
+          @mutex.unlock rescue nil
         end
         nil
       end
 
       # Receive a message from the Mailbox
       def receive(timeout = nil, &block)
-        message = next_message(&block)
+        message = next_message(block)
 
         until message
           if timeout
@@ -53,7 +55,7 @@ module Celluloid
           end
           
           @reactor.run_once(wait_interval)
-          message = next_message(&block)
+          message = next_message(block)
         end
 
         message
@@ -61,6 +63,16 @@ module Celluloid
         shutdown # force shutdown of the mailbox
         raise MailboxShutdown, "mailbox shutdown called during receive"
       end
+      
+      # Obtain the next message from the mailbox that matches the given block
+      def next_message(block)
+        @mutex.lock
+        begin
+          super(&block)
+        ensure
+          @mutex.unlock rescue nil
+        end
+      end
 
       # Cleanup any IO objects this Mailbox may be using
       def shutdown

data/lib/celluloid/io/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
   module IO
-    VERSION = "0.10.0"
+    VERSION = "0.11.0"
   end
 end

data/spec/celluloid/io/dns_resolver_spec.rb

@@ -5,4 +5,22 @@ describe Celluloid::IO::DNSResolver do
     resolver = Celluloid::IO::DNSResolver.new
     resolver.resolve("celluloid.io").should == Resolv::IPv4.create("207.97.227.245")
   end
-end
+
+  it "resolves CNAME responses" do
+    resolver = Celluloid::IO::DNSResolver.new
+    results = resolver.resolve("www.google.com")
+    if results.is_a?(Array)
+      results.all? {|i| i.is_a?(Resolv::IPv4) }.should be_true
+    else
+      results.is_a?(Resolv::IPv4).should be_true
+    end
+    # www.yahoo.com will be resolved randomly whether multiple or
+    # single entry.
+    results = resolver.resolve("www.yahoo.com")
+    if results.is_a?(Array)
+      results.all? {|i| i.is_a?(Resolv::IPv4) }.should be_true
+    else
+      results.is_a?(Resolv::IPv4).should be_true
+    end
+  end
+end

data/spec/celluloid/io/tcp_socket_spec.rb

@@ -24,6 +24,20 @@ describe Celluloid::IO::TCPSocket do
       end
     end
 
+    it "read complete payload when nil size is given to #read" do
+        with_connected_sockets do |subject, peer|
+        peer << payload
+        within_io_actor { subject.read(nil) }.should eq payload
+      end
+    end
+
+    it "read complete payload when no size is given to #read" do
+        with_connected_sockets do |subject, peer|
+        peer << payload
+        within_io_actor { subject.read }.should eq payload
+      end
+    end
+
     it "reads data" do
       with_connected_sockets do |subject, peer|
         peer << payload

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-io
 version: !ruby/object:Gem::Version
-  version: 0.10.0
-  prerelease: 
+  prerelease:
+  version: 0.11.0
 platform: ruby
 authors:
 - Tony Arcieri
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70278839545080 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2056 !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
+        version: 0.11.0
+    none: false
+  requirement: *2056
   prerelease: false
-  version_requirements: *70278839545080
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: nio4r
-  requirement: &70278839544320 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2074 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
+        version: 0.4.0
+    none: false
+  requirement: *2074
   prerelease: false
-  version_requirements: *70278839544320
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70278839543940 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2090 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
+  requirement: *2090
   prerelease: false
-  version_requirements: *70278839543940
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70278839543480 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2108 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
+  requirement: *2108
   prerelease: false
-  version_requirements: *70278839543480
+  type: :development
 - !ruby/object:Gem::Dependency
   name: benchmark_suite
-  requirement: &70278839543020 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2124 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
+  requirement: *2124
   prerelease: false
-  version_requirements: *70278839543020
+  type: :development
 description: Evented IO for Celluloid actors
 email:
 - tony.arcieri@gmail.com
@@ -82,7 +82,6 @@ files:
 - README.md
 - Rakefile
 - benchmarks/actor.rb
-- benchmarks/ring.rb
 - celluloid-io.gemspec
 - examples/echo_client.rb
 - examples/echo_server.rb
@@ -107,29 +106,28 @@ files:
 - tasks/rspec.task
 homepage: http://github.com/celluloid/celluloid-io
 licenses: []
-post_install_message: 
+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
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.17
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.15
+signing_key:
 specification_version: 3
-summary: Celluloid::IO allows you to monitor multiple IO objects within a Celluloid
-  actor
+summary: Celluloid::IO allows you to monitor multiple IO objects within a Celluloid actor
 test_files:
 - spec/celluloid/io/actor_spec.rb
 - spec/celluloid/io/dns_resolver_spec.rb
@@ -138,3 +136,4 @@ test_files:
 - spec/celluloid/io/tcp_socket_spec.rb
 - spec/celluloid/io/udp_socket_spec.rb
 - spec/spec_helper.rb
+...

data/benchmarks/ring.rb

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'bundler/setup'
-require 'celluloid'
-require 'benchmark/ips'
-require File.expand_path("../../examples/ring", __FILE__)
-
-# 512-node ring
-ring = Ring.new 512
-
-Benchmark.ips do |ips|
-  ips.report("ring-around") { |n| ring.run n }
-end