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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ada955a5c6940f5bf3fd7f3efc12210f2dc1d9bf
-  data.tar.gz: aeb02c85a89c3912846c4d30d299b10fe58cf83c
+  metadata.gz: 83f2620a4c2eed0e0f1eb98da8c67016552ec433
+  data.tar.gz: 4b22cf9a8d516da7dde5fcb37f56c08140810e82
 SHA512:
-  metadata.gz: 543fa619455552de5c4a4dc2232d0aef928b84c7b2517afe91b78f2b3441d18b285877c74e149b70b1c14362417cf59945b875cf546409b90c70d241f8c336b9
-  data.tar.gz: 2fd175be846b3bb64e3725f00dd8e641b4cfc9a72ebecc3669e23e0e03daad64af504de8fb5b21d622bfb04877489210f3a0a405133af4008e641fc617cb4c71
+  metadata.gz: 66f59a6bba578e6600a4f6c8ab9a688f4f663daba74d1cbe977e847a17f22bc7d589893169e074f3fdac4ac78de51ef2054d3aa63d467b9b575908dcf6f0da9c
+  data.tar.gz: 03f35ba5ff4e6761e5a79e40c4e1cfff39b5cce8ed7939f48c740c6cf22e1e517cbda63cb9af7337646bfa99b22606c8ed3df65d7fe1b1fffa3ac4408f144d8d

data/lib/cocaine/cocaine.rb

@@ -52,7 +52,6 @@ module Cocaine
               }
           ]
       }
-      ERROR_CODE = 1
     end
   end
 
@@ -91,18 +90,18 @@ module Cocaine
 
       @tree = Hash.new
       tree.each do |id, (method, txtree, rxtree)|
-        @tree[id] = txtree
+        @tree[id] = [method.to_sym, txtree]
       end
     end
 
     def push(id, payload)
-      txtree = @tree[id]
+      method, txtree = @tree[id]
       if txtree && txtree.empty?
         # Todo: Close.
         LOG.debug "Closing RX channel #{self}"
       end
 
-      @queue << [id, payload]
+      @queue << [method, payload]
     end
   end
 
@@ -251,8 +250,8 @@ module Cocaine
     def initialize(name, host=nil, port=nil)
       locator = Locator.new host, port
       tx, rx = locator.resolve name
-      id, payload = rx.recv
-      if id == Default::Locator::ERROR_CODE
+      method, payload = rx.recv
+      if method == :error
         raise ServiceError.new payload
       end
 
@@ -435,7 +434,7 @@ module Cocaine
         Cocaine::LOG.debug "After receive: '#{{:id => id, :payload => payload}}'"
 
         case id
-          when Cocaine::RPC::CHUNK
+          when :write
             method, url, version, headers, body = MessagePack::unpack payload
             Cocaine::LOG.debug "After unpack: '#{id}, #{[method, url, version, headers, body]}'"
 
@@ -481,8 +480,8 @@ module Cocaine
             end
 
             body.close if body.respond_to?(:close)
-          when Cocaine::RPC::ERROR
-          when Cocaine::RPC::CHOKE
+          when :error
+          when :choke
           else
             # Type code here.
         end

data/lib/cocaine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocaine-framework
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre.rc8
+  version: 0.12.0.pre.rc9
 platform: ruby
 authors:
 - Evgeny Safronov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec