rflow-components-http 0.0.6 → 0.0.7

data/Gemfile

@@ -1,6 +1,3 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in rflow-components-http.gemspec
-gem 'avro', :path => "../avro/lang/ruby"
-gem 'rflow', :path => "../rflow"
 gemspec

data/lib/rflow/components/http.rb

@@ -6,12 +6,12 @@ class RFlow
     module HTTP
       # Load the schemas
       SCHEMA_DIRECTORY = ::File.expand_path(::File.join(::File.dirname(__FILE__), '..', '..', '..', 'schema'))
-      
+
       SCHEMA_FILES = {
         'http_response.avsc' => 'RFlow::Message::Data::HTTP::Response',
         'http_request.avsc'  => 'RFlow::Message::Data::HTTP::Request',
       }
-      
+
       SCHEMA_FILES.each do |file_name, data_type_name|
         schema_string = ::File.read(::File.join(SCHEMA_DIRECTORY, file_name))
         RFlow::Configuration.add_available_data_type data_type_name, 'avro', schema_string
@@ -23,7 +23,7 @@ class RFlow
       RFlow::Configuration.add_available_data_extension('RFlow::Message::Data::HTTP::Request',
                                                         RFlow::Components::HTTP::Extensions::HTTPRequestExtension)
 
-      
+
       RFlow::Configuration.add_available_data_extension('RFlow::Message::Data::HTTP::Response',
                                                         RFlow::Components::HTTP::Extensions::IPConnectionExtension)
       RFlow::Configuration.add_available_data_extension('RFlow::Message::Data::HTTP::Response',

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

@@ -17,7 +17,7 @@ class RFlow
             end
           end
         end
-        
+
         # Need to be careful when extending to not clobber data already in data_object
         module HTTPRequestExtension
           def self.extended(base_data)
@@ -34,7 +34,7 @@ class RFlow
             end
           end
         end
-        
+
         # Need to be careful when extending to not clobber data already in data_object
         module HTTPResponseExtension
           def self.extended(base_data)
@@ -59,7 +59,7 @@ class RFlow
               data_object[name] = args.first.to_i
             end
           end
-          
+
         end
 
       end

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

@@ -10,9 +10,9 @@ class RFlow
       class Server < RFlow::Component
         input_port :response_port
         output_port :request_port
-        
+
         attr_accessor :port, :listen, :server_signature, :connections
-        
+
         def configure!(config)
           @listen = config['listen'] ? config['listen'] : '127.0.0.1'
           @port = config['port'] ? config['port'].to_i : 8000
@@ -43,7 +43,7 @@ class RFlow
             end
           end
         end
-        
+
         class Connection < EventMachine::Connection
           include EventMachine::HttpServer
 
@@ -58,16 +58,16 @@ 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.instance_uuid, Time.now.utc)
 
             request_message = RFlow::Message.new('RFlow::Message::Data::HTTP::Request')
@@ -83,12 +83,12 @@ class RFlow
             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
@@ -96,7 +96,7 @@ class RFlow
             server.request_port.send_message request_message
           end
 
-          
+
           def send_http_response(response_message=nil)
             resp = EventMachine::DelegatedHttpResponse.new(self)
 
@@ -105,7 +105,7 @@ class RFlow
             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
@@ -115,17 +115,18 @@ class RFlow
             end
 
             RFlow.logger.debug { "#{self.class.name}: Sending a HTTP response #{resp.status} to #{client_ip}:#{client_port}" }
-            
+
             resp.send_response
             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)
             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

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

@@ -1,7 +1,7 @@
 class RFlow
   module Components
     module HTTP
-      VERSION = "0.0.6"
+      VERSION = "0.0.7"
     end
   end
 end

data/rflow-components-http.gemspec

@@ -6,10 +6,10 @@ Gem::Specification.new do |s|
   s.name        = "rflow-components-http"
   s.version     = RFlow::Components::HTTP::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.required_ruby_version = '~> 1.9'
+  s.required_ruby_version = '>= 1.9'
   s.authors     = ["Michael L. Artz"]
   s.email       = ["michael.artz@redjack.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/redjack/rflow-components-http"
   s.summary     = %q{HTTP client and server components for the RFlow FBP framework}
   s.description = %q{HTTP client and server components for the RFlow FBP framework.  Also includes the necessary HTTP::Request and HTTP::Response message types}
 

data/spec/extensions_spec.rb

@@ -18,7 +18,7 @@ describe RFlow::Components::HTTP::Extensions::HTTPRequestExtension do
     request.data.uri = 'POST'
     request.data.uri.should == 'POST'
   end
-  
+
 end
 
 describe RFlow::Components::HTTP::Extensions::HTTPResponseExtension do
@@ -28,7 +28,7 @@ describe RFlow::Components::HTTP::Extensions::HTTPResponseExtension do
 
   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
@@ -39,5 +39,5 @@ describe RFlow::Components::HTTP::Extensions::HTTPResponseExtension do
     response.data.status_code = 404
     response.data.status_code.should == 404
   end
-  
+
 end

data/spec/schema_spec.rb

@@ -4,7 +4,7 @@ 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
-  
+
   it "should encode and decode an object" do
     request = {
       'method' => 'METHOD',
@@ -38,7 +38,7 @@ 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
-  
+
   it "should encode and decode an object" do
     response = {
       'protocol' => 'METHOD',

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'rflow-c
 require 'logger'
 
 RFlow.logger = Logger.new STDOUT
-  
+
 def decode_avro(schema_string, serialized_object)
   schema = Avro::Schema.parse(schema_string)
   sio = StringIO.new(serialized_object)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rflow-components-http
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -99,7 +99,7 @@ files:
 - spec/http_server_spec.rb
 - spec/schema_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/redjack/rflow-components-http
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -108,7 +108,7 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ~>
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement