kimchi 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50be63f68126fd189265feaeecfa47d6fd26fff4
-  data.tar.gz: 517917d868b5133200cd51c167219dc0b85687f3
+  metadata.gz: 8d50d4f46433a4071a80b5fcf8be535a0c7a1b71
+  data.tar.gz: 0310d6289c82dceb4e8ac8e1a176ed3992992943
 SHA512:
-  metadata.gz: d1914caa884c20a3842e0941a7e4b1acf4776819f66be697ec75724d0eb051b8b379792781e606ddcf6d86fd5177bf2dfa3f8d80eb3d2dd6266b3fb8c808e581
-  data.tar.gz: a9683d576c905eb44ae74048cd16e206c88244a812d874f84dd960818ac88fce0f9897e50c3a3503a61040bb0e8c94e0b32ec0075aa8ba39d52080c47778d211
+  metadata.gz: 8cdccaf36078dc2f0d4ba0ca5d754322b3a461a2d4129edf69e62de2da9b09f4734cb38c276cef6ff27b8b0e75240a3cb117fa3afee4d159815798ec5c4d3b8f
+  data.tar.gz: 58d20f5e0145a38ffd35e59051313429d837dcf715e371dba9153a95cefda6bf71b3152199233e658cbe8d16292fed7bcaf70dcb980cca2796df0912a6c1341d

data/kimchi.gemspec

@@ -4,23 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kimchi/version'
 
 Gem::Specification.new do |spec|
-  spec.name		= "kimchi"
+  spec.name		= 'kimchi'
   spec.version		= Kimchi::VERSION
-  spec.authors		= ["Taylor Gautier", "David Berkman"]
-  spec.email		= ["robot@icix-usa.com"]
+  spec.authors		= ['Taylor Gautier', 'David Berkman']
+  spec.email		= ['robot@icix-usa.com']
   spec.summary		= %q{Various frameworks and utilities to accelerate ICIX bdd tests}
   spec.description	= %q{BDD testing frameworks and utilities}
-  spec.homepage		= "http://www.icix.com"
-  spec.license		= "MIT"
+  spec.homepage		= 'http://www.icix.com'
+  spec.license		= 'MIT'
 
   spec.files         	= `git ls-files`.split($/)
   spec.executables   	= spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    	= spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths 	= ["lib"]
+  spec.require_paths 	= ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
 
-  spec.add_dependency "uuid"
-  spec.add_dependency "bunny"
+  spec.add_dependency 'uuid'
+  spec.add_dependency 'bunny'
 end

data/lib/kimchi/version.rb

@@ -1,3 +1,3 @@
 module Kimchi
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/lib/wire.rb

@@ -1,8 +1,8 @@
-require "rubygems"
-require "fiber"
-require "uuid"
-require "bunny"
-require "net/http"
+require 'rubygems'
+require 'fiber'
+require 'uuid'
+require 'bunny'
+require 'net/http'
 
 module Wire
 
@@ -15,17 +15,17 @@ module Wire
     end
 
     # ignore this for any real service call, the http endpoint is evidently incapable of getting this from a header
-    def service= service
+    def service= (service)
       @service=service
     end
 
     # ignore this for any real service call, the http endpoint is evidently incapable of getting this from a header
-    def version= version
+    def version= (version)
       @version=version
     end
 
     def to_json
-      "{\"endpoint\": \"#{@name}\"" + ((@signature == nil) ? "" : ", \"signature\": #{@signature}") + ((@result_type == nil) ? "" : ", \"resultType\": \"#{@result_type}\"") + ((@native_type == nil) ? "" : ", \"nativeType\": \"#{@native_type}\"") + ((@service == nil) ? "" : ", \"service\": \"#{@service}\"") + ((@version == nil) ? "" : ", \"version\": \"#{@version}\"") + "}"
+      "{'endpoint': '#{@name}'" + ((@signature == nil) ? '' : ", 'signature': #{@signature}") + ((@result_type == nil) ? '' : ", 'resultType': '#{@result_type}'") + ((@native_type == nil) ? '' : ", 'nativeType': '#{@native_type}'") + ((@service == nil) ? '' : ", 'service': '#{@service}'") + ((@version == nil) ? '' : ", 'version': '#{@version}'") + '}'
     end
   end
 
@@ -40,7 +40,7 @@ module Wire
       @function
     end
 
-    def contexts= contexts
+    def contexts= (contexts)
       @contexts=contexts
     end
 
@@ -49,7 +49,7 @@ module Wire
     end
 
     def to_json
-      "{\"address\": #{@function.to_json}, \"body\": #{@arguments.to_json}, \"contexts\": #{@contexts.to_json}}"
+      "{'address': #{@function.to_json}, 'body': #{@arguments.to_json}, 'contexts': #{@contexts.to_json}}"
     end
   end
 
@@ -94,7 +94,7 @@ module Wire
       @result = result
     end
 
-    def timeout ()
+    def timeout
       raise Timeout::Error.new
     end
   end
@@ -139,13 +139,13 @@ module Wire
     end
 
     def transmit_in_only(service_name, version, invocation_signal)
-      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)
+      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, timeout_seconds)
       message_id = "#{@uuid.generate}".freeze
       @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)
+      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
@@ -153,9 +153,11 @@ module Wire
 
   class HttpTransport
     def initialize (host, port = nil)
+      @type_signatures = {'Fixnum'.freeze => 'I', 'String'.freeze => 'G', 'Array'.freeze => '!Enumerable', 'Hash'.freeze => '!Dictionary'}
+
       @host = host
-      if !port.nil?
-        @host += ":" + port
+      if port != nil
+        @host += ':' + port
       end
     end
 
@@ -164,7 +166,7 @@ module Wire
 
       begin
         uri = URI("#{@host}/api/message")
-        headers = {"Content-Type" => "application/json"}
+        headers = {'Content-Type' => 'application/json'}
         http = Net::HTTP.new(uri.host, uri.port)
         http.read_timeout = timeout_seconds
 
@@ -190,5 +192,32 @@ module Wire
 
       message
     end
+
+    # call a service method
+    def call(service, method, args = nil, result_type = nil)
+      function = Function.new(method, (args == nil) ? nil : get_signature(args), result_type)
+      contexts = [
+          {'auth'.freeze => {'user'.freeze => {'id'.freeze => '1'}, 'organization'.freeze => {'id'.freeze => '1'}, 'proxy'.freeze => {'id'.freeze => '-1'}}},
+          {'core'.freeze => {'transaction'.freeze => {'id'.freeze => UUID.new.generate.to_s}, 'stream'.freeze => {'id'.freeze => UUID.new.generate.to_s}}}
+      ]
+
+      #  puts 'Calling ' + service + '.' + method #+ signature.to_s
+      message = self.transmit(service, '1', InvocationSignal.new(function, args, contexts), 60)
+      result = message.result
+      return result['body']
+    end
+
+    # return array with the type of each argument
+    def get_signature(args)
+      arg_types=[]
+      args.each do |arg|
+        arg_types.push(get_type(arg))
+      end
+      return arg_types
+    end
+
+    def get_type (arg)
+      return @type_signatures[arg.class.to_s]
+    end
   end
 end

metadata

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