carnivore-http 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aeabfa6f6dc0811a7cdeb3249e701a58e9eb899
-  data.tar.gz: 7d01fd0e327f4d9172dd064e556482456a6b1483
+  metadata.gz: 9595b652c27534813c2b972ca1d51be428cb3ac7
+  data.tar.gz: c279093c9392ec09668b29c57603e4b0aca6c91c
 SHA512:
-  metadata.gz: 056b6335c5c9c622f2f159423076e4e974250a504fe30b4e55b563f125954a01235b6e60d12b5d99bb96dfc1e272456396c052076c953861d8acd3c40d6d2fd5
-  data.tar.gz: a7db515e4fe78aca2aa5581edf95b0f9a5895b763b48370b4c9eed700ef3741ebeedb67d26253d8862e3bf41b99a808e46720770ed4b10edbf4864f5862dadd9
+  metadata.gz: 76dab7d9fbd67731c3cb8130c335045222574f480bbb21688efcded5caa1697d99b61ab3506d2545267a1e7d42ff047856ca76124d57dfbaf058c5864743076d
+  data.tar.gz: d628ecc733fd036c324f85e9418fcaebafdd0f70b2d6a849ac32192e41e1b2db1c71dd2cdcae08707b4458d7194eebce95c20832fe71aa8b926bed28c40f281b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.3.0
+* Updates for carnivore 1.0
+* Remove reel and replace with puma
+
 # v0.2.8
 * Set confirmed state directly into message
 * Support body on non-200 type responses

data/carnivore-http.gemspec

@@ -10,9 +10,13 @@ Gem::Specification.new do |s|
   s.description = 'Carnivore HTTP source'
   s.license = 'Apache 2.0'
   s.require_path = 'lib'
-  s.add_dependency 'carnivore', '>= 0.1.8'
-  s.add_dependency 'reel', '~> 0.5.0'
-  s.add_dependency 'blockenspiel'
-  s.add_dependency 'htauth'
-  s.files = Dir['**/*']
+  s.add_runtime_dependency 'carnivore', '>= 1.0.0', '< 2.0'
+  s.add_runtime_dependency 'puma', '~> 2.13.4'
+  s.add_runtime_dependency 'rack', '~> 1.6.4'
+  s.add_runtime_dependency 'blockenspiel', '~> 0.4.5'
+  s.add_runtime_dependency 'htauth', '~> 2.0.0'
+  s.add_development_dependency 'http'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'pry'
+  s.files = Dir['lib/**/*'] + %w(carnivore-http.gemspec README.md CHANGELOG.md)
 end

data/lib/carnivore-http/app.rb

@@ -0,0 +1,218 @@
+require 'rack'
+require 'timeout'
+require 'carnivore-http'
+
+module Carnivore
+  module Http
+    # Rack app for processing messages
+    class App
+
+      # Customized response
+      class Response < Rack::Response
+
+        # Lazy status mapping
+        STATUS_CODES = Smash.new(
+          "continue" => 100,
+          "switching_protocols" => 101,
+          "processing" => 102,
+          "ok" => 200,
+          "created" => 201,
+          "accepted" => 202,
+          "non_authoritative_information" => 203,
+          "no_content" => 204,
+          "reset_content" => 205,
+          "partial_content" => 206,
+          "multi_status" => 207,
+          "already_reported" => 208,
+          "im_used" => 226,
+          "multiple_choices" => 300,
+          "moved_permanently" => 301,
+          "found" => 302,
+          "see_other" => 303,
+          "not_modified" => 304,
+          "use_proxy" => 305,
+          "temporary_redirect" => 307,
+          "permanent_redirect" => 308,
+          "bad_request" => 400,
+          "unauthorized" => 401,
+          "payment_required" => 402,
+          "forbidden" => 403,
+          "not_found" => 404,
+          "method_not_allowed" => 405,
+          "not_acceptable" => 406,
+          "proxy_authentication_required" => 407,
+          "request_timeout" => 408,
+          "conflict" => 409,
+          "gone" => 410,
+          "length_required" => 411,
+          "precondition_failed" => 412,
+          "payload_too_large" => 413,
+          "uri_too_long" => 414,
+          "unsupported_media_type" => 415,
+          "range_not_satisfiable" => 416,
+          "expectation_failed" => 417,
+          "misdirected_request" => 421,
+          "unprocessable_entity" => 422,
+          "locked" => 423,
+          "failed_dependency" => 424,
+          "upgrade_required" => 426,
+          "precondition_required" => 428,
+          "too_many_requests" => 429,
+          "request_header_fields_too_large" => 431,
+          "internal_server_error" => 500,
+          "not_implemented" => 501,
+          "bad_gateway" => 502,
+          "service_unavailable" => 503,
+          "gateway_timeout" => 504,
+          "http_version_not_supported" => 505,
+          "variant_also_negotiates" => 506,
+          "insufficient_storage" => 507,
+          "loop_detected" => 508,
+          "not_extended" => 510,
+          "network_authentication_required" => 511
+        )
+
+        # Create a new response
+        #
+        # @param code [String, Symbol, Integer] status code of response
+        # @param string_or_args [String, Hash] response content
+        # @option :body [String] response body
+        # @option :json [Hash, Array] response body to serialize
+        # @option :form [Hash] response body to encode
+        # @option :headers [Hash] response headers
+        # @return [self]
+        def initialize(code, string_or_args, &block)
+          status = STATUS_CODES.fetch(code, code).to_i
+          case string_or_args
+          when String
+            body = string_or_args
+            headers = {}
+          when Hash
+            headers = string_or_args.fetch(:headers, {})
+            if(string_or_args[:body])
+              body = string_or_args[:body]
+              unless(headers['Content-Type'])
+                headers['Content-Type'] = 'text/plain'
+              end
+            elsif(string_or_args[:json])
+              body = MultiJson.dump(string_or_args[:json])
+              unless(headers['Content-Type'])
+                headers['Content-Type'] = 'application/json'
+              end
+            elsif(string_or_args[:form])
+              body = dump_query_string(string_or_args[:form])
+              unless(headers['Content-Type'])
+                headers['Content-Type'] = 'application/x-www-form-urlencoded'
+              end
+            end
+          else
+            raise TypeError.new "Invalid type provided. Expected `String` or `Hash` but got `#{string_or_args.class}`"
+          end
+          super(body, status, headers, &block)
+        end
+
+      end
+
+
+      # Customized request
+      class Request < Rack::Request
+
+        include Zoidberg::SoftShell
+
+        option :cache_signals
+
+        # @return [Response]
+        attr_reader :response_value
+
+        # Respond to the request
+        #
+        # @param code [String, Symbol, Integer] response status code
+        # @param string_or_args [String, Hash]
+        # @return [TrueClass, FalseClass]
+        def respond(code, string_or_args='')
+          unless(@response_value)
+            signal(:response, Response.new(code, string_or_args))
+          else
+            raise 'Response was already set!'
+          end
+        end
+
+        # Response to this request
+        #
+        # @param timeout [Integer] maximum number of seconds to wait
+        # @return [Response]
+        def response(timeout=5)
+          unless(@response_value)
+            begin
+              Timeout.timeout(timeout) do
+                @response_value = wait_for(:response)
+              end
+            rescue Timeout::Error
+              @response_value = Response.new(:internal_server_error, 'Timeout waiting for response')
+            end
+          end
+          @response_value
+        end
+
+        # @return [Smash]
+        def headers
+          Smash[
+            env.map do |k,v|
+              k.start_with?('rack.') ? nil : [k.downcase.sub(/^http_/, '').to_sym,v]
+            end.compact
+          ]
+        end
+
+        # @return [String]
+        def remote_addr
+          headers['REMOTE_ADDR']
+        end
+
+        # @return [Symbol]
+        def method
+          request_method.to_s.downcase.to_sym
+        end
+
+      end
+
+      # @return [Proc] action to process request
+      attr_reader :action
+
+      # Create a new instance
+      #
+      # @param args [Hash]
+      # @yield processes request
+      # @return [self]
+      def initialize(args={}, &block)
+        @action = block
+      end
+
+      # Process the request
+      #
+      # @param env [Hash]
+      # @return [Array]
+      def call(env)
+        request = Request.new(env)
+        action.call(request)
+        request.response.finish
+      end
+
+      class << self
+
+        # Build a new app
+        #
+        # @param args [Hash] options
+        # @param block [Proc]
+        # @return [App]
+        def build_app(args={}, &block)
+          Rack::Builder.new do
+            use Rack::Chunked
+            run self.new(args, &block)
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/carnivore-http/http.rb

@@ -8,24 +8,22 @@ module Carnivore
       def process(*process_args)
         unless(@processing)
           @processing = true
-          srv = build_listener do |con|
-            con.each_request do |req|
-              begin
-                msg = build_message(con, req)
-                msg = format(msg)
-                if(authorized?(msg))
-                  callbacks.each do |name|
-                    c_name = callback_name(name)
-                    debug "Dispatching #{msg} to callback<#{name} (#{c_name})>"
-                    callback_supervisor[c_name].call(msg)
-                  end
-                  req.respond(:ok, 'So long, and thanks for all the fish!') if args[:auto_respond]
-                else
-                  req.respond(:unauthorized, 'You are not authorized to perform requested action!')
+          srv = build_listener do |req|
+            begin
+              msg = build_message(req)
+              msg = format(msg)
+              if(authorized?(msg))
+                callbacks.each do |name|
+                  c_name = callback_name(name)
+                  debug "Dispatching #{msg} to callback<#{name} (#{c_name})>"
+                  callback_supervisor[c_name].call(msg)
                 end
-              rescue => e
-                req.respond(:bad_request, "Failed to process request -> #{e}")
+                req.respond(:ok, 'So long, and thanks for all the fish!') if args[:auto_respond]
+              else
+                req.respond(:unauthorized, 'You are not authorized to perform requested action!')
               end
+            rescue => e
+              req.respond(:bad_request, "Failed to process request -> #{e}")
             end
           end
           true

data/lib/carnivore-http/http_endpoints.rb

@@ -85,25 +85,23 @@ module Carnivore
       def process(*process_args)
         unless(processing)
           @processing = true
-          srv = build_listener do |con|
-            con.each_request do |req|
-              begin
-                msg = build_message(con, req)
-                msg = format(msg)
-                if(authorized?(msg))
-                  unless(@points.deliver(msg))
-                    warn "No match found for request: #{msg} (path: #{msg[:message][:request].url})"
-                    debug "Unmatched message (#{msg}): #{msg.inspect}"
-                    req.respond(:not_found, 'So long, and thanks for all the fish!')
-                  end
-                else
-                  req.respond(:unauthorized, 'You are not authorized to perform requested action!')
+          srv = build_listener do |req|
+            begin
+              msg = build_message(req)
+              msg = format(msg)
+              if(authorized?(msg))
+                unless(@points.deliver(msg))
+                  warn "No match found for request: #{msg} (path: #{msg[:message][:request].url})"
+                  debug "Unmatched message (#{msg}): #{msg.inspect}"
+                  req.respond(:not_found, 'So long, and thanks for all the fish!')
                 end
-              rescue => e
-                error "Failed to process message: #{e.class} - #{e}"
-                debug "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
-                req.respond(:bad_request, 'Failed to process request')
+              else
+                req.respond(:unauthorized, 'You are not authorized to perform requested action!')
               end
+            rescue => e
+              error "Failed to process message: #{e.class} - #{e}"
+              debug "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
+              req.respond(:bad_request, 'Failed to process request')
             end
           end
           true

data/lib/carnivore-http/http_paths.rb

@@ -12,7 +12,6 @@ module Carnivore
       # Default response wait time stepping
       DEFAULT_RESPONSE_WAIT_STEP = 0.1
 
-      finalizer :halt_listener
       include Bogo::Memoization
 
       # @return [String] end point path
@@ -21,10 +20,10 @@ module Carnivore
       attr_reader :http_method
 
       # Kill listener on shutdown
-      def halt_listener
+      def terminate
         listener = memoize("#{args[:bind]}-#{args[:port]}", :global){ nil }
