nio4r 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b801ac687bb5098220b7d2b870f84d172cdcd0683c50175006196e7ab9f5021
-  data.tar.gz: 93301d044d3bb5fe7b7e9db9b1ab7d0b683770a22adda61b6e6ccb60bbe1a137
+  metadata.gz: cfaa168a1d757e1242d427f89189e39f424039c30fe6a384194166ae7a6e6694
+  data.tar.gz: fe2f130edf1d7963672302b21210a18d915583d096c1721b65e8ec9dc702b5ce
 SHA512:
-  metadata.gz: 000f6a6ebe2acb74581d0c4976c0fc46ed2ae2baeaea6b18622c7b7105567e3734517429867e9b1bed9df5e8b320430d4dff505f98e817d9c6248eca6a7ccdba
-  data.tar.gz: 988ee869b08ea7d91c5383ee28c505db0e595eec35c98513b3468e1ecec66224894514e352db810cc1143b797c9c6af714ebd3d3eee90291f036e09ad4a28ccd
+  metadata.gz: 0a195646b2139336075368785eeb77e2de30f700c0845cd14696572685dcfeded9e023761414ed01485e0d617ce96790c6e97cc810bfb95ed600e44cf467ac55
+  data.tar.gz: fa758ef58d38dbe41c44936998d00830e9058b1daef51fe30f551b15ed2148121d5c536dfee8c2ac9c8f064000b8df170b30cb5f87fbc7c4cb6348bd92d3ec15

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 2.3.0 (2018-03-15)
+
+* [#183](https://github.com/socketry/nio4r/pull/183)
+  Allow `Monitor#interests` to be nil
+  ([@ioquatix])
+
 ## 2.2.0 (2017-12-27)
 
 * [#151](https://github.com/socketry/nio4r/pull/151)
@@ -206,3 +212,4 @@
 [@larskanis]: https://github.com/larskanis
 [@HoneyryderChuck]: https://github.com/HoneyryderChuck
 [@tompng]: https://github.com/tompng
+[@ioquatix]: https://github.com/ioquatix

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2017 Tony Arcieri
+Copyright (c) 2011-2018 Tony Arcieri
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -95,7 +95,7 @@ to maintain a large codebase.
 
 ## License
 
-Copyright (c) 2011-2017 Tony Arcieri. Distributed under the MIT License.
+Copyright (c) 2011-2018 Tony Arcieri. Distributed under the MIT License.
 See [LICENSE.txt] for further details.
 
 Includes libev 4.24. Copyright (c) 2007-2016 Marc Alexander Lehmann.

data/ext/nio4r/monitor.c

@@ -163,7 +163,11 @@ static VALUE NIO_Monitor_interests(VALUE self)
 
 static VALUE NIO_Monitor_set_interests(VALUE self, VALUE interests)
 {
-    NIO_Monitor_update_interests(self, NIO_Monitor_symbol2interest(interests));
+    if(NIL_P(interests)) {
+        NIO_Monitor_update_interests(self, 0);
+    } else {
+        NIO_Monitor_update_interests(self, NIO_Monitor_symbol2interest(interests));
+    }
 
     return rb_ivar_get(self, rb_intern("interests"));
 }
@@ -292,9 +296,11 @@ static void NIO_Monitor_update_interests(VALUE self, int interests)
         rb_ivar_set(self, rb_intern("interests"), Qnil);
     }
 
-    monitor->interests = interests;
+    if(monitor->interests != interests) {
+        monitor->interests = interests;
 
-    ev_io_stop(monitor->selector->ev_loop, &monitor->ev_io);
-    ev_io_set(&monitor->ev_io, monitor->ev_io.fd, monitor->interests);
-    ev_io_start(monitor->selector->ev_loop, &monitor->ev_io);
+        ev_io_stop(monitor->selector->ev_loop, &monitor->ev_io);
+        ev_io_set(&monitor->ev_io, monitor->ev_io.fd, monitor->interests);
+        ev_io_start(monitor->selector->ev_loop, &monitor->ev_io);
+    }
 }

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

@@ -62,7 +62,12 @@ public class Monitor extends RubyObject {
         Ruby ruby = context.getRuntime();
         SelectableChannel channel = (SelectableChannel)io.getChannel();
 
-        key.interestOps(Nio4r.symbolToInterestOps(ruby, channel, interests));
+        if(interests != context.nil) {
+            key.interestOps(Nio4r.symbolToInterestOps(ruby, channel, interests));
+        } else {
+            key.interestOps(0);
+        }
+        
         this.interests = interests;
 
         return this.interests;

data/lib/nio/monitor.rb

@@ -26,12 +26,12 @@ module NIO
 
     # Replace the existing interest set with a new one
     #
-    # @param interests [:r, :w, :rw] I/O readiness we're interested in (read/write/readwrite)
+    # @param interests [:r, :w, :rw, nil] I/O readiness we're interested in (read/write/readwrite)
     #
     # @return [Symbol] new interests
     def interests=(interests)
       raise EOFError, "monitor is closed" if closed?
-      raise ArgumentError, "bad interests: #{interests}" unless %i[r w rw].include?(interests)
+      raise ArgumentError, "bad interests: #{interests}" unless [:r, :w, :rw, nil].include?(interests)
 
       @interests = interests
     end

data/lib/nio/version.rb

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

data/spec/nio/monitor_spec.rb

@@ -29,6 +29,12 @@ RSpec.describe NIO::Monitor do
   end
 
   describe "#interests=" do
+    it "can set interests to nil" do
+      expect(monitor.interests).not_to eq(nil)
+      monitor.interests = nil
+      expect(monitor.interests).to eq(nil)
+    end
+
     it "changes the interest set" do
       expect(monitor.interests).not_to eq(:w)
       monitor.interests = :w

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nio4r
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-27 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: New IO for Ruby