httpthumbnailer-client 0.1.0 → 0.1.1

data/Gemfile

@@ -1,16 +1,17 @@
 source "http://rubygems.org"
 
-gem "httpclient", ">= 2.2.1"
+gem "httpclient", ">= 2.2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
+  gem "rspec", "~> 2.3"
   gem "cucumber", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "bundler", "~> 1.1"
+  gem "jeweler", "~> 1.6"
+  gem "simplecov", ">= 0"
   gem "rdoc", "~> 3.9"
   gem "daemon", "~> 1"
-  gem "httpthumbnailer", "~> 0.1.0"
+  gem "httpthumbnailer", "~> 0.3"
 end
+

data/Gemfile.lock

@@ -2,74 +2,74 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (3.0.0)
-    cgi_multipart_eof_fix (2.5.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.1.4)
+    daemons (1.0.10)
     diff-lcs (1.1.3)
-    fastthread (1.0.7)
     gem_plugin (0.2.3)
-    gherkin (2.6.7)
+    gherkin (2.11.2)
       json (>= 1.4.6)
     git (1.2.5)
-    haml (3.1.4)
-    httpclient (2.2.3)
-    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)
-    jeweler (1.6.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.1)
-    mongrel (1.1.5)
-      cgi_multipart_eof_fix (>= 2.4)
-      daemons (>= 1.0.3)
-      fastthread (>= 1.0.1)
-      gem_plugin (>= 0.2.3)
-    rack (1.3.5)
-    rack-protection (1.1.4)
+      rdoc
+    json (1.7.5)
+    mongrel (1.2.0.pre2)
+      daemons (~> 1.0.10)
+      gem_plugin (~> 0.2.3)
+    multi_json (1.3.6)
+    rack (1.4.1)
+    rack-protection (1.2.0)
       rack
     rake (0.9.2.2)
-    rcov (0.9.11)
-    rdoc (3.9.4)
+    rdoc (3.12)
+      json (~> 1.4)
     rmagick (2.13.1)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
     ruby-ip (0.9.1)
-    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
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler (~> 1.1)
   cucumber
   daemon (~> 1)
-  httpclient (>= 2.2.1)
-  httpthumbnailer (~> 0.1.0)
-  jeweler (~> 1.6.4)
-  rcov
+  httpclient (>= 2.2)
+  httpthumbnailer (~> 0.3)
+  jeweler (~> 1.6)
   rdoc (~> 3.9)
-  rspec (~> 2.3.0)
+  rspec (~> 2.3)
+  simplecov

data/README.md

@@ -0,0 +1,55 @@
+# httpthumbnailer-client
+
+Ruby client to [httpthumbnailer](http://github.com/jpastuszek/httpthumbnailer) image scaling and conversion HTTP API server.
+
+## Installing
+
+    gem install httpthumbnailer-client
+
+## Usage
+
+Basic usage:
+
+```ruby
+require 'httpthumbnailer-client'
+
+# read orginal image data (may be any format supported by ImageMagick installation on the server)
+data = File.read('image_file.jpg')
+
+# thumbnail image with API server listening on localhost port 3100
+thumbnails = HTTPThumbnailerClient.new('http://localhost:3100').thumbnail(data) do
+	# definition of thumbnail formats - see the API server documentation for available operations, formats and options
+	thumbnail 'crop', 6, 3, 'JPEG' 
+	thumbnail 'crop', 8, 8, 'PNG'
+	thumbnail 'pad', 4, 4, 'PNG'
+end
+
+thumbnails[0].mime_type 	# => 'image/jpeg'
+thumbnails[0].data 			# => 6x3 thumbnail JPEG data Strine
+
+thumbnails[1].mime_type 	# => 'image/png'
+thumbnails[1].data 			# => 8x8 thumbnail PNG data String
+
+thumbnails[2].mime_type		# => 'image/png'
+thumbnails[2].data			# => 4x4 thumbnail PNG data String
+
+thumbnails.input_mime_type	# => 'image/jpeg' - detected input image format by API server (content based)
+```
+
+For more details see [RSpec tests](http://github.com/jpastuszek/httpthumbnailer-client/blob/master/spec/httpthumbnailer-client_spec.rb)
+
+## Contributing to httpthumbnailer-client
+ 
+* 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
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+## Copyright
+
+Copyright (c) 2012 Jakub Pastuszek. See LICENSE.txt for
+further details.
+

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/httpthumbnailer-client.gemspec

@@ -5,16 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = "httpthumbnailer-client"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2012-01-04"
+  s.date = "2012-09-05"
   s.description = "Thumbnails images using httpthumbniler server"
   s.email = "jpastuszek@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "features/step_definitions/httpthumbnailer-client_steps.rb",
@@ -40,43 +40,43 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/jpastuszek/httpthumbnailer-client"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.23"
   s.summary = "API client for httpthumbniler server"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httpclient>, [">= 2.2.1"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_runtime_dependency(%q<httpclient>, [">= 2.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
+      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.3"])
     else
-      s.add_dependency(%q<httpclient>, [">= 2.2.1"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<httpclient>, [">= 2.2"])
+      s.add_dependency(%q<rspec>, ["~> 2.3"])
       s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6"])
+      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.3"])
     end
   else
-    s.add_dependency(%q<httpclient>, [">= 2.2.1"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<httpclient>, [">= 2.2"])
+    s.add_dependency(%q<rspec>, ["~> 2.3"])
     s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6"])
+    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.3"])
   end
 end
 

data/lib/httpthumbnailer-client.rb

@@ -67,13 +67,18 @@ class HTTPThumbnailerClient
 		attr_reader :type, :message
 	end
 
-	def initialize(server_url)
+	def initialize(server_url, options = {})
 		@server_url = server_url
+		@client = HTTPClient.new
+		@keep_alive = options[:keep_alive] || false
 	end
 
 	def thumbnail(data, &block)
 		uri = URIBuilder.thumbnail(&block)
-		response = HTTPClient.new.request('PUT', "#{@server_url}#{uri}", nil, data)
+
+		response = @client.request('PUT', "#{@server_url}#{uri}", nil, data, {'Content-Type' => 'image/autodetect'})
+		@client.reset_all unless @keep_alive
+
 		content_type = response.header['Content-Type'].last
 
 		case content_type
@@ -109,6 +114,8 @@ class HTTPThumbnailerClient
 		else
 			raise UnknownResponseType, content_type
 		end
+	rescue HTTPClient::KeepAliveDisconnected
+		raise RemoteServerError, 'empty response'
 	end
 end
 

data/spec/httpthumbnailer-client_spec.rb

@@ -14,7 +14,7 @@ end
 describe HTTPThumbnailerClient do
 	before :all do
 		log = spec_dir + 'server.log'
-		log.truncate(0)
+		log.truncate(0) if log.exist?
 		
 		start_server(
 			"httpthumbnailer",

metadata

@@ -1,175 +1,174 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: httpthumbnailer-client
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Jakub Pastuszek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 2
-        - 1
-        version: 2.2.1
-  prerelease: false
+date: 2012-09-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httpclient
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  name: cucumber
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  name: rcov
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 3
-        - 9
-        version: "3.9"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rdoc
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        version: "1"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
   name: daemon
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
   name: httpthumbnailer
-  version_requirements: *id009
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: Thumbnails images using httpthumbniler server
 email: jpastuszek@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
-files: 
+- README.md
+files:
 - .document
 - .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - features/step_definitions/httpthumbnailer-client_steps.rb
@@ -184,37 +183,31 @@ files:
 - spec/test.jpg
 - spec/test.txt
 homepage: http://github.com/jpastuszek/httpthumbnailer-client
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3545490488098179725
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: API client for httpthumbniler server
 test_files: []
-

data/README.rdoc

@@ -1,19 +0,0 @@
-= httpthumbnailer-client
-
-Description goes here.
-
-== Contributing to httpthumbnailer-client
- 
-* 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
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2011 Jakub Pastuszek. See LICENSE.txt for
-further details.
-