kimchi 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8883424bb826544feaef6c94a6b55f11692b5d08
-  data.tar.gz: f28ce0474a811d495876985354ffc03c489c6457
+  metadata.gz: 5654ac8ca0de9106fded06aca9f0191d7e470843
+  data.tar.gz: 865917d2156790f803f631aa93ce448f2134df2a
 SHA512:
-  metadata.gz: 13a423da3a62ff956d1ed2e3eaa9d13db48d0af6070b0328abd4d3833e609a4c4b62d32f670e74be49f9226ce68948816c13919d5e5e00b577768533ee9382c2
-  data.tar.gz: 382c61c84602b4e7591d44611bc5d4abbcd2aa8789a384b3ba269d8fe6ff0d8f946d8294582a55c3f0978a203cc4889525a19bf9ada6622a2abfc757a1d5cbce
+  metadata.gz: cec8f80cac3960fbc2be24be6ba42cca3f52c2aa99343c095b2bc4df867a2a0f7f4c25255f8d4cbbbaae56938d9fa6b79c57684d88791a42a1a0f866f578d9c9
+  data.tar.gz: b3cbbdd7d9b552ebb93b77a7f90c4ba474799a19799c2f21ae28daa2ab58d2d4fdd24d9707f6fe08a3d92658e125baa93cd6173d3da9c45380299e54f3085ec0

data/lib/kimchi/version.rb

@@ -1,3 +1,3 @@
 module Kimchi
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/wire.rb

@@ -1,4 +1,5 @@
 require "rubygems"
+require "fiber"
 require "uuid"
 require "bunny"
 require "net/http"
@@ -39,7 +40,7 @@ module Wire
       @function
     end
 
-    def contexts=contexts
+    def contexts= contexts
       @contexts=contexts
     end
 
@@ -77,6 +78,27 @@ module Wire
     end
   end
 
+  class Message
+
+    @result = nil
+
+    def result
+      while @result == nil
+        sleep(1)
+      end
+
+      @result
+    end
+
+    def complete (result)
+      @result = result
+    end
+
+    def timeout ()
+      raise Timeout::Error.new
+    end
+  end
+
   class RabbitMQTransport
     def initialize (host, port)
       @connection = Bunny.new("amqp://#{host}:#{port}")
@@ -120,10 +142,12 @@ module Wire
       initialize_service(service_name).publish(invocation_signal.to_json, :routing_key => "#{version}.2", :headers => {"x-opt-callerId" => "#{@caller_id}"}, :content_type => "application/json", :message_id => "#{@uuid.generate}", :timestamp => Time.new.to_i)
     end
 
-    def transmit(service_name, version, invocation_signal, callback, timeout_seconds)
+    def transmit(service_name, version, invocation_signal, timeout_seconds)
       message_id = "#{@uuid.generate}".freeze
-      @message_hash[message_id] = MessageCallback.new(@message_hash, message_id, callback, timeout_seconds)
+      @message_hash[message_id] = MessageCallback.new(@message_hash, message_id, message = Message.new, timeout_seconds)
       initialize_service(service_name).publish(invocation_signal.to_json, :routing_key => "#{version}.2", :headers => {"x-opt-callerId" => "#{@caller_id}"}, :content_type => "application/json", :message_id => "#{message_id}", :timestamp => Time.new.to_i)
+
+      message
     end
   end
 
@@ -133,30 +157,36 @@ module Wire
       @port = port
     end
 
-    def transmit (service_name, version, invocation_signal, callback, timeout_seconds)
-      uri = URI("#{@host}:#{@port}/api/message")
-      headers = {"Content-Type" => "application/json"}
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.read_timeout = timeout_seconds
+    def transmit (service_name, version, invocation_signal, timeout_seconds)
+      message = Message.new
 
-      invocation_signal.function.service = service_name
-      invocation_signal.function.version = version
+      begin
+        uri = URI("#{@host}:#{@port}/api/message")
+        headers = {"Content-Type" => "application/json"}
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.read_timeout = timeout_seconds
 
-      context_hash = {}
-      invocation_signal.contexts.each {|context| context.each{|key,value| context_hash[key] = value}}
-      invocation_signal.contexts = context_hash
+        invocation_signal.function.service = service_name
+        invocation_signal.function.version = version
 
-      res = http.post(uri.path, invocation_signal.to_json, headers)
+        context_hash = {}
+        invocation_signal.contexts.each { |context| context.each { |key, value| context_hash[key] = value } }
+        invocation_signal.contexts = context_hash
 
-      case res
-        when Net::HTTPSuccess
-          response = JSON.parse res.body
-          callback.complete(response)
-        else
-          res.error!
+        res = http.post(uri.path, invocation_signal.to_json, headers)
+
+        case res
+          when Net::HTTPSuccess
+            response = JSON.parse res.body
+            message.complete(response)
+          else
+            res.error!
+        end
+      rescue Timeout::Error
+        message.timeout
       end
-    rescue Timeout::Error
-      callback.timeout
+
+      message
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kimchi
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Taylor Gautier
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler