strelka 0.0.1.pre.284 → 0.0.1.pre.290

data/ChangeLog

@@ -1,3 +1,30 @@
+2012-08-03  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/strelka/paramvalidator.rb:
+	Add a paramvalidator built-in for matching UUIDs.
+	[3e38478b3f4d] [tip]
+
+2012-07-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* .rvm.gems, Rakefile:
+	Bumping mongrel2 dependency
+	[c098284fe5df]
+
+	* bin/strelka:
+	Load apps before loading configs so app dependencies contribute to
+	config defaults
+	[40f1a13a41d7]
+
+	* lib/strelka/mixins.rb:
+	Fix documentation for Strelka::MethodUtilities
+	[d4a1f8b96550]
+
+2012-07-18  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/app/restresources.rb:
+	Fix type on error message
+	[67379f896726]
+
 2012-07-17  Michael Granger  <ged@FaerieMUD.org>
 
 	* bin/strelka, lib/strelka/app/restresources.rb,
@@ -6,7 +33,7 @@
 	spec/strelka/app/restresources_spec.rb,
 	spec/strelka/paramvalidator_spec.rb:
 	Clean up some :restresources behavior
-	[153e65a22805] [tip]
+	[153e65a22805]
 
 2012-07-16  Michael Granger  <ged@FaerieMUD.org>
 

data/Rakefile

@@ -28,7 +28,7 @@ hoespec = Hoe.spec 'strelka' do
 	self.dependency 'highline',        '~> 1.6'
 	self.dependency 'inversion',       '~> 0.11'
 	self.dependency 'loggability',     '~> 0.4'
-	self.dependency 'mongrel2',        '~> 0.29'
+	self.dependency 'mongrel2',        '~> 0.30'
 	self.dependency 'pluginfactory',   '~> 1.0'
 	self.dependency 'sysexits',        '~> 1.0'
 	self.dependency 'trollop',         '~> 1.16'

data/bin/strelka

@@ -295,8 +295,8 @@ class Strelka::CLICommand
 		]
 		fork do
 			self.log.debug "  in the child."
-			Strelka.load_config( self.options.config ) if self.options.config
 			apps = Strelka::App.load( path )
+			Strelka.load_config( self.options.config ) if self.options.config
 			self.log.debug "  loaded: %p" % [ apps ]
 			apps.first.run
 		end

data/lib/strelka/app/restresources.rb

@@ -480,7 +480,7 @@ module Strelka::App::RestResources
 			self.log.debug "Adding dataset method read handler: %s" % [ path ]
 
 			config = rsrcobj.db_schema[ param ] or
-				raise ArgumentError, "no such column %p for %p" % [ col, rsrcobj ]
+				raise ArgumentError, "no such column %p for %p" % [ param, rsrcobj ]
 			param( param, config[:type] )
 
 			self.add_route( :GET, path, options ) do |req|

data/lib/strelka/httprequest.rb

@@ -181,13 +181,13 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 
 	### Return a Hash of request form data.
 	def parse_form_data
-		unless self.headers.content_type
+		unless self.content_type
 			finish_with( HTTP::BAD_REQUEST, "Malformed request (no content type?)" )
 		end
 
 		self.body.rewind
 
-		case self.headers.content_type.split( ';' ).first
+		case self.content_type.split( ';' ).first
 		when 'application/x-www-form-urlencoded'
 			return merge_query_args( URI.decode_www_form(self.body.read) )
 		when 'application/json', 'text/javascript'
@@ -195,16 +195,17 @@ class Strelka::HTTPRequest < Mongrel2::HTTPRequest
 		when 'text/x-yaml', 'application/x-yaml'
 			return YAML.load( self.body )
 		when 'multipart/form-data'
-			boundary = self.headers.content_type[ /\bboundary=(\S+)/, 1 ] or
+			boundary = self.content_type[ /\bboundary=(\S+)/, 1 ] or
 				raise Strelka::ParseError, "no boundary found for form data: %p" %
-				[ self.headers.content_type ]
+				[ self.content_type ]
 			boundary = dequote( boundary )
 
 			parser = Strelka::MultipartParser.new( self.body, boundary )
 			return parser.parse
 		else
-			raise Strelka::Error, "don't know how to handle %p form data" %
-				[ self.headers.content_type ]
+			self.log.debug "don't know how to handle %p form data" %
+				[ self.content_type ]
+			return {}
 		end
 	end
 

data/lib/strelka/mixins.rb

@@ -224,7 +224,7 @@ module Strelka
 	# A collection of methods for declaring other methods.
 	#
 	#   class MyClass
-	#       include Strelka::MethodUtilities
+	#       extend Strelka::MethodUtilities
 	#
 	#       singleton_attr_accessor :types
 	#       singleton_method_alias :kinds, :types

data/lib/strelka/paramvalidator.rb

@@ -123,6 +123,7 @@ class Strelka::ParamValidator < ::FormValidator
 		:email        => /^(?<email>#{RFC822_EMAIL_ADDRESS})$/,
 		:hostname     => /^(?<hostname>#{RFC1738_HOSTNAME})$/,
 		:uri          => /^(?<uri>#{URI::URI_REF})$/,
+		:uuid         => /^(?<uuid>[[:xdigit:]]{8}(?:-[[:xdigit:]]{4}){3}-[[:xdigit:]]{12})$/i
 	}
 
 	# Pattern to use to strip binding operators from parameter patterns so they

data/spec/data/forms/testform.form

@@ -2,12 +2,12 @@
 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
-
+{\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=""
@@ -34,7 +34,7 @@ Content-Disposition: form-data; name="thingfish-metadata-namespace"
 
 testing
 --sillyboundary
-Content-Di form-data; name="thingfish-metadata-rating"
+Content-Disposition: form-data; name="thingfish-metadata-rating"
 
 5
 --sillyboundary--

data/spec/strelka/httprequest_spec.rb

@@ -23,7 +23,7 @@ require 'strelka/cookie'
 describe Strelka::HTTPRequest do
 
 	before( :all ) do
-		setup_logging( :fatal )
+		setup_logging()
 		@request_factory = Mongrel2::RequestFactory.new( route: '/directory' )
 	end
 
@@ -237,14 +237,17 @@ describe Strelka::HTTPRequest do
 
 			before( :each ) do
 				@req = @request_factory.post( '/directory/path', '',
-					'Content-type' => 'multipart/form-data' )
+					'Content-type' => 'multipart/form-data; boundary=--a_boundary' )
 			end
 
-			it "returns nil for an empty body" do
-				pending "multipart/form-data support" do
-					@req.body = ''
-					@req.params.should be_nil()
-				end
+			it "returns a hash for form parameters" do
+				@req.body = "----a_boundary\r\n" +
+					%{Content-Disposition: form-data; name="title"\r\n} +
+					%{\r\n} +
+					%{An Impossible Task\r\n} +
+					%{----a_boundary--\r\n}
+
+				@req.params.should == {'title' => 'An Impossible Task'}
 			end
 
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.284
+  version: 0.0.1.pre.290
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -141,7 +141,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: pluginfactory
   requirement: !ruby/object:Gem::Requirement

metadata.gz.sig

@@ -1,4 +1 @@
-������)!/���t��o�@yaH�ۤ�ad��k������
-�t�
-hDM��Eڙ���r~�X�d9�)4�LC��cP�J��=�.���%��:t�]
l����8]�RDx8T�b�Vܥ���L�D����Aԫ1��.NM38�Z����(*:��I�e|Q��|���+���/
-�������Y�/{�5�>
��Z�~��>��X�8��6KY���=�0��suD7�K�2��:0e�fI4��Yz3B
+��L�5i
:��ռ݃�'��l���As�1�,ҳ� &M��d4��;2�]	SbZϮ���`���-��j���� x��o"諈Ž'�H`Ǯz��~A��a�	�5�&L.�^3<c��߀�]5`k댩�H���p���U'����.4X�'�u����A��]�#�\��J�&���q�&�ׯ�(?}�2��K��F>G�pV��B������L� ��u�J�)r������l��weO��?