multipart-parser 0.1.0 → 0.1.1

data/README

@@ -12,6 +12,11 @@ Some things to note:
 
 * Does not depend on any other library.
 
+Latest release: 0.1.1
+  * Fixes some issues with ruby 1.9
+
 Contributors:
   Daniel Abrahamsson
   Jérémy Bobbio
+  Aaron Patterson
+  Jeff Mancuso

data/Rakefile

@@ -0,0 +1,10 @@
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+  t.warning = true
+end
+
+task :default => :test

data/lib/multipart_parser/parser.rb

@@ -22,7 +22,7 @@ module MultipartParser
 
       @boundary_chars = {}
       @boundary.each_byte do |b|
-        @boundary_chars[b] = true
+        @boundary_chars[b.chr] = true
       end
     end
 
@@ -137,7 +137,7 @@ module MultipartParser
               # See http://debuggable.com/posts/parsing-file-uploads-at-500-
               # mb-s-with-node-js:4c03862e-351c-4faa-bb67-4365cbdd56cb
               while i + boundary_length <= buffer_length
-                break if boundary_chars.has_key? buffer[i + boundary_end]
+                break if boundary_chars.has_key? buffer[i + boundary_end].chr
                 i += boundary_length
               end
               c = buffer[i, 1]

data/lib/multipart_parser/reader.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../parser', __FILE__)
+require 'multipart_parser/parser'
 
 module MultipartParser
   class NotMultipartError < StandardError; end;

data/lib/multipart_parser/version.rb

@@ -1,3 +1,3 @@
 module MultipartParser
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/test/fixtures/multipart.rb

@@ -10,7 +10,7 @@ module MultipartParser::Fixtures
     def boundary
       'AaB03x'
     end
-    
+
     def expect_error
       false
     end
@@ -22,7 +22,7 @@ module MultipartParser::Fixtures
       part2[:headers] = {}
       part2[:headers]['content-disposition'] = 'form-data; name="pics"; ' +
                                                 'filename="file1.txt"'
-      part2[:headers]['Content-Type'] = 'text/plain' 
+      part2[:headers]['Content-Type'] = 'text/plain'
       part2[:data] = "... contents of file1.txt ...\r"
       [part1, part2]
     end
@@ -59,11 +59,11 @@ module MultipartParser::Fixtures
       part2[:headers] = {}
       part2[:headers]['content-disposition'] = 'form-data; name="pics"; ' +
                                                 'filename="file1.txt"'
-      part2[:headers]['Content-Type'] = 'text/plain' 
+      part2[:headers]['Content-Type'] = 'text/plain'
       part2[:data] = "... contents of file1.txt ...\r"
       [part1, part2]
     end
-    
+
     def raw
       ['--AaB03x',
         'content-disposition: form-data; name="field1"',
@@ -79,15 +79,41 @@ module MultipartParser::Fixtures
     end
   end
 
+  class LongBoundary
+    def boundary
+      '----------------------------5c4dc587f69f'
+    end
+
+    def expect_error
+      false
+    end
+
+    def parts
+      part1 = {}
+      part1[:headers] = {'content-disposition' => 'form-data; name="field1"'}
+      part1[:data] = "Joe Blow\r\nalmost tricked you!"
+      [part1]
+    end
+
+    def raw
+      ['----------------------------5c4dc587f69f',
+        'content-disposition: form-data; name="field1"',
+        '',
+        "Joe Blow\r\nalmost tricked you!",
+        '----------------------------5c4dc587f69f--'
+      ].join("\r\n")
+    end
+  end
+
   class EmptyHeader
     def boundary
       'AaB03x'
     end
-  
+
     def expect_error
       true
     end
-    
+
     def parts
       [] # Should never be called
     end

data/test/multipart_parser/parser_test.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
-require File.dirname(__FILE__) + "/../../lib/multipart_parser/parser"
-require File.dirname(__FILE__) + "/../fixtures/multipart"
+require "multipart_parser/parser"
+require "fixtures/multipart"
 
 module MultipartParser
   class ParserTest < Test::Unit::TestCase
@@ -11,8 +11,7 @@ module MultipartParser
 
       parser.init_with_boundary("abc")
       assert_equal "\r\n--abc", parser.boundary
-      expected_bc = {13 => true, 10 => true, 45 => true, 97 => true,
-                    98 => true, 99 => true}
+      expected_bc = {"\r"=>true, "\n"=>true, "-"=>true, "a"=>true, "b"=>true, "c"=>true}
       assert_equal expected_bc, parser.boundary_chars
     end
 
@@ -85,7 +84,7 @@ module MultipartParser
           end
         end
         unless got_error
-          assert true, end_called
+          assert_equal true, end_called
           assert_equal fixture.parts, parts
         else
           assert fixture.expect_error,

data/test/multipart_parser/{reader.rb → reader_test.rb}

@@ -70,5 +70,40 @@ module MultipartParser
       assert_equal 'file1.txt', file[:part].filename
       assert_equal fixture.parts.last[:data], file[:data]
     end
+
+    def test_long
+      fixture = Fixtures::LongBoundary.new
+      reader = Reader.new(fixture.boundary)
+      on_error_called = false
+      parts = {}
+
+      reader.on_error do |err|
+        on_error_called = true
+      end
+
+      reader.on_part do |part|
+        part_entry = {:part => part, :data => '', :ended => false}
+        parts[part.name] = part_entry
+        part.on_data do |data|
+          part_entry[:data] << data
+        end
+        part.on_end do
+          part_entry[:ended] = true
+        end
+      end
+
+      reader.write(fixture.raw)
+
+      assert !on_error_called
+      assert reader.ended?
+
+      assert_equal parts.size, fixture.parts.size
+      assert parts.all? {|k, v| v[:ended]}
+
+      field = parts['field1']
+      assert !field.nil?
+      assert_equal 'field1', field[:part].name
+      assert_equal fixture.parts.first[:data], field[:data]
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multipart-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-17 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies: []
 description: ! 'multipart-parser is a simple parser for multipart MIME messages, written
   in
@@ -40,13 +40,14 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README
+- Rakefile
 - lib/multipart_parser/parser.rb
 - lib/multipart_parser/reader.rb
 - lib/multipart_parser/version.rb
 - multipart-parser.gemspec
 - test/fixtures/multipart.rb
 - test/multipart_parser/parser_test.rb
-- test/multipart_parser/reader.rb
+- test/multipart_parser/reader_test.rb
 homepage: https://github.com/danabr/multipart-parser
 licenses: []
 post_install_message: 
@@ -67,11 +68,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: simple parser for multipart MIME messages
-test_files:
-- test/fixtures/multipart.rb
-- test/multipart_parser/parser_test.rb
-- test/multipart_parser/reader.rb
+test_files: []
+has_rdoc: