em-nodes 0.2.3 → 0.2.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fe922a1ce046c59c80d0e07fef0231bf5fa01e61
+  data.tar.gz: 1779d2eae2c85475290ff25dd6c885da0bffc3df
+SHA512:
+  metadata.gz: b654c62869647ee287a5b5e15627020ef2512aafa72db19d18e9eb13e9f8260bbd1959449e5af292fb65e290835b45cab86299edbd1cd743b8e3898805b531d3
+  data.tar.gz: 571c7a47c76818db7fabfd20c106290bdf6237937da0e5e97d6538e34aaefdcaf34313cfd2706dd75ed20fa21e02364a4985f184d5a87f43ae7314037c835fce

data/examples/work_client.rb

@@ -0,0 +1,22 @@
+require 'bundler/setup'
+Bundler.require
+require 'logger'
+
+l = Logger.new(STDOUT)
+l.level = Logger::INFO
+EM::Nodes.logger = l
+
+class Client < EM::Nodes::DefaultClient
+  def info
+    { :name => "client" }
+  end
+  
+  def on_task(task_id, x)
+    new_x = x + 1
+    send_task_result(task_id, new_x)
+  end
+end
+
+EM.run do
+  Client.connect "/tmp/em_nodes_test.sock"
+end

data/examples/work_server.rb

@@ -0,0 +1,25 @@
+require 'bundler/setup'
+Bundler.require
+require 'logger'
+
+l = Logger.new(STDOUT)
+l.level = Logger::INFO
+EM::Nodes.logger = l
+
+class Server < EM::Nodes::DefaultServer
+  def on_task_result(new_x)
+    puts new_x
+    EM.stop
+  end
+end
+
+EM.run do
+  Server.start "/tmp/em_nodes_test.sock"
+  
+  Thread.new do
+    puts "waiting for first client"
+    sleep 0.5 while Server.ready_clients.count < 1
+
+    Server.ready_clients.first.send_task(0)
+  end
+end

data/lib/em-nodes/client/task.rb

@@ -3,16 +3,23 @@ class EM::Nodes::Client
 
     def on_task(task_id, data)
       # redefine me
+      # after task done, should call send_task_result(task_id, result)
     end
 
-  private
-
-    def on_task_internal(task_id, data)
-      on_task(task_id, data)
+    def tasks
+      @tasks ||= {}
     end
 
     def send_task_result(task_id, result)
       send_task_result_internal(task_id, result)
+      tasks.delete(task_id)
+    end
+
+  private
+
+    def on_task_internal(task_id, data)
+      obj = on_task(task_id, data)
+      tasks[task_id] = obj
     end
   end
 end

data/lib/em-nodes/version.rb

@@ -2,5 +2,5 @@ module EventMachine
 end
 
 module EventMachine::Nodes
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/task_spec.rb

@@ -34,9 +34,10 @@ describe "Task spec" do
     client4 = nil
     EM.run do
       $server4 = Server4.start('127.0.0.1', 19995)
+      sleep 0.1
       $client4 = Client4.connect('127.0.0.1', 19995)
 
-      EM.next_tick do
+      EM.add_timer(0.1) do
         client4 = Server4.clients.first
         10.times { |i| client4.send_task(i) }
       end
@@ -52,7 +53,7 @@ describe "Task spec" do
       $server4 = Server4.start('127.0.0.1', 19996)
       $client4 = Client4.connect('127.0.0.1', 19996)
 
-      EM.next_tick do
+      EM.add_timer(0.1) do
         client4 = Server4.clients.first
         20.times { |i| client4.send_task(i) }
       end

data/spec/waiter_spec.rb

@@ -0,0 +1,55 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+class Waiter
+  attr_accessor :time
+  def initialize(conn, task_id)
+    @time = Time.now
+    EM.add_timer(1) { conn.send_task_result(task_id, true) }
+  end
+end
+
+class Client5 < EM::Nodes::Client
+  include TaskFeature
+
+  def on_task(task_id, data)
+    Waiter.new(self, task_id)    
+  end
+end
+
+
+class Server5 < EM::Nodes::Server
+  include TaskFeature
+
+  def on_task_result(res)
+    $server5_results << res
+    EM.stop if $server5_results.size == 10
+  end
+end
+
+describe "write task object, to prevent GC" do
+  before {
+    $server5_results = []
+  }
+
+  it "should work" do
+    client5 = nil
+    EM.run do
+      $server5 = Server5.start('127.0.0.1', 19997)
+      $client5 = Client5.connect('127.0.0.1', 19997)
+
+      EM.add_timer(0.1) do
+        client5 = Server5.clients.first
+        10.times { |i| client5.send_task(i) }
+      end
+
+      EM.add_timer(0.5) do
+        $server5_results.should be_empty
+        $client5.tasks.size.should == 10
+        $client5.tasks.values.map(&:time).compact.size.should == 10
+      end
+    end
+
+    $server5_results.size.should == 10
+    $client5.tasks.size.should == 0
+  end
+end

metadata

@@ -1,92 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-nodes
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
+version: !ruby/object:Gem::Version
+  version: 0.2.4
 platform: ruby
-authors: 
+authors:
 - "'Konstantin Makarchev'"
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-05-29 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
+date: 2015-06-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
-  requirement: *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple EM client server, and some stuffs
-email: 
+email:
 - "'kostya27@gmail.com'"
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .rspec
+files:
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,6 +88,8 @@ files:
 - em-nodes.gemspec
 - examples/chat_client.rb
 - examples/chat_server.rb
+- examples/work_client.rb
+- examples/work_server.rb
 - lib/em-nodes.rb
 - lib/em-nodes/adapter.rb
 - lib/em-nodes/client.rb
@@ -119,44 +109,36 @@ files:
 - spec/simple_spec.rb
 - spec/spec_helper.rb
 - spec/task_spec.rb
-has_rdoc: true
+- spec/waiter_spec.rb
 homepage: https://github.com/kostya/em-nodes
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple EM client server, and some stuffs
-test_files: 
+test_files:
 - spec/base_spec.rb
 - spec/hello_spec.rb
 - spec/simple2_spec.rb
 - spec/simple_spec.rb
 - spec/spec_helper.rb
 - spec/task_spec.rb
+- spec/waiter_spec.rb