nio4r 2.1.0-java → 2.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac3e49179816af644f609a1e3bbe64597ff616b8
-  data.tar.gz: 068bb05b019c601258e4ad8716107f0ac7cc6bf4
+  metadata.gz: 221e18a17ac8c6566eb620526d6b0f70fba72a13
+  data.tar.gz: cb3e78b46136229e792d13d92a0fd3aac8e5f81d
 SHA512:
-  metadata.gz: 0c4d9dff97f7570e07e790f93ead41e84d5db0ac1c8eb9be6c7563d3833a1f12f14bae7a4dbd3e06a9c8fe91a0a79bd63a0c51f08a833d733424cf7020cc0130
-  data.tar.gz: 5d16069650825220774e8f7dd970364ed2b80270b8b0f28d58b8e8a05da77e1aad78c62d75945da0f5dabdb8e1aa7ce64289656e93022a88300178b5b72f486e
+  metadata.gz: ba80c79bd0d2a18342998c59bbfd4bf7152dec4003d5b1880e9cac36ca0ac7f7385bf228fd93bb70e58937ebfeb68230e768379839739855bb4f9e618fd127bc
+  data.tar.gz: eecdbf21b6be0bfe01fd7a768ff70a80a4d1c43891fcb8b404d86ca3f2ccf8c024c5f972451e22a69c021972cabb02fcf31d1a87faef1a1dfe6e10fe11092362

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  TargetRubyVersion: 2.2
   DisplayCopNames: true
 
 #
@@ -18,6 +19,9 @@ Lint/Loop:
 Metrics/AbcSize:
   Max: 35
 
+Metrics/BlockLength:
+  Max: 128
+
 Metrics/ClassLength:
   Max: 128
 
@@ -34,12 +38,22 @@ Metrics/CyclomaticComplexity:
 Metrics/PerceivedComplexity:
   Max: 15
 
+#
+# Performance
+#
+
+Performance/RegexpMatch:
+  Enabled: false
+
 #
 # Style
 #
 
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
+Style/FormatStringToken:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
 
 Style/GlobalVars:
   Enabled: false
@@ -50,5 +64,11 @@ Style/NumericPredicate:
 Style/RescueModifier:
   Enabled: false
 
+Style/SafeNavigation:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
 Style/TrivialAccessors:
   Enabled: false

data/.travis.yml

@@ -3,7 +3,7 @@ sudo: false
 cache: bundler
 
 before_install:
-  - gem update --system 2.6.10
+  - gem update --system
   - gem --version
 
 bundler_args: --without development
@@ -13,10 +13,11 @@ branches:
     - master
 
 rvm:
-  - jruby-9.1.10.0 # latest stable
+  - jruby-9.1.15.0 # latest stable
   - 2.2.7
   - 2.3.4
   - 2.4.1
+  - 2.5.0
   - ruby-head
 
 env:

data/CHANGES.md

@@ -1,3 +1,41 @@
+## 2.2.0 (2017-12-27)
+
+* [#151](https://github.com/socketry/nio4r/pull/151)
+  `NIO::Selector`: Support for enumerating and configuring backend
+  ([@tarcieri])
+
+* [#153](https://github.com/socketry/nio4r/pull/153)
+  Fix builds on Windows
+  ([@unak])
+
+* [#157](https://github.com/socketry/nio4r/pull/157)
+  Windows / MinGW test failure - fix spec_helper.rb
+  ([@MSP-Greg])
+
+* [#162](https://github.com/socketry/nio4r/pull/162)
+  Don't build the C extension on Windows
+  ([@larskanis])
+
+* [#164](https://github.com/socketry/nio4r/pull/164)
+  Fix NIO::ByteBuffer leak
+  ([@HoneyryderChuck])
+
+* [#170](https://github.com/socketry/nio4r/pull/170)
+  Avoid CancelledKeyExceptions on JRuby
+  ([@HoneyryderChuck])
+
+* [#177](https://github.com/socketry/nio4r/pull/177)
+  Fix `NIO::ByteBuffer` string conversions on JRuby
+  ([@tarcieri])
+
+* [#179](https://github.com/socketry/nio4r/pull/179)
+  Fix argument error when running on ruby 2.5.0
+  ([@tompng])
+
+* [#180](https://github.com/socketry/nio4r/pull/180)
+  ext/nio4r/extconf.rb: check for port_event_t in port.h (fixes #178)
+  ([@tarcieri])
+
 ## 2.1.0 (2017-05-28)
 
 * [#130](https://github.com/socketry/nio4r/pull/130)
@@ -163,3 +201,8 @@
 [@johnnyt]: https://github.com/johnnyt
 [@UpeksheJay]: https://github.com/UpeksheJay
 [@junaruga]: https://github.com/junaruga
+[@unak]: https://github.com/unak
+[@MSP-Greg]: https://github.com/MSP-Greg
+[@larskanis]: https://github.com/larskanis
+[@HoneyryderChuck]: https://github.com/HoneyryderChuck
+[@tompng]: https://github.com/tompng

data/Gemfile

@@ -14,7 +14,7 @@ end
 group :development, :test do
   gem "coveralls",         require: false
   gem "rake-compiler",     require: false
-  gem "rspec", "~> 3",     require: false
+  gem "rspec", "~> 3.7",   require: false
   gem "rspec-retry",       require: false
-  gem "rubocop", "0.46.0", require: false
+  gem "rubocop", "0.52.1", require: false
 end

data/Guardfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-directories %w(lib spec)
+directories %w[lib spec]
 clearing :on
 
 guard :rspec, cmd: "bundle exec rspec" do

data/README.md

@@ -1,9 +1,11 @@
 # ![nio4r](https://raw.github.com/socketry/nio4r/master/logo.png)
 
 [![Gem Version](https://badge.fury.io/rb/nio4r.svg)](http://rubygems.org/gems/nio4r)
-[![Build Status](https://secure.travis-ci.org/socketry/nio4r.svg?branch=master)](http://travis-ci.org/socketry/nio4r)
+[![Travis CI Status](https://secure.travis-ci.org/socketry/nio4r.svg?branch=master)](http://travis-ci.org/socketry/nio4r)
+[![Appveyor Status](https://ci.appveyor.com/api/projects/status/1ru8x81v91vaewax/branch/master?svg=true)](https://ci.appveyor.com/project/tarcieri/nio4r/branch/master)
 [![Code Climate](https://codeclimate.com/github/socketry/nio4r.svg)](https://codeclimate.com/github/socketry/nio4r)
 [![Coverage Status](https://coveralls.io/repos/socketry/nio4r/badge.svg?branch=master)](https://coveralls.io/r/socketry/nio4r)
+[![Yard Docs](https://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/gems/nio4r/2.2.0)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/socketry/nio4r/blob/master/LICENSE.txt)
 
 _NOTE: This is the 2.x **stable** branch of nio4r.  For the 1.x **legacy** branch,

data/Rakefile

@@ -5,6 +5,6 @@ require "rake/clean"
 
 Dir[File.expand_path("../tasks/**/*.rake", __FILE__)].each { |task| load task }
 
-task default: %w(compile spec rubocop)
+task default: %w[compile spec rubocop]
 
 CLEAN.include "**/*.o", "**/*.so", "**/*.bundle", "**/*.jar", "pkg", "tmp"

data/appveyor.yml

@@ -0,0 +1,27 @@
+branches:
+  only:
+    - master
+
+environment:
+  PATH: C:\Ruby%RUBY_VERSION%\DevKit\mingw\bin;C:\Ruby%RUBY_VERSION%\bin;C:\Ruby%RUBY_VERSION%\DevKit\bin;%PATH%
+  matrix:
+  - RUBY_VERSION: "24-x64"
+  - RUBY_VERSION: "23-x64"
+  - RUBY_VERSION: "23"
+  - RUBY_VERSION: "22"
+
+install:
+  - SET RAKEOPT=-rdevkit
+  - ruby -v
+  - gem -v
+  - bundle -v
+  - bundle install
+
+build: off
+
+before_build:
+  - gem update --system
+
+test_script:
+  - echo %PATH%
+  - bundle exec rake spec

data/ext/nio4r/bytebuffer.c

@@ -75,6 +75,7 @@ void Init_NIO_ByteBuffer()
 static VALUE NIO_ByteBuffer_allocate(VALUE klass)
 {
     struct NIO_ByteBuffer *bytebuffer = (struct NIO_ByteBuffer *)xmalloc(sizeof(struct NIO_ByteBuffer));
+    bytebuffer->buffer = NULL;
     return Data_Wrap_Struct(klass, NIO_ByteBuffer_gc_mark, NIO_ByteBuffer_free, bytebuffer);
 }
 
@@ -84,6 +85,8 @@ static void NIO_ByteBuffer_gc_mark(struct NIO_ByteBuffer *buffer)
 
 static void NIO_ByteBuffer_free(struct NIO_ByteBuffer *buffer)
 {
+    if(buffer->buffer)
+      xfree(buffer->buffer);
     xfree(buffer);
 }
 
@@ -124,10 +127,11 @@ static VALUE NIO_ByteBuffer_get_position(VALUE self)
 
 static VALUE NIO_ByteBuffer_set_position(VALUE self, VALUE new_position)
 {
+    int pos;
     struct NIO_ByteBuffer *buffer;
     Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
 
-    int pos = NUM2INT(new_position);
+    pos = NUM2INT(new_position);
 
     if(pos < 0) {
         rb_raise(rb_eArgError, "negative position given");
@@ -156,10 +160,11 @@ static VALUE NIO_ByteBuffer_get_limit(VALUE self)
 
 static VALUE NIO_ByteBuffer_set_limit(VALUE self, VALUE new_limit)
 {
+    int lim;
     struct NIO_ByteBuffer *buffer;
     Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
 
-    int lim = NUM2INT(new_limit);
+    lim = NUM2INT(new_limit);
 
     if(lim < 0) {
         rb_raise(rb_eArgError, "negative limit given");
@@ -237,10 +242,11 @@ static VALUE NIO_ByteBuffer_get(int argc, VALUE *argv, VALUE self)
 
 static VALUE NIO_ByteBuffer_fetch(VALUE self, VALUE index)
 {
+    int i;
     struct NIO_ByteBuffer *buffer;
     Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
 
-    int i = NUM2INT(index);
+    i = NUM2INT(index);
 
     if(i < 0) {
         rb_raise(rb_eArgError, "negative index given");
@@ -255,10 +261,12 @@ static VALUE NIO_ByteBuffer_fetch(VALUE self, VALUE index)
 
 static VALUE NIO_ByteBuffer_put(VALUE self, VALUE string)
 {
+    long length;
     struct NIO_ByteBuffer *buffer;
     Data_Get_Struct(self, struct NIO_ByteBuffer, buffer);
 
-    long length = RSTRING_LEN(string);
+    StringValue(string);
+    length = RSTRING_LEN(string);
 
     if(length > buffer->limit - buffer->position) {
         rb_raise(cNIO_ByteBuffer_OverflowError, "buffer is full");

data/ext/nio4r/extconf.rb

@@ -1,35 +1,26 @@
 # frozen_string_literal: true
 
-require "mkmf"
-
-have_header("unistd.h")
-
-$defs << "-DEV_USE_SELECT" if have_header("sys/select.h")
+require "rubygems"
 
-$defs << "-DEV_USE_POLL" if have_header("poll.h")
-
-$defs << "-DEV_USE_EPOLL" if have_header("sys/epoll.h")
-
-if have_header("sys/event.h") && have_header("sys/queue.h")
-  $defs << "-DEV_USE_KQUEUE"
+# Write a dummy Makefile on Windows because we use the pure Ruby implementation there
+if Gem.win_platform?
+  File.write("Makefile", "all install::\n")
+  File.write("nio4r_ext.so", "")
+  exit
 end
 
-$defs << "-DEV_USE_PORT" if have_header("port.h")
+require "mkmf"
 
+have_header("unistd.h")
+
+$defs << "-DEV_USE_SELECT"       if have_header("sys/select.h")
+$defs << "-DEV_USE_POLL"         if have_type("port_event_t", "poll.h")
+$defs << "-DEV_USE_EPOLL"        if have_header("sys/epoll.h")
+$defs << "-DEV_USE_KQUEUE"       if have_header("sys/event.h") && have_header("sys/queue.h")
+$defs << "-DEV_USE_PORT"         if have_type("port_event_t", "port.h")
 $defs << "-DHAVE_SYS_RESOURCE_H" if have_header("sys/resource.h")
 
-CONFIG["optflags"] << " -fno-strict-aliasing"
+CONFIG["optflags"] << " -fno-strict-aliasing" unless RUBY_PLATFORM =~ /mswin/
 
 dir_config "nio4r_ext"
 create_makefile "nio4r_ext"
-
-# win32 needs to link in "just the right order" for some reason or
-# ioctlsocket will be mapped to an [inverted] ruby specific version.
-if RUBY_PLATFORM =~ /mingw|win32/
-  makefile_contents = File.read "Makefile"
-
-  makefile_contents.gsub! "DLDFLAGS = ", "DLDFLAGS = -export-all "
-
-  makefile_contents.gsub! "LIBS = $(LIBRUBYARG_SHARED)", "LIBS = -lws2_32 $(LIBRUBYARG_SHARED)"
-  File.open("Makefile", "w") { |f| f.write makefile_contents }
-end

data/ext/nio4r/monitor.c

@@ -92,7 +92,7 @@ static VALUE NIO_Monitor_initialize(VALUE self, VALUE io, VALUE interests, VALUE
         monitor->interests = EV_READ | EV_WRITE;
     } else {
         rb_raise(rb_eArgError, "invalid event type %s (must be :r, :w, or :rw)",
-            RSTRING_PTR(rb_funcall(interests, rb_intern("inspect"), 0, 0)));
+            RSTRING_PTR(rb_funcall(interests, rb_intern("inspect"), 0)));
     }
 
     GetOpenFile(rb_convert_type(io, T_FILE, "IO", "to_io"), fptr);
@@ -258,7 +258,7 @@ static int NIO_Monitor_symbol2interest(VALUE interests)
         return EV_READ | EV_WRITE;
     } else {
         rb_raise(rb_eArgError, "invalid interest type %s (must be :r, :w, or :rw)",
-            RSTRING_PTR(rb_funcall(interests, rb_intern("inspect"), 0, 0)));
+            RSTRING_PTR(rb_funcall(interests, rb_intern("inspect"), 0)));
     }
 }
 

data/ext/nio4r/nio4r_ext.c

@@ -12,6 +12,8 @@ void Init_NIO_ByteBuffer();
 
 void Init_nio4r_ext()
 {
+    ev_set_allocator(xrealloc);
+
     Init_NIO_Selector();
     Init_NIO_Monitor();
     Init_NIO_ByteBuffer();

data/ext/nio4r/org/nio4r/ByteBuffer.java

@@ -163,10 +163,8 @@ public class ByteBuffer extends RubyObject {
 
     @JRubyMethod(name = "<<")
     public IRubyObject put(ThreadContext context, IRubyObject str) {
-        String string = str.asJavaString();
-
         try {
-            this.byteBuffer.put(string.getBytes());
+            this.byteBuffer.put(str.convertToString().getByteList().bytes());
         } catch(BufferOverflowException e) {
             throw ByteBuffer.newOverflowError(context, "buffer is full");
         }

data/ext/nio4r/org/nio4r/Monitor.java

@@ -102,12 +102,16 @@ public class Monitor extends RubyObject {
 
     @JRubyMethod
     public IRubyObject readiness(ThreadContext context) {
+        if(!key.isValid())
+          return this.interests; 
         return Nio4r.interestOpsToSymbol(context.getRuntime(), key.readyOps());
     }
 
     @JRubyMethod(name = "readable?")
     public IRubyObject isReadable(ThreadContext context) {
         Ruby runtime  = context.getRuntime();
+        if (!this.key.isValid())
+          return runtime.getTrue();
         int  readyOps = this.key.readyOps();
 
         if((readyOps & SelectionKey.OP_READ) != 0 || (readyOps & SelectionKey.OP_ACCEPT) != 0) {
@@ -120,6 +124,8 @@ public class Monitor extends RubyObject {
     @JRubyMethod(name = {"writable?", "writeable?"})
     public IRubyObject writable(ThreadContext context) {
         Ruby runtime  = context.getRuntime();
+        if (!this.key.isValid())
+          return runtime.getTrue();
         int  readyOps = this.key.readyOps();
 
         if((readyOps & SelectionKey.OP_WRITE) != 0 || (readyOps & SelectionKey.OP_CONNECT) != 0) {

data/ext/nio4r/org/nio4r/Selector.java

@@ -7,6 +7,7 @@ import java.io.IOException;
 import java.nio.channels.Channel;
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
+import java.nio.channels.CancelledKeyException;
 
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
@@ -30,8 +31,23 @@ public class Selector extends RubyObject {
         super(ruby, rubyClass);
     }
 
+    @JRubyMethod(meta = true)
+    public static IRubyObject backends(ThreadContext context, IRubyObject self) {
+        return context.runtime.newArray(context.runtime.newSymbol("java"));
+    }
+
     @JRubyMethod
     public IRubyObject initialize(ThreadContext context) {
+        initialize(context, context.runtime.newSymbol("java"));
+        return context.nil;
+    }
+
+    @JRubyMethod
+    public IRubyObject initialize(ThreadContext context, IRubyObject backend) {
+        if(backend != context.runtime.newSymbol("java")) {
+            throw context.runtime.newArgumentError(":java is the only supported backend");
+        }
+
         this.cancelledKeys = new HashMap<SelectableChannel,SelectionKey>();
         this.wakeupFired = false;
 
@@ -193,6 +209,7 @@ public class Selector extends RubyObject {
         while(selectedKeys.hasNext()) {
             SelectionKey key = (SelectionKey)selectedKeys.next();
             processKey(key);
+
             selectedKeys.remove();
 
             if(block.isGiven()) {
@@ -254,7 +271,7 @@ public class Selector extends RubyObject {
     // Remove connect interest from connected sockets
     // See: http://stackoverflow.com/questions/204186/java-nio-select-returns-without-selected-keys-why
     private void processKey(SelectionKey key) {
-        if((key.readyOps() & SelectionKey.OP_CONNECT) != 0) {
+        if(key.isValid() && (key.readyOps() & SelectionKey.OP_CONNECT) != 0) {
             int interestOps = key.interestOps();
 
             interestOps &= ~SelectionKey.OP_CONNECT;

data/ext/nio4r/selector.c

@@ -27,8 +27,11 @@ static void NIO_Selector_mark(struct NIO_Selector *loop);
 static void NIO_Selector_shutdown(struct NIO_Selector *selector);
 static void NIO_Selector_free(struct NIO_Selector *loop);
 
-/* Methods */
-static VALUE NIO_Selector_initialize(VALUE self);
+/* Class methods */
+static VALUE NIO_Selector_supported_backends(VALUE klass);
+
+/* Instance methods */
+static VALUE NIO_Selector_initialize(int argc, VALUE *argv, VALUE self);
 static VALUE NIO_Selector_backend(VALUE self);
 static VALUE NIO_Selector_register(VALUE self, VALUE selectable, VALUE interest);
 static VALUE NIO_Selector_deregister(VALUE self, VALUE io);
@@ -65,7 +68,8 @@ void Init_NIO_Selector()
     cNIO_Selector = rb_define_class_under(mNIO, "Selector", rb_cObject);
     rb_define_alloc_func(cNIO_Selector, NIO_Selector_allocate);
 
-    rb_define_method(cNIO_Selector, "initialize", NIO_Selector_initialize, 0);
+    rb_define_singleton_method(cNIO_Selector, "backends", NIO_Selector_supported_backends, 0);
+    rb_define_method(cNIO_Selector, "initialize", NIO_Selector_initialize, -1);
     rb_define_method(cNIO_Selector, "backend", NIO_Selector_backend, 0);
     rb_define_method(cNIO_Selector, "register", NIO_Selector_register, 2);
     rb_define_method(cNIO_Selector, "deregister", NIO_Selector_deregister, 1);
@@ -102,7 +106,9 @@ static VALUE NIO_Selector_allocate(VALUE klass)
     }
 
     selector = (struct NIO_Selector *)xmalloc(sizeof(struct NIO_Selector));
-    selector->ev_loop = ev_loop_new(0);
+
+    /* Defer initializing the loop to #initialize */
+    selector->ev_loop = 0;
 
     ev_init(&selector->timer, NIO_Selector_timeout_callback);
 
@@ -112,8 +118,6 @@ static VALUE NIO_Selector_allocate(VALUE klass)
     ev_io_init(&selector->wakeup, NIO_Selector_wakeup_callback, selector->wakeup_reader, EV_READ);
     selector->wakeup.data = (void *)selector;
 
-    ev_io_start(selector->ev_loop, &selector->wakeup);
-
     selector->closed = selector->selecting = selector->wakeup_fired = selector->ready_count = 0;
     selector->ready_array = Qnil;
 
@@ -154,12 +158,83 @@ static void NIO_Selector_free(struct NIO_Selector *selector)
     xfree(selector);
 }
 
+/* Return an array of symbols for supported backends */
+static VALUE NIO_Selector_supported_backends(VALUE klass) {
+    unsigned int backends = ev_supported_backends();
+    VALUE result = rb_ary_new();
+
+    if(backends & EVBACKEND_EPOLL) {
+        rb_ary_push(result, ID2SYM(rb_intern("epoll")));
+    }
+
+    if(backends & EVBACKEND_POLL) {
+        rb_ary_push(result, ID2SYM(rb_intern("poll")));
+    }
+
+    if(backends & EVBACKEND_KQUEUE) {
+        rb_ary_push(result, ID2SYM(rb_intern("kqueue")));
+    }
+
+    if(backends & EVBACKEND_SELECT) {
+        rb_ary_push(result, ID2SYM(rb_intern("select")));
+    }
+
+    if(backends & EVBACKEND_PORT) {
+        rb_ary_push(result, ID2SYM(rb_intern("port")));
+    }
+
+    return result;
+}
+
 /* Create a new selector. This is more or less the pure Ruby version
    translated into an MRI cext */
-static VALUE NIO_Selector_initialize(VALUE self)
+static VALUE NIO_Selector_initialize(int argc, VALUE *argv, VALUE self)
 {
+    ID backend_id;
+    VALUE backend;
     VALUE lock;
 
+    struct NIO_Selector *selector;
+    unsigned int flags = 0;
+
+    Data_Get_Struct(self, struct NIO_Selector, selector);
+
+    rb_scan_args(argc, argv, "01", &backend);
+
+    if(backend != Qnil) {
+        if(!rb_ary_includes(NIO_Selector_supported_backends(CLASS_OF(self)), backend)) {
+            rb_raise(rb_eArgError, "unsupported backend: %s",
+                RSTRING_PTR(rb_funcall(backend, rb_intern("inspect"), 0)));
+        }
+
+        backend_id = SYM2ID(backend);
+
+        if(backend_id == rb_intern("epoll")) {
+            flags = EVBACKEND_EPOLL;
+        } else if(backend_id == rb_intern("poll")) {
+            flags = EVBACKEND_POLL;
+        } else if(backend_id == rb_intern("kqueue")) {
+            flags = EVBACKEND_KQUEUE;
+        } else if(backend_id == rb_intern("select")) {
+            flags = EVBACKEND_SELECT;
+        } else if(backend_id == rb_intern("port")) {
+            flags = EVBACKEND_PORT;
+        } else {
+            rb_raise(rb_eArgError, "unsupported backend: %s",
+                RSTRING_PTR(rb_funcall(backend, rb_intern("inspect"), 0)));
+        }
+    }
+
+    /* Ensure the selector loop has not yet been initialized */
+    assert(!selector->ev_loop);
+
+    selector->ev_loop = ev_loop_new(flags);
+    if(!selector->ev_loop) {
+        rb_raise(rb_eIOError, "error initializing event loop");
+    }
+
+    ev_io_start(selector->ev_loop, &selector->wakeup);
+
     rb_ivar_set(self, rb_intern("selectables"), rb_hash_new());
     rb_ivar_set(self, rb_intern("lock_holder"), Qnil);
 
@@ -204,7 +279,7 @@ static VALUE NIO_Selector_synchronize(VALUE self, VALUE (*func)(VALUE *args), VA
 
     if(lock_holder != current_thread) {
         lock = rb_ivar_get(self, rb_intern("lock"));
-        rb_funcall(lock, rb_intern("lock"), 0, 0);
+        rb_funcall(lock, rb_intern("lock"), 0);
         rb_ivar_set(self, rb_intern("lock_holder"), current_thread);
 
         /* We've acquired the lock, so ensure we unlock it */
@@ -223,7 +298,7 @@ static VALUE NIO_Selector_unlock(VALUE self)
     rb_ivar_set(self, rb_intern("lock_holder"), Qnil);
 
     lock = rb_ivar_get(self, rb_intern("lock"));
-    rb_funcall(lock, rb_intern("unlock"), 0, 0);
+    rb_funcall(lock, rb_intern("unlock"), 0);
 
     return Qnil;
 }

data/lib/nio.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "thread"
 require "socket"
 require "nio/version"
 
@@ -19,7 +18,7 @@ if ENV["NIO4R_PURE"] == "true" || (Gem.win_platform? && !defined?(JRUBY_VERSION)
   require "nio/monitor"
   require "nio/selector"
   require "nio/bytebuffer"
-  NIO::ENGINE = "ruby"
+  NIO::ENGINE = "ruby".freeze
 else
   require "nio4r_ext"
 
@@ -27,8 +26,8 @@ else
     require "java"
     require "jruby"
     org.nio4r.Nio4r.new.load(JRuby.runtime, false)
-    NIO::ENGINE = "java"
+    NIO::ENGINE = "java".freeze
   else
-    NIO::ENGINE = "libev"
+    NIO::ENGINE = "libev".freeze
   end
 end

data/lib/nio/bytebuffer.rb

@@ -48,10 +48,8 @@ module NIO
       raise ArgumentError, "negative position given" if new_position < 0
       raise ArgumentError, "specified position exceeds capacity" if new_position > @capacity
 
+      @mark = nil if @mark && @mark > new_position
       @position = new_position
-      @mark = nil if @mark && @mark > @position
-
-      new_position
     end
 
     # Set the limit to the given value. New limit must be less than capacity.
@@ -65,11 +63,9 @@ module NIO
       raise ArgumentError, "negative limit given" if new_limit < 0
       raise ArgumentError, "specified limit exceeds capacity" if new_limit > @capacity
 
+      @position = new_limit if @position > new_limit
+      @mark = nil if @mark && @mark > new_limit
       @limit = new_limit
-      @position = new_limit if @position > @limit
-      @mark = nil if @mark && @mark > @limit
-
-      new_limit
     end
 
     # Number of bytes remaining in the buffer before the limit
@@ -115,15 +111,22 @@ module NIO
 
     # Add a String to the buffer
     #
+    # @param str [#to_str] data to add to the buffer
+    #
+    # @raise [TypeError] given a non-string type
     # @raise [NIO::ByteBuffer::OverflowError] buffer is full
     #
     # @return [self]
-    def <<(str)
+    def put(str)
+      raise TypeError, "expected String, got #{str.class}" unless str.respond_to?(:to_str)
+      str = str.to_str
+
       raise OverflowError, "buffer is full" if str.length > @limit - @position
       @buffer[@position...str.length] = str
       @position += str.length
       self
     end
+    alias << put
 
     # Perform a non-blocking read from the given IO object into the buffer
     # Reads as much data as is immediately available and returns

data/lib/nio/monitor.rb

@@ -31,7 +31,7 @@ module NIO
     # @return [Symbol] new interests
     def interests=(interests)
       raise EOFError, "monitor is closed" if closed?
-      raise ArgumentError, "bad interests: #{interests}" unless [:r, :w, :rw].include?(interests)
+      raise ArgumentError, "bad interests: #{interests}" unless %i[r w rw].include?(interests)
 
       @interests = interests
     end

data/lib/nio/selector.rb

@@ -5,8 +5,17 @@ require "set"
 module NIO
   # Selectors monitor IO objects for events of interest
   class Selector
+    # Return supported backends as symbols
+    #
+    # See `#backend` method definition for all possible backends
+    def self.backends
+      [:ruby]
+    end
+
     # Create a new NIO::Selector
-    def initialize
+    def initialize(backend = :ruby)
+      raise ArgumentError, "unsupported backend: #{backend}" unless backend == :ruby
+
       @selectables = {}
       @lock = Mutex.new
 

data/lib/nio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NIO
-  VERSION = "2.1.0"
+  VERSION = "2.2.0".freeze
 end

data/nio4r.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
     spec.extensions = ["ext/nio4r/extconf.rb"]
   end
 
-  spec.add_development_dependency "rake"
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
 end

data/spec/nio/acceptables_spec.rb

@@ -20,13 +20,13 @@ RSpec.describe "NIO acceptables" do
     let(:port) { next_available_tcp_port }
 
     let :acceptable_subject do
-      server = TCPServer.new("localhost", port)
-      TCPSocket.open("localhost", port)
+      server = TCPServer.new("127.0.0.1", port)
+      TCPSocket.open("127.0.0.1", port)
       server
     end
 
     let :unacceptable_subject do
-      TCPServer.new("localhost", port + 1)
+      TCPServer.new("127.0.0.1", port + 1)
     end
 
     it_behaves_like "an NIO acceptable"

data/spec/nio/bytebuffer_spec.rb

@@ -2,6 +2,7 @@
 
 require "spec_helper"
 
+# rubocop:disable Metrics/BlockLength
 RSpec.describe NIO::ByteBuffer do
   let(:capacity)       { 256 }
   let(:example_string) { "Testing 1 2 3..." }
@@ -179,6 +180,11 @@ RSpec.describe NIO::ByteBuffer do
       expect(bytebuffer.limit).to eq capacity
     end
 
+    it "raises TypeError if given a non-String type" do
+      expect { bytebuffer << 42 }.to raise_error(TypeError)
+      expect { bytebuffer << nil }.to raise_error(TypeError)
+    end
+
     it "raises NIO::ByteBuffer::OverflowError if the buffer is full" do
       bytebuffer << "X" * (capacity - 1)
       expect { bytebuffer << "X" }.not_to raise_error
@@ -281,7 +287,7 @@ RSpec.describe NIO::ByteBuffer do
   end
 
   context "I/O" do
-    let(:addr)   { "localhost" }
+    let(:addr)   { "127.0.0.1" }
     let(:port)   { next_available_tcp_port }
     let(:server) { TCPServer.new(addr, port) }
     let(:client) { TCPSocket.new(addr, port) }
@@ -347,3 +353,4 @@ RSpec.describe NIO::ByteBuffer do
     end
   end
 end
+# rubocop:enable Metrics/BlockLength

data/spec/nio/monitor_spec.rb

@@ -4,7 +4,7 @@ require "spec_helper"
 require "socket"
 
 RSpec.describe NIO::Monitor do
-  let(:addr) { "localhost" }
+  let(:addr) { "127.0.0.1" }
   let(:port) { next_available_tcp_port }
 
   let(:reader) { TCPServer.new(addr, port) }

data/spec/nio/selectables/pipe_spec.rb

@@ -27,12 +27,17 @@ RSpec.describe "IO.pipe" do
     #      will throw EAGAIN if there is too little space to write the string
     # TODO: Use FFI to lookup the platform-specific size of PIPE_BUF
     str = "JUNK IN THE TUBES" * 10_000
+    cntr = 0
     begin
       pipe.write_nonblock str
-      _, writers = select [], [pipe], [], 0
+      cntr += 1
+      t = select [], [pipe], [], 0
     rescue Errno::EPIPE
       break
-    end while writers && writers.include?(pipe)
+    rescue IO::EWOULDBLOCKWaitWritable
+      skip "windows - can't test due to 'select' not showing correct status"
+      break
+    end while t && t[1].include?(pipe) && cntr < 20
 
     pipe
   end

data/spec/nio/selectables/ssl_socket_spec.rb

@@ -4,23 +4,23 @@ require "spec_helper"
 require "openssl"
 
 RSpec.describe OpenSSL::SSL::SSLSocket do
-  let(:addr) { "localhost" }
+  let(:addr) { "127.0.0.1" }
   let(:port) { next_available_tcp_port }
 
   let(:ssl_key) { OpenSSL::PKey::RSA.new(1024) }
 
   let(:ssl_cert) do
-    name = OpenSSL::X509::Name.new([%w(CN localhost)])
+    name = OpenSSL::X509::Name.new([%w[CN 127.0.0.1]])
     OpenSSL::X509::Certificate.new.tap do |cert|
       cert.version = 2
       cert.serial = 1
       cert.issuer = name
       cert.subject = name
       cert.not_before = Time.now
-      cert.not_after = Time.now + (365 * 24 * 60 * 60)
+      cert.not_after = Time.now + (7 * 24 * 60 * 60)
       cert.public_key = ssl_key.public_key
 
-      cert.sign(ssl_key, OpenSSL::Digest::SHA1.new)
+      cert.sign(ssl_key, OpenSSL::Digest::SHA256.new)
     end
   end
 
@@ -111,14 +111,15 @@ RSpec.describe OpenSSL::SSL::SSLSocket do
     ssl_peer.accept
     thread.join
 
+    cntr = 0
     begin
-      _, writers = select [], [ssl_client], [], 0
       count = ssl_client.write_nonblock "X" * 1024
       expect(count).not_to eq(0)
+      cntr += 1
+      t = select [], [ssl_client], [], 0
     rescue IO::WaitReadable, IO::WaitWritable
       pending "SSL will report writable but not accept writes"
-      raise if writers.include? ssl_client
-    end while writers && writers.include?(ssl_client)
+    end while t && t[1].include?(ssl_client) && cntr < 30
 
     # I think the kernel might manage to drain its buffer a bit even after
     # the socket first goes unwritable. Attempt to sleep past this and then
@@ -141,8 +142,6 @@ RSpec.describe OpenSSL::SSL::SSLSocket do
   end
 
   let :pair do
-    pending "figure out why newly created sockets are selecting readable immediately"
-
     server = TCPServer.new(addr, port)
     client = TCPSocket.new(addr, port)
     peer = server.accept

data/spec/nio/selectables/tcp_socket_spec.rb

@@ -19,9 +19,7 @@ RSpec.describe TCPSocket do
     sock = TCPSocket.new(addr, port)
 
     # Sanity check to make sure we actually produced an unreadable socket
-    if select([sock], [], [], 0)
-      pending "Failed to produce an unreadable socket"
-    end
+    pending "Failed to produce an unreadable socket" if select([sock], [], [], 0)
 
     sock
   end
@@ -57,9 +55,7 @@ RSpec.describe TCPSocket do
     end
 
     # Sanity check to make sure we actually produced an unwritable socket
-    if select([], [sock], [], 0)
-      pending "Failed to produce an unwritable socket"
-    end
+    pending "Failed to produce an unwritable socket" if select([], [sock], [], 0)
 
     sock
   end

data/spec/nio/selectables/udp_socket_spec.rb

@@ -2,27 +2,37 @@
 
 require "spec_helper"
 
-RSpec.describe UDPSocket do
+RSpec.describe UDPSocket, if: !defined?(JRUBY_VERSION) do
   let(:udp_port) { 23_456 }
 
   let :readable_subject do
     sock = UDPSocket.new
-    sock.bind("localhost", udp_port)
+    sock.bind("127.0.0.1", udp_port)
 
     peer = UDPSocket.new
-    peer.send("hi there", 0, "localhost", udp_port)
+    peer.send("hi there", 0, "127.0.0.1", udp_port)
 
     sock
   end
 
   let :unreadable_subject do
     sock = UDPSocket.new
-    sock.bind("localhost", udp_port + 1)
+    sock.bind("127.0.0.1", udp_port + 1)
     sock
   end
 
   let :writable_subject do
-    pending "come up with a writable UDPSocket example"
+    peer = UDPSocket.new
+    peer.connect "127.0.0.1", udp_port
+    cntr = 0
+    begin
+      peer.send("X" * 1024, 0)
+      cntr += 1
+      t = select [], [peer], [], 0
+    rescue Errno::ECONNREFUSED => ex
+      skip "Couln't make writable UDPSocket subject: #{ex.class}: #{ex}"
+    end while t && t[1].include?(peer) && cntr < 5
+    peer
   end
 
   let :unwritable_subject do

data/spec/nio/selector_spec.rb

@@ -8,11 +8,35 @@ require "timeout"
 # the tests
 TIMEOUT_PRECISION = 0.1
 
+# rubocop:disable Metrics/BlockLength
 RSpec.describe NIO::Selector do
   let(:pair)   { IO.pipe }
   let(:reader) { pair.first }
   let(:writer) { pair.last }
 
+  context ".backends" do
+    it "knows all supported backends" do
+      expect(described_class.backends).to be_a Array
+      expect(described_class.backends.first).to be_a Symbol
+    end
+  end
+
+  context "#initialize" do
+    it "allows explicitly specifying a backend" do
+      backend = described_class.backends.first
+      selector = described_class.new(backend)
+      expect(selector.backend).to eq backend
+    end
+
+    it "raises ArgumentError if given an invalid backend" do
+      expect { described_class.new(:derp) }.to raise_error ArgumentError
+    end
+
+    it "raises TypeError if given a non-Symbol parameter" do
+      expect { described_class.new(42).to raise_error TypeError }
+    end
+  end
+
   context "backend" do
     it "knows its backend" do
       expect(subject.backend).to be_a Symbol
@@ -191,3 +215,4 @@ RSpec.describe NIO::Selector do
     expect(subject).to be_closed
   end
 end
+# rubocop:enable Metrics/BlockLength

data/spec/spec_helper.rb

@@ -20,8 +20,8 @@ def next_available_tcp_port
     $current_tcp_port += 1
 
     begin
-      sock = Timeout.timeout(1) { TCPSocket.new("localhost", $current_tcp_port) }
-    rescue Errno::ECONNREFUSED
+      sock = Timeout.timeout(0.5) { TCPSocket.new("127.0.0.1", $current_tcp_port) }
+    rescue Errno::ECONNREFUSED, Timeout::Error
       break $current_tcp_port
     end
 

data/spec/support/selectable_examples.rb

@@ -34,9 +34,6 @@ RSpec.shared_context "an NIO selectable stream" do
   let(:peer)     { pair.last }
 
   it "selects readable when the other end closes" do
-    # hax: this test is broken for OpenSSL sockets
-    skip "broken for SSL ;_;" if peer.is_a? OpenSSL::SSL::SSLSocket
-
     monitor = selector.register(stream, :r)
     expect(selector.select(0)).to be_nil
 
@@ -57,4 +54,12 @@ RSpec.shared_context "an NIO bidirectional stream" do
       expect(m.readiness).to eq(:rw)
     end
   end
+  it "keeps readiness after the selectable has been closed" do
+    selector.register(readable_subject, :rw)
+    selector.select(0) do |m|
+      expect(m.readiness).to eq(:rw)
+      readable_subject.close
+      expect(m.readiness).to eq(:rw)
+    end
+  end
 end

metadata

@@ -1,44 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: java
 authors:
 - Tony Arcieri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: bundler
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
-description: Cross-platform asynchronous I/O primitives for scalable network clients and servers. Inspired by the Java NIO API, but simplified for ease-of-use.
+description: Cross-platform asynchronous I/O primitives for scalable network clients
+  and servers. Inspired by the Java NIO API, but simplified for ease-of-use.
 email:
 - bascule@gmail.com
 executables: []
@@ -48,7 +49,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGES.md
 - Gemfile
@@ -56,6 +56,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- appveyor.yml
 - examples/echo_server.rb
 - ext/libev/Changes
 - ext/libev/LICENSE
@@ -124,18 +125,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key:
 specification_version: 4
 summary: New IO for Ruby
-test_files:
-- spec/nio/acceptables_spec.rb
-- spec/nio/bytebuffer_spec.rb
-- spec/nio/monitor_spec.rb
-- spec/nio/selectables/pipe_spec.rb
-- spec/nio/selectables/ssl_socket_spec.rb
-- spec/nio/selectables/tcp_socket_spec.rb
-- spec/nio/selectables/udp_socket_spec.rb
-- spec/nio/selector_spec.rb
-- spec/spec_helper.rb
-- spec/support/selectable_examples.rb
+test_files: []

data/.ruby-version

@@ -1 +0,0 @@
-2.4.0