carnivore-http 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37467796ce245a347449a07231e2f70f6ac07c9b
-  data.tar.gz: d9a37d58b50449b003bc95c78a1d7e023eacae97
+  metadata.gz: f342b9b66f1d52b80f5c7602e176352bea82e607
+  data.tar.gz: e42127361c8171ce84eee20e138819053c3a3748
 SHA512:
-  metadata.gz: b39823d634cab46702f942faa37ac92e86eaeac025bb4743dc4ee151639d3a158df8fd986b1c0937659231d321b6b0dc771578fe11a226192897d4888fb6d34f
-  data.tar.gz: cb6e3b2acc5eb175ec4a5c4b023065f90b16567917dee7b497645b33a49a4dc827abb17de5163056b420a959bf6202daf3ffe486acb152c019167caf20cce6aa
+  metadata.gz: 19bd3bbc193dd30ed033ad5469c5e6bad34f4e136af8048764ccd92ead069a12863c54f19b46b73a868ca4e2a3a3ee501a320358958380a0c4a1f84db5c80c6a
+  data.tar.gz: 763d46d07186e87cb60e5f9603c8489273a3e2746996a405bbeb8d900db30f82a0afd1d48c5d8ade17504584c640f486792fe13bbc308b15cc492ac7a30ce493

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.2.6
+* Add support to disable listen
+* Attempt delivery prior to payload persist
+* Load payload if possible and deliver via :json
+
 # v0.2.4
 * Add fix for memoization issues on init
 

data/lib/carnivore-http/http_source.rb

@@ -94,7 +94,7 @@ module Carnivore
 
       # Always auto start
       def auto_process?
-        true
+        args.has_key?(:enable_processing) ? args[:enable_processing] : true
       end
 
       # Message is authorized for processing
@@ -234,8 +234,10 @@ module Carnivore
       # @param headers [Hash] request headers
       # @return [NilClass]
       def perform_transmission(message_id, payload, method, url, headers={})
-        write_for_retry(message_id, payload, method, url, headers)
-        retry_delivery.async.attempt_redelivery(message_id)
+        unless(retry_delivery.redeliver(message_id, payload, method, url, headers))
+          write_for_retry(message_id, payload, method, url, headers)
+          retry_delivery.async.attempt_redelivery(message_id)
+        end
         nil
       end
 
@@ -352,7 +354,14 @@ module Carnivore
             :password => pass
           }
         end
-        msg
+        if(msg[:body].is_a?(Hash) && msg[:body][:id])
+          Smash.new(
+            :raw => msg,
+            :content => msg[:body].to_smash
+          )
+        else
+          msg
+        end
       end
 
     end

data/lib/carnivore-http/retry_delivery.rb

@@ -68,7 +68,16 @@ module Carnivore
           if(uri.userinfo)
             base = base.basic_auth(:user => uri.user, :pass => uri.password)
           end
-          result = base.send(method, url, :body => payload)
+          if(payload.is_a?(String))
+            begin
+              payload = MultiJson.load(payload)
+            rescue MultiJson::ParseError
+              # ignore
+            end
+          end
+          result = base.send(method, url,
+            payload.is_a?(Hash) ? :json : :body => payload
+          )
           if(result.code < 200 || result.code > 299)
             error "Invalid response code received for #{message_id}: #{result.code} - #{result.reason}"
             false

data/lib/carnivore-http/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-http
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore
@@ -75,7 +75,6 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - carnivore-http.gemspec
@@ -116,4 +115,3 @@ signing_key:
 specification_version: 4
 summary: Message processing helper
 test_files: []
-has_rdoc: 

data/Gemfile.lock

@@ -1,61 +0,0 @@
-PATH
-  remote: .
-  specs:
-    carnivore-http (0.2.1)
-      blockenspiel
-      carnivore (>= 0.1.8)
-      htauth
-      reel (~> 0.5.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    attribute_struct (0.2.8)
-    blockenspiel (0.4.5)
-    bogo (0.1.8)
-      hashie
-      multi_json
-    bogo-config (0.1.8)
-      attribute_struct
-      bogo (>= 0.1.4, < 1.0)
-      multi_json
-      multi_xml
-    carnivore (0.3.6)
-      bogo-config
-      celluloid
-      hashie
-      multi_json
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    celluloid-io (0.16.2)
-      celluloid (>= 0.16.0)
-      nio4r (>= 1.1.0)
-    form_data (0.1.0)
-    hashie (3.4.0)
-    highline (1.7.0)
-    hitimes (1.2.2)
-    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)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    nio4r (1.1.0)
-    reel (0.5.0)
-      celluloid (>= 0.15.1)
-      celluloid-io (>= 0.15.0)
-      http (>= 0.6.0.pre)
-      http_parser.rb (>= 0.6.0)
-      websocket_parser (>= 0.1.6)
-    timers (4.0.1)
-      hitimes
-    websocket_parser (1.0.0)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  carnivore-http!