zulip-client 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28469725b7fb68767bb0d61bee21ba57d07981c2
-  data.tar.gz: 25b5846794a969010cda1b67e562db4ee3f5a057
+  metadata.gz: 2ed91bd167a9937bfb461ebc2d8698b0ec8c3eee
+  data.tar.gz: ca6fe355afd2a7539a0fbd78b8179d7d722cce2f
 SHA512:
-  metadata.gz: 62ce637e1393b02ed343fd6b4aa4a3cff6bcc8f553c1262fffda5c579a9a53f804c5f16ea7f7d9abae927bacf7fb3b94cfa47dda289f46069b964815f4ba1b51
-  data.tar.gz: ce9e95208c481471fda11f018d5edc917ec2df6d1554a2fe1b1bc8181873abe6c401460705b907187eae4014c592608cd5a8fe683b30c71d4e75f4241edc0e65
+  metadata.gz: 7950360517f5f47f448c8e944869bb0bd3367fabee10d920036cb1590cfd54530c4a700d27859d491d061ec8da2e6f269296137defc49ac8c3b5040f7678dff6
+  data.tar.gz: 9ec7af9c69102d606b2b3cb2d881c9b3b5c02835ab85e92b36add9e91bc9e8de9cbdf3988e14c46b2752850da2f96a6f16eddb44a143d40b6977a77527beeb29

data/lib/zulip/client.rb

@@ -80,47 +80,34 @@ module Zulip
     end
 
     def stream_event(event_types: [], narrow: [])
-      queue_id, last_event_id = register(event_types: event_types, narrow: narrow)
-      response_reader, response_writer = IO.pipe
-      command_reader, @command_writer = IO.pipe
       @running = true
-      t = Thread.new do
-        loop do
-          break unless @running
-          response = get_events(queue_id: queue_id, last_event_id: last_event_id)
-          response_writer.write(response)
-          sleep(1)
-        end
-      end
-      buf = ""
+      queue_id, last_event_id = register(event_types: event_types, narrow: narrow)
       loop do
-        reader, _writer, _exception = IO.select([response_reader, command_reader])
-        case reader.first
-        when response_reader
-          buf << response_reader.readpartial(1024)
-          begin
-            res = JSON.parse(buf, symbolize_names: true)
-          rescue JSON::ParserError
-            # Ignore error because buf is incomplete JSON
-            next
+        break unless @running
+        response = nil
+        @connection.in_parallel do
+          response = @connection.get do |request|
+            request.url("/api/v1/events")
+            request.params["queue_id"] = queue_id
+            request.params["last_event_id"] = last_event_id
           end
-          buf = ""
-          if res[:result] == "success"
-            res[:events].each do |event|
-              last_event_id = event[:id]
-              if event_types.empty? || event_types.include?(event[:type])
-                yield event
-              end
+        end
+
+        if response.success?
+          res = JSON.parse(response.body, symbolize_names: true)
+          raise Zulip::ResponseError, res[:msg] unless res[:result] == "success"
+          res[:events].each do |event|
+            last_event_id = event[:id]
+            if event_types.empty? || event_types.include?(event[:type])
+              yield event
             end
-          else
-            raise Zulip::ResponseError, res[:msg]
           end
-        when command_reader
-          break
+        else
+          raise Zulip::ResponseError, response.reason_phrase
         end
       end
+    ensure
       unregister(queue_id)
-      t.join
     end
 
     def stream_message(narrow: [])
@@ -131,23 +118,6 @@ module Zulip
 
     def close_stream
       @running = false
-      @command_writer.write("q") if @command_writer
-    end
-
-    private
-
-    def get_events(queue_id:, last_event_id:)
-      response = @connection.get do |request|
-        request.url("/api/v1/events")
-        request.params["queue_id"] = queue_id
-        request.params["last_event_id"] = last_event_id
-        request.params["dont_block"] = true
-      end
-      if response.success?
-        response.body
-      else
-        raise Zulip::ResponseError, response.reason_phrase
-      end
     end
   end
 end

data/lib/zulip/client/version.rb

@@ -1,5 +1,5 @@
 module Zulip
   class Client
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zulip-client
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - okkez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-09 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday