web-connect 0.4.12 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 273dc9f8b0c167f981f7dc726a5a2c90b4b3cca9
-  data.tar.gz: cf3251442213fa65617e0b69591345596efbf294
+  metadata.gz: 52cd6dd3ae425d48864e984ed72dd41b35ef1f4a
+  data.tar.gz: ec3b4953d6f45e8be6074fb603145da6e78ba2a0
 SHA512:
-  metadata.gz: b7c425a18993a3ef9138327ced689d54f82ca5acb214e119b24c9bf41ca7ef7682070bbf2a70c4f43627b3c77978d28d56b430995c9aa8cbcc845ff7fc4352a1
-  data.tar.gz: a94076bac46ff5f1a6ef825a47d3895b7b54910155284b120556a50c6dbddd0b6ee54ec4b3fb0c2ddb3638dcc05d39682b0efa5c644f2d5e291060c18e96a158
+  metadata.gz: e455749ad8bb95f79ebd8947eb3f4d02572ad7bfad0009cb5a40b042de0aa9791d9414536941fe9648c09fc6c8d4cde9c9d61974d7f50d8515612bd51f22f98e
+  data.tar.gz: 6c8036b621934fb75db6ba1d082d8f370fb00e6d3c11039bdea5c86e0d91e8a721b4932ab8a860f6a5ad3c1b386f8094a311ac892ac2ceeb03a275bcb550d1c0

data/lib/netfira/web_connect/request_filter.rb

@@ -9,21 +9,42 @@ module Netfira::WebConnect
     end
 
     def call(env)
-      if (env['CONTENT_TYPE'] || env['HTTP_CONTENT_TYPE']) == 'application/x-netfira-webconnect-packed'
-        begin
-          unpack env
-        rescue Zlib::GzipFile::Error => e
-          return [400, {}, {errorCode: 19, errorMessage: "Gzip decompression error: #{e.message}"}]
+      begin
+        if (env['CONTENT_TYPE'] || env['HTTP_CONTENT_TYPE']) == 'application/x-netfira-webconnect-packed'
+          begin
+            unpack env
+          rescue Zlib::GzipFile::Error, Zlib::DataError => e
+            return [400, {}, {errorCode: 19, errorMessage: "Decompression error: #{e.message}"}]
+          end
         end
+        env['WC_ACCEPTABLE_REQUEST_TYPES'] = %w[packed unpacked]
+        @app.call env
+      rescue Exception => error
+        # TODO: this mirrors code in rack_app.rb. Consolidate?
+        [
+            500,
+            {'Content-Type' => 'application/json'},
+            {
+                errorCode: 1,
+                errorMessage: 'Uncaught Exception',
+                exception: {
+                    class: error.class.name,
+                    message: error.message,
+                    backtrace: error.backtrace
+                }
+            }
+        ]
       end
-      env['WC_ACCEPTABLE_REQUEST_TYPES'] = %w[packed unpacked]
-      @app.call env
     end
 
     def unpack(env)
       env['original.rack.input'] = input = env['rack.input']
 
-      input = Zlib::GzipReader.new(input) if (env['CONTENT_ENCODING'] || env['HTTP_CONTENT_ENCODING']) == 'gzip'
+      input = case env['CONTENT_ENCODING'] || env['HTTP_CONTENT_ENCODING']
+        when 'gzip' then Zlib::GzipReader.new(input)
+        when 'deflate' then StringIO.new(Zlib::Inflate.inflate input.read)
+        else input
+      end
 
       method, path, query_string, headers, body = parse_request(input)
 

data/lib/netfira/web_connect/version.rb

@@ -1,6 +1,6 @@
 module Netfira
   module WebConnect
-    VERSION = '0.4.12'
+    VERSION = '0.4.13'
     PLATFORM_AND_VERSION = 'Rack/' << VERSION
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-connect
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
 platform: ruby
 authors:
 - Neil E. Pearson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord