flammarion 0.1.2 → 0.1.3

data/lib/flammarion/version.rb

@@ -1,3 +1,3 @@
   module Flammarion
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end

data/lib/rubame/rubame.rb

@@ -1,6 +1,5 @@
 require 'websocket'
 require 'socket'
-require 'fiber'
 
 module Rubame
   class Server
@@ -74,8 +73,8 @@ module Rubame
       client.closed = true
     end
 
-    def run(time = 0, &blk)
-      readable, writable = IO.select(@reading, @writing, nil, 0)
+    def run(&blk)
+      readable, writable = IO.select(@reading, @writing, nil)
 
       if readable
         readable.each do |socket|
@@ -90,16 +89,6 @@ module Rubame
           blk.call(client) if client and blk
         end
       end
-
-      # Check for lazy send items
-      timer_start = Time.now
-      time_passed = 0
-      begin
-        @clients.each do |s, c|
-          c.send_some_lazy(5)
-        end
-        time_passed = Time.now - timer_start
-      end while time_passed < time
     end
 
     def stop
@@ -116,8 +105,6 @@ module Rubame
       @frame = WebSocket::Frame::Incoming::Server.new(:version => @handshake.version)
       @opened = false
       @messaged = []
-      @lazy_queue = []
-      @lazy_current_queue = nil
       @closed = false
       @server = server
     end
@@ -136,40 +123,6 @@ module Rubame
       end
     end
 
-    def lazy_send(data)
-      @lazy_queue.push data
-    end
-
-    def get_lazy_fiber
-      # Create the fiber if needed
-      if @lazy_fiber == nil or !@lazy_fiber.alive?
-        @lazy_fiber = Fiber.new do
-          @lazy_current_queue.each do |data|
-            send(data)
-            Fiber.yield unless @lazy_current_queue[-1] == data
-          end
-        end
-      end
-
-      return @lazy_fiber
-    end
-
-    def send_some_lazy(count)
-      # To save on cpu cycles, we don't want to be chopping and changing arrays, which could get quite large.  Instead,
-      # we iterate over an array which we are sure won't change out from underneath us.
-      unless @lazy_current_queue
-        @lazy_current_queue = @lazy_queue
-        @lazy_queue = []
-      end
-
-      completed = 0
-      begin
-        get_lazy_fiber.resume
-        completed += 1
-      end while (@lazy_queue.count > 0 or @lazy_current_queue.count > 0) and completed < count
-
-    end
-
     def onopen(&blk)
       if @opened
         begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flammarion
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubame