fdk 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2e64a0e5796780aa5da851a552a9c5f987b1b259
-  data.tar.gz: 4fe294730d566e185a03cdcfbddc87b69fd33450
+SHA256:
+  metadata.gz: 8958c018c5730c72cf314b69f19e7930ba7995fb3b1dddb3b012ebcf66dc6171
+  data.tar.gz: 915b07e47c9f919333e380d919f46abcc50a624bdae77153c503246f2ef61576
 SHA512:
-  metadata.gz: 99d1269bad6884de4fab41fc1ea5d45b0a72d29b9b9e4245305b0a2c510a07e400fa162d15758ea1b0ca6253cc99ce1d15c77dd88d1113e7a44e2562b47dd16d
-  data.tar.gz: ed0b93ab6cd9757e474bc02d0bb752c2861fbc9a2a910fd3a1bedcb79d1e4654e9f485d6a15106851a2388f00cd46ba88315fe56fc8bbedb9c792635c7857b00
+  metadata.gz: 235b4bcf982c408099fa2f1713a4cc658af7c9ff86b61cf1e21bbd72645a39594a063f12b9d34c8e73a4b61931e6825f3f8411cd92dc0ede3d03406cd1e201d7
+  data.tar.gz: 5f506adf41f2df8e0d719b96162c438f8fec6dc118ea10bb8e08927cf9cda73b58ed3a9b35cae8ae7ca01f04e365a5ead1df5969b584e25519c600dbedb50e96

data/lib/fdk/runner.rb

@@ -11,46 +11,91 @@ module FDK
         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)
+            first_bracket = false
+            # end_bracket=false
+            stack_count = 0
+            STDIN.each_char do |c|
+                # STDERR.puts "c: #{c}"
+                if c == '{'
+                    if !first_bracket
+                        # STDERR.puts "setting first_bracket"
+                        first_bracket = true
+                    end
+                    stack_count += 1
+                elsif c == '}'
+                    stack_count -= 1
+                end
+                if first_bracket
+                    # STDERR.puts "in first_bracket stack_count: #{stack_count}"
+                    obs += c
+                    if stack_count == 0 # found last bracket, so close this out
+                        # STDERR.puts "OBJECT: #{obs}"
+                        payload = JSON.parse(obs)
+                        # STDERR.puts "payload: #{payload.inspect}"
+                        ctx = Context.new(payload)
+                        # STDERR.puts "context: " + ctx.inspect
+                        # STDERR.flush
+                        body = payload['body']
+                        if ctx.content_type == 'application/json' && body != ""
+                            body = JSON.parse(body)
+                        end
+                        # TODO: begin/rescue so we can respond with proper error response and code
+                        se = FDK.single_event(func, ctx, body)
+                        response = {
+                            headers: {
+                                'Content-Type' => 'application/json'
+                            },
+                            'status_code' => 200,
+                            body: se.to_json,
+                        }
+                        STDOUT.puts response.to_json
+                        STDOUT.puts
+                        STDOUT.flush
+                        first_bracket = false
+                        obs = ""
                     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
+
+            # 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
@@ -69,7 +114,7 @@ module FDK
             end
             puts FDK.single_event(func, c, body).to_json
         else
-            raise "Format #{format} not supported in Ruby FDK."
+            raise "Format '#{format}' not supported in Ruby FDK."
         end
     end
 

data/lib/fdk/version.rb

@@ -1,5 +1,5 @@
 module FDK
 
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fdk
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2018-03-02 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.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby FDK for Fn Project