httpimagestore 0.0.4 → 0.0.5

data/Gemfile

@@ -4,6 +4,7 @@ gem "sinatra", ">= 1.2.6"
 gem "mongrel", ">= 1.1.5"
 gem "s3", "~> 0.3"
 gem "httpthumbnailer-client", "~> 0.0.3"
+gem "cli", "~> 0.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -15,5 +16,6 @@ group :development do
   gem "rcov", ">= 0"
   gem "rdoc", "~> 3.9"
   gem "daemon", "~> 1"
-  gem "httpthumbnailer", "~> 0.0.7"
+  gem "httpthumbnailer", "~> 0.0.8"
+  gem "prawn", "= 0.8.4"
 end

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     builder (3.0.0)
     cgi_multipart_eof_fix (2.5.0)
+    cli (0.0.2)
     cucumber (1.1.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -13,13 +14,16 @@ GEM
     daemons (1.1.4)
     diff-lcs (1.1.3)
     fastthread (1.0.7)
+    fcgi (0.8.8)
     gem_plugin (0.2.3)
     gherkin (2.6.8)
       json (>= 1.4.6)
     git (1.2.5)
     haml (3.1.4)
     httpclient (2.2.3)
-    httpthumbnailer (0.0.7)
+    httpthumbnailer (0.0.8)
+      cli (~> 0.0)
+      fcgi (~> 0.8)
       haml (~> 3)
       mongrel (>= 1.1.5)
       rmagick (~> 2)
@@ -36,6 +40,13 @@ GEM
       daemons (>= 1.0.3)
       fastthread (>= 1.0.1)
       gem_plugin (>= 0.2.3)
+    prawn (0.8.4)
+      prawn-core (>= 0.8.4, < 0.9)
+      prawn-layout (>= 0.8.4, < 0.9)
+      prawn-security (>= 0.8.4, < 0.9)
+    prawn-core (0.8.4)
+    prawn-layout (0.8.4)
+    prawn-security (0.8.4)
     proxies (0.2.1)
     rack (1.3.5)
     rack-protection (1.1.4)
@@ -67,12 +78,14 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  cli (~> 0.0)
   cucumber
   daemon (~> 1)
-  httpthumbnailer (~> 0.0.7)
+  httpthumbnailer (~> 0.0.8)
   httpthumbnailer-client (~> 0.0.3)
   jeweler (~> 1.6.4)
   mongrel (>= 1.1.5)
+  prawn (= 0.8.4)
   rcov
   rdoc (~> 3.9)
   rspec (~> 2.3.0)

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/httpimagestore

@@ -1,5 +1,14 @@
 #!/usr/bin/ruby
 
+require 'cli'
+options = CLI.new do
+	description 'HTTP based image storage and thumbnailer'
+	option :bind, :short => :b, :default => 'localhost', :description => "HTTP server bind address"
+	option :port, :short => :p, :default => 3000, :cast => Integer, :description => "HTTP server TCP port"
+	option :server, :short => :s, :default => 'mongrel', :description => "Rack server handler like thin, mongrel, webrick, fastcgi etc."
+	argument :config, :cast => Pathname, :description => "Configuration file path"
+end.parse!
+
 require 'sinatra/base'
 require 'pathname'
 require 's3'
@@ -12,13 +21,14 @@ require 'httpimagestore/pathname'
 
 sinatra = Sinatra.new
 
+sinatra.set :port, options.port
+sinatra.set :bind, options.bind
 sinatra.set :environment, 'production'
-sinatra.set :server, ['mongrel']
+sinatra.set :server, options.server
 sinatra.set :lock, true
 sinatra.set :logging, true
 
-conf_file = ARGV[0] or fail "no configuration file given (ARGV[0])"
-Configuration.from_file(conf_file).put(sinatra)
+Configuration.from_file(options.config).put(sinatra)
 
 class S3Put
 	def initialize(key_id, key_secret, bucket, options = {})
@@ -149,10 +159,5 @@ sinatra.error do
 	halt_exception(500, env['sinatra.error'])
 end
 
-begin
-	sinatra.run!
-rescue Errno::EACCES, Errno::EADDRNOTAVAIL, SocketError => e
-	puts "Error: failed to bind HTTP server socket (#{options[:bind]}): #{e}"
-	exit 5
-end
+sinatra.run!
 

data/features/httpimagestore.feature

@@ -1,7 +1,7 @@
-Feature: Original image and it's thumnails generation and storing on S2
-	In order to store original image and it's thumbnails in configured S3 buckte
-	A user must PUT image data to URI representing it's pathi with bucket
-	The respons will be paths to files storred in S3
+Feature: Storing of original image and specified classes of its thumbnails on S3
+	In order to store original image and its thumbnails in preconfigured S3 bucket
+	A user must PUT the image data to URI representing its path within the bucket
+	The response will be paths to files stored in S3
 
 	Background:
 		Given httpimagestore log is empty
@@ -19,7 +19,7 @@ Feature: Original image and it's thumnails generation and storing on S2
 		Given httpthumbnailer server is running at http://localhost:3100/
 		Given issthumbtest S3 bucket with key AKIAJMUYVYOSACNXLPTQ and secret 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
 
-	Scenario: Putting thumbnails and original to S3 bucket
+	Scenario: Putting original and its thumbnails to S3 bucket
 		Given there is no test/image/4006450256177f4a/test.jpg file in S3 bucket
 		And there is no test/image/4006450256177f4a/test-small.jpg file in S3 bucket
 		And there is no test/image/4006450256177f4a/test-tiny.jpg file in S3 bucket
@@ -27,7 +27,7 @@ Feature: Original image and it's thumnails generation and storing on S2
 		When I do PUT request http://localhost:3000/thumbnail/small,tiny/test/image/test.jpg
 		Then response status will be 200
 		And response content type will be text/uri-list
-		And response body will be CRLF endend lines
+		And response body will be CRLF ended lines
 		"""
 		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test.jpg
 		http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-small.jpg
@@ -37,16 +37,16 @@ Feature: Original image and it's thumnails generation and storing on S2
 		And http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-small.jpg will contain JPEG image of size 128x128
 		And http://issthumbtest.s3.amazonaws.com/test/image/4006450256177f4a/test-tiny.jpg will contain JPEG image of size 32x32
 
-	Scenario: Reporitng of missing resource
+	Scenario: Reporting of missing resource
 		When I do GET request http://localhost:3000/blah
 		Then response status will be 404
 		And response content type will be text/plain
-		And response body will be CRLF endend lines
+		And response body will be CRLF ended lines
 		"""
 		Resource '/blah' not found
 		"""
 
-	Scenario: Reporitng of unsupported media type
+	Scenario: Reporting of unsupported media type
 		Given there is no test/image/4006450256177f4a/test.jpg file in S3 bucket
 		And there is no test/image/4006450256177f4a/test-small.jpg file in S3 bucket
 		And there is no test/image/4006450256177f4a/test-tiny.jpg file in S3 bucket
@@ -54,7 +54,7 @@ Feature: Original image and it's thumnails generation and storing on S2
 		When I do PUT request http://localhost:3000/thumbnail/small,tiny/test/image/test.jpg
 		Then response status will be 415
 		And response content type will be text/plain
-		And response body will be CRLF endend lines like
+		And response body will be CRLF ended lines like
 		"""
 		Error: HTTPThumbnailerClient::UnsupportedMediaTypeError:
 		"""
@@ -62,7 +62,7 @@ Feature: Original image and it's thumnails generation and storing on S2
 		And S3 bucket will not contain test/image/4006450256177f4a/test-small.jpg
 		And S3 bucket will not contain test/image/4006450256177f4a/test-tiny.jpg
 
-	Scenario: Reporitng and handling of thumbnailing errors
+	Scenario: Reporting and handling of thumbnailing errors
 		Given there is no test/image/4006450256177f4a/test.jpg file in S3 bucket
 		And there is no test/image/4006450256177f4a/test-small.jpg file in S3 bucket
 		And there is no test/image/4006450256177f4a/test-tiny.jpg file in S3 bucket
@@ -70,7 +70,7 @@ Feature: Original image and it's thumnails generation and storing on S2
 		When I do PUT request http://localhost:3000/thumbnail/small,tiny,bad/test/image/test.jpg
 		Then response status will be 500
 		And response content type will be text/plain
-		And response body will be CRLF endend lines like
+		And response body will be CRLF ended lines like
 		"""
 		Error: ThumbnailingError: Thumbnailing for class 'bad' failed: Error: ArgumentError:
 		"""
@@ -83,7 +83,7 @@ Feature: Original image and it's thumnails generation and storing on S2
 		When I do PUT request http://localhost:3000/thumbnail/small,bogous,bad/test/image/test.jpg
 		Then response status will be 404
 		And response content type will be text/plain
-		And response body will be CRLF endend lines like
+		And response body will be CRLF ended lines like
 		"""
 		Error: Configuration::ThumbnailClassDoesNotExistError: Class 'bogous' does not exist
 		"""
@@ -93,17 +93,17 @@ Feature: Original image and it's thumnails generation and storing on S2
 		When I do PUT request http://localhost:3000/thumbnail/small/
 		Then response status will be 400
 		And response content type will be text/plain
-		And response body will be CRLF endend lines like
+		And response body will be CRLF ended lines like
 		"""
 		Error: BadRequestError: Path is empty
 		"""
 
-	Scenario: Too large image - uploaded image too big to load
+	Scenario: Too large image - uploaded image too big to fit in memory limit
 		Given test-large.jpg file content as request body
 		When I do PUT request http://localhost:3000/thumbnail/small/test/image/test.jpg
 		Then response status will be 413
 		And response content type will be text/plain
-		And response body will be CRLF endend lines like
+		And response body will be CRLF ended lines like
 		"""
 		Error: HTTPThumbnailerClient::ImageTooLargeError:
 		"""
@@ -113,7 +113,7 @@ Feature: Original image and it's thumnails generation and storing on S2
 		When I do PUT request http://localhost:3000/thumbnail/superlarge/test/image/test.jpg
 		Then response status will be 413
 		And response content type will be text/plain
-		And response body will be CRLF endend lines like
+		And response body will be CRLF ended lines like
 		"""
 		Error: ThumbnailingError: Thumbnailing for class 'superlarge' failed: Error: Thumbnailer::ImageTooLargeError:
 		"""

data/features/step_definitions/httpimagestore_steps.rb

@@ -56,14 +56,14 @@ Then /response content type will be (.*)/ do |content_type|
 	@response.header['Content-Type'].first.should == content_type
 end
 
-Then /response body will be CRLF endend lines like/ do |body|	
+Then /response body will be CRLF ended lines like/ do |body|	
 	@response.body.should match(body)
 	@response.body.each do |line|
 		line[-2,2].should == "\r\n"
 	end
 end
 
-Then /response body will be CRLF endend lines$/ do |body|	
+Then /response body will be CRLF ended lines$/ do |body|	
 	@response.body.should == body.gsub("\n", "\r\n") + "\r\n"
 end
 

data/httpimagestore.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "httpimagestore"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2011-11-30"
+  s.date = "2011-12-01"
   s.description = "Thumbnails images using httpthumbnailer and stored data on HTTP server (S3)"
   s.email = "jpastuszek@gmail.com"
   s.executables = ["httpimagestore"]
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mongrel>, [">= 1.1.5"])
       s.add_runtime_dependency(%q<s3>, ["~> 0.3"])
       s.add_runtime_dependency(%q<httpthumbnailer-client>, ["~> 0.0.3"])
+      s.add_runtime_dependency(%q<cli>, ["~> 0.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -63,12 +64,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.9"])
       s.add_development_dependency(%q<daemon>, ["~> 1"])
-      s.add_development_dependency(%q<httpthumbnailer>, ["~> 0.0.7"])
+      s.add_development_dependency(%q<httpthumbnailer>, ["~> 0.0.8"])
+      s.add_development_dependency(%q<prawn>, ["= 0.8.4"])
     else
       s.add_dependency(%q<sinatra>, [">= 1.2.6"])
       s.add_dependency(%q<mongrel>, [">= 1.1.5"])
       s.add_dependency(%q<s3>, ["~> 0.3"])
       s.add_dependency(%q<httpthumbnailer-client>, ["~> 0.0.3"])
+      s.add_dependency(%q<cli>, ["~> 0.0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -76,13 +79,15 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.9"])
       s.add_dependency(%q<daemon>, ["~> 1"])
-      s.add_dependency(%q<httpthumbnailer>, ["~> 0.0.7"])
+      s.add_dependency(%q<httpthumbnailer>, ["~> 0.0.8"])
+      s.add_dependency(%q<prawn>, ["= 0.8.4"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 1.2.6"])
     s.add_dependency(%q<mongrel>, [">= 1.1.5"])
     s.add_dependency(%q<s3>, ["~> 0.3"])
     s.add_dependency(%q<httpthumbnailer-client>, ["~> 0.0.3"])
+    s.add_dependency(%q<cli>, ["~> 0.0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -90,7 +95,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.9"])
     s.add_dependency(%q<daemon>, ["~> 1"])
-    s.add_dependency(%q<httpthumbnailer>, ["~> 0.0.7"])
+    s.add_dependency(%q<httpthumbnailer>, ["~> 0.0.8"])
+    s.add_dependency(%q<prawn>, ["= 0.8.4"])
   end
 end
 

data/lib/httpimagestore/configuration.rb

@@ -15,9 +15,6 @@ class Configuration
 
 		@thumbnailer_url = "http://localhost:3100"
 
-		@port = 3000
-		@bind = 'localhost'
-
 		instance_eval &block
 	end
 
@@ -45,16 +42,8 @@ class Configuration
 		@thumbnailer_url = url
 	end
 
-	def port(no)
-		@port = no
-	end
-
-	def bind(address)
-		@bind = address
-	end
-
 	def get
-		Struct.new(:thumbnail_classes, :s3_key_id, :s3_key_secret, :s3_bucket, :thumbnailer_url, :port, :bind).new(@thumbnail_classes, @s3_key_id, @s3_key_secret, @s3_bucket, @thumbnailer_url, @port, @bind)
+		Struct.new(:thumbnail_classes, :s3_key_id, :s3_key_secret, :s3_bucket, :thumbnailer_url).new(@thumbnail_classes, @s3_key_id, @s3_key_secret, @s3_bucket, @thumbnailer_url)
 	end
 
 	def put(sinatra)

data/spec/configuration_spec.rb

@@ -65,22 +65,6 @@ describe Configuration do
 		c.thumbnailer_url.should == 'http://test'
 	end
 
-	it "should provide port and bind address and defaults" do
-		c = Configuration.new do
-		end.get
-
-		c.port.should == 3000
-		c.bind.should == 'localhost'
-
-		c = Configuration.new do
-			port 123
-			bind 'blah'
-		end.get
-
-		c.port.should == 123
-		c.bind.should == 'blah'
-	end
-
 	it "can set sinatra settings with configured keys" do
 		sinatra = Sinatra.new
 		c = Configuration.new do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpimagestore
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 Z
+date: 2011-12-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -81,8 +81,23 @@ dependencies:
   name: httpthumbnailer-client
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 0
+        version: "0.0"
+  prerelease: false
+  name: cli
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,10 +110,10 @@ dependencies:
         version: 2.3.0
   prerelease: false
   name: rspec
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -109,10 +124,10 @@ dependencies:
         version: "0"
   prerelease: false
   name: cucumber
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -125,10 +140,10 @@ dependencies:
         version: 1.0.0
   prerelease: false
   name: bundler
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -141,10 +156,10 @@ dependencies:
         version: 1.6.4
   prerelease: false
   name: jeweler
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -155,10 +170,10 @@ dependencies:
         version: "0"
   prerelease: false
   name: rcov
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -170,10 +185,10 @@ dependencies:
         version: "3.9"
   prerelease: false
   name: rdoc
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -184,23 +199,39 @@ dependencies:
         version: "1"
   prerelease: false
   name: daemon
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15
         segments: 
         - 0
         - 0
-        - 7
-        version: 0.0.7
+        - 8
+        version: 0.0.8
   prerelease: false
   name: httpthumbnailer
-  version_requirements: *id012
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 8
+        - 4
+        version: 0.8.4
+  prerelease: false
+  name: prawn
+  version_requirements: *id014
 description: Thumbnails images using httpthumbnailer and stored data on HTTP server (S3)
 email: jpastuszek@gmail.com
 executables: