kimchi 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74d556ba7f72327244762b5bf743e90c9275214b
-  data.tar.gz: 1a7e1224ad0fbfcf028f21608b0b7c7986121597
+  metadata.gz: 692b1c5b73b1c9aca217219ad4fa844e95c00ba8
+  data.tar.gz: 529260fb62c822cfd3b579ae748dffa6292165a8
 SHA512:
-  metadata.gz: 157121e698f35462e62a2603c74956bbc60e4a61b6a0e70ef76957a0637981f2be20dfac7cf339bd7539bcd91a4f1d28420a7bfa5786bf44859155bff5386934
-  data.tar.gz: f19fa638106dba00a06c073ecdccddf962727bf0210e87f700cda708bcae958d7d7b2e1f6ff4eb090702e845c0835d1470e27ec3d85b5ac432e4b8ecfe9d8c6e
+  metadata.gz: 8b6f5f6b8fd1f64e0fd6ff966ba2c84f809fb4363bc3d066fd38cbb459dec36b4e09ec1dab446d9d1cbcdbe9818e22026b4c7194d093c2e61710ba55fe68ad22
+  data.tar.gz: 6dcb65f0b93c370be8d6da1576acc27766f3eaae43b9b7a800a9ced8fb9028a2e1da01949497f5b6571b54b3167591d02a51d5e2844959fa9f067633326df288

data/lib/kimchi/version.rb

@@ -1,3 +1,3 @@
 module Kimchi
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/lib/wire.rb

@@ -5,13 +5,15 @@ require "bunny"
 module Wire
 
   class Function
-    def initialize(name, signature = nil, result = nil)
+    def initialize(name, signature = nil, result_type = nil, native_type = nil)
       @name = name
       @signature = signature
-      @result = result
+      @result_type = result_type
+      @native_type = native_type
     end
+
     def to_json
-      "{\"endpoint\": \"#{@name}\"" + ((@signature == nil) ? "" : ", \"signature\": #{@signature}") + ((@result == nil) ? "" : ", \"result\": \"#{@result}\"") + "}"
+      "{\"endpoint\": \"#{@name}\"" + ((@signature == nil) ? "" : ", \"signature\": #{@signature}") + ((@result_type == nil) ? "" : ", \"resultType\": \"#{@result_type}\"") + ((@native_type == nil) ? "" : ", \"nativeType\": \"#{@native_type}\"") + "}"
     end
   end
 
@@ -21,8 +23,34 @@ module Wire
       @arguments = arguments
       @contexts = contexts
     end
+
     def to_json
-     "{\"address\": #{@function.to_json}, \"body\": #{@arguments.to_json}, \"contexts\": #{@contexts}}"
+      "{\"address\": #{@function.to_json}, \"body\": #{@arguments.to_json}, \"contexts\": #{@contexts}}"
+    end
+  end
+
+  class MessageCallback
+    def initialize (message_hash, message_id, callback, timeout_seconds)
+      @semaphore = Mutex.new
+      @callback = callback
+      @result = nil
+
+      Thread.new do
+        sleep(timeout_seconds)
+        message_hash.delete(message_id)
+        @semaphore.synchronize do
+          if @result.nil?
+            callback.timeout
+          end
+        end
+      end
+    end
+
+    def set_result (result)
+      @semaphore.synchronize do
+        @result = result
+        @callback.complete(@result)
+      end
     end
   end
 
@@ -34,6 +62,8 @@ module Wire
       @uuid = UUID.new
       @caller_id = @uuid.generate
 
+      @message_hash = {}
+
       request_channel = @connection.create_channel
       @request_exchange = request_channel.topic("#{service_name}.request")
 
@@ -43,15 +73,39 @@ module Wire
       response_queue = response_channel.queue("#{response_queue_name}", {:durable => false, :exclusive => true, :auto_delete => true})
 
       response_queue.bind(response_exchange, :routing_key => "#{@caller_id}").subscribe do |delivery_info, metadata, payload|
-        result_body = JSON.parse(payload)
-        puts "#{payload}"
+        if (message_callback = @message_hash[metadata[:correlation_id]]) != nil
+          result_body = JSON.parse(payload)
+          message_callback.set_result(result_body)
+        end
       end
     end
 
     def transmit_in_only(version, invocation_signal)
+      @request_exchange.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
 
-      @request_exchange.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)
+    def transmit(version, invocation_signal, callback, timeout_seconds)
+      message_id = "#{@uuid.generate}".freeze
+      @message_hash[message_id] = MessageCallback.new(@message_hash, message_id, callback, timeout_seconds)
+      @request_exchange.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)
     end
   end
 
-end
+  class HttpTransport
+    def initialize (host, port)
+      @host = host
+      @port = port
+    end
+    def transmit (version, invocation_signal, callback, timeout_seconds)
+      uri = URI("#{@host}:#{@port}/api/message")
+      headers = {"Content-Type" => "application/json", "X-Icix-Version" => "#{version}"}
+      http = Net::HTTP.new(uri.host, uri.port)
+
+      res = http.post(uri.path, invocation_signal.to_json, headers)
+      res.code.should == '200'
+
+      response = JSON.parse res.body
+      callback.complete(response)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kimchi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Taylor Gautier
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,10 +80,9 @@ files:
 - README.md
 - Rakefile
 - kimchi.gemspec
-- lib/kimchi.rb
+- lib/cucumber/features/step_definitions/common.rb
 - lib/kimchi/version.rb
 - lib/wire.rb
-- src/main/ruby/kimchi/wire/foo.rb
 homepage: http://www.icix.com
 licenses:
 - MIT

data/src/main/ruby/kimchi/wire/foo.rb

@@ -1,7 +0,0 @@
-require_relative "wire"
-require "json"
-
-puts "hellO"
-Wire::RabbitMQTransport.new("localhost", 5672, "echo").transmit_in_only("1", Wire::InvocationSignal.new(Wire::Function.new("talk"),{"message" => "Hello out there"}, []))
-sleep 60
-