nio4r 0.2.2-java → 0.3.0-java

data/spec/nio/selector_spec.rb

@@ -6,11 +6,17 @@ require 'spec_helper'
 TIMEOUT_PRECISION = 0.1
 
 describe NIO::Selector do
-  it "monitors IO objects" do
-    pipe, _ = IO.pipe
+  context "register" do
+    it "registers IO objects" do
+      pipe, _ = IO.pipe
+
+      monitor = subject.register(pipe, :r)
+      monitor.should_not be_closed
+    end
 
-    monitor = subject.register(pipe, :r)
-    monitor.should_not be_closed
+    it "raises TypeError if asked to register non-IO objects" do
+      expect { subject.register(42, :r) }.to raise_exception TypeError
+    end
   end
 
   it "knows which IO objects are registered" do
@@ -30,22 +36,31 @@ describe NIO::Selector do
     monitor.should be_closed
   end
 
-  it "waits for a timeout when selecting" do
-    reader, writer = IO.pipe
-    monitor = subject.register(reader, :r)
+  context "timeouts" do
+    it "waits for a timeout when selecting" do
+      reader, writer = IO.pipe
+      monitor = subject.register(reader, :r)
 
-    payload = "hi there"
-    writer << payload
+      payload = "hi there"
+      writer << payload
 
-    timeout = 0.5
-    started_at = Time.now
-    subject.select(timeout).should include monitor
-    (Time.now - started_at).should be_within(TIMEOUT_PRECISION).of(0)
-    reader.read_nonblock(payload.size)
+      timeout = 0.5
+      started_at = Time.now
+      subject.select(timeout).should include monitor
+      (Time.now - started_at).should be_within(TIMEOUT_PRECISION).of(0)
+      reader.read_nonblock(payload.size)
 
-    started_at = Time.now
-    subject.select(timeout).should be_nil
-    (Time.now - started_at).should be_within(TIMEOUT_PRECISION).of(timeout)
+      started_at = Time.now
+      subject.select(timeout).should be_nil
+      (Time.now - started_at).should be_within(TIMEOUT_PRECISION).of(timeout)
+    end
+
+    it "raises ArgumentError if given a negative timeout" do
+      reader, _ = IO.pipe
+      subject.register(reader, :r)
+
+      expect { subject.select(-1) }.to raise_exception(ArgumentError)
+    end
   end
 
   context "wakeup" do
@@ -74,6 +89,45 @@ describe NIO::Selector do
     end
   end
 
+  context "select" do
+    it "selects IO objects" do
+      readable, writer = IO.pipe
+      writer << "ohai"
+
+      unreadable, _ = IO.pipe
+
+      readable_monitor   = subject.register(readable, :r)
+      unreadable_monitor = subject.register(unreadable, :r)
+
+      selected = subject.select(0)
+      selected.size.should == 1
+      selected.should include(readable_monitor)
+      selected.should_not include(unreadable_monitor)
+    end
+
+    it "iterates across selected objects with a block" do
+      readable1, writer = IO.pipe
+      writer << "ohai"
+
+      readable2, writer = IO.pipe
+      writer << "ohai"
+
+      unreadable, _ = IO.pipe
+
+      monitor1 = subject.register(readable1, :r)
+      monitor2 = subject.register(readable2, :r)
+      monitor3 = subject.register(unreadable, :r)
+
+      readables = []
+      result = subject.select { |monitor| readables << monitor }
+      result.should == 2
+
+      readables.should include(monitor1)
+      readables.should include(monitor2)
+      readables.should_not include(monitor3)
+    end
+  end
+
   context "select_each" do
     it "iterates across ready selectables" do
       readable1, writer = IO.pipe
@@ -117,160 +171,4 @@ describe NIO::Selector do
     subject.close
     subject.should be_closed
   end
-
-  context "selectables" do
-    shared_context "an NIO selectable" do
-      it "selects for read readiness" do
-        waiting_monitor = subject.register(unreadable_subject, :r)
-        ready_monitor   = subject.register(readable_subject, :r)
-
-        ready_monitors = subject.select
-        ready_monitors.should include ready_monitor
-        ready_monitors.should_not include waiting_monitor
-      end
-
-      it "selects for write readiness" do
-        waiting_monitor = subject.register(unwritable_subject, :w)
-        ready_monitor   = subject.register(writable_subject, :w)
-
-        ready_monitors = subject.select(0.1)
-
-        ready_monitors.should include ready_monitor
-        ready_monitors.should_not include waiting_monitor
-      end
-    end
-
-    context "IO.pipe" do
-      let :readable_subject do
-        pipe, peer = IO.pipe
-        peer << "data"
-        pipe
-      end
-
-      let :unreadable_subject do
-        pipe, _ = IO.pipe
-        pipe
-      end
-
-      let :writable_subject do
-        _, pipe = IO.pipe
-        pipe
-      end
-
-      let :unwritable_subject do
-        reader, pipe = IO.pipe
-
-        begin
-          pipe.write_nonblock "JUNK IN THE TUBES"
-          _, writers = select [], [pipe], [], 0
-        rescue Errno::EPIPE
-          break
-        end while writers and writers.include? pipe
-
-        pipe
-      end
-
-      it_behaves_like "an NIO selectable"
-    end
-
-    context TCPSocket do
-      let(:tcp_port) { 12345 }
-
-      let :readable_subject do
-        server = TCPServer.new("localhost", tcp_port)
-        sock = TCPSocket.open("localhost", tcp_port)
-        peer = server.accept
-        peer << "data"
-        sock
-      end
-
-      let :unreadable_subject do
-        if defined?(JRUBY_VERSION) and ENV['TRAVIS']
-          pending "This is sporadically showing up readable on JRuby in CI"
-        else
-          TCPServer.new("localhost", tcp_port + 1)
-          TCPSocket.open("localhost", tcp_port + 1)
-        end
-      end
-
-      let :writable_subject do
-        TCPServer.new("localhost", tcp_port + 2)
-        TCPSocket.open("localhost", tcp_port + 2)
-      end
-
-      let :unwritable_subject do
-        server = TCPServer.new("localhost", tcp_port + 3)
-        sock = TCPSocket.open("localhost", tcp_port + 3)
-        peer = server.accept
-
-        begin
-          sock.write_nonblock "JUNK IN THE TUBES"
-          _, writers = select [], [sock], [], 0
-        end while writers and writers.include? sock
-
-        sock
-      end
-
-      it_behaves_like "an NIO selectable"
-    end
-
-    context UDPSocket do
-      let(:udp_port) { 23456 }
-
-      let :readable_subject do
-        sock = UDPSocket.new
-        sock.bind('localhost', udp_port)
-
-        peer = UDPSocket.new
-        peer.send("hi there", 0, 'localhost', udp_port)
-
-        sock
-      end
-
-      let :unreadable_subject do
-        sock = UDPSocket.new
-        sock.bind('localhost', udp_port + 1)
-        sock
-      end
-
-      let :writable_subject do
-        pending "come up with a writable UDPSocket example"
-      end
-
-      let :unwritable_subject do
-        pending "come up with a UDPSocket that's blocked on writing"
-      end
-
-      it_behaves_like "an NIO selectable"
-    end
-  end
-
-  context "acceptables" do
-    shared_context "an NIO acceptable" do
-      it "selects for read readiness" do
-        waiting_monitor = subject.register(unacceptable_subject, :r)
-        ready_monitor   = subject.register(acceptable_subject, :r)
-
-        ready_monitors = subject.select
-        ready_monitors.should include ready_monitor
-        ready_monitors.should_not include waiting_monitor
-      end
-    end
-
-    context TCPServer do
-      let(:tcp_port) { 23456 }
-
-      let :acceptable_subject do
-        server = TCPServer.new("localhost", tcp_port)
-        TCPSocket.open("localhost", tcp_port)
-        server
-      end
-
-      let :unacceptable_subject do
-        TCPServer.new("localhost", tcp_port + 1)
-      end
-
-      it_behaves_like "an NIO acceptable"
-    end
-  end
 end

data/tasks/extension.rake

@@ -1,9 +1,10 @@
-require 'rake/extensiontask'
-
-if defined?(JRUBY_VERSION)
-  # Don't build the native extension on JRuby since it uses native Java NIO
-  task :compile
+if defined? JRUBY_VERSION
+  require 'rake/javaextensiontask'
+  Rake::JavaExtensionTask.new('nio4r_ext') do |ext|
+    ext.ext_dir = 'ext/nio4r'
+  end
 else
+  require 'rake/extensiontask'
   Rake::ExtensionTask.new('nio4r_ext') do |ext|
     ext.ext_dir = 'ext/nio4r'
   end

metadata

@@ -1,49 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  prerelease:
+  version: 0.3.0
 platform: java
 authors:
 - Tony Arcieri
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-01-08 00:00:00.000000000 Z
+date: 2012-02-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70302856516460 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2056 !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.9
-  type: :development
+        version: '0'
+    none: false
+  requirement: *2056
   prerelease: false
-  version_requirements: *70302856516460
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70302856515580 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2074 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
+  requirement: *2074
   prerelease: false
-  version_requirements: *70302856515580
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70302856514260 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &2090 !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
-  type: :development
+        version: '0'
+    none: false
+  requirement: *2090
   prerelease: false
-  version_requirements: *70302856514260
+  type: :development
 description: New IO for Ruby
 email:
 - tony.arcieri@gmail.com
@@ -80,45 +80,49 @@ files:
 - ext/nio4r/monitor.c
 - ext/nio4r/nio4r.h
 - ext/nio4r/nio4r_ext.c
+- ext/nio4r/org/nio4r/Nio4r.java
 - ext/nio4r/selector.c
 - lib/nio.rb
-- lib/nio/jruby/monitor.rb
-- lib/nio/jruby/selector.rb
 - lib/nio/monitor.rb
 - lib/nio/selector.rb
 - lib/nio/version.rb
+- lib/nio4r_ext.jar
 - nio4r.gemspec
+- spec/nio/acceptables_spec.rb
 - spec/nio/monitor_spec.rb
+- spec/nio/selectables_spec.rb
 - spec/nio/selector_spec.rb
 - spec/spec_helper.rb
 - tasks/extension.rake
 - tasks/rspec.rake
 homepage: https://github.com/tarcieri/nio4r
 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.10
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.15
+signing_key:
 specification_version: 3
 summary: NIO provides a high performance selector API for monitoring IO objects
 test_files:
+- spec/nio/acceptables_spec.rb
 - spec/nio/monitor_spec.rb
+- spec/nio/selectables_spec.rb
 - spec/nio/selector_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+...

data/lib/nio/jruby/monitor.rb

@@ -1,42 +0,0 @@
-module NIO
-  # Monitors watch Channels for specific events
-  class Monitor
-    attr_accessor :value, :io
-
-    # :nodoc
-    def initialize(io, selection_key)
-      @io, @key = io, selection_key
-      selection_key.attach self
-      @closed = false
-    end
-
-    # Obtain the interests for this monitor
-    def interests
-      Selector.iops2sym @key.interestOps
-    end
-
-    # What is the IO object ready for?
-    def readiness
-      Selector.iops2sym @key.readyOps
-    end
-
-    # Is the IO object readable?
-    def readable?
-      readiness == :r || readiness == :rw
-    end
-
-    # Is the IO object writable?
-    def writable?
-      readiness == :w || readiness == :rw
-    end
-    alias_method :writeable?, :writable?
-
-    # Is this monitor closed?
-    def closed?; @closed; end
-
-    # Deactivate this monitor
-    def close
-      @closed = true
-    end
-  end
-end