songkick-transport 0.1.3 → 0.1.4

data/lib/songkick/transport.rb

@@ -9,8 +9,9 @@ module Songkick
     DEFAULT_TIMEOUT = 5
     DEFAULT_FORMAT  = :json
     
-    HTTP_VERBS = %w[get post put delete head]
-    USE_BODY   = %w[post put]
+    HTTP_VERBS    = %w[get post put delete head]
+    USE_BODY      = %w[post put]
+    FORM_ENCODING = 'application/x-www-form-urlencoded'
     
     ROOT = File.expand_path('..', __FILE__)
     

data/lib/songkick/transport/base.rb

@@ -39,10 +39,10 @@ module Songkick
       end
       
       def headers
-        {
+        Headers.new(
           'Connection' => 'close',
           'User-Agent' => user_agent || ''
-        }
+        )
       end
       
       def logger

data/lib/songkick/transport/curb.rb

@@ -45,7 +45,6 @@ module Songkick
         end
         
         if req.use_body?
-          connection.headers['Content-Type'] ||= req.content_type
           connection.__send__("http_#{req.verb}", req.body)
         else
           connection.__send__("http_#{req.verb}")

data/lib/songkick/transport/headers.rb

@@ -4,6 +4,18 @@ module Songkick
     class Headers
       include Enumerable
       
+      def self.new(hash)
+        return hash if self === hash
+        super
+      end
+      
+      def self.normalize(header_name)
+        header_name.
+            gsub(/^HTTP_/, '').gsub('_', '-').
+            downcase.
+            gsub(/(^|-)([a-z])/) { $1 + $2.upcase }
+      end
+      
       def initialize(hash = {})
         @hash = {}
         hash.each do |key, value|
@@ -19,15 +31,18 @@ module Songkick
         @hash[self.class.normalize(header_name)]
       end
       
+      def []=(header_name, value)
+        @hash[self.class.normalize(header_name)] = value
+      end
+      
       def merge(hash)
-        @hash.merge(hash)
+        headers = self.class.new(to_hash)
+        hash.each { |k,v| headers[k] = v }
+        headers
       end
       
-      def self.normalize(header_name)
-        header_name.
-            gsub(/^HTTP_/, '').gsub('_', '-').
-            downcase.
-            gsub(/(^|-)([a-z])/) { $1 + $2.upcase }
+      def to_hash
+        @hash.dup
       end
     end
     

data/lib/songkick/transport/httparty.rb

@@ -26,12 +26,7 @@ module Songkick
           timeout = req.timeout || self.class.default_options[:timeout]
           
           response = if req.use_body?
-            if req.multipart?
-              head = req.headers.merge('Content-Type' => req.content_type)
-              self.class.__send__(req.verb, req.path, :body => req.body, :headers => head, :timeout => timeout)
-            else
-              self.class.__send__(req.verb, req.path, :body => req.body, :headers => req.headers, :timeout => timeout)
-            end
+            self.class.__send__(req.verb, req.path, :body => req.body, :headers => req.headers, :timeout => timeout)
           else
             self.class.__send__(req.verb, req.url, :headers => req.headers, :timeout => timeout)
           end

data/lib/songkick/transport/request.rb

@@ -2,15 +2,14 @@ module Songkick
   module Transport
     
     class Request
-      attr_reader   :endpoint,
-                    :verb,
-                    :path,
-                    :params,
-                    :headers,
-                    :timeout,
-                    :start_time,
-                    :response,
-                    :error
+      attr_reader :endpoint,
+                  :verb,
+                  :path,
+                  :params,
+                  :timeout,
+                  :start_time,
+                  :response,
+                  :error
       
       alias :http_method :verb
       
@@ -18,11 +17,15 @@ module Songkick
         @endpoint   = endpoint
         @verb       = verb.to_s.downcase
         @path       = path
-        @headers    = headers
+        @headers    = Headers.new(headers)
         @params     = params
         @timeout    = timeout
         @start_time = start_time || Time.now
         @multipart  = Serialization.multipart?(params)
+        
+        if use_body?
+          @headers['Content-Type'] ||= @multipart ? multipart_request[:content_type] : FORM_ENCODING
+        end
       end
       
       def response=(response)
@@ -40,6 +43,10 @@ module Songkick
         (@end_time.to_f - @start_time.to_f) * 1000
       end
       
+      def headers
+        @headers.to_hash
+      end
+      
       def use_body?
         USE_BODY.include?(@verb)
       end
@@ -48,15 +55,6 @@ module Songkick
         @multipart
       end
       
-      def content_type
-        return nil unless use_body?
-        if @multipart
-          multipart_request[:content_type]
-        else
-          'application/x-www-form-urlencoded'
-        end
-      end
-      
       def body
         return nil unless use_body?
         if @multipart
@@ -82,7 +80,6 @@ module Songkick
         end
         return command unless use_body?
         query = Serialization.build_query_string(params, true, true)
-        command << " -H 'Content-Type: #{content_type}'"
         command << " -d '#{query}'"
         command
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: songkick-transport
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post