multipart_body 0.1.0 → 0.2.0

data/lib/multipart_body/part.rb

@@ -1,4 +1,4 @@
-class Part < Struct.new(:name, :body, :filename, :content_type, :encoding)
+class Part < Struct.new(:name, :body, :filename, :content_disposition, :content_type, :encoding)
   def initialize(*args)
     if args.flatten.first.is_a? Hash
       from_hash(args.flatten.first)
@@ -9,21 +9,29 @@ class Part < Struct.new(:name, :body, :filename, :content_type, :encoding)
   
   def from_hash(hash)
     hash.each_pair do |k, v|
-      self[k] = v
+      if k.to_s == 'body' && (v.is_a?(File) || v.is_a?(Tempfile))
+        self[k] = v.read
+        self['filename'] = File.basename(v)
+      else
+        self[k] = v
+      end
     end
   end
   
   def from_args(name, body, filename=nil)
-    self[:name] = name
-    self[:body] = body
-    self[:filename] = filename
+    self.from_hash(:name => name, :body => body, :filename => filename)
   end
   
   def header
-    header = "Content-Disposition: form-data; name=\"#{name}\""
-    header << "; filename=\"#{filename}\"" if filename
-    header << "\r\nContent-Type: #{content_type}" if content_type
-    header << "\r\nContent-Transfer-Encoding: #{encoding}" if encoding
+    header = ""
+    if content_disposition || name
+      header << "Content-Disposition: #{content_disposition || 'form-data'}"
+      header << "; name=\"#{name}\"" if name && !content_disposition
+      header << "; filename=\"#{filename}\"" if filename && !content_disposition
+      header << "\r\n"
+    end
+    header << "Content-Type: #{content_type}\r\n" if content_type
+    header << "Content-Transfer-Encoding: #{encoding}\r\n" if encoding
     header
   end
   
@@ -38,6 +46,6 @@ class Part < Struct.new(:name, :body, :filename, :content_type, :encoding)
   end
   
   def to_s
-    "#{header}\r\n\r\n#{encoded_body}"
+    "#{header}\r\n#{encoded_body}"
   end
 end

data/test/file

@@ -0,0 +1 @@
+hello

data/test/file.txt

@@ -0,0 +1 @@
+hello

data/test/test.rb

@@ -1,10 +1,12 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
+require 'tempfile'
 
 class MultipartBodyTest < Test::Unit::TestCase
-  context "MultipartBodyBody" do
+  context "MultipartBody" do
     setup do
       @hash = {:test => 'test', :two => 'two'}
       @parts = [Part.new('name', 'value'), Part.new('name2', 'value2')]
+      @example_text = "------multipart-boundary-307380\r\nContent-Disposition: form-data; name=\"name\"\r\n\r\nvalue\r\n------multipart-boundary-307380\r\nContent-Disposition: form-data; name=\"name2\"\r\n\r\nvalue2\r\n------multipart-boundary-307380--"
     end
     
     should "return a new multipart when sent #from_hash" do
@@ -51,11 +53,21 @@ class MultipartBodyTest < Test::Unit::TestCase
       multipart = MultipartBody.new(@parts)
       assert_match multipart.parts.join("\r\n--#{multipart.boundary}\r\n"), multipart.to_s
     end
+    
+    should "contrsuct a valid multipart text when passed #to_s" do
+      multipart = MultipartBody.new(@parts)
+      multipart.boundary = '----multipart-boundary-307380'
+      assert_equal @example_text, multipart.to_s
+    end
   end
   
   context "a Part" do
     setup do
       @part = Part
+      @file = Tempfile.new('file')
+      @file.write('hello')
+      @file.flush
+      @file.open
     end
     
     should "assign values when sent #new with a hash" do
@@ -86,7 +98,22 @@ class MultipartBodyTest < Test::Unit::TestCase
       assert_equal nil, part.filename
     end
     
-    should "include a content disposition when sent #header name" do
+    should "include a content type when one is set" do
+      part = Part.new(:content_type => 'plain/text', :body => 'content')
+      assert_match "Content-Type: plain\/text\r\n", part.header
+    end
+    
+    should "include a content disposition when sent #header and one is set" do
+      part = Part.new(:content_disposition => 'content-dispo', :body => 'content')
+      assert_match "Content-Disposition: content-dispo\r\n", part.header
+    end
+    
+    should "not include a content disposition of form-data when nothing is set" do
+      part = Part.new(:body => 'content')
+      assert_no_match /content-disposition/i, part.header
+    end
+    
+    should "include a content disposition when sent #header and name is set" do
       part = Part.new(:name => 'key', :body => 'content')
       assert_match /content-disposition: form-data; name="key"/i, part.header
     end
@@ -116,7 +143,17 @@ class MultipartBodyTest < Test::Unit::TestCase
     
     should "output the header and body when sent #to_s" do
       part = Part.new(:name => 'key', :body => 'content')
-      assert_equal "#{part.header}\r\n\r\n#{part.body}", part.to_s
+      assert_equal "#{part.header}\r\n#{part.body}", part.to_s
+    end
+    
+    should "add the files content not the file when passed a file" do
+      part = Part.new(:name => 'key', :body => @file)
+      assert_equal 'hello', part.body
+    end
+    
+    should "automatically assign a filename when passed a file to body" do
+      part = Part.new(:name => 'key', :body => @file)
+      assert_not_nil part.filename
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multipart_body
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Steve Smith
@@ -15,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 +01:00
+date: 2010-09-19 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
 description: A ruby library to create multipart bodies.
-email: gems@scsworld.co.uk
+email: gems@dynedge.co.uk
 executables: []
 
 extensions: []
@@ -32,6 +32,8 @@ files:
 - lib/multipart_body/multipart_body.rb
 - lib/multipart_body/part.rb
 - lib/multipart_body.rb
+- test/file
+- test/file.txt
 - test/test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -69,5 +71,7 @@ signing_key:
 specification_version: 3
 summary: MultipartBody allows you to create consistant multipart bodies
 test_files: 
+- test/file
+- test/file.txt
 - test/test.rb
 - test/test_helper.rb