fdk 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7a564f14b0f61260a330e08debfe705ccc5843b
-  data.tar.gz: aed28341f97120c579414d2e73007b9f57ce8188
+  metadata.gz: 889ac354ba75007c3c66504348de355f1e9df299
+  data.tar.gz: 57a526258372f03fb5277e6f0b8614879a729d5a
 SHA512:
-  metadata.gz: 7fd389a7f528f957169587477e5db8a547dd992aa964667c99782af011f41a0dc2e68cb10f45ed437c295a482a3d60bbf8c13c76bb36b20c03f0aba3210e43dc
-  data.tar.gz: 973be6fd2a97c2a1315044de4a06363641a6fb8b492c331c48aa2c0730efbf0c0fde2b9a7dca9b5ccc155997617efa6f2939685f9befe1b15549bc1686a416cd
+  metadata.gz: 0e34f13c1f3296853605b3331d9154904dce1dbfc3c7c12fe8256246a9e7715d7b340cbb8ba1877a0c714544f03a3ddc0cc7998f109589760604d16610b4f59c
+  data.tar.gz: 37a51d0e2fc38dd1aa6974f445bd4aa85f8165827f52084d27930ab24a83bedb694e4e691e45382c0e5f0296897cea462fa4e80501db6f300db51c4d6a8191d3

data/README.md

@@ -36,16 +36,40 @@ FDK.call(myfunc)
 ```ruby
 require 'fdk'
 
+def myfunc(context, input)
+    return {message: "Hello World!"}
+end
+
+FDK.handle(:myfunc)
+
 def call(context, input) 
     # Do some work here
-    STDERR.puts "input: " + input
-    return "I got: " + input + "!"
+    return "Hello " + input + "!"
 end
 ```
 
-## Example in root dir
+## Running the example that is in the root directory of this repo
+
+```sh
+echo '{"name":"coolio"}' | fn run
+```
 
 ```sh
-echo '{"yo":"dawg"}' | fn run
+fn deploy --app myapp --local && echo '{"name":"coolio"}' | fn call myapp /fdk-ruby
 ```
 
+Change to hot:
+
+Update func.yaml: `format: json`
+
+```sh
+fn deploy --app myapp --local && echo '{"name":"coolio"}' | fn call myapp /fdk-ruby
+```
+
+## Compare cold and hot
+
+Run
+
+```sh
+ruby loop.rb
+```

data/lib/fdk/context.rb

@@ -1,10 +1,16 @@
 module FDK
+
+    # Config looks up values in the env vars
+    class Config
+        def [](key)
+            return ENV[key.upcase]
+        end
+    end
+
     class Context
 
-        # fixed
-        attr_accessor :app_name, :path, :format, :memory, :type, :config
-        # per request
-        attr_accessor :request_url, :call_id, :headers
+        # TODO: Rethink FN_PATH, if it's a reference to the route, maybe it should be FN_ROUTE? eg: if it's a dynamic path, this env var would 
+        #    show the route's path (ie: route identifier), eg: /users/:name, not the actual path.
 
         # FN_REQUEST_URL - the full URL for the request (parsing example)
         # FN_APP_NAME - the name of the application that matched this route, eg: myapp
@@ -18,23 +24,29 @@ module FDK
         # $X - any configuration values you've set for the Application or the Route. Replace X with the upper cased name of the config variable you set. Ex: minio_secret=secret will be exposed via MINIO_SECRET env var.
         # FN_PARAM_$Y
 
-        def initialize()
-            config = {}
-            ENV.each_pair do |k,v|
-                puts "#{k}: #{v}"
-                if k.start_with? "FN_"
-                    k2 = k[3..-1].downcase
-                    self.instance_variable_set("@#{k2}".to_sym, v)                    
-                    next
-                end
-                config[k] = v
-            end
-            headers = {}
+        attr_reader :payload, :config
+
+        def initialize(payload)
+            @payload = payload
         end
 
-        # This returns the per request data, such as headers, request_id, etc
-        def [](key)
-            return config[key]
+        def config
+            return @config if @config
+            @config = Config.new
+            return @config
         end
+
+        def call_id
+            payload['call_id']
+        end
+
+        def content_type
+            payload['content_type']
+        end
+
+        def protocol
+            payload['protocol']
+        end
+
     end
 end

data/lib/fdk/runner.rb

@@ -2,24 +2,79 @@
 # Executes it with input
 # Responds with output
 
+require 'json'
+
 module FDK
-    def self.included(base)
-        puts "MODULE FDK INCLUDED"
-        p base
-    end
 
     def self.handle(func)
-        puts "Calling func: " + func.to_s
-        if ENV['FN_FORMAT'] == "json"
-            # TODO:
+        # STDERR.puts `env`
+        format = ENV['FN_FORMAT']
+        if format == "json"
+            obs = ""
+            endbracket=false
+            STDIN.each do |line|
+                # STDERR.puts "LINE: --#{line}--"
+                # STDERR.flush
+                ls = line.strip
+                STDERR.puts "ls: #{ls}"
+                if ls == "}"
+                    STDERR.puts "endbracket true"
+                    endbracket=true
+                elsif ls == "" && endbracket
+                    # TODO: this isn't very robust, probably needs to be better :/
+                    STDERR.puts "OBJECT: #{obs}"
+                    payload = JSON.parse(obs)
+                    # STDERR.puts "payload: #{payload.inspect}"
+                    c = Context.new(payload)
+                    # STDERR.puts "context: " + c.inspect
+                    # STDERR.flush
+                    body = payload['body']
+                    if c.content_type == 'application/json'
+                        body = JSON.parse(body)
+                    end
+                    # TODO: begin/rescue so we can respond with proper error response and code
+                    s = FDK.single_event(func, c, body)
+                    response = {
+                        headers: {
+                            'Content-Type' => 'application/json'
+                        },
+                        'status_code' => 200,
+                        body: s.to_json,
+                    }
+                    STDOUT.puts response.to_json
+                    STDOUT.puts
+                    STDOUT.flush
+                    obs = ""
+                    next
+                else 
+                    endbracket = false
+                end
+                obs += line
+            end
+        elsif format == "default"
+            # TODO: check if content type json, and if so, parse it before passing it in
+            body = STDIN.read
+            payload = {}
+            payload['call_id'] = ENV['FN_CALL_ID']
+            payload['content_type'] = ENV['FN_HEADER_Content_Type']
+            payload['protocol'] = {
+                'type' => 'http',
+                'request_url' => ENV['FN_REQUEST_URL']
+            }
+            # STDERR.puts "payload: #{payload}"
+            c = Context.new(payload)
+            if c.content_type == "application/json"
+                # STDERR.puts "parsing json"
+                body = JSON.parse(body)
+            end
+            puts FDK.single_event(func, c, body).to_json
         else
-            c = Context.new()
-            payload = STDIN.read
-            FDK.single_event(func, c, payload)
+            raise "Format #{format} not supported in Ruby FDK."
         end
     end
+
     def self.single_event(func, c, i)
-        o = send func, c, i
-        puts o
+        s = send func, c, i
+        return s
     end
 end

data/lib/fdk/version.rb

@@ -1,5 +1,5 @@
 module FDK
 
-    VERSION = "0.0.1"
+    VERSION = "0.0.5"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fdk
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby FDK for Fn Project