rflow-components-http 1.0.0a2 → 1.0.0a3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7c8e0aafd255f7936e411610a811d1af425de6a5
+  data.tar.gz: 733e7ea0910aca051f9979f0a58a2982ab645cc6
+SHA512:
+  metadata.gz: ecde2cf8d154c68120901bebb4f7abaf80af439384e7ae314a994761b8f58b222e0d0862aea45ed2ba0f211e82fa144f3e6bcaf4b7fc36e20110bef838aa3469
+  data.tar.gz: dc580c77986021c51228604bea59a575cf91e84aaeaffcdf2a14e446c93bb3574df1bcd5a27637f12733f1752b06d66f98cd778081fbb7029b4e2aaf873df6e2

data/.rspec

@@ -0,0 +1 @@
+--color -fd

data/.ruby-gemset

@@ -0,0 +1 @@
+rflow-dev

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.1.1

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

@@ -1,10 +1,7 @@
 class RFlow
   module Components
     module HTTP
-
-      # The set of extensions to add capability to HTTP data types
       module Extensions
-
         module IPConnectionExtension
           # Default accessors
           # TODO: validate the stuffs
@@ -21,7 +18,7 @@ class RFlow
         # Need to be careful when extending to not clobber data already in data_object
         module HTTPRequestExtension
           def self.extended(base_data)
-            base_data.data_object ||= {'uri' => '/', 'method' => 'GET', 'protocol' => 'HTTP/1.0', 'headers'=>{}, 'content' => ''}
+            base_data.data_object ||= {'uri' => '/', 'method' => 'GET', 'protocol' => 'HTTP/1.0', 'headers' => {}, 'content' => ''}
           end
 
           # Default accessors
@@ -59,9 +56,7 @@ class RFlow
               data_object[name] = args.first.to_i
             end
           end
-
         end
-
       end
     end
   end

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

@@ -1,12 +1,10 @@
 require 'eventmachine'
 require 'evma_httpserver'
-
 require 'rflow'
 
 class RFlow
   module Components
     module HTTP
-
       class Server < RFlow::Component
         input_port :response_port
         output_port :request_port
@@ -16,7 +14,7 @@ class RFlow
         def configure!(config)
           @listen = config['listen'] ? config['listen'] : '127.0.0.1'
           @port = config['port'] ? config['port'].to_i : 8000
-          @connections = Hash.new
+          @connections = {}
         end
 
         def run!
@@ -58,59 +56,55 @@ class RFlow
             no_environment_strings
           end
 
-
           def receive_data(data)
             RFlow.logger.debug { "#{self.class.name}: Received #{data.bytesize} bytes of data from #{client_ip}:#{client_port} to #{@server_ip}:#{@server_port}" }
             super
           end
 
-
           def process_http_request
             RFlow.logger.debug { "#{self.class.name}: Received HTTP request from #{client_ip}:#{client_port} to #{@server_ip}:#{@server_port} for #{@http_request_uri}" }
 
-            processing_event = RFlow::Message::ProcessingEvent.new(server.uuid, Time.now.utc)
-
-            request_message = RFlow::Message.new('RFlow::Message::Data::HTTP::Request')
-
-            request_message.data.client_ip    = @client_ip
-            request_message.data.client_port  = @client_port
-            request_message.data.server_ip    = @server_ip
-            request_message.data.server_port  = @server_port
-
-            request_message.data.method       = @http_request_method
-            request_message.data.uri          = @http_request_uri
-            request_message.data.query_string = @http_query_string
-            request_message.data.protocol     = @http_protocol
-            request_message.data.content      = @http_post_content
-            request_message.data.headers      = {}
-
-            @http_headers.split(/\0/).each do |header|
-              name, val = header.split(/:\s*/, 2)
-              request_message.data.headers[name] = val
-            end
-
-            processing_event.context = signature.to_s
-            processing_event.completed_at = Time.now.utc
-            request_message.provenance << processing_event
+            server.request_port.send_message(RFlow::Message.new('RFlow::Message::Data::HTTP::Request').tap do |m|
+              m.data.client_ip    = @client_ip
+              m.data.client_port  = @client_port
+              m.data.server_ip    = @server_ip
+              m.data.server_port  = @server_port
+
+              m.data.method       = @http_request_method
+              m.data.uri          = @http_request_uri
+              m.data.query_string = @http_query_string
+              m.data.protocol     = @http_protocol
+              m.data.content      = @http_post_content
+              m.data.headers      = {}
+
+              @http_headers.split(/\0/).each do |header|
+                name, val = header.split(/:\s*/, 2)
+                m.data.headers[name] = val
+              end
 
-            server.request_port.send_message request_message
+              m.provenance << RFlow::Message::ProcessingEvent.new(server.uuid, Time.now.utc).tap do |e|
+                e.context = signature.to_s
+                e.completed_at = Time.now.utc
+              end
+            end)
+          rescue Exception => e
+            RFlow.logger.error "Error processing HTTP request from #{client_ip}:#{client_port} to #{@server_ip}:#{@server_port} for #{@http_request_uri}: #{e.class.name}: #{e.message}, because: #{e.backtrace.inspect}"
           end
 
-
-          def send_http_response(response_message=nil)
-            resp = EventMachine::DelegatedHttpResponse.new(self)
-
-            # Default values
-            resp.status                  = 200
-            resp.content                 = ""
-            resp.headers["Content-Type"] = "text/html"
-            resp.headers["Server"]       = "Apache"
-
-            if response_message
-              resp.status  = response_message.data.status_code
-              resp.content = response_message.data.content
-              response_message.data.headers.each do |header, value|
-                resp.headers[header] = value
+          def send_http_response(response_message = nil)
+            resp = EventMachine::DelegatedHttpResponse.new(self).tap do |r|
+              # Default values
+              r.status                  = 200
+              r.content                 = ""
+              r.headers["Content-Type"] = "text/html"
+              r.headers["Server"]       = "Apache"
+
+              if response_message
+                r.status  = response_message.data.status_code
+                r.content = response_message.data.content
+                response_message.data.headers.each do |header, value|
+                  r.headers[header] = value
+                end
               end
             end
 
@@ -120,17 +114,15 @@ class RFlow
             close_connection_after_writing
           end
 
-
           # Called when a connection is torn down for whatever reason.
           # Remove this connection from the server's list
-          def unbind(reason=nil)
+          def unbind(reason = nil)
             RFlow.logger.debug { "#{self.class.name}: Disconnected from HTTP client #{client_ip}:#{client_port}#{reason.nil? ? '' : " due to '#{reason}'"}" }
             server.connections.delete(self.signature.to_s)
             super()
           end
         end
       end
-
     end
   end
 end

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

@@ -1,7 +1,7 @@
 class RFlow
   module Components
     module HTTP
-      VERSION = "1.0.0a2"
+      VERSION = "1.0.0a3"
     end
   end
 end

data/rflow-components-http.gemspec

@@ -21,9 +21,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rflow', '~> 1.0.0a1'
-  s.add_dependency 'eventmachine_httpserver', '~> 0.2'
+  s.add_dependency 'rflow', '~> 1.0.0a2'
+  s.add_dependency 'eventmachine_httpserver_update', '~> 0.2.1'
 
-  s.add_development_dependency 'rspec', '~> 2.6'
+  s.add_development_dependency 'rspec', '~> 2.99'
+  s.add_development_dependency 'rspec-collection_matchers', '~> 0.0.4'
   s.add_development_dependency 'rake', '~> 0.8'
 end

data/spec/rflow/components/http/extensions/extensions_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+class RFlow
+  module Components
+    module HTTP
+      module Extensions
+        describe HTTPRequestExtension do
+          it "should work" do
+            Configuration.available_data_extensions['RFlow::Message::Data::HTTP::Request'].should include(described_class)
+
+            Message.new('RFlow::Message::Data::HTTP::Request').data.tap do |d|
+              d.uri.should == '/'
+              d.method.should == 'GET'
+              d.query_string.should == nil
+              d.protocol.should == 'HTTP/1.0'
+              d.headers.should == {}
+              d.uri = '/foo'
+              d.uri.should == '/foo'
+            end
+          end
+        end
+
+        describe HTTPResponseExtension do
+          it "should work" do
+            Configuration.available_data_extensions['RFlow::Message::Data::HTTP::Response'].should include(described_class)
+
+            Message.new('RFlow::Message::Data::HTTP::Response').data.tap do |d|
+              d.protocol.should == 'HTTP/1.0'
+              d.status_code.should == 200
+              d.status_reason_phrase.should == 'OK'
+              d.headers.should == {}
+              d.content.should == ''
+              d.status_code = 404
+              d.status_code.should == 404
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/rflow/components/http/server_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+class RFlow
+  module Components
+    module HTTP
+      describe Server do
+        let(:conn) { Server::Connection.new('a') }
+
+        it "should return a default HTTP response" do
+          conn.should_receive(:send_data).with("HTTP/1.1 200 OK\r\nContent-Length: 0\r\nContent-Type: text/html\r\nServer: Apache\r\n\r\n")
+          conn.should_receive(:send_data).with('')
+          conn.stub(:close_connection)
+
+          conn.send_http_response(Message.new("RFlow::Message::Data::HTTP::Response"))
+        end
+
+        it "should use proper status reason phrases" do
+          conn.should_receive(:send_data).with("HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\nContent-Type: text/html\r\nServer: Apache\r\n\r\n")
+          conn.should_receive(:send_data).with('')
+          conn.stub(:close_connection)
+
+          conn.send_http_response(Message.new("RFlow::Message::Data::HTTP::Response").tap {|r| r.data.status_code = 404 })
+        end
+
+        it "should return a fully configured HTTP response" do
+          m = Message.new("RFlow::Message::Data::HTTP::Response").tap do |m|
+            m.data.status_code = 1337
+            m.data.status_reason_phrase = "JUST BECAUSE" # ignored as status phrases are overwritten
+            m.data.headers['Boom'] = 'Town'
+            m.data.content = 'boom'
+          end
+
+          expected_body = "boom"
+
+          conn.should_receive(:send_data).with("HTTP/1.1 1337\r\nBoom: Town\r\nContent-Length: 4\r\nContent-Type: text/html\r\nServer: Apache\r\n\r\n")
+          conn.should_receive(:send_data).with('boom')
+          conn.stub(:close_connection)
+
+          conn.send_http_response(m)
+        end
+      end
+    end
+  end
+end

data/spec/schema_spec.rb

@@ -1,9 +1,7 @@
-require 'spec_helper.rb'
+require 'spec_helper'
 
 describe 'RFlow::Message::Data::HTTP::Request Avro Schema' do
-  before(:each) do
-    @schema_string = RFlow::Configuration.available_data_types['RFlow::Message::Data::HTTP::Request']['avro']
-  end
+  let(:schema) { RFlow::Configuration.available_data_types['RFlow::Message::Data::HTTP::Request']['avro'] }
 
   it "should encode and decode an object" do
     request = {
@@ -18,26 +16,23 @@ describe 'RFlow::Message::Data::HTTP::Request Avro Schema' do
       'content' => '',
     }
 
-    expect {encode_avro(@schema_string, request)}.to_not raise_error
-    avro_encoded_request = encode_avro(@schema_string, request)
-
-    expect {decode_avro(@schema_string, avro_encoded_request)}.to_not raise_error
-    decoded_request = decode_avro(@schema_string, avro_encoded_request)
-
-    decoded_request['method'].should == request['method']
-    decoded_request['uri'].should == request['uri']
-    decoded_request['query_string'].should == request['query_string']
-    decoded_request['protocol'].should == request['protocol']
-    decoded_request['headers'].should == request['headers']
-    decoded_request['content'].should == request['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|
+      decoded['method'].should == request['method']
+      decoded['uri'].should == request['uri']
+      decoded['query_string'].should == request['query_string']
+      decoded['protocol'].should == request['protocol']
+      decoded['headers'].should == request['headers']
+      decoded['content'].should == request['content']
+    end
   end
 end
 
-
 describe 'RFlow::Message::Data::HTTP::Response Avro Schema' do
-  before(:each) do
-    @schema_string = RFlow::Configuration.available_data_types['RFlow::Message::Data::HTTP::Response']['avro']
-  end
+  let(:schema) { RFlow::Configuration.available_data_types['RFlow::Message::Data::HTTP::Response']['avro'] }
 
   it "should encode and decode an object" do
     response = {
@@ -51,17 +46,16 @@ describe 'RFlow::Message::Data::HTTP::Response Avro Schema' do
       'content' => 'CONTENT',
     }
 
-    expect {encode_avro(@schema_string, response)}.to_not raise_error
-    avro_encoded_response = encode_avro(@schema_string, response)
-
-    expect {decode_avro(@schema_string, avro_encoded_response)}.to_not raise_error
-    decoded_response = decode_avro(@schema_string, avro_encoded_response)
-
-    decoded_response['protocol'].should == response['protocol']
-    decoded_response['status_code'].should == response['status_code']
-    decoded_response['status_reason_phrase'].should == response['status_reason_phrase']
-    decoded_response['headers'].should == response['headers']
-    decoded_response['content'].should == response['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|
+      decoded['protocol'].should == response['protocol']
+      decoded['status_code'].should == response['status_code']
+      decoded['status_reason_phrase'].should == response['status_reason_phrase']
+      decoded['headers'].should == response['headers']
+      decoded['content'].should == response['content']
+    end
   end
 end
-

data/spec/spec_helper.rb

@@ -1,13 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'rflow-components-http'))
-
 require 'logger'
+require 'rflow-components-http'
 
 RFlow.logger = Logger.new STDOUT
+RFlow.logger.level = 5
 
 def decode_avro(schema_string, serialized_object)
   schema = Avro::Schema.parse(schema_string)
-  sio = StringIO.new(serialized_object)
-  Avro::IO::DatumReader.new(schema, schema).read Avro::IO::BinaryDecoder.new(sio)
+  Avro::IO::DatumReader.new(schema, schema).read Avro::IO::BinaryDecoder.new(StringIO.new(serialized_object))
 end
 
 def encode_avro(schema_string, object)

metadata

@@ -1,78 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: rflow-components-http
 version: !ruby/object:Gem::Version
-  version: 1.0.0a2
-  prerelease: 5
+  version: 1.0.0a3
 platform: ruby
 authors:
 - Michael L. Artz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rflow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0a1
+        version: 1.0.0a2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0a1
+        version: 1.0.0a2
 - !ruby/object:Gem::Dependency
-  name: eventmachine_httpserver
+  name: eventmachine_httpserver_update
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.99'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 description: HTTP client and server components for the RFlow FBP framework.  Also
@@ -83,52 +88,54 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/rflow-components-http.rb
 - lib/rflow/components/http.rb
-- lib/rflow/components/http/client.rb
 - lib/rflow/components/http/extensions.rb
 - lib/rflow/components/http/server.rb
 - lib/rflow/components/http/version.rb
 - rflow-components-http.gemspec
 - schema/http_request.avsc
 - schema/http_response.avsc
-- spec/extensions_spec.rb
-- spec/http_server_spec.rb
+- spec/rflow/components/http/extensions/extensions_spec.rb
+- spec/rflow/components/http/server_spec.rb
 - spec/schema_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/redjack/rflow-components-http
 licenses:
 - Apache-2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: rflow-components-http
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HTTP client and server components for the RFlow FBP framework
 test_files:
-- spec/extensions_spec.rb
-- spec/http_server_spec.rb
+- spec/rflow/components/http/extensions/extensions_spec.rb
+- spec/rflow/components/http/server_spec.rb
 - spec/schema_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/spec/extensions_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper.rb'
-
-describe RFlow::Components::HTTP::Extensions::HTTPRequestExtension do
-  before(:each) do
-    @schema_string = RFlow::Configuration.available_data_types['RFlow::Message::Data::HTTP::Request']['avro']
-  end
-
-  it "should work" do
-    RFlow::Configuration.available_data_extensions['RFlow::Message::Data::HTTP::Request'].should include(described_class)
-
-    request = RFlow::Message.new('RFlow::Message::Data::HTTP::Request')
-    request.data.uri.should == '/'
-    request.data.method.should == 'GET'
-    request.data.query_string.should == nil
-    request.data.protocol.should == 'HTTP/1.0'
-    request.data.headers.should == {}
-
-    request.data.uri = 'POST'
-    request.data.uri.should == 'POST'
-  end
-
-end
-
-describe RFlow::Components::HTTP::Extensions::HTTPResponseExtension do
-  before(:each) do
-    @schema_string = RFlow::Configuration.available_data_types['RFlow::Message::Data::HTTP::Response']['avro']
-  end
-
-  it "should work" do
-    RFlow::Configuration.available_data_extensions['RFlow::Message::Data::HTTP::Response'].should include(described_class)
-
-    response = RFlow::Message.new('RFlow::Message::Data::HTTP::Response')
-    response.data.protocol.should == 'HTTP/1.0'
-    response.data.status_code.should == 200
-    response.data.status_reason_phrase.should == 'OK'
-    response.data.headers.should == {}
-    response.data.content.should == ''
-
-    response.data.status_code = 404
-    response.data.status_code.should == 404
-  end
-
-end

data/spec/http_server_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-describe RFlow::Components::HTTP::Server do
-
-  it "should return a default HTTP response" do
-    c = RFlow::Components::HTTP::Server::Connection.new('a')
-    m = RFlow::Message.new("RFlow::Message::Data::HTTP::Response")
-
-    expected_header = "HTTP/1.1 200 ...\r\nContent-Type: text/html\r\nContent-length: 0\r\nServer: Apache\r\n\r\n"
-    expected_body = ""
-
-    c.should_receive(:send_data) do |header|
-      header.should == expected_header
-    end
-    c.should_receive(:send_data) do |body|
-      body.should == expected_body
-    end
-    c.should_receive(:close_connection).any_number_of_times
-
-    c.send_http_response(m)
-  end
-
-  it "should return a fully configured HTTP response" do
-    c = RFlow::Components::HTTP::Server::Connection.new('a')
-
-    m = RFlow::Message.new("RFlow::Message::Data::HTTP::Response")
-    m.data.status_code = 1337
-    m.data.status_reason_phrase = "JUST BECAUSE"
-    m.data.headers['Boom'] = 'Town'
-    m.data.content = 'boom'
-
-    expected_header = "HTTP/1.1 1337 ...\r\nBoom: Town\r\nContent-Type: text/html\r\nContent-length: 4\r\nServer: Apache\r\n\r\n"
-    expected_body = "boom"
-
-    c.should_receive(:send_data) do |header|
-      header.should == expected_header
-    end
-    c.should_receive(:send_data) do |body|
-      body.should == expected_body
-    end
-    c.should_receive(:close_connection).any_number_of_times
-
-    c.send_http_response(m)
-  end
-
-end