cocaine-framework 0.12.0.pre.rc9 → 0.12.0.pre.rc10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83f2620a4c2eed0e0f1eb98da8c67016552ec433
-  data.tar.gz: 4b22cf9a8d516da7dde5fcb37f56c08140810e82
+  metadata.gz: 8575f791e2fcb8c473c4d1c2f93bb83f0d878695
+  data.tar.gz: 6794e2aafa782f1e808598b4de99854f53e56fdf
 SHA512:
-  metadata.gz: 66f59a6bba578e6600a4f6c8ab9a688f4f663daba74d1cbe977e847a17f22bc7d589893169e074f3fdac4ac78de51ef2054d3aa63d467b9b575908dcf6f0da9c
-  data.tar.gz: 03f35ba5ff4e6761e5a79e40c4e1cfff39b5cce8ed7939f48c740c6cf22e1e517cbda63cb9af7337646bfa99b22606c8ed3df65d7fe1b1fffa3ac4408f144d8d
+  metadata.gz: 084a79f149c0e482ea09004a446c8bd7f6aa475e790ca3d9b7d4aa486b75b2b8d46c9e367e767342778318420bf1f925d6b230ba0b88848bb14076c2e2cd9798
+  data.tar.gz: bfa70252a8e27ff0ff3c47a1b197e74ff8f08f5b0ef2cfc75eb004a50b6638913b524411713657935504386e88aa3e7b9eb4e168fe2f3e5903a5c8d4ac85c8d1

data/lib/cocaine/cocaine.rb

@@ -85,20 +85,23 @@ module Cocaine
   # [Detail]
   # Write-only part for shared reader state.
   class TxMailbox < Mailbox
-    def initialize(queue, tree)
+    def initialize(queue, tree, session, &block)
       super queue
 
       @tree = Hash.new
       tree.each do |id, (method, txtree, rxtree)|
         @tree[id] = [method.to_sym, txtree]
       end
+
+      @session = session
+      @close = block
     end
 
     def push(id, payload)
       method, txtree = @tree[id]
       if txtree && txtree.empty?
-        # Todo: Close.
         LOG.debug "Closing RX channel #{self}"
+        @close.call @session
       end
 
       @queue << [method, payload]
@@ -110,9 +113,9 @@ module Cocaine
   class RxChannel
     attr_reader :tx, :rx
 
-    def initialize(tree)
+    def initialize(tree, session, &block)
       queue = Celluloid::Mailbox.new
-      @tx = TxMailbox.new queue, tree
+      @tx = TxMailbox.new queue, tree, session, &block
       @rx = RxMailbox.new queue
     end
   end
@@ -160,6 +163,9 @@ module Cocaine
     end
   end
 
+  class ServiceError < IOError
+  end
+
   # [Detail]
   # Service actor, which can define itself via its dispatch tree.
   class DefinedService < Meta
@@ -222,7 +228,10 @@ module Cocaine
       LOG.debug "Invoking #{@name}[#{id}=#{method}] with #{args}"
 
       txchan = TxChannel.new txtree, @counter, @socket
-      rxchan = RxChannel.new rxtree
+      rxchan = RxChannel.new rxtree, @counter do |session|
+        @sessions.delete session
+      end
+
       @sessions[@counter] = [txchan, rxchan.tx]
 
       LOG.debug "<- [#{@counter}, #{id}, #{args}]"
@@ -241,17 +250,14 @@ module Cocaine
     end
   end
 
-  class ServiceError < IOError
-  end
-
   # [API]
   # Service class. All you need is name and (optionally) locator endpoint.
   class Service < DefinedService
     def initialize(name, host=nil, port=nil)
       locator = Locator.new host, port
       tx, rx = locator.resolve name
-      method, payload = rx.recv
-      if method == :error
+      id, payload = rx.recv
+      if id == :error
         raise ServiceError.new payload
       end
 
@@ -351,7 +357,9 @@ module Cocaine
     def invoke(session, event)
       actor = @actors[event]
       txchan = TxChannel.new RPC::TXTREE, session, @socket
-      rxchan = RxChannel.new RPC::RXTREE
+      rxchan = RxChannel.new RPC::RXTREE, session do |session_|
+        @sessions.delete session_
+      end
 
       if actor
         @sessions[session] = [txchan, rxchan.tx]

data/lib/cocaine/version.rb

@@ -1,3 +1,3 @@
 module Cocaine
-  VERSION = '0.12.0-rc9'
+  VERSION = '0.12.0-rc10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocaine-framework
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre.rc9
+  version: 0.12.0.pre.rc10
 platform: ruby
 authors:
 - Evgeny Safronov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement