httpthumbnailer 1.1.1 → 1.1.2

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/httpthumbnailer.iml

@@ -0,0 +1,56 @@
+<?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="builder (v3.2.0, 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="capybara (v1.1.4, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="childprocess (v0.3.9, 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.1, 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="ffi (v1.8.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gherkin (v2.12.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="git (v1.2.5, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="httpclient (v2.3.3, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="jeweler (v1.8.4, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v1.7.7, 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.23, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.7.3, 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="nokogiri (v1.5.9, 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="rack-test (v0.6.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.0.4, 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.13.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v2.13.1, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.13.0, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.13.1, 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="rubyzip (v0.9.9, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="selenium-webdriver (v2.32.1, 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="websocket (v1.0.7, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="xpath (v0.1.4, RVM: ruby-1.9.3-p429) [gem]" level="application" />
+  </component>
+</module>
+

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/httpthumbnailer.iml" filepath="$PROJECT_DIR$/.idea/httpthumbnailer.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

@@ -11,7 +11,7 @@ group :development do
   gem "rspec-mocks", "~> 2.13"
   gem "cucumber", ">= 0"
   gem "capybara", "~> 1.1"
-  gem "jeweler", "~> 1.8.4"
+  gem "jeweler", "~> 1.8.8"
   gem "httpclient", "~> 2.3"
   gem "rdoc", "~> 3.9"
   gem "multipart-parser", "~> 0.1.1"

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.5)
     builder (3.2.0)
     capybara (1.1.4)
       mime-types (>= 1.16)
@@ -22,27 +23,54 @@ GEM
     daemon (1.1.0)
     diff-lcs (1.2.4)
     facter (1.6.18)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     ffi (1.8.1)
     gherkin (2.12.0)
       multi_json (~> 1.3)
-    git (1.2.5)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.20)
+    httpauth (0.2.0)
     httpclient (2.3.3)
-    jeweler (1.8.4)
+    jeweler (1.8.8)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
     json (1.7.7)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
     kgio (2.8.1)
     mime-types (1.23)
     multi_json (1.7.3)
+    multi_xml (0.5.5)
     multipart-parser (0.1.1)
-    nokogiri (1.5.9)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
     raindrops (0.12.0)
-    rake (10.0.4)
+    rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rmagick (2.13.2)
@@ -84,7 +112,7 @@ DEPENDENCIES
   cucumber
   daemon (~> 1.1)
   httpclient (~> 2.3)
-  jeweler (~> 1.8.4)
+  jeweler (~> 1.8.8)
   multipart-parser (~> 0.1.1)
   rdoc (~> 3.9)
   rmagick (~> 2)

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/bin/httpthumbnailer

@@ -71,7 +71,7 @@ Application.new('httpthumbnailer', port: 3100) do
 				end
 
 				on 'health_check' do
-					write_plain 200, 'OK'
+					write_plain 200, 'HTTP Thumbnailer OK'
 				end
 
 				on root do

data/features/step_definitions/httpthumbnailer_steps.rb

@@ -46,14 +46,14 @@ Then /I should get multipart response/ do
 	@response_multipart.should_not be_empty
 end
 
-Then /response body should be CRLF endend lines like/ do |body|	
+Then /response body should be CRLF endend lines like/ do |body|
 	@response.body.should match(body)
 	@response.body.each_line do |line|
 		line[-2,2].should == "\r\n"
 	end
 end
 
-Then /response body should be CRLF endend lines$/ do |body|	
+Then /response body should be CRLF endend lines$/ do |body|
 	@response.body.should == body.gsub("\n", "\r\n") + "\r\n"
 end
 
@@ -73,11 +73,11 @@ Then /^([^ ]+) part (.*) header should be (.*)/ do |part, header, value|
 	@response_multipart[part_no(part)].headers[header.downcase].should == value
 end
 
-Then /^([^ ]+) part body should be CRLF endend lines$/ do |part, body|	
+Then /^([^ ]+) part body should be CRLF endend lines$/ do |part, body|
 	@response_multipart[part_no(part)].body.should == body.gsub("\n", "\r\n")
 end
 
-Then /^([^ ]+) part body should be CRLF endend lines like$/ do |part, body|	
+Then /^([^ ]+) part body should be CRLF endend lines like$/ do |part, body|
 	pbody = @response_multipart[part_no(part)].body
 	pbody.should match(body)
 end
@@ -130,7 +130,11 @@ And /that image pixel at (.*)x(.*) should be of color (.*)/ do |x, y, color|
 end
 
 And /that image should be (.*) bit image/ do |bits|
-	@image.depth.should == bits.to_i
+	if @image.depth < 8
+		(@image.depth * 8).should == bits.to_i # newer versions return 1 for 8 bit?!
+	else
+		@image.depth.should == bits.to_i
+	end
 end
 
 And /there should be no leaked images/ do

data/features/thumbnail.feature

@@ -169,6 +169,17 @@ Feature: Generating single thumbnail with PUT request
 		at least one image dimension is zero: 0x0
 		"""
 
+	@error_handling
+	Scenario: Reporitng of bad color value
+		Given test.jpg file content as request body
+		When I do PUT request http://localhost:3100/thumbnail/pad,240,200,input,background-color:ff11
+		Then response status should be 400
+		And response content type should be text/plain
+		And response body should be CRLF endend lines
+		"""
+		invalid color name: ff11
+		"""
+
 	@optimization
 	Scenario: Handing of large image data - possible thanks to loading size optimization
 		Given test-large.jpg file content as request body

data/httpthumbnailer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpthumbnailer"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2013-10-07"
+  s.date = "2013-11-04"
   s.description = "Provides HTTP API for thumbnailing images"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpthumbnailer"]
@@ -19,6 +19,12 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".idea/encodings.xml",
+    ".idea/httpthumbnailer.iml",
+    ".idea/misc.xml",
+    ".idea/modules.xml",
+    ".idea/scopes/scope_settings.xml",
+    ".idea/vcs.xml",
     ".rspec",
     "Gemfile",
     "Gemfile.lock",
@@ -82,7 +88,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec-mocks>, ["~> 2.13"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<capybara>, ["~> 1.1"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.8"])
       s.add_development_dependency(%q<httpclient>, ["~> 2.3"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.9"])
       s.add_development_dependency(%q<multipart-parser>, ["~> 0.1.1"])
@@ -94,7 +100,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec-mocks>, ["~> 2.13"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<capybara>, ["~> 1.1"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
       s.add_dependency(%q<httpclient>, ["~> 2.3"])
       s.add_dependency(%q<rdoc>, ["~> 3.9"])
       s.add_dependency(%q<multipart-parser>, ["~> 0.1.1"])
@@ -107,7 +113,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec-mocks>, ["~> 2.13"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<capybara>, ["~> 1.1"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.8"])
     s.add_dependency(%q<httpclient>, ["~> 2.3"])
     s.add_dependency(%q<rdoc>, ["~> 3.9"])
     s.add_dependency(%q<multipart-parser>, ["~> 0.1.1"])

data/lib/httpthumbnailer/error_reporter.rb

@@ -14,7 +14,8 @@ class ErrorReporter < Controler
 		on error(
 			ThumbnailSpec::BadThubnailSpecError,
 			Plugin::Thumbnailer::ZeroSizedImageError,
-			Plugin::Thumbnailer::UnsupportedMethodError
+			Plugin::Thumbnailer::UnsupportedMethodError,
+			Plugin::Thumbnailer::InvalidColorNameError
 		) do |error|
 			write_error 400, error
 		end

data/lib/httpthumbnailer/plugin/thumbnailer.rb

@@ -50,6 +50,12 @@ module Plugin
 			end
 		end
 
+		class InvalidColorNameError < ArgumentError
+			def initialize(color)
+				super("invalid color name: #{color}")
+			end
+		end
+
 		module ImageProcessing
 			def replace
 				@use_count ||= 0
@@ -187,13 +193,13 @@ module Plugin
 
 			extend Stats
 			def_stats(
-				:total_images_loaded, 
-				:total_images_reloaded, 
-				:total_images_downscaled, 
-				:total_thumbnails_created, 
-				:images_loaded, 
-				:max_images_loaded, 
-				:max_images_loaded_worker, 
+				:total_images_loaded,
+				:total_images_reloaded,
+				:total_images_downscaled,
+				:total_thumbnails_created,
+				:images_loaded,
+				:max_images_loaded,
+				:max_images_loaded_worker,
 				:total_images_created,
 				:total_images_destroyed,
 				:total_images_created_from_blob,
@@ -396,7 +402,11 @@ class Magick::Image
 
 	def render_on_background(background_color, width = nil, height = nil)
 		Magick::Image.new(width || self.columns, height || self.rows) {
-			self.background_color = background_color
+			begin
+				self.background_color = background_color
+			rescue ArgumentError
+				raise Plugin::Thumbnailer::InvalidColorNameError.new(background_color)
+			end
 			self.depth = 8
 		}.replace do |background|
 			background.composite!(self, Magick::CenterGravity, Magick::OverCompositeOp)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpthumbnailer
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn-cuba-base
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.8.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.8.8
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +197,12 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
+- .idea/encodings.xml
+- .idea/httpthumbnailer.iml
+- .idea/misc.xml
+- .idea/modules.xml
+- .idea/scopes/scope_settings.xml
+- .idea/vcs.xml
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -258,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -997329938697643917
+      hash: 626389733843602187
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: