carnivore-http 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f9f4a7936dcc06d41a919c221612c146426790a
-  data.tar.gz: 6153beb3e86f2dd7a3bf7eadad967a3fde8826b5
+  metadata.gz: 2f249ff2bcc32e656dea42855b1c9f5002c7f7c5
+  data.tar.gz: da5167bc1fa804b63b741da4bea7483d2d544653
 SHA512:
-  metadata.gz: 459ee7c23877b7638eadf34b397dcfacec31237b7b6543ed0aaf7567ac26d155a87a422a1ea309bc7f09aaff0f82702321d51ab25a08e1e8c129f9042172697a
-  data.tar.gz: 029e4ebfc459957bb46db5fc1f3590efa1126d3dedb0e4f2831b70cb480860d4a33d4675d5a87acdd798f00451d3276a0a953c8e181f7ffdbc03072fa3480f7a
+  metadata.gz: 5f6975483b01d2f7060cc6d213bd9513eb345b4c268fe0ddb0ab76b5a81026edb4bf421dcdb6fa07746ec647a3e9dd09f21a8846268e2dee8e90f0bdb4bacc1f
+  data.tar.gz: f1d1f7147463224541388146d95c9e19e7a4f8a5d86f045fa947e15c5f2db939e4655475bd476d8ab7ac05b24e0d8157cc2aedbc73ac5d8f29103132ca02843b

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# V0.2.0
+# v0.2.2
+* Add glob support to `:http_path` source
+* Allow disabling automatic response on `:http_path`
+
+# v0.2.0
 * Add support for message re-delivery and local persistence
 * Add support for authorization
 * Add HTTPS support

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    carnivore-http (0.1.9)
+    carnivore-http (0.2.1)
       blockenspiel
       carnivore (>= 0.1.8)
       htauth
@@ -12,15 +12,15 @@ GEM
   specs:
     attribute_struct (0.2.8)
     blockenspiel (0.4.5)
-    bogo (0.1.6)
+    bogo (0.1.8)
       hashie
       multi_json
-    bogo-config (0.1.6)
+    bogo-config (0.1.8)
       attribute_struct
       bogo (>= 0.1.4, < 1.0)
       multi_json
       multi_xml
-    carnivore (0.3.4)
+    carnivore (0.3.6)
       bogo-config
       celluloid
       hashie
@@ -31,21 +31,18 @@ GEM
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
     form_data (0.1.0)
-    hashie (3.3.2)
-    highline (1.6.21)
+    hashie (3.4.0)
+    highline (1.7.0)
     hitimes (1.2.2)
-    hitimes (1.2.2-java)
     htauth (1.1.0)
       highline (~> 1.6)
     http (0.7.1)
       form_data (~> 0.1.0)
       http_parser.rb (~> 0.6.0)
     http_parser.rb (0.6.0)
-    http_parser.rb (0.6.0-java)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     nio4r (1.1.0)
-    nio4r (1.1.0-java)
     reel (0.5.0)
       celluloid (>= 0.15.1)
       celluloid-io (>= 0.15.0)

data/lib/carnivore-http/http_paths.rb

@@ -7,6 +7,11 @@ module Carnivore
     # Carnivore HTTP paths
     class HttpPaths < HttpSource
 
+      # Default max wait time for message response
+      DEFAULT_RESPONSE_TIMEOUT = 10
+      # Default response wait time stepping
+      DEFAULT_RESPONSE_WAIT_STEP = 0.1
+
       finalizer :halt_listener
       include Bogo::Memoization
 
@@ -32,9 +37,14 @@ module Carnivore
         if(message_queues[queue_key])
           raise ArgumentError.new "Conflicting HTTP path source provided! path: #{http_path} method: #{http_method}"
         else
-          message_queues[queue_key] = Queue.new
+          message_queues[queue_key] = Smash.new(
+            :queue => Queue.new
+          )
         end
         super
+        message_queues[queue_key].merge!(
+          Smash.new(:config => args.to_smash)
+        )
       end
 
       # Setup the HTTP listener source
@@ -66,11 +76,35 @@ module Carnivore
             con.each_request do |req|
               begin
                 msg = build_message(con, req)
-                msg_queue = message_queues["#{req.path}-#{req.method.to_s.downcase}"]
+                # 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
+                end
                 if(msg_queue)
                   if(authorized?(msg))
-                    msg_queue << msg
-                    req.respond(:ok, 'So long and thanks for all the fish!')
+                    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.response_state == :headers && 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
@@ -89,7 +123,7 @@ module Carnivore
       def receive(*_)
         val = nil
         until(val)
-          val = Celluloid::Future.new{ message_queue.pop }.value
+          val = Celluloid::Future.new{ message_queue[:queue].pop }.value
         end
         val
       end

data/lib/carnivore-http/http_source.rb

@@ -273,10 +273,14 @@ module Carnivore
       # @param args [Hash]
       # @option args [Symbol] :code return code
       def confirm(message, args={})
-        code = args.delete(:code) || :ok
-        args[:response_body] = 'Thanks' if code == :ok && args.empty?
-        debug "Confirming #{message} with: Code: #{code.inspect} Args: #{args.inspect}"
-        message[:message][:request].respond(code, args[:response_body] || args)
+        if(message[:message][:connection].response_state != :headers)
+          code = args.delete(:code) || :ok
+          args[:response_body] = 'Thanks' if code == :ok && args.empty?
+          debug "Confirming #{message} with: Code: #{code.inspect} Args: #{args.inspect}"
+          message[:message][:request].respond(code, args[:response_body] || args)
+        else
+          warn "Message was already confimed. Confirmation not sent! (#{message})"
+        end
       end
 
       # Initialize http listener correctly based on configuration

data/lib/carnivore-http/version.rb

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

data/test/specs/paths.rb

@@ -16,11 +16,12 @@ describe 'Carnivore::Source::Http' do
           :path => '/fubar',
           :method => :post,
           :bind => '127.0.0.1',
-          :port => '8706'
+          :port => '8706',
+          :auto_respond => false
         }
       ).add_callback(:store) do |message|
         MessageStore.messages.push(message[:message][:body])
-        message.confirm!
+        message.confirm!(:response_body => 'custom response')
       end
       Carnivore::Source.build(
         :type => :http_paths,
@@ -33,7 +34,18 @@ describe 'Carnivore::Source::Http' do
         }
       ).add_callback(:store) do |message|
         MessageStore.messages.push(message[:message][:body])
-        message.confirm!
+      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
@@ -59,7 +71,7 @@ describe 'Carnivore::Source::Http' do
 
     end
 
-    describe 'message transmissions' do
+    describe 'source message transmissions' do
 
       it 'should accept message transmits' do
         Carnivore::Supervisor.supervisor[:fubar_source].transmit('test message')
@@ -82,6 +94,31 @@ describe 'Carnivore::Source::Http' do
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-http
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore