carnivore-http 0.1.6 → 0.1.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 254e80996f94e8fb440fd9e685205764dc4c1d6d
+  data.tar.gz: 56d1e0aab6e50decb27265752c90cb7490daf033
+SHA512:
+  metadata.gz: 92ef01935a6852996c57cb73b290d67d9ecae93f0b4cff4b96cbc98e6fc25ef2fc31e57ba4c168eb89889055a2615784ef7a4bbfa909f226d7b24e1364593cce
+  data.tar.gz: 0e1e6bea0f6e36e5d305c720aaf83add3c420c61fd6bd6b3b460835096f7b4bf211160ff6a380e76f54f3b8bdea00a120f5b4f8a2696b76293dd1030981f456b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.1.8
+* Add better message body handling
+* Update DSL inclusion on subclasses
+
 # v0.1.6
 * Add support for point builder subclassing
 * DRY out message generation to be consistent between http and endpoint

data/lib/carnivore-http/http.rb

@@ -111,18 +111,24 @@ module Carnivore
       def build_message(con, req)
         msg = Smash.new(
           :request => req,
-          :headers => req.headers,
+          :headers => Smash[
+            req.headers.map{ |k,v| [k.downcase.tr('-', '_'), v]}
+          ],
           :connection => con,
           :query => parse_query_string(req.query_string)
         )
-        if(req.headers['Content-Type'] == 'application/json')
-          msg[:query].merge(
-            parse_query_string(
-              req.body.to_s
-            )
+        if(msg[:headers][:content_type] == 'application/json')
+          msg[:body] = MultiJson.load(
+            req.body.to_s
           )
-          msg[:body] = req.body.to_s
-        elsif(req.headers['Content-Length'].to_i > BODY_TO_FILE_SIZE)
+        elsif(msg[:headers][:content_type] == 'application/x-www-form-urlencoded')
+          msg[:body] = parse_query_string(
+            req.body.to_s
+          )
+          if(msg[:body].size == 1 && msg[:body].values.first.is_a?(Array) && msg[:body].values.first.empty?)
+            msg[:body] = msg[:body].keys.first
+          end
+        elsif(msg[:headers][:content_length].to_i > BODY_TO_FILE_SIZE)
           msg[:body] = Tempfile.new('carnivore-http')
           while((chunk = req.body.readpartial(2048)))
             msg[:body] << chunk

data/lib/carnivore-http/http_endpoints.rb

@@ -78,6 +78,7 @@ module Carnivore
 
       # Start processing
       def connect
+        info 'Override initialization process startup. Force enabling processing.'
         async.process
       end
 
@@ -88,6 +89,7 @@ module Carnivore
             begin
               msg = build_message(con, req)
               unless(@points.deliver(msg))
+                warn "No match found for request: #{msg}"
                 req.respond(:ok, 'So long, and thanks for all the fish!')
               end
             rescue => e

data/lib/carnivore-http/point_builder.rb

@@ -226,7 +226,6 @@ module Carnivore
         # @param klass [Class]
         def inherited(klass)
           descendants.push(klass)
-          klass.send(:include, Blockenspiel::DSL)
         end
 
         # Define new API block

data/lib/carnivore-http/utils.rb

@@ -49,7 +49,7 @@ module Carnivore
               new_args[k] = format_query_type(v)
             end
           end
-          new_args
+          new_args.to_smash
         end
 
         # Best attempt to convert to true type

data/lib/carnivore-http/version.rb

@@ -1,9 +1,6 @@
 module Carnivore
   module Http
-    # Custom version class
-    class Version < Gem::Version
-    end
-    # Current library version
-    VERSION = Version.new('0.1.6')
+    # current library version
+    VERSION = Gem::Version.new('0.1.8')
   end
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-http
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.8
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: reel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: blockenspiel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Carnivore HTTP source
@@ -65,45 +58,44 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/carnivore-http/point_builder.rb
-- lib/carnivore-http/version.rb
+- CHANGELOG.md
+- CONTRIBUTING.md
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.md
+- carnivore-http.gemspec
+- lib/carnivore-http.rb
 - lib/carnivore-http/http.rb
-- lib/carnivore-http/utils.rb
 - lib/carnivore-http/http_endpoints.rb
-- lib/carnivore-http.rb
+- lib/carnivore-http/point_builder.rb
+- lib/carnivore-http/utils.rb
+- lib/carnivore-http/version.rb
 - test/spec.rb
 - test/specs/http.rb
-- Gemfile
-- README.md
-- LICENSE
-- carnivore-http.gemspec
-- CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile.lock
 homepage: https://github.com/carnivore-rb/carnivore-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: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Message processing helper
 test_files: []
 has_rdoc: