multipart-post 0.1 → 1.0

data/Manifest.txt

@@ -1,4 +1,6 @@
 lib/composite_io.rb
+lib/multipartable.rb
+lib/parts.rb
 lib/net/http/post/multipart.rb
 Manifest.txt
 Rakefile

data/README.txt

@@ -33,14 +33,13 @@ None
 
 == INSTALL:
 
-rake package
-gem install pkg/multipart-form*.gem
+gem install multipart-post
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2007-2008 Nick Sieger <nick@nicksieger.com>
+Copyright (c) 2007-2009 Nick Sieger <nick@nicksieger.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -2,7 +2,9 @@ begin
 require 'rubygems'
 require 'hoe'
 
-hoe = Hoe.new("multipart-post", '0.1') do |p|
+require 'lib/multipart_post'
+
+hoe = Hoe.new("multipart-post", MultipartPost::VERSION) do |p|
   p.rubyforge_name = "caldersphere"
   p.author = "Nick Sieger"
   p.url = "http://github.com/nicksieger/multipart-post"

data/lib/multipartable.rb

@@ -0,0 +1,13 @@
+require 'parts'
+  module Multipartable
+    DEFAULT_BOUNDARY = "-----------RubyMultipartPost"
+    def initialize(path, params, headers={}, boundary = DEFAULT_BOUNDARY)
+      super(path, headers)
+      parts = params.map {|k,v| Parts::Part.new(boundary, k, v)}
+      parts << Parts::EpiloguePart.new(boundary)
+      ios = parts.map{|p| p.to_io }
+      self.set_content_type("multipart/form-data", { "boundary" => boundary })
+      self.content_length = parts.inject(0) {|sum,i| sum + i.length }
+      self.body_stream = CompositeReadIO.new(*ios)
+    end
+  end

data/lib/net/http/post/multipart.rb

@@ -8,95 +8,20 @@ require 'net/http'
 require 'stringio'
 require 'cgi'
 require 'composite_io'
+require 'multipartable'
+require 'parts'
 
 module Net #:nodoc:
   class HTTP #:nodoc:
-    class Post #:nodoc:
-      module Part #:nodoc:
-        def self.new(boundary, name, value)
-          if value.respond_to? :content_type
-            FilePart.new(boundary, name, value)
-          else
-            ParamPart.new(boundary, name, value)
-          end
-        end
-
-        def length
-          @part.length
-        end
-
-        def to_io
-          @io
-        end
-      end
-
-      # Represents a part to be filled with a string name/value pair.
-      class ParamPart
-        include Part
-        def initialize(boundary, name, value)
-          @part = build_part(boundary, name, value)
-          @io = StringIO.new(@part)
-        end
-
-        def build_part(boundary, name, value)
-          part = ''
-          part << "--#{boundary}\r\n"
-          part << "Content-Disposition: form-data; name=\"#{name.to_s}\"\r\n"
-          part << "\r\n"
-          part << "#{value}\r\n"
-        end
+    class Put
+      class Multipart < Put
+        include Multipartable
       end
-
-      # Represents a part to be filled from file IO.
-      class FilePart
-        include Part
-        attr_reader :length
-        def initialize(boundary, name, io)
-          @head = build_head(boundary, name, io.original_filename, io.content_type)
-          file_length = if io.respond_to? :length
-            io.length
-          else
-            File.size(io.local_path)
-          end
-          @length = @head.length + file_length
-          @io = CompositeReadIO.new(StringIO.new(@head), io, StringIO.new("\r\n"))
-        end
-
-        def build_head(boundary, name, filename, type)
-          part = ''
-          part << "--#{boundary}\r\n"
-          part << "Content-Disposition: form-data; name=\"#{name.to_s}\"; filename=\"#{filename}\"\r\n"
-          part << "Content-Type: #{type}\r\n"
-          part << "Content-Transfer-Encoding: binary\r\n"
-          part << "\r\n"
-        end
-      end
-
-      # Represents the epilogue or closing boundary.
-      class EpiloguePart
-        include Part
-        def initialize(boundary)
-          @part = "--#{boundary}--\r\n"
-          @io = StringIO.new(@part)
-        end
-      end
-
-      DEFAULT_BOUNDARY = "-----------RubyMultipartPost"
-
-      # Extension to the Net::HTTP::Post class that builds a post body
-      # consisting of a multipart mime stream based on the parameters given.
-      # See README.txt for synopsis and details.
+    end
+    class Post #:nodoc:
       class Multipart < Post
-        def initialize(path, params, boundary = DEFAULT_BOUNDARY)
-          super(path)
-          parts = params.map {|k,v| Part.new(boundary, k, v)}
-          parts << EpiloguePart.new(boundary)
-          ios = parts.map{|p| p.to_io }
-          self.set_content_type("multipart/form-data", { "boundary" => boundary })
-          self.content_length = parts.inject(0) {|sum,i| sum + i.length }
-          self.body_stream = CompositeReadIO.new(*ios)
-        end
+        include Multipartable
       end
     end
   end
-end
+end

data/lib/parts.rb

@@ -0,0 +1,66 @@
+module Parts
+  module Part #:nodoc:
+    def self.new(boundary, name, value)
+      if value.respond_to? :content_type
+        FilePart.new(boundary, name, value)
+      else
+        ParamPart.new(boundary, name, value)
+      end
+    end
+
+    def length
+      @part.length
+    end
+
+    def to_io
+      @io
+    end
+  end
+
+  class ParamPart
+    include Part
+    def initialize(boundary, name, value)
+      @part = build_part(boundary, name, value)
+      @io = StringIO.new(@part)
+    end
+
+    def build_part(boundary, name, value)
+      part = ''
+      part << "--#{boundary}\r\n"
+      part << "Content-Disposition: form-data; name=\"#{name.to_s}\"\r\n"
+      part << "\r\n"
+      part << "#{value}\r\n"
+    end
+  end
+
+  # Represents a part to be filled from file IO.
+  class FilePart
+    include Part
+    attr_reader :length
+    def initialize(boundary, name, io)
+      file_length = io.respond_to?(:length) ?  io.length : File.size(io.local_path)
+      @head = build_head(boundary, name, io.original_filename, io.content_type, file_length)
+      @length = @head.length + file_length
+      @io = CompositeReadIO.new(StringIO.new(@head), io, StringIO.new("\r\n"))
+    end
+
+    def build_head(boundary, name, filename, type, content_len)
+      part = ''
+      part << "--#{boundary}\r\n"
+      part << "Content-Disposition: form-data; name=\"#{name.to_s}\"; filename=\"#{filename}\"\r\n"
+      part << "Content-Length: #{content_len}\r\n"
+      part << "Content-Type: #{type}\r\n"
+      part << "Content-Transfer-Encoding: binary\r\n"
+      part << "\r\n"
+    end
+  end
+
+  # Represents the epilogue or closing boundary.
+  class EpiloguePart
+    include Part
+    def initialize(boundary)
+      @part = "--#{boundary}--\r\n"
+      @io = StringIO.new(@part)
+    end
+  end
+end

data/test/net/http/post/test_multipart.rb

@@ -26,6 +26,12 @@ class Net::HTTP::Post::MultiPartTest < Test::Unit::TestCase
     UploadIO.convert! @io, "text/plain", TEMP_FILE, TEMP_FILE
     assert_results Net::HTTP::Post::Multipart.new("/foo/bar", :foo => 'bar', :file => @io)
   end
+  def test_form_multipart_body_put
+    File.open(TEMP_FILE, "w") {|f| f << "1234567890"}
+    @io = File.open(TEMP_FILE)
+    UploadIO.convert! @io, "text/plain", TEMP_FILE, TEMP_FILE
+    assert_results Net::HTTP::Put::Multipart.new("/foo/bar", :foo => 'bar', :file => @io)
+  end
   
   def test_form_multipart_body_with_stringio
     @io = StringIO.new("1234567890")
@@ -36,9 +42,9 @@ class Net::HTTP::Post::MultiPartTest < Test::Unit::TestCase
   def assert_results(post)
     assert post.content_length && post.content_length > 0
     assert post.body_stream
-    assert_equal "multipart/form-data; boundary=#{Net::HTTP::Post::DEFAULT_BOUNDARY}", post['content-type']
+    assert_equal "multipart/form-data; boundary=#{Multipartable::DEFAULT_BOUNDARY}", post['content-type']
     body = post.body_stream.read
-    boundary_regex = Regexp.quote Net::HTTP::Post::DEFAULT_BOUNDARY
+    boundary_regex = Regexp.quote Multipartable::DEFAULT_BOUNDARY
     assert body =~ /1234567890/
     # ensure there is at least one boundary
     assert body =~ /^--#{boundary_regex}\r\n/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: multipart-post
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "1.0"
 platform: ruby
 authors: 
 - Nick Sieger
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 -05:00
+date: 2009-02-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.3
+        version: 1.8.2
     version: 
 description: "Use with Net::HTTP to do multipart form posts.  IO values that have #content_type, #original_filename, and #local_path will be posted as a binary file."
 email: nick@nicksieger.com
@@ -33,6 +33,8 @@ extra_rdoc_files:
 - README.txt
 files: 
 - lib/composite_io.rb
+- lib/multipartable.rb
+- lib/parts.rb
 - lib/net/http/post/multipart.rb
 - Manifest.txt
 - Rakefile
@@ -62,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: caldersphere
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Creates a multipart form post accessory for Net::HTTP.