httpimagestore 1.4.1 → 1.5.0

data/.idea/.name

@@ -0,0 +1 @@
+httpimagestore

data/.idea/.rakeTasks

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Settings><!--This file was automatically generated by Ruby plugin.
+You are allowed to: 
+1. Remove rake task
+2. Add existing rake tasks
+To add existing rake tasks automatically delete this file and reload the project.
+--><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build gem into pkg/" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated file" fullCmd="clobber" taksId="clobber" /><RakeTask description="Remove RDoc HTML files" fullCmd="clobber_rdoc" taksId="clobber_rdoc" /><RakeTask description="Start IRB with all runtime dependencies loaded" fullCmd="console[script]" taksId="console[script]" /><RakeTask description="Run Cucumber features" fullCmd="features" taksId="features" /><RakeGroup description="" fullCmd="" taksId="gemcutter"><RakeTask description="Release gem to Gemcutter" fullCmd="gemcutter:release" taksId="release" /></RakeGroup><RakeTask description="Generate and validate gemspec" fullCmd="gemspec" taksId="gemspec" /><RakeGroup description="" fullCmd="" taksId="gemspec"><RakeTask description="Display the gemspec for debugging purposes, as jeweler knows it (not from the filesystem)" fullCmd="gemspec:debug" taksId="debug" /><RakeTask description="Regenerate the gemspec on the filesystem" fullCmd="gemspec:generate" taksId="generate" /><RakeTask description="Regenerate and validate gemspec, and then commits and pushes to git" fullCmd="gemspec:release" taksId="release" /><RakeTask description="Validates the gemspec on the filesystem" fullCmd="gemspec:validate" taksId="validate" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="git"><RakeTask description="Tag and push release to git" fullCmd="git:release" taksId="release" /></RakeGroup><RakeTask description="Build and install gem using `gem install`" fullCmd="install" taksId="install" /><RakeTask description="Run RSpec code examples" fullCmd="rcov" taksId="rcov" /><RakeTask description="Build RDoc HTML files" fullCmd="rdoc" taksId="rdoc" /><RakeTask description="Release gem" fullCmd="release" taksId="release" /><RakeTask description="Rebuild RDoc HTML files" fullCmd="rerdoc" taksId="rerdoc" /><RakeTask description="Run RSpec code examples" fullCmd="spec" taksId="spec" /><RakeTask description="Displays the current version" fullCmd="version" taksId="version" /><RakeGroup description="" fullCmd="" taksId="version"><RakeGroup description="" fullCmd="" taksId="bump"><RakeTask description="Bump the major version by 1" fullCmd="version:bump:major" taksId="major" /><RakeTask description="Bump the a minor version by 1" fullCmd="version:bump:minor" taksId="minor" /><RakeTask description="Bump the patch version by 1" fullCmd="version:bump:patch" taksId="patch" /></RakeGroup><RakeTask description="Writes out an explicit version" fullCmd="version:write" taksId="write" /></RakeGroup><RakeTask description="" fullCmd="console" taksId="console" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="gemspec_required" taksId="gemspec_required" /><RakeTask description="" fullCmd="rdoc/index.html" taksId="rdoc/index.html" /><RakeTask description="" fullCmd="version_required" taksId="version_required" /></RakeGroup></Settings>

data/.idea/codeStyleSettings.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+      </value>
+    </option>
+  </component>
+</project>
+

data/.idea/dictionaries/wcc.xml

@@ -0,0 +1,8 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="wcc">
+    <words>
+      <w>httpimagestore</w>
+      <w>httpthumbnailer</w>
+    </words>
+  </dictionary>
+</component>

data/.idea/encodings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+

data/.idea/httpimagestore.iml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="gem" name="Gem">
+      <configuration>
+        <option name="GEM_APP_ROOT_PATH" value="$MODULE_DIR$" />
+        <option name="GEM_APP_TEST_PATH" value="" />
+        <option name="GEM_APP_LIB_PATH" value="$MODULE_DIR$/lib" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="addressable (v2.3.5, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v1.18.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.3.5, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="cli (v1.3.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="cuba (v3.1.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="cucumber (v1.3.8, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="daemon (v1.1.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.4, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="facter (v1.6.18, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday (v0.8.8, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gherkin (v2.12.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="git (v1.2.6, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="github_api (v0.10.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="hashie (v2.0.5, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="highline (v1.6.19, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="httpauth (v0.2.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="httpclient (v2.3.4.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="httpthumbnailer (v1.1.1, /Users/wcc/Documents/httpthumbnailer) [path][gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="httpthumbnailer-client (v1.1.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="jeweler (v1.8.7, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v1.8.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="jwt (v0.1.8, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="kgio (v2.8.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mime-types (v1.25, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="msgpack (v0.5.5, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.8.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_test (v0.0.2, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_xml (v0.5.5, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multipart-parser (v0.1.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multipart-post (v1.2.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.5.10, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="oauth2 (v0.9.2, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="prawn (v0.8.4, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="prawn-core (v0.8.4, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="prawn-layout (v0.8.4, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="prawn-security (v0.8.4, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rack (v1.5.2, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="raindrops (v0.12.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v10.1.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rdoc (v3.12.2, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rmagick (v2.13.2, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v2.14.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v2.14.5, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.14.2, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.14.3, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-ip (v0.9.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sdl4r (v0.9.11, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unicorn (v4.6.3, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unicorn-cuba-base (v1.1.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="uuidtools (v2.1.4, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+  </component>
+</module>
+

data/.idea/jenkinsSettings.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Jenkins.Application.Settings">
+    <option name="rssSettings">
+      <RssSettings />
+    </option>
+  </component>
+</project>
+

data/.idea/misc.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-1.9.3-p429" project-jdk-type="RUBY_SDK" />
+</project>
+

data/.idea/modules.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/httpimagestore.iml" filepath="$PROJECT_DIR$/.idea/httpimagestore.iml" />
+    </modules>
+  </component>
+</project>
+

data/.idea/scopes/scope_settings.xml

@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+  <state>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </state>
+</component>

data/.idea/vcs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
+

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 ruby "1.9.3"
 
-gem "unicorn-cuba-base", "~> 1.1.1"
+gem "unicorn-cuba-base", "~> 1.1.2"
 #gem "unicorn-cuba-base", path: "../unicorn-cuba-base"
 gem "httpthumbnailer-client", "~> 1.1.1"
 #gem "httpthumbnailer-client", path: "../httpthumbnailer-client"

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: ../httpthumbnailer
   specs:
-    httpthumbnailer (1.1.0)
+    httpthumbnailer (1.1.1)
       rmagick (~> 2)
-      unicorn-cuba-base (~> 1.1)
+      unicorn-cuba-base (~> 1.1.1)
 
 GEM
   remote: http://rubygems.org/
@@ -101,7 +101,7 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    unicorn-cuba-base (1.1.1)
+    unicorn-cuba-base (1.1.2)
       cli (~> 1.3)
       cuba (~> 3.0)
       facter (~> 1.6.11)
@@ -127,4 +127,4 @@ DEPENDENCIES
   rdoc (~> 3.9)
   rspec (~> 2.13)
   sdl4r (~> 0.9)
-  unicorn-cuba-base (~> 1.1.1)
+  unicorn-cuba-base (~> 1.1.2)

data/README.md

@@ -17,6 +17,11 @@ It is using [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer) as
 
 ## Changelog
 
+### 1.5.0
+* `output_ok` and `output_text` support
+* named captures regexp matcher support
+* better matcher debugging
+
 ### 1.4.0
 * read-through and write-through S3 object cache support
 
@@ -32,7 +37,7 @@ It is using [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer) as
 * matching for query string key and value
 * getting query string key value into variable
 * optional query string matchers with default value
-* default values for optional component matchers
+* default values for optional segment matchers
 * S3 storage prefix support
 
 ### 1.1.0
@@ -152,27 +157,26 @@ Each endpoint can have one or more operation defined that will be performed on r
 
 Endpoints will be evaluated in order of definition until one is matched.
 
-Statement should start with one of the following HTTP verbs in lowercase: `get`, `post`, `put`, `delete`, followed by list of URI component matchers:
+Statement should start with one of the following HTTP verbs in lowercase: `get`, `post`, `put`, `delete`, followed by list of URI segment matchers:
 
-* `<string>` - `<string>` literally match against URI component in that position for the endpoint to be evaluated
-* `:<symbol>` - match any URI component in that position and store matched component value in variable named `<symbol>`
-* `:<symbol>?[defalut]` - optionally match URI component in that position and store matched component value in variable named `<symbol>`; request URI may not contain component in that position (usually at the end of URI) to be matched for this endpoint to be evaluated; if `[default]` value is specified it will be used when no value was found in the URI, otherwise empty string will be used
-* `:<symbol>/<regexp>/` - match URI component using `/` surrounded [regular expression](http://rubular.com) and store matched component value in variable named `<symbol>`
-* `&<key>=<value>` - match this endpoint when query string contains key `<key>` with value of `<value>`
+* `<string>` - `<string>` literally match against URI segment in that position for the endpoint to be evaluated
+* `:<symbol>` - match any URI segment in that position and store matched segment value in variable named `<symbol>`
+* `:<symbol>?[defalut]` - optionally match URI segment in that position and store matched segment value in variable named `<symbol>`; request URI may not contain segment in that position (usually at the end of URI) to be matched for this endpoint to be evaluated; if `[default]` value is specified it will be used when no value was found in the URI, otherwise empty string will be used
+* `:<symbol>/<regexp>/` - match remaining URI using `/` surrounded [regular expression](http://rubular.com) and store matched segments in variable named `<symbol>`
+* `/<regexp>/` - match remaining URI using `/` surrounded [regular expression](http://rubular.com) and store zero or more named captures in variable named as corresponding capture name; e.g. `/(?<my_number>[0-9]+)/` - match a number and store it in `my_number` variable
+* `&<key>=<value>` - match this endpoint when query string contains key `<key>` with value of `<value>` and store the `<value>` in variable named `<key>`
 * `&:<key>` - match query string parameter of key `<key>` and store it's value in variable named `<key>`
 * `&:<key>?[default]` - optionally match query string parameter of key `<key>`; when `[default]` is specified it will be used as variable value, otherwise empty string will be used
 
-Note that any remaining unmatched URI is stored in `path` variable.
-All query string parameters are available as variables named by their key. 
-Additionally `query_string_options` variable is build from query string parameters and can be used to specify options to [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer).
+Note that any remaining unmatched URI part is stored in `path` variable.
+Variable `query_string_options` is build from all query string parameters and can be used to specify options to [HTTP Thumbnailer](https://github.com/jpastuszek/httpthumbnailer).
 
 Note that variables can get overwritten in order of evaluation:
-1. all query string parameters
-2. `path` variable value
-3. all matched URI components and query string parameters in order of specification from left to right
-4. `query_string_options` variable value
+1. `path` variable value
+2. all matched URI components and query string parameters in order of specification from left to right
+3. `query_string_options` variable value
 
-Note that URI components are URI decoded after they are matched. 
+Note that URI components are URI decoded after they are matched.
 Query string parameter values are URI decoded before they are matched.
 
 Example:
@@ -386,9 +390,27 @@ Putting image data to `/store/hello.jpg` will store two copies of the image unde
 
 ### API endpoint output operations
 
-When all images are stored output statements are processed.
-They are responsible with generating HTTP response for the API endpoint.
-If not output statement is specified the server will respond with `200 OK` and `OK` in response body.
+After all images are stored the output statement is processed.
+It is responsible for generating HTTP response for the API endpoint.
+If no output statement is specified the server will respond with `200 OK` and `OK` in response body.
+
+#### output_text
+
+This statement will produce custom `text/plain` response.
+
+Arguments:
+
+1. text - text to be provided in response body; you can use `#{variable}` expansion
+
+Options:
+
+* `status` - numerical value for HTTP response status; default: 200
+* `cache-control` - value for the `Cache-Control` response header
+
+#### output_ok
+
+This is the default output if none is specified.
+It will always produce `200` status HTTP response with `OK` in it's body.
 
 #### output_image
 
@@ -474,7 +496,7 @@ Each output URL is `\r\n` ended.
 
 Arguments:
 
-1. image names - names of images 
+1. image names - names of images
 
 Example:
 
@@ -686,7 +708,7 @@ put "thumbnail" ":name_list" {
 	# Save input image for future reprocessing
 	store_s3 "input"			bucket="mybucket"	path="compat-hash"	public=true
 
-	# Backend classe 
+	# Backend classe
 	store_s3 "original"			bucket="mybucket"	path="compat-hash-name"	public=true cache-control="public, max-age=31557600, s-maxage=0" if-image-name-on="#{name_list}"
 	store_s3 "search"			bucket="mybucket"	path="compat-hash-name"	public=true cache-control="public, max-age=31557600, s-maxage=0" if-image-name-on="#{name_list}"
 	store_s3 "brochure"			bucket="mybucket"	path="compat-hash-name"	public=true cache-control="public, max-age=31557600, s-maxage=0" if-image-name-on="#{name_list}"
@@ -699,7 +721,7 @@ put "thumbnail" ":name_list" {
 	}
 }
 
-# Thumbnail on demand API 
+# Thumbnail on demand API
 path "hash"	"#{input_digest}.#{image_mime_extension}"
 path "path"	"#{path}"
 
@@ -732,7 +754,7 @@ Compatibility API example:
 
 ```bash
 # Uploading image and thumbnailing to 'original' and 'brochure' classes
-$ curl -X PUT 10.1.1.24:3000/thumbnail/original,brochure -q --data-binary @Pictures/compute.jpg 
+$ curl -X PUT 10.1.1.24:3000/thumbnail/original,brochure -q --data-binary @Pictures/compute.jpg
 http://s3-eu-west-1.amazonaws.com/test.my.bucket/4006450256177f4a.jpg
 http://s3-eu-west-1.amazonaws.com/test.my.bucket/4006450256177f4a/original.jpg
 http://s3-eu-west-1.amazonaws.com/test.my.bucket/4006450256177f4a/brochure.jpg
@@ -745,7 +767,7 @@ $ curl http://s3-eu-west-1.amazonaws.com/test.my.bucket/4006450256177f4a/brochur
 > User-Agent: curl/7.22.0 (x86_64-apple-darwin10.8.0) libcurl/7.22.0 OpenSSL/1.0.1c zlib/1.2.7 libidn/1.25
 > Host: s3-eu-west-1.amazonaws.com
 > Accept: */*
-> 
+>
 < HTTP/1.1 200 OK
 < x-amz-id-2: ZXJSWlUBthbIoUXztc9GkSu7mhpGK5HK+sVXWPdbCX9+a3nVkr4A6pclH1kdKjM9
 < x-amz-request-id: 3DD4C96B6B55B4ED
@@ -757,7 +779,7 @@ $ curl http://s3-eu-west-1.amazonaws.com/test.my.bucket/4006450256177f4a/brochur
 < Content-Type: image/jpeg
 < Content-Length: 39458
 < Server: AmazonS3
-< 
+<
 { [data not shown]
 * Connection #0 to host s3-eu-west-1.amazonaws.com left intact
 * Closing connection #0
@@ -770,7 +792,7 @@ On demand API example:
 
 ```bash
 # Uploading image
-$ curl -X PUT 10.1.1.24:3000/v1/original -q --data-binary @Pictures/compute.jpg 
+$ curl -X PUT 10.1.1.24:3000/v1/original -q --data-binary @Pictures/compute.jpg
 4006450256177f4a.jpg
 
 # Getting fit operation 100x1000 thumbnail to /tmp/test.jpg
@@ -781,7 +803,7 @@ $ curl 10.1.1.24:3000/v1/thumbnail/4006450256177f4a.jpg/fit/100/1000 -v -s -o /t
 > User-Agent: curl/7.22.0 (x86_64-apple-darwin10.8.0) libcurl/7.22.0 OpenSSL/1.0.1c zlib/1.2.7 libidn/1.25
 > Host: 10.1.1.24:3000
 > Accept: */*
-> 
+>
 < HTTP/1.1 200 OK
 < Server: nginx/1.2.9
 < Date: Thu, 11 Jul 2013 11:26:15 GMT
@@ -790,7 +812,7 @@ $ curl 10.1.1.24:3000/v1/thumbnail/4006450256177f4a.jpg/fit/100/1000 -v -s -o /t
 < Connection: keep-alive
 < Status: 200 OK
 < Cache-Control: public, max-age=31557600, s-maxage=0
-< 
+<
 { [data not shown]
 * Connection #0 to host 10.1.1.24 left intact
 * Closing connection #0
@@ -806,7 +828,7 @@ $ curl 10.1.1.24:3000/v2/thumbnail/pad/100/100/4006450256177f4a.jpg?background-c
 > User-Agent: curl/7.22.0 (x86_64-apple-darwin10.8.0) libcurl/7.22.0 OpenSSL/1.0.1c zlib/1.2.7 libidn/1.25
 > Host: 10.1.1.24:3000
 > Accept: */*
-> 
+>
 < HTTP/1.1 200 OK
 < Server: nginx/1.2.9
 < Date: Wed, 24 Jul 2013 11:38:39 GMT
@@ -815,7 +837,7 @@ $ curl 10.1.1.24:3000/v2/thumbnail/pad/100/100/4006450256177f4a.jpg?background-c
 < Connection: keep-alive
 < Status: 200 OK
 < Cache-Control: public, max-age=31557600, s-maxage=0
-< 
+<
 { [data not shown]
 * Connection #0 to host 10.1.1.24 left intact
 * Closing connection #0
@@ -826,7 +848,7 @@ $ identify /tmp/test.jpg
 
 ## Usage
 
-After installation of the gem the `httpimagestore` executable is installed in **PATH**. 
+After installation of the gem the `httpimagestore` executable is installed in **PATH**.
 This executable is used to start HTTP Image Service with given configuration file path as it's last argument.
 
 ### Stand alone
@@ -936,7 +958,7 @@ http {
 
 			client_body_buffer_size		16m;
 			client_max_body_size		128m;
-			
+
 			proxy_buffering				on;
 			proxy_buffer_size			64k;
 			proxy_buffers				256 64k;
@@ -978,7 +1000,7 @@ If all goes well `200 OK` will be returned otherwise:
 * uploaded image is too big to fit in memory
 * request body is too long
 * too much image data is loaded in memory
-* memory or pixel cache limit in the thumbnailer backend has been exhausted 
+* memory or pixel cache limit in the thumbnailer backend has been exhausted
 
 ### 415
 
@@ -1025,7 +1047,7 @@ $ curl 10.1.1.24:3000/stats/total_s3_source
 ```
 
 ## Contributing to HTTP Image Store
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.5.0

data/bin/httpimagestore

@@ -24,8 +24,8 @@ Application.new('httpimagestore', port: 3000, processor_count_factor: 2) do
 			extend Stats
 			def_stats(
 				:workers,
-				:total_requests, 
-				:total_errors 
+				:total_requests,
+				:total_errors
 			)
 
 			raindrops_stats = Raindrops::Middleware::Stats.new
@@ -66,11 +66,25 @@ Application.new('httpimagestore', port: 3000, processor_count_factor: 2) do
 					write_plain 200, 'HTTP Image Store OK'
 				end
 
+				log.debug{"got request: #{env["REQUEST_METHOD"]} #{env["REQUEST_URI"]}"}
 				env['app.configuration'].handlers.each do |handler|
+					log.debug{"trying handler: #{handler.http_method}, #{handler.uri_matchers.join(', ')}"}
 					on eval(handler.http_method), *handler.uri_matchers.map{|m| instance_eval(&m.matcher)} do |*args|
-						# map and decode matched URI componetns
+						log.debug{"matched handler: #{handler.http_method}, #{handler.uri_matchers.join(', ')}"}
+						# map and decode matched URI segments
 						matches = {}
-						Hash[handler.uri_matchers.select{|m| m.name}.map{|m| m.name}.zip(args)].each do |name, value|
+						names = handler.uri_matchers
+						.map do |matcher|
+							matcher.names
+						end
+						.flatten
+
+						fail "matched more arguments than named (#{args.length} for #{names.length})" if args.length > names.length
+						fail "matched less arguments than named (#{args.length} for #{names.length})" if args.length < names.length
+
+						names.zip(args)
+						.each do |name, value|
+							fail "name should be a symbol" unless name.is_a? Symbol
 							matches[name] = URI.decode(value).force_encoding('UTF-8')
 						end
 
@@ -79,7 +93,7 @@ Application.new('httpimagestore', port: 3000, processor_count_factor: 2) do
 							URI.decode(part).force_encoding('UTF-8')
 						end.join('/')
 
-						# query string already doceded by Rack
+						# query string already decoded by Rack
 						query_string = req.GET
 
 						state = Configuration::RequestState.new(req.body.read, matches, path, query_string, memory_limit)