rflow-components-http 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 97f9bcce41e96a58c58513b6edb0ea9d02c1f5d4
-  data.tar.gz: 161ef0f6852b256d9270a641e541e56bc1e60bfe
+SHA256:
+  metadata.gz: 51e7a5ffaa2fe475e26873cf3a3fa8682e9cedc12c2e653430f700b3fc9f4997
+  data.tar.gz: f62e1e136e2beab1f5b061f267a4b63e91b185dbfcf2ad18ba39b75efb3903f8
 SHA512:
-  metadata.gz: 98a0c1e856216c7332bab76d5f45c05ca07dded321ef20b60e5a3a54b771895c3ab9690a38f35d44bc54282547bcc3ce3bc38480015c2f485111d9c88e1880e9
-  data.tar.gz: 1b35d706f8d764a859c4877641e90dd62dca32c639f6416e528709ca10bb00ad92acf734b1e1397b6027f5b4197004b8976f7dee754ae0a88f35c89cdeefdda4
+  metadata.gz: 4546c3f537e1a82a034e0983cab8c52974d21c36e4f186ce48f3289108f21219d90df0c3cd07b2dbe2904b211da4ec6965d62de9887bc1fbacc9b81318e17dfb
+  data.tar.gz: 11d7410f6d54df4ebe0c207a0624ac2f51a636571c2f61ae47f175cb43ec231f3f573d034ec4704915ac2d51598f86a401fb2533a960ecad30f39a309561afb7

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.1
+ruby-2.6.4

data/.travis.yml

@@ -17,6 +17,4 @@ before_install:
 script: bundle exec rspec spec
 
 notifications:
-  hipchat:
-    rooms:
-      secure: ZVFjNSjLq8mbEaEHTqKZWovWMR17Q8cs4q3spt2Q9Q7QJp+oRz4yFVKYZCRYPsh0+mnSo2Hl8qHn/JGhxI2HsiLQVHK/9tf4TNXmT3DL//fQPTSMEHUn5D0M0CNCAWFBIbUh2PocRJxhIdUEl3PS7U4mca2nDoA+V+r+HToTZpw=
+  slack: redjack:FMYKDe4eilb9usdN8BQe5ZMA

data/lib/rflow/components/http/version.rb

@@ -2,7 +2,7 @@ class RFlow
   module Components
     module HTTP
       # The gem version.
-      VERSION = "1.1.1"
+      VERSION = "2.0.0"
     end
   end
 end

data/schema/http_request.avsc

@@ -10,10 +10,10 @@
         {"name": "server_port",  "type": ["int", "null"]},
 
         {"name": "method",       "type": "string"},
-        {"name": "uri",          "type": "string"},
-        {"name": "query_string", "type": ["string", "null"]},
+        {"name": "uri",          "type": "bytes"},
+        {"name": "query_string", "type": ["bytes", "null"]},
         {"name": "protocol",     "type": "string"},
-        {"name": "headers",      "type": {"type": "map", "values": ["string", "null"]}},
+        {"name": "headers",      "type": {"type": "map", "values": ["bytes", "null"]}},
         {"name": "content",      "type": ["bytes", "null"]}
     ]
 }

data/schema/http_response.avsc

@@ -12,7 +12,7 @@
         {"name": "protocol",             "type": "string"},
         {"name": "status_code",          "type": "int"},
         {"name": "status_reason_phrase", "type": "string"},
-        {"name": "headers",              "type": {"type": "map", "values": "string"}},
+        {"name": "headers",              "type": {"type": "map", "values": "bytes"}},
         {"name": "content",              "type": "bytes"}
     ]
 }

data/spec/schema_spec.rb

@@ -29,6 +29,33 @@ describe 'RFlow::Message::Data::HTTP::Request Avro Schema' do
       expect(decoded['content']).to eq(request['content'])
     end
   end
+
+  it "should encode and decode non-UTF8 data" do
+    request = {
+      'method' => 'METHOD',
+      'uri' => "\xFF".force_encoding('binary'),
+      'query_string' => "\xFF".force_encoding('binary'),
+      'protocol' => 'PROTOCOL',
+      'headers' => {
+        'header1' => "\xFF".force_encoding('binary'),
+        'header2' => "\xFF".force_encoding('binary')
+      },
+      'content' => '',
+    }
+
+    expect { encode_avro(schema, request) }.to_not raise_error
+    encoded_request = encode_avro(schema, request)
+
+    expect { decode_avro(schema, encoded_request) }.to_not raise_error
+    decode_avro(schema, encoded_request).tap do |decoded|
+      expect(decoded['method']).to eq(request['method'])
+      expect(decoded['uri']).to eq(request['uri'])
+      expect(decoded['query_string']).to eq(request['query_string'])
+      expect(decoded['protocol']).to eq(request['protocol'])
+      expect(decoded['headers']).to eq(request['headers'])
+      expect(decoded['content']).to eq(request['content'])
+    end
+  end
 end
 
 describe 'RFlow::Message::Data::HTTP::Response Avro Schema' do
@@ -58,4 +85,29 @@ describe 'RFlow::Message::Data::HTTP::Response Avro Schema' do
       expect(decoded['content']).to eq(response['content'])
     end
   end
+
+  it "should encode and decode non-UTF8 data" do
+    response = {
+      'protocol' => 'METHOD',
+      'status_code' => 200,
+      'status_reason_phrase' => 'STATUSREASONPHRASE',
+      'headers' => {
+        'header1' => "\xFF".force_encoding('binary'),
+        'header2' => "\xFF".force_encoding('binary')
+      },
+      'content' => 'CONTENT',
+    }
+
+    expect { encode_avro(schema, response) }.to_not raise_error
+    encoded_response = encode_avro(schema, response)
+
+    expect { decode_avro(schema, encoded_response) }.to_not raise_error
+    decode_avro(schema, encoded_response).tap do |decoded|
+      expect(decoded['protocol']).to eq(response['protocol'])
+      expect(decoded['status_code']).to eq(response['status_code'])
+      expect(decoded['status_reason_phrase']).to eq(response['status_reason_phrase'])
+      expect(decoded['headers']['header1']).to eq(response['headers']['header1'])
+      expect(decoded['content']).to eq(response['content'])
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rflow-components-http
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Michael L. Artz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2019-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rflow
@@ -149,8 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rflow-components-http
-rubygems_version: 2.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: HTTP client and server components for the RFlow FBP framework