fdk 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: eb1a57393835969767b31529c287eaf5424798f82e96fb090e1727878cb1a557
-  data.tar.gz: eb32d2f88da3de6211f92405110bdbf967ea0607248d4a6ed642fd8bbce6dd5b
+SHA1:
+  metadata.gz: 3f057f3e89f9eb850ed4985a5f6126c8e8bfa48d
+  data.tar.gz: 9cae6ab2bf5440ead52770fd6bd9169f3aa16827
 SHA512:
-  metadata.gz: 84c403a1ad1c7dcde9772f020e4bdd94d37aa2297113844d14b14bcc54bb5d397ed6f51977c4507f089c0a678be5020404904a57a71223250bbaff7c20ab5783
-  data.tar.gz: 36ddfac04af2a711e64aae32ab3621bf0d2ad7f5b1e5da4f0abd7dc2488513b0603fa9a937ef61a38b4bf2beea777c4a5bbdd408f79e03e5b1b9ae13b575f64e
+  metadata.gz: 53027dd0dc51188135be54f0d6a669cf5dbb3e32a5b6bcecc504c7e96312ecb3237f9c5572b0e7675171fbbd9c0705ee1ac079851503b72d41c405308d652bfe
+  data.tar.gz: 3e8f21b25c20dd5e8595c53a0cfa80fb1c7cef152a1f3f5914d628cd13b3b86a547a4a80494215ea11f52ba75ca0a3a8dc2ed5bc7fd259e01cace8203e6d8931

data/README.md

@@ -37,13 +37,12 @@ FDK.handle(myfunction)
 require 'fdk'
 
 def myfunction(context:, input:)
-    STDERR.puts "request_url: " + context.protocol['request_url']
-    STDERR.puts "call_id: " + context.call_id
-    STDERR.puts "input: " + input.to_s
-    { message: "Hello #{input['name']}!" }
+  input_value = input.respond_to?(:fetch) ? input.fetch('name') : input
+  name = input_value.to_s.strip.empty? ? 'World' : input_value
+  { message: "Hello #{name}!" }
 end
 
-FDK.handle(:myfunction)
+FDK.handle(function: :myfunction)
 ```
 
 ## Running the example that is in the root directory of this repo

data/lib/fdk/runner.rb

@@ -6,7 +6,7 @@ require 'json'
 require 'yajl'
 
 module FDK
-  def self.handle(func)
+  def self.handle(function, input_stream: STDIN, output_stream: STDOUT)
     format = ENV['FN_FORMAT']
     if format == 'cloudevent'
       parser = Yajl::Parser.new
@@ -15,22 +15,22 @@ module FDK
         context = Context.new(event)
         body = event['data']
         # Skipping json parsing of body because it would already be a parsed map according to the format spec defined here: https://github.com/cloudevents/spec/blob/master/serialization.md#json
-        se = FDK.single_event(function: func, context: context, input: body)
+        se = FDK.single_event(function: function, context: context, input: body)
 
         # Respond with modified event
         event['data'] = se
         event['extensions']['protocol'] = {
           headers: {
-              'Content-Type' => ['application/json']
+            'Content-Type' => ['application/json']
           },
-          'status_code' => 200,
+          'status_code' => 200
         }
-        STDOUT.puts event.to_json
-        STDOUT.puts
-        STDOUT.flush
+        output_stream.puts event.to_json
+        output_stream.puts
+        output_stream.flush
       end
 
-      STDIN.each_line { |line| parser.parse_chunk(line) }
+      input_stream.each_line { |line| parser.parse_chunk(line) }
 
     elsif format == 'json'
       parser = Yajl::Parser.new
@@ -41,7 +41,7 @@ module FDK
         if context.content_type == 'application/json' && body != ''
           body = Yajl::Parser.parse(body)
         end
-        se = FDK.single_event(function: func, context: context, input: body)
+        se = FDK.single_event(function: function, context: context, input: body)
         response = {
           headers: {
             'Content-Type' => ['application/json']
@@ -49,12 +49,12 @@ module FDK
           'status_code' => 200,
           body: se.to_json
         }
-        STDOUT.puts response.to_json
-        STDOUT.puts
-        STDOUT.flush
+        output_stream.puts response.to_json
+        output_stream.puts
+        output_stream.flush
       end
 
-      STDIN.each_line { |line| parser.parse_chunk(line) }
+      input_stream.each_line { |line| parser.parse_chunk(line) }
 
     elsif format == 'default'
       event = {}
@@ -63,14 +63,13 @@ module FDK
         'type' => 'http',
         'request_url' => ENV['FN_REQUEST_URL']
       }
-      c = Context.new(event)
-      puts FDK.single_event(function: func, context: c, input: STDIN.read).to_json
+      output_stream.puts FDK.single_event(function: function, context: Context.new(event), input: input_stream.read).to_json
     else
       raise "Format '#{format}' not supported in Ruby FDK."
     end
   end
 
   def self.single_event(function:, context:, input:)
-    send function, context, input
+    send(function, context: context, input: input)
   end
 end

data/lib/fdk/version.rb

@@ -1,3 +1,3 @@
 module FDK
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fdk
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Travis Reeder
+- Ewan Slater
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,9 +31,30 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 description: Ruby Function Developer Kit for Fn Project.
 email:
 - treeder@gmail.com
+- ewan.slater@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -63,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby FDK for Fn Project