httpimagestore 0.3.1 → 0.3.2

data/Gemfile

@@ -15,9 +15,10 @@ group :development do
   gem "rspec", "~> 2.8.0"
   gem "cucumber", ">= 0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "simplecov", ">= 0"
   gem "rdoc", "~> 3.9"
   gem "daemon", "~> 1"
-  gem "httpthumbnailer", "~> 0.1.0"
+  gem "httpthumbnailer", "~> 0.2"
   gem "prawn", "= 0.8.4"
 end
+

data/Gemfile.lock

@@ -2,40 +2,40 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (3.0.0)
-    cli (1.1.0)
-    cucumber (1.1.3)
+    cli (1.1.1)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.6.7)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
     daemon (1.1.0)
     daemons (1.0.10)
     diff-lcs (1.1.3)
     gem_plugin (0.2.3)
-    gherkin (2.6.8)
+    gherkin (2.11.2)
       json (>= 1.4.6)
     git (1.2.5)
-    haml (3.1.4)
-    httpclient (2.2.4)
-    httpthumbnailer (0.1.0)
+    haml (3.1.7)
+    httpclient (2.2.7)
+    httpthumbnailer (0.3.1)
       cli (~> 1.1.0)
       haml (~> 3)
-      mongrel (>= 1.1.5)
+      mongrel (>= 1.2.0.pre2)
       rmagick (~> 2)
       ruby-ip (~> 0.9)
       sinatra (>= 1.2.6)
-    httpthumbnailer-client (0.1.0)
-      httpclient (>= 2.2.1)
+    httpthumbnailer-client (0.1.1)
+      httpclient (>= 2.2)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.2)
+    json (1.7.5)
     mime-types (1.17.2)
     mongrel (1.2.0.pre2)
       daemons (~> 1.0.10)
       gem_plugin (~> 0.2.3)
+    multi_json (1.3.6)
     prawn (0.8.4)
       prawn-core (>= 0.8.4, < 0.9)
       prawn-layout (>= 0.8.4, < 0.9)
@@ -44,12 +44,11 @@ GEM
     prawn-layout (0.8.4)
     prawn-security (0.8.4)
     proxies (0.2.1)
-    rack (1.3.5)
-    rack-protection (1.1.4)
+    rack (1.4.1)
+    rack-protection (1.2.0)
       rack
     rake (0.9.2.2)
-    rcov (0.9.11)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
     retry-this (1.1)
     rmagick (2.13.1)
@@ -61,14 +60,17 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    ruby-ip (0.9.0)
-    s3 (0.3.9)
+    ruby-ip (0.9.1)
+    s3 (0.3.11)
       proxies (~> 0.2.0)
-    sinatra (1.3.1)
-      rack (~> 1.3, >= 1.3.4)
-      rack-protection (~> 1.1, >= 1.1.2)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    term-ansicolor (1.0.7)
     tilt (1.3.3)
 
 PLATFORMS
@@ -78,16 +80,16 @@ DEPENDENCIES
   cli (~> 1.1.0)
   cucumber
   daemon (~> 1)
-  httpthumbnailer (~> 0.1.0)
+  httpthumbnailer (~> 0.2)
   httpthumbnailer-client (~> 0.1.0)
   jeweler (~> 1.6.4)
   mime-types (~> 1.17.2)
   mongrel (>= 1.2.0.pre2)
   prawn (= 0.8.4)
-  rcov
   rdoc (~> 3.9)
   retry-this (~> 1.1)
   rspec (~> 2.8.0)
   ruby-ip (~> 0.9)
   s3 (~> 0.3)
+  simplecov
   sinatra (>= 1.2.6)

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/bin/httpimagestore

@@ -55,13 +55,6 @@ class ThumbnailingError < RuntimeError
 	attr_reader :remote_error
 end
 
-sinatra.before do
-	logger.level = Logger::DEBUG if settings.logging and settings.debug
-	# singletons
-	$s3 ||= S3Service.new(settings.s3_key_id, settings.s3_key_secret, settings.s3_bucket, :logger => logger, :upload_retry_times => settings.upload_retry_times, :upload_retry_delay => settings.upload_retry_delay)
-	$thumbnailer ||= HTTPThumbnailerClient.new(settings.thumbnailer_url)
-end
-
 sinatra.helpers do
 	def hatl_response(status, msg)
 		headers "Content-Type" => "text/plain"
@@ -70,7 +63,13 @@ sinatra.helpers do
 	end
 
 	def halt_exception(status, exception)
-		hatl_response(status, "Error: #{exception.class.name}: #{exception}")
+		msg = "Error: #{exception.class.name}: #{exception}"
+		if status >= 500
+			logger.error msg
+		else
+			logger.warn msg
+		end
+		hatl_response(status, msg)
 	end
 
 	def digest(data)
@@ -78,6 +77,17 @@ sinatra.helpers do
 	end
 end
 
+sinatra.before do
+	begin
+		logger.level = Logger::DEBUG if settings.logging and settings.debug
+		# singletons
+		$s3 ||= S3Service.new(settings.s3_key_id, settings.s3_key_secret, settings.s3_bucket, :logger => logger, :upload_retry_times => settings.upload_retry_times, :upload_retry_delay => settings.upload_retry_delay)
+		$thumbnailer ||= HTTPThumbnailerClient.new(settings.thumbnailer_url)
+	rescue => exception
+		halt_exception(500, exception)
+	end
+end
+
 sinatra.get '/' do
 	"hello"
 end
@@ -130,12 +140,12 @@ end
 
 # problem with singe thumbnail
 sinatra.error ThumbnailingError do
-	e = env['sinatra.error']
-	case e.remote_error.type
+	exception = env['sinatra.error']
+	case exception.remote_error.type
 	when "Thumbnailer::ImageTooLargeError"
-		halt_exception(413, e)
+		halt_exception(413, exception)
 	else
-		halt_exception(500, e)
+		halt_exception(500, exception)
 	end
 end
 

data/features/httpimagestore.feature

@@ -20,6 +20,7 @@ Feature: Storing of original image and specified classes of its thumbnails on S3
 		Given httpthumbnailer log is empty
 		Given httpthumbnailer server is running at http://localhost:3100/
 		Given issthumbtest S3 bucket with key AKIAJMUYVYOSACNXLPTQ and secret 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
+		Given Content-Type header set to image/autodetect
 
 	Scenario: Putting original and its thumbnails to S3 bucket
 		Given there is no 4006450256177f4a.jpg file in S3 bucket

data/features/step_definitions/httpimagestore_steps.rb

@@ -25,11 +25,13 @@ Given /httpthumbnailer server is running at (.*)/ do |url|
 end
 
 Given /httpimagestore log is empty/ do
-		(support_dir + 'server.log').truncate(0)
+		log = support_dir + 'server.log'
+		log.truncate(0) if log.exist?
 end
 
 Given /httpthumbnailer log is empty/ do
-		(support_dir + 'thumbniler.log').truncate(0)
+		log = support_dir + 'thumbniler.log'
+		log.truncate(0) if log.exist?
 end
 
 Given /(.*) file content as request body/ do |file|

data/httpimagestore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpimagestore"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2012-08-20"
+  s.date = "2012-09-05"
   s.description = "Thumbnails images using httpthumbnailer and stored data on HTTP server (S3)"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpimagestore"]
@@ -64,10 +64,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.9"])
       s.add_development_dependency(%q<daemon>, ["~> 1"])
-      s.add_development_dependency(%q<httpthumbnailer>, ["~> 0.1.0"])
+      s.add_development_dependency(%q<httpthumbnailer>, ["~> 0.2"])
       s.add_development_dependency(%q<prawn>, ["= 0.8.4"])
     else
       s.add_dependency(%q<sinatra>, [">= 1.2.6"])
@@ -81,10 +81,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.9"])
       s.add_dependency(%q<daemon>, ["~> 1"])
-      s.add_dependency(%q<httpthumbnailer>, ["~> 0.1.0"])
+      s.add_dependency(%q<httpthumbnailer>, ["~> 0.2"])
       s.add_dependency(%q<prawn>, ["= 0.8.4"])
     end
   else
@@ -99,10 +99,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.9"])
     s.add_dependency(%q<daemon>, ["~> 1"])
-    s.add_dependency(%q<httpthumbnailer>, ["~> 0.1.0"])
+    s.add_dependency(%q<httpthumbnailer>, ["~> 0.2"])
     s.add_dependency(%q<prawn>, ["= 0.8.4"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpimagestore
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -188,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.4
 - !ruby/object:Gem::Dependency
-  name: rcov
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -242,7 +242,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -250,7 +250,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
@@ -316,7 +316,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4193891708801063626
+      hash: -3544343476789840343
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: