chef-api 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89bca373e08eb29df75521fe78473fb1a566e9af
-  data.tar.gz: 4565d8fa17cfe68bbe4d204045a5f5d114ff5f92
+  metadata.gz: 80b62ceb2d3f3e1b7046d2115d6b741bc983499b
+  data.tar.gz: ade937778aea1f66776c212918e73565ed5f1bd1
 SHA512:
-  metadata.gz: ee5206c83877648adfda095c52d688b46fd1e4a46b7745c8e9cfdf3db8e6ed4f014d353fb91e6dc38549671ff5acaa6632ee6da1edabc0b9aba9dfd77db3c0f1
-  data.tar.gz: 46561de5a2908f9cd2dbe6781de8c67b9b625153aad5a964b532337ea775efef99408176913e9dd6d31d7440ea7c36a74bef53b725fce019f98b412ba8924078
+  metadata.gz: ebb178741c859052b3762e52ec0d9da19b6b9bb9df52099319e028813e03b776e1ca8401dc9506bcd65a3be8a683e631c0acc89da3d1090a98a0e549e9d16b87
+  data.tar.gz: bd0cb8413f6add6ddac6c2f60d38a68b87d63e905a20eb2e92b36a77b7afd61d204de15242be4287e8e3d9717c38034b63fc664eae086f7823c9444281552422

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 ChefAPI Changelog
 =================
 
+v0.4.0 (2014-07-05)
+-------------------
+- Support multipart POST
 
 v0.3.0 (2014-06-18)
 -------------------

data/chef-api.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'logify',                '~> 0.1'
   spec.add_dependency 'mixlib-authentication', '~> 1.3'
+  spec.add_dependency 'mime-types',            '~> 2.3'
 end

data/lib/chef-api/connection.rb

@@ -204,7 +204,16 @@ module ChefAPI
         if data.respond_to?(:read)
           request.body_stream = data
         elsif data.is_a?(Hash)
-          request.form_data = data
+          # If any of the values in the hash are File-like, assume this is a
+          # multi-part post
+          if data.values.any? { |value| value.respond_to?(:read) }
+            multipart = Multipart::Body.new(data)
+            request.content_length = multipart.content_length
+            request.content_type   = multipart.content_type
+            request.body_stream    = multipart.stream
+          else
+            request.form_data = data
+          end
         else
           request.body = data
         end
@@ -503,4 +512,165 @@ module ChefAPI
       end
     end
   end
+
+  require 'cgi'
+  require 'mime/types'
+
+  module Multipart
+    BOUNDARY = '------ChefAPIMultipartBoundary'.freeze
+
+    class Body
+      def initialize(params = {})
+        params.each do |key, value|
+          if value.respond_to?(:read)
+            parts << FilePart.new(key, value)
+          else
+            parts << ParamPart.new(key, value)
+          end
+        end
+
+        parts << EndingPart.new
+      end
+
+      def stream
+        MultiIO.new(*parts.map(&:io))
+      end
+
+      def content_type
+        "multipart/form-data; boundary=#{BOUNDARY}"
+      end
+
+      def content_length
+        parts.map(&:size).inject(:+)
+      end
+
+      private
+
+      def parts
+        @parts ||= []
+      end
+    end
+
+    class MultiIO
+      def initialize(*ios)
+        @ios = ios
+        @index = 0
+      end
+
+      # Read from IOs in order until `length` bytes have been received.
+      def read(length = nil, outbuf = nil)
+        got_result = false
+        outbuf = outbuf ? outbuf.replace('') : ''
+
+        while io = current_io
+          if result = io.read(length)
+            got_result ||= !result.nil?
+            result.force_encoding('BINARY') if result.respond_to?(:force_encoding)
+            outbuf << result
+            length -= result.length if length
+            break if length == 0
+          end
+          advance_io
+        end
+
+        (!got_result && length) ? nil : outbuf
+      end
+
+      def rewind
+        @ios.each { |io| io.rewind }
+        @index = 0
+      end
+
+      private
+
+      def current_io
+        @ios[@index]
+      end
+
+      def advance_io
+        @index += 1
+      end
+    end
+
+    #
+    # A generic key => value part.
+    #
+    class ParamPart
+      def initialize(name, value)
+        @part = build(name, value)
+      end
+
+      def io
+        @io ||= StringIO.new(@part)
+      end
+
+      def size
+        @part.bytesize
+      end
+
+      private
+
+      def build(name, value)
+        part =  %|--#{BOUNDARY}\r\n|
+        part << %|Content-Disposition: form-data; name="#{CGI.escape(name)}"\r\n\r\n|
+        part << %|#{value}\r\n|
+        part
+      end
+    end
+
+    #
+    # A File part
+    #
+    class FilePart
+      def initialize(name, file)
+        @file = file
+        @head = build(name, file)
+        @foot = "\r\n"
+      end
+
+      def io
+        @io ||= MultiIO.new(
+          StringIO.new(@head),
+          @file,
+          StringIO.new(@foot)
+        )
+      end
+
+      def size
+        @head.bytesize + @file.size + @foot.bytesize
+      end
+
+      private
+
+      def build(name, file)
+        filename  = File.basename(file.path)
+        mime_type = MIME::Types.type_for(filename)[0] || MIME::Types['application/octet-stream'][0]
+
+        part =  %|--#{BOUNDARY}\r\n|
+        part << %|Content-Disposition: form-data; name="#{CGI.escape(name)}"; filename="#{filename}"\r\n|
+        part << %|Content-Length: #{file.size}\r\n|
+        part << %|Content-Type: #{mime_type.simplified}|
+        part << %|Content-Transfer-Encoding: binary\r\n|
+        part << %|\r\n|
+        part
+      end
+    end
+
+    #
+    # The end of the entire request
+    #
+    class EndingPart
+      def initialize
+        @part = "--#{BOUNDARY}--\r\n\r\n"
+      end
+
+      def io
+        @io ||= StringIO.new(@part)
+      end
+
+      def size
+        @part.bytesize
+      end
+    end
+  end
 end

data/lib/chef-api/version.rb

@@ -1,3 +1,3 @@
 module ChefAPI
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-api
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logify
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 description: A tiny Chef API client with minimal dependencies
 email:
 - sethvargo@gmail.com
@@ -138,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: A Chef API client in Ruby