-        if(listener && listener.alive?)
-          listener.terminate
+        if(listener && listener.running)
+          listener.stop(:sync)
         end
         unmemoize("#{args[:bind]}-#{args[:port]}", :global)
         unmemoize("#{args[:bind]}-#{args[:port]}-queues", :global)
@@ -72,48 +71,37 @@ module Carnivore
       # Start the HTTP(S) listener
       def start_listener!
         memoize("#{args[:bind]}-#{args[:port]}", :global) do
-          build_listener do |con|
-            con.each_request do |req|
-              begin
-                msg = build_message(con, req)
-                # Start with static path lookup since it's the
-                # cheapest, then fallback to iterative globbing
-                msg_queue = nil
-                unless(msg_queue = message_queues["#{req.path}-#{req.method.to_s.downcase}"])
-                  message_queues.each do |k,v|
-                    path_glob, http_method = k.split('-')
-                    if(req.method.to_s.downcase == http_method && File.fnmatch(path_glob, req.path))
-                      msg_queue = v
-                    end
+          build_listener do |req|
+            begin
+              msg = build_message(req)
+              # Start with static path lookup since it's the
+              # cheapest, then fallback to iterative globbing
+              msg_queue = nil
+              unless(msg_queue = message_queues["#{req.path}-#{req.method.to_s.downcase}"])
+                message_queues.each do |k,v|
+                  path_glob, http_method = k.split('-')
+                  if(req.method.to_s.downcase == http_method && File.fnmatch(path_glob, req.path))
+                    msg_queue = v
                   end
                 end
-                if(msg_queue)
-                  if(authorized?(msg))
-                    msg_queue[:queue] << msg
-                    if(msg_queue[:config][:auto_respond])
-                      code = msg_queue[:config].fetch(:response, :code, 'ok').to_sym
-                      response = msg_queue[:config].fetch(:response, :message, 'So long and thanks for all the fish!')
-                      req.respond(code, response)
-                    else
-                      wait_time = msg_queue[:config].fetch(:response_timeout, DEFAULT_RESPONSE_TIMEOUT).to_f
-                      wait_step = msg_queue[:config].fetch(:response_wait_step, DEFAULT_RESPONSE_WAIT_STEP).to_f
-                      while(!con.socket.closed? && wait_time > 0)
-                        sleep(wait_step)
-                        wait_time -= wait_step
-                      end
-                      if(con.response_state == :headers)
-                        raise "Timeout has been exceeded waiting for response! (#{msg})"
-                      end
-                    end
-                  else
-                    req.respond(:unauthorized, 'You are not authorized to perform requested action!')
+              end
+              if(msg_queue)
+                if(authorized?(msg))
+                  msg_queue[:queue] << msg
+                  if(msg_queue[:config][:auto_respond])
+                    code = msg_queue[:config].fetch(:response, :code, 'ok').to_sym
+                    response = msg_queue[:config].fetch(:response, :message, 'So long and thanks for all the fish!')
+                    req.respond(code, response)
                   end
                 else
-                  req.respond(:not_found, 'Requested path not found!')
+                  req.respond(:unauthorized, 'You are not authorized to perform requested action!')
                 end
-              rescue => e
-                req.respond(:bad_request, "Failed to process request -> #{e}")
+              else
+                req.respond(:not_found, 'Requested path not found!')
               end
+            rescue => e
+              req.respond(:bad_request, "Failed to process request -> #{e}")
+              puts "#{e}\n#{e.backtrace.join("\n")}"
             end
           end
         end
@@ -123,8 +111,9 @@ module Carnivore
       def receive(*_)
         val = nil
         until(val)
-          val = Celluloid::Future.new{ message_queue[:queue].pop }.value
+          val = defer{ message_queue[:queue].pop }
         end
+        info "PROCESSING MSG: #{val}"
         val
       end
 

data/lib/carnivore-http/http_source.rb

@@ -1,4 +1,4 @@
-require 'reel'
+require 'puma'
 require 'tempfile'
 require 'carnivore/source'
 require 'carnivore-http/utils'
@@ -9,14 +9,10 @@ module Carnivore
     # Carnivore HTTP source
     class HttpSource < Source
 
-      trap_exit :retry_delivery_failure
-
       include Carnivore::Http::Utils::Params
 
       # @return [Hash] source arguments
       attr_reader :args
-      # @return [Carnivore::Http::RetryDelivery]
-      attr_reader :retry_delivery
       # @return [Array<IPAddr>] allowed request origin addresses
       attr_reader :auth_allowed_origins
       # @return [HTAuth::PasswdFile]
@@ -28,8 +24,13 @@ module Carnivore
       def setup(args={})
         require 'fileutils'
         @args = default_args(args)
-        @retry_delivery = Carnivore::Http::RetryDelivery.new(retry_directory)
-        self.link retry_delivery
+        unless(retry_delivery)
+          Carnivore::Supervisor.supervisor.supervise_as(
+            :http_retry_delivery,
+            Carnivore::Http::RetryDelivery,
+            retry_directory
+          )
+        end
         if(args.get(:authorization, :allowed_origins))
           require 'ipaddr'
           @allowed_origins = [args.get(:authorization, :allowed_origins)].flatten.compact.map do |origin_check|
@@ -42,25 +43,12 @@ module Carnivore
             args.get(:authorization, :htpasswd)
           )
         end
+        @listeners = []
       end
 
-      # Handle failed retry deliveries
-      #
-      # @param actor [Object] terminated actor
-      # @param reason [Exception] reason for termination
-      # @return [NilClass]
-      def retry_delivery_failure(actor, reason)
-        if(actor == retry_delivery)
-          if(reason)
-            error "Failed RetryDelivery encountered: #{reason}. Rebuilding."
-            @retry_delivery = Carnivore::Http::RetryDelivery.new(retry_directory)
-          else
-            info 'Encountered RetryDelivery failure. No reason so assuming teardown.'
-          end
-        else
-          error "Unknown actor failure encountered: #{reason}"
-        end
-        nil
+      # @return [RetryDelivery]
+      def retry_delivery
+        Carnivore::Supervisor.supervisor[:http_retry_delivery]
       end
 
       # @return [String, NilClass] directory storing failed messages
@@ -218,7 +206,7 @@ module Carnivore
           method = options.fetch(:method,
             args.fetch(:method, :post)
           ).to_s.downcase.to_sym
-          message_id = message.is_a?(Hash) ? message.fetch(:id, Celluloid.uuid) : Celluloid.uuid
+          message_id = message.is_a?(Hash) ? message.fetch(:id, Carnivore.uuid) : Carnivore.uuid
           payload = message.is_a?(String) ? message : MultiJson.dump(message)
           info "Transmit request type for Message ID: #{message_id}"
           async.perform_transmission(message_id.to_s, payload, method, url, options.fetch(:headers, {}))
@@ -280,8 +268,7 @@ module Carnivore
           args[:response_body] = 'Thanks' if code == :ok && args.empty?
           body = args.delete(:response_body)
           debug "Confirming #{message} with: Code: #{code.inspect} Args: #{args.inspect} Body: #{body}"
-          message[:message][:request].respond(code, *(args.empty? ? [body] : [args, body]))
-          message[:message][:connection].close
+          message[:message][:request].respond(code, *(args.empty? ? [body] : [args.merge(:body => body)]))
           message[:message][:confirmed] = true
         else
           warn "Message was already confimed. Confirmation not sent! (#{message})"
@@ -293,16 +280,27 @@ module Carnivore
       # @param block [Proc] processing block
       # @return [Reel::Server::HTTP, Reel::Server::HTTPS]
       def build_listener(&block)
+        app = Carnivore::Http::App.new(&block)
+        options = {:bind => []}
         if(args[:ssl])
-          ssl_config = Smash.new(args[:ssl][key].dup)
-          [:key, :cert].each do |key|
-            if(ssl_config[key])
-              ssl_config[key] = File.open(ssl_config.delete(key))
-            end
-          end
-          Reel::Server::HTTPS.supervise(args[:bind], args[:port], ssl_config, &block)
+          ssl_config = Smash.new(args[:ssl])
+          options[:bind] << "ssl://#{args[:bind]}:#{args[:port]}?cert=#{ssl_config[:cert]}&key=#{ssl_config[:key]}"
         else
-          Reel::Server::HTTP.supervise(args[:bind], args[:port], &block)
+          options[:bind] << "tcp://#{args[:bind]}:#{args[:port]}"
+        end
+        srv = Puma::Server.new(app, Puma::Events.stdio, options)
+        @listeners.push(srv)
+        srv.binder.parse(options[:bind], Puma::Events.stdio)
+        srv.run
+        srv
+      end
+
+      def terminate
+        if(@listeners)
+          @listeners.each do |l|
+            l.stop(:sync)
+          end
+          @listeners.clear
         end
       end
 
@@ -311,30 +309,28 @@ module Carnivore
 
       # Build message hash from request
       #
-      # @param con [Reel::Connection]
-      # @param req [Reel::Request]
+      # @param req [Carnivore::Http::App::Request]
       # @return [Hash]
       # @note
       #   if body size is greater than BODY_TO_FILE_SIZE
       #   the body will be a temp file instead of a string
-      def build_message(con, req)
+      def build_message(req)
         msg = Smash.new(
           :request => req,
           :headers => Smash[
             req.headers.map{ |k,v| [k.downcase.tr('-', '_'), v]}
           ],
-          :connection => con,
           :query => parse_query_string(req.query_string),
           :origin => req.remote_addr,
           :authentication => {}
         )
         if(msg[:headers][:content_type] == 'application/json')
           msg[:body] = MultiJson.load(
-            req.body.to_s
+            req.body.read
           )
         elsif(msg[:headers][:content_type] == 'application/x-www-form-urlencoded')
           msg[:body] = parse_query_string(
-            req.body.to_s
+            req.body.read
           )
           if(msg[:body].size == 1 && msg[:body].values.first.is_a?(Array) && msg[:body].values.first.empty?)
             msg[:body] = msg[:body].keys.first
@@ -346,7 +342,7 @@ module Carnivore
           end
           msg[:body].rewind
         else
-          msg[:body] = req.body.to_s
+          msg[:body] = req.body.read
         end
         if(msg[:headers][:authorization])
           user, pass = Base64.urlsafe_decode64(

data/lib/carnivore-http/point_builder.rb

@@ -1,7 +1,6 @@
 require 'blockenspiel'
 require 'singleton'
 require 'carnivore/utils'
-require 'celluloid'
 
 module Carnivore
   module Http
@@ -12,7 +11,8 @@ module Carnivore
       # End point
       class Endpoint
 
-        include Celluloid
+        include Zoidberg::SoftShell
+        include Zoidberg::Supervise
         include Carnivore::Utils::Params
         include Carnivore::Utils::Logging
 
@@ -58,7 +58,7 @@ module Carnivore
       end
 
       include Carnivore::Utils::Params
-      include Celluloid::Logger
+      include Carnivore::Utils::Logging
       include Blockenspiel::DSL
 
       # @return [Hash] static path endpoints
@@ -232,7 +232,7 @@ module Carnivore
         #
         # @yield new API block
         def define(&block)
-          store(Celluloid.uuid, block)
+          store(Zoidberg.uuid, block)
         end
 
         # Store block

data/lib/carnivore-http/retry_delivery.rb

@@ -5,7 +5,8 @@ module Carnivore
 
     class RetryDelivery
 
-      include Celluloid
+      include Zoidberg::SoftShell
+      include Zoidberg::Supervise
       include Carnivore::Utils::Logging
 
       # @return [String] message directory

data/lib/carnivore-http/utils.rb

@@ -24,13 +24,21 @@ module Carnivore
         # @return [Hash]
         def parse_query_string(string)
           unless(string.to_s.empty?)
-            args = CGI.parse(string)
+            args = Rack::Utils.parse_nested_query(string)
             format_query_args(args)
           else
-            {}
+            Smash.new
           end
         end
 
+        # Generate query string
+        #
+        # @param hash [Hash] request parameters
+        # @return [String]
+        def dump_query_string(hash)
+          Rack::Utils.build_nested_query(hash)
+        end
+
         # Cast hash values when possible
         #
         # @param args [Hash]

data/lib/carnivore-http/version.rb

@@ -1,6 +1,6 @@
 module Carnivore
   module Http
     # current library version
-    VERSION = Gem::Version.new('0.2.8')
+    VERSION = Gem::Version.new('0.3.0')
   end
 end

data/lib/carnivore-http.rb

@@ -5,6 +5,7 @@ require 'multi_json'
 module Carnivore
   # HTTP namespace
   module Http
+    autoload :App, 'carnivore-http/app'
     autoload :PointBuilder, 'carnivore-http/point_builder'
     autoload :RetryDelivery, 'carnivore-http/retry_delivery'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-http
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore
@@ -16,36 +16,84 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 1.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 1.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.13.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.13.4
 - !ruby/object:Gem::Dependency
-  name: reel
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: blockenspiel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+- !ruby/object:Gem::Dependency
+  name: htauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,13 +101,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: htauth
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -73,13 +135,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
-- LICENSE
 - README.md
-- carnivore-http-0.2.6.gem
 - carnivore-http.gemspec
 - lib/carnivore-http.rb
+- lib/carnivore-http/app.rb
 - lib/carnivore-http/http.rb
 - lib/carnivore-http/http_endpoints.rb
 - lib/carnivore-http/http_paths.rb
@@ -88,9 +147,6 @@ files:
 - lib/carnivore-http/retry_delivery.rb
 - lib/carnivore-http/utils.rb
 - lib/carnivore-http/version.rb
-- test/spec.rb
-- test/specs/http.rb
-- test/specs/paths.rb
 homepage: https://github.com/carnivore-rb/carnivore-http
 licenses:
 - Apache 2.0
@@ -111,9 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Message processing helper
 test_files: []
-has_rdoc: 

data/CONTRIBUTING.md

@@ -1,25 +0,0 @@
-# Contributing
-
-## Branches
-
-### `master` branch
-
-The master branch is the current stable released version.
-
-### `develop` branch
-
-The develop branch is the current edge of development.
-
-## Pull requests
-
-* https://github.com/carnivore-rb/carnivore-http/pulls
-
-Please base all pull requests of the `develop` branch. Merges to
-`master` only occur through the `develop` branch. Pull requests
-based on `master` will likely be cherry picked.
-
-## Issues
-
-Need to report an issue? Use the github issues:
-
-* https://github.com/carnivore-rb/carnivore-http/issues

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/LICENSE

@@ -1,13 +0,0 @@
-   Copyright 2014 Chris Roberts
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

data/test/spec.rb

@@ -1 +0,0 @@
-require 'carnivore/spec_helper'

data/test/specs/http.rb

@@ -1,69 +0,0 @@
-require 'http'
-require 'minitest/autorun'
-require 'carnivore-http'
-
-describe 'Carnivore::Source::Http' do
-
-  before do
-    MessageStore.init
-    Carnivore::Source.build(
-      :type => :http,
-      :args => {
-        :name => :http_source,
-        :bind => '127.0.0.1',
-        :port => '8705'
-      }
-    ).add_callback(:store) do |message|
-      MessageStore.messages.push(message[:message][:body])
-      message.confirm!
-    end
-    @runner = Thread.new{ Carnivore.start! }
-    source_wait
-  end
-
-  after do
-    @runner.terminate
-  end
-
-  describe 'HTTP source based communication' do
-
-    before do
-      MessageStore.messages.clear
-    end
-
-    describe 'Building an HTTP based source' do
-
-      it 'returns the source' do
-        Carnivore::Supervisor.supervisor[:http_source].wont_be_nil
-      end
-
-    end
-
-    describe 'message transmissions' do
-
-      it 'should accept message transmits' do
-        Carnivore::Supervisor.supervisor[:http_source].transmit('test message')
-      end
-
-      it 'should receive messages' do
-        Carnivore::Supervisor.supervisor[:http_source].transmit('test message 2')
-        source_wait(2) do
-          !MessageStore.messages.empty?
-        end
-        MessageStore.messages.wont_be_empty
-        MessageStore.messages.pop.must_equal 'test message 2'
-      end
-
-      it 'should accept http requests' do
-        HTTP.get('http://127.0.0.1:8705/')
-        source_wait(2) do
-          !MessageStore.messages.empty?
-        end
-        MessageStore.messages.wont_be_empty
-        MessageStore.messages.pop.wont_be_nil
-      end
-
-    end
-  end
-
-end

data/test/specs/paths.rb

@@ -1,124 +0,0 @@
-require 'http'
-require 'minitest/autorun'
-require 'carnivore-http'
-
-
-describe 'Carnivore::Source::Http' do
-
-  before do
-    MessageStore.init
-
-    unless(@runner)
-      Carnivore::Source.build(
-        :type => :http_paths,
-        :args => {
-          :name => :fubar_source,
-          :path => '/fubar',
-          :method => :post,
-          :bind => '127.0.0.1',
-          :port => '8706',
-          :auto_respond => false
-        }
-      ).add_callback(:store) do |message|
-        MessageStore.messages.push(message[:message][:body])
-        message.confirm!(:response_body => 'custom response')
-      end
-      Carnivore::Source.build(
-        :type => :http_paths,
-        :args => {
-          :name => :ohai_source,
-          :path => '/ohai',
-          :method => :get,
-          :bind => '127.0.0.1',
-          :port => '8706'
-        }
-      ).add_callback(:store) do |message|
-        MessageStore.messages.push(message[:message][:body])
-      end
-      Carnivore::Source.build(
-        :type => :http_paths,
-        :args => {
-          :name => :glob_source,
-          :path => '/glob/v*/*',
-          :method => :get,
-          :bind => '127.0.0.1',
-          :port => '8706'
-        }
-      ).add_callback(:store) do |message|
-        MessageStore.messages.push(message[:message][:body])
-      end
-      @runner = Thread.new{ Carnivore.start! }
-      source_wait
-    end
-  end
-
-  after do
-    @runner.terminate
-  end
-
-  describe 'HTTP source based communication' do
-
-    before do
-      MessageStore.messages.clear
-    end
-
-    describe 'Building an HTTP based source' do
-
-      it 'returns the sources' do
-        Carnivore::Supervisor.supervisor[:fubar_source].wont_be_nil
-        Carnivore::Supervisor.supervisor[:ohai_source].wont_be_nil
-      end
-
-    end
-
-    describe 'source message transmissions' do
-
-      it 'should accept message transmits' do
-        Carnivore::Supervisor.supervisor[:fubar_source].transmit('test message')
-        Carnivore::Supervisor.supervisor[:ohai_source].transmit('test message')
-      end
-
-      it 'should receive messages' do
-        Carnivore::Supervisor.supervisor[:fubar_source].transmit('test message to fubar')
-        source_wait(4) do
-          !MessageStore.messages.empty?
-        end
-        MessageStore.messages.wont_be_empty
-        MessageStore.messages.pop.must_equal 'test message to fubar'
-        Carnivore::Supervisor.supervisor[:ohai_source].transmit('test message to ohai')
-        source_wait(4) do
-          !MessageStore.messages.empty?
-        end
-        MessageStore.messages.wont_be_empty
-        MessageStore.messages.pop.must_equal 'test message to ohai'
-      end
-
-    end
-
-    describe 'HTTP message transmissions' do
-
-      it 'should receive messages and provide custom response' do
-        response = HTTP.post('http://127.0.0.1:8706/fubar', :body => 'test')
-        response.body.to_s.must_equal 'custom response'
-        source_wait{ !MessageStore.messages.empty? }
-        MessageStore.messages.pop.must_equal 'test'
-      end
-
-      it 'should receive messages and provide default response' do
-        response = HTTP.get('http://127.0.0.1:8706/ohai')
-        source_wait{ !MessageStore.messages.empty? }
-        response.body.to_s.must_equal 'So long and thanks for all the fish!'
-        MessageStore.messages.pop.must_be :empty?
-      end
-
-      it 'should receive messages via glob matching' do
-        response = HTTP.get('http://127.0.0.1:8706/glob/v2/things')
-        source_wait{ !MessageStore.messages.empty? }
-        response.body.to_s.must_equal 'So long and thanks for all the fish!'
-        MessageStore.messages.pop.must_be :empty?
-      end
-
-    end
-  end
-
-end