strelka 0.0.1.pre.265 → 0.0.1.pre.279

data/lib/strelka/paramvalidator.rb

@@ -27,6 +27,7 @@ require 'strelka/app' unless defined?( Strelka::App )
 #	validator.add( :name, /^(?<lastname>\S+), (?<firstname>\S+)$/, "Customer Name" )
 #	validator.add( :email, "Customer Email" )
 #	validator.add( :feedback, :printable, "Customer Feedback" )
+#	validator.override( :email, :printable, "Your Email Address" )
 #
 #   # Untaint all parameter values which match their constraints
 #   validate.untaint_all_constraints = true

data/spec/data/forms/singleupload.form

@@ -0,0 +1,12 @@
+--sillyBoundary
+Content-Disposition: form-data; name="upload"; filename="testfile.rtf"
+Content-Type: application/rtf
+
+{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf420
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww9000\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+
+\f0\fs24 \cf0 This is a test of the ThingFish upload handler.  This is only a test.  If this were real, you'd hear people screaming outside in anguish, and emergency sirens blaring.}
+--sillyBoundary--

data/spec/data/forms/testform.form

@@ -0,0 +1,40 @@
+--sillyboundary
+Content-Disposition: fProgram Files\Documents\testfile.rtf"
+Content-Type: application/rtf
+
+{\rtfcpg10000\cocoartf824\cocoasubrtf420
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww9000\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+
+\f0\fs24 \cf0 This is a test of the ThingFish upload handler.  This is only a test.  If this were real, you'd hear people screaming outside in anguish, and emergency sirens blaring.}
+--sillyboundary
+Content-Disposition: form-data; name="thingfish-upload"; filename=""
+Content-Type: application/octet-stream
+
+
+--sillyboundary
+Content-Disposition: form-data; name="upload"; filename=""
+Content-Type: application/octet-stream
+
+
+--sillyboundary
+Content-Disposition: form-data; name="thingfish-upload"; filename=""
+Content-Type: application/octet-stream
+
+
+--sillyboundary
+Content-Dispositiona; name="thingfish-upload"; filename=""
+Content-Type: application/octet-stream
+
+
+--sillyboundary
+Content-Disposition: form-data; name="thingfish-metadata-namespace"
+
+testing
+--sillyboundary
+Content-Di form-data; name="thingfish-metadata-rating"
+
+5
+--sillyboundary--

data/spec/data/forms/testform_bad.form

@@ -0,0 +1,20 @@
+--sillyBADboundary
+Content-Dispositionthingfish-upload"; filename="C:\Program Files\Documents\testfile.rtf"
+Content-Type: application/rtf
+
+{\rtfcpg10000\cocoartf824\cocoasubrtf420
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww9000\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+
+\f0\fs24 \cf0 This is a test of the ThingFish upload handler.  This is only a test.  If this were real, you'd hear people screaming outside in anguish, and emergency sirens blaring.}
+--sillyBADboundary
+Content-Disposition: form-data; name="thingfish-metadata-namespace"
+
+testing
+--sillyBADboundary
+Content-Disposition: form-data; name="thingfish-metadata-rating"
+
+5
+--s

data/spec/data/forms/testform_badheaders.form

@@ -0,0 +1,3 @@
+--sillyBoundary
+Content-Disposition: form-data; name="upload"; filename="C:\Program Files\Documents\testfile.rtf"
+Content-Type: application/oh.-my-god-something-bad-about-to-happen..

data/spec/data/forms/testform_metadataonly.form

@@ -0,0 +1,32 @@
+--sillyBoundary
+Content-Disposition: form-data; name="pork"
+
+fornk
+--sillyBoundary
+Content-Disposition: form-data; name="pork"
+
+zoot
+--sillyBoundary
+Content-Disposition: form-data; name="velour-fog"
+
+Sweet, sweet canday.  BAM.
+--sillyBoundary
+Content-Disposition: form-data; name="namespace"
+
+testing
+--sillyBoundary
+Content-Disposition: form-data; name="rating"
+
+5
+--sillyBoundary
+Content-Disposition: form-data; name="x-livejournal-entry"
+
+Hello.  I am content that ThingFish doesn't give a damn about.  I am so very sad
+to not be included in the ThingFish party.  I'm going to sit at home and eat ice
+cream instead. Fuck ThingFish! I don't need him anyway. I mean, he never even called
+me back after I put out and everything.
+
+He doesn't know what he's missing!  I'm a catch.  My Mom told me so.
+
+lolzz!11
+--sillyBoundary--

data/spec/data/forms/testform_msie.form

@@ -0,0 +1,12 @@
+--sillyBoundary
+Content-Disposition: form-data; name="upload"; filename="C:\Program Files\Documents\testfile.rtf"
+Content-Type: application/rtf
+
+{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf420
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww9000\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+
+\f0\fs24 \cf0 This is a test of the ThingFish upload handler.  This is only a test.  If this were real, you'd hear people screaming outside in anguish, and emergency sirens blaring.}
+--sillyBoundary--

data/spec/data/forms/testform_multivalue.form

@@ -0,0 +1,48 @@
+--sillyBoundary
+Content-Disposition: form-data; name="pork"
+
+fornk
+--sillyBoundary
+Content-Disposition: form-data; name="pork"
+
+zoot
+--sillyBoundary
+Content-Disposition: form-data; name="upload"; filename="testfile.rtf"
+Content-Type: application/rtf
+
+{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf420
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww9000\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+
+\f0\fs24 \cf0 This is a test of the ThingFish upload handler.  This is only a test.  If this were real, you'd hear people screaming outside in anguish, and emergency sirens blaring.}
+--sillyBoundary
+Content-Disposition: form-data; name="upload"; filename=""
+Content-Type: application/octet-stream
+
+
+--sillyBoundary
+Content-Disposition: form-data; name="upload"; filename=""
+Content-Type: application/octet-stream
+
+
+--sillyBoundary
+Content-Disposition: form-data; name="upload"; filename=""
+Content-Type: application/octet-stream
+
+
+--sillyBoundary
+Content-Disposition: form-data; name="upload"; filename=""
+Content-Type: application/octet-stream
+
+
+--sillyBoundary
+Content-Disposition: form-data; name="namespace"
+
+testing
+--sillyBoundary
+Content-Disposition: form-data; name="rating"
+
+5
+--sillyBoundary--

data/spec/data/forms/testform_truncated_metadata.form

@@ -0,0 +1,12 @@
+--sillyBoundary
+Content-Disposition: form-data; name="namespace"
+
+testing
+--sillyBoundary
+Content-Disposition: form-data; name="rating"
+
+5
+--sillyBoundary
+Content-Disposition: form-data; name="x-livejournal-entry"
+
+I am truncated. So sad...

data/spec/lib/helpers.rb

@@ -71,6 +71,22 @@ module Strelka::SpecHelpers
 	end
 
 
+	### Create a temporary working directory and return
+	### a Pathname object for it.
+	###
+	def make_tempdir
+		dirname = "%s.%d.%0.4f" % [
+			'strelka_spec',
+			Process.pid,
+			(Time.now.to_f % 3600),
+		  ]
+		tempdir = Pathname.new( Dir.tmpdir ) + dirname
+		tempdir.mkpath
+
+		return tempdir
+	end
+
+
 	#
 	# Matchers
 	#
@@ -250,12 +266,10 @@ RSpec.configure do |c|
 	c.mock_with( :rspec )
 
 	c.extend( Strelka::TestConstants )
-	c.extend( Strelka::TestConstants )
-	c.include( Strelka::TestConstants )
+
 	c.include( Loggability::SpecHelpers )
 	c.include( Mongrel2::SpecHelpers )
 	c.include( Strelka::SpecHelpers )
-	# c.include( Strelka::Matchers )
 end
 
 # vim: set nosta noet ts=4 sw=4:

data/spec/strelka/app_spec.rb

@@ -377,6 +377,17 @@ describe Strelka::App do
 		end
 	end
 
+	it "closes async uploads with a 413 Request Entity Too Large by default" do
+		@req.headers.x_mongrel2_upload_start = 'an/uploaded/file/path'
+
+		app = @app.new
+		app.conn.should_receive( :reply ).with( an_instance_of(Strelka::HTTPResponse) )
+		app.conn.should_receive( :reply_close ).with( @req )
+
+		res = app.handle_async_upload_start( @req )
+
+		res.should be_nil()
+	end
 
 	describe "process name" do
 

data/spec/strelka/mixins_spec.rb

@@ -197,6 +197,11 @@ describe Strelka, "mixins" do
 			Strelka::DataUtilities.deep_copy( :a_symbol ).should be( :a_symbol )
 		end
 
+		it "doesn't try to dup modules/classes" do
+			klass = Class.new
+			Strelka::DataUtilities.deep_copy( klass ).should be( klass )
+		end
+
 		it "makes distinct copies of arrays and their members" do
 			original = [ 'foom', Set.new([ 1,2 ]), :a_symbol ]
 

data/spec/strelka/multipartparser_spec.rb

@@ -0,0 +1,169 @@
+#!/usr/bin/env ruby
+#encoding: utf-8
+
+BEGIN {
+	require 'pathname'
+	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+}
+
+require 'date'
+require 'rspec'
+
+require 'spec/lib/helpers'
+
+require 'strelka'
+require 'strelka/multipartparser'
+
+
+#####################################################################
+###	C O N T E X T S
+#####################################################################
+describe Strelka::MultipartParser do
+
+	BOUNDARY = 'sillyBoundary'
+	MIMEPARSER_SPECDIR = Pathname.new( __FILE__ ).dirname.parent
+	MIMEPARSER_DATADIR = MIMEPARSER_SPECDIR + 'data/forms'
+
+
+	### Create a stub request prepopulated with HTTP headers and form data
+	def load_form( filename )
+		datafile = MIMEPARSER_DATADIR + filename
+		return datafile.open( 'r', encoding: 'ascii-8bit' )
+	end
+
+
+	before( :all ) do
+		setup_logging( :fatal )
+		@tmpdir = make_tempdir()
+	end
+
+	after( :all ) do
+		reset_logging()
+		FileUtils.rm_rf( @tmpdir )
+	end
+
+
+	before( :each ) do
+		described_class.configure( spooldir: @tmpdir, bufsize: 4096 )
+	end
+
+
+	it "should error if the initial boundary can't be found" do
+		socket = load_form( "testform_bad.form" )
+		parser = described_class.new( socket, BOUNDARY )
+
+		expect {
+			parser.parse
+		}.to raise_error( Strelka::ParseError, /^No initial boundary/ )
+	end
+
+	it "should error if headers can't be found" do
+		socket = load_form( "testform_badheaders.form" )
+		parser = described_class.new( socket, BOUNDARY )
+
+		expect {
+			parser.parse
+		}.to raise_error( Strelka::ParseError, /^EOF while searching for headers/ )
+	end
+
+	it "raises an error when the document is truncated inside a form field" do
+		socket = load_form( "testform_truncated_metadata.form" )
+		parser = described_class.new( socket, BOUNDARY )
+
+		expect {
+			parser.parse
+		}.to raise_error( Strelka::ParseError, /EOF while scanning/i )
+	end
+
+
+	it "parses form fields" do
+		socket = load_form( "testform_metadataonly.form" )
+		parser = described_class.new( socket, BOUNDARY )
+
+		params = parser.parse
+
+		params.should have( 5 ).keys
+		params.keys.should include( 'x-livejournal-entry' )
+		params['velour-fog'].should =~ /Sweet, sweet canday/i
+	end
+
+
+	it "parses the file from a simple upload" do
+		socket = load_form( "singleupload.form" )
+		parser = described_class.new( socket, BOUNDARY )
+		params = parser.parse
+
+		file = params['upload']
+
+		file.should be_a( Tempfile )
+		file.filename.should == 'testfile.rtf'
+		file.content_length.should == 480
+		file.content_type.should == 'application/rtf'
+
+		file.open
+		file.read.should =~ /screaming.+anguish.+sirens/
+	end
+
+	it "strips full paths from upload filenames (e.g., from MSIE)" do
+		socket = load_form( "testform_msie.form" )
+		parser = described_class.new( socket, BOUNDARY )
+		params = parser.parse
+
+		file = params['upload']
+
+		file.should be_a( Tempfile )
+		file.filename.should == 'testfile.rtf'
+		file.content_length.should == 480
+		file.content_type.should == 'application/rtf'
+
+		file.open
+		file.read.should =~ /screaming.+anguish.+sirens/
+	end
+
+	it "parses a mix of uploaded files and form data" do
+		socket = load_form( "testform_multivalue.form" )
+		parser = described_class.new( socket, BOUNDARY )
+		params = parser.parse
+
+		params['pork'].should be_an_instance_of( Array )
+		params['pork'].should have( 2 ).members
+		params['pork'].should include( 'zoot' )
+		params['pork'].should include( 'fornk' )
+
+		params['namespace'].should == 'testing'
+		params['rating'].should == '5'
+
+		file = params['upload']
+
+		file.should be_an_instance_of( Tempfile )
+		file.filename.should == 'testfile.rtf'
+		file.content_length.should == 480
+		file.content_type.should == 'application/rtf'
+
+		file.open
+		file.read.should =~ /screaming.+anguish.+sirens/
+	end
+
+
+	JPEG_MAGIC = "\xff\xd8".force_encoding( 'ascii-8bit' )
+
+	it "parses the files from multiple uploads" do
+		socket = load_form( "2_images.form" )
+		parser = described_class.new( socket, BOUNDARY )
+		params = parser.parse
+
+		file1, file2 = params['thingfish-upload']
+
+		file1.filename.should == 'Photo 3.jpg'
+		file2.filename.should == 'grass2.jpg'
+
+		file1.content_type.should == 'image/jpeg'
+		file2.content_type.should == 'image/jpeg'
+
+		file1.content_length.should == 82143
+		file2.content_length.should == 439257
+	end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.265
+  version: 0.0.1.pre.279
   prerelease: 
 platform: ruby
 authors:
@@ -36,16 +36,16 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: configurability
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -53,15 +53,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: foreman
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.47'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,15 +69,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.47'
 - !ruby/object:Gem::Dependency
-  name: sysexits
+  name: formvalidator
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,15 +85,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: formvalidator
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -101,7 +101,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: inversion
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,15 +117,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: mongrel2
+  name: loggability
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -133,15 +133,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: uuidtools
+  name: mongrel2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,9 +149,9 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.28'
 - !ruby/object:Gem::Dependency
-  name: configurability
+  name: pluginfactory
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -167,7 +167,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: pluginfactory
+  name: sysexits
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -183,13 +183,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: loggability
+  name: trollop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -197,15 +197,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: foreman
+  name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -213,7 +213,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -364,12 +364,12 @@ files:
 - contrib/hoetemplate/data/project/templates/top.tmpl.erb
 - contrib/hoetemplate/lib/file_name.rb.erb
 - contrib/hoetemplate/spec/file_name_spec.rb.erb
-- examples/.env
 - examples/Procfile
 - examples/apps/auth-demo
 - examples/apps/auth-demo2
 - examples/apps/hello-world
 - examples/apps/sessions-demo
+- examples/apps/upload-demo
 - examples/config.yml
 - examples/gen-config.rb
 - examples/static/examples.css
@@ -377,6 +377,8 @@ files:
 - examples/templates/auth-form.tmpl
 - examples/templates/auth-success.tmpl
 - examples/templates/layout.tmpl
+- examples/templates/upload-form.tmpl
+- examples/templates/upload-success.tmpl
 - lib/strelka.rb
 - lib/strelka/app.rb
 - lib/strelka/app/auth.rb
@@ -405,6 +407,7 @@ files:
 - lib/strelka/httpresponse/negotiation.rb
 - lib/strelka/httpresponse/session.rb
 - lib/strelka/mixins.rb
+- lib/strelka/multipartparser.rb
 - lib/strelka/paramvalidator.rb
 - lib/strelka/plugins.rb
 - lib/strelka/router.rb
@@ -414,6 +417,15 @@ files:
 - lib/strelka/session/db.rb
 - lib/strelka/session/default.rb
 - spec/data/error.tmpl
+- spec/data/forms/2_images.form
+- spec/data/forms/singleupload.form
+- spec/data/forms/testform.form
+- spec/data/forms/testform_bad.form
+- spec/data/forms/testform_badheaders.form
+- spec/data/forms/testform_metadataonly.form
+- spec/data/forms/testform_msie.form
+- spec/data/forms/testform_multivalue.form
+- spec/data/forms/testform_truncated_metadata.form
 - spec/data/layout.tmpl
 - spec/data/main.tmpl
 - spec/lib/constants.rb
@@ -443,6 +455,7 @@ files:
 - spec/strelka/httpresponse/session_spec.rb
 - spec/strelka/httpresponse_spec.rb
 - spec/strelka/mixins_spec.rb
+- spec/strelka/multipartparser_spec.rb
 - spec/strelka/paramvalidator_spec.rb
 - spec/strelka/plugins_spec.rb
 - spec/strelka/router/default_spec.rb