imageproxy 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/imageproxy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{imageproxy}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Erik Hanson"]
-  s.date = %q{2011-06-09}
+  s.authors = [%q{Erik Hanson}]
+  s.date = %q{2011-08-24}
   s.description = %q{A image processing proxy server, written in Ruby as a Rack application. Requires ImageMagick.}
   s.email = %q{erik@eahanson.com}
   s.extra_rdoc_files = [
@@ -48,9 +48,9 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/eahanson/imageproxy}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{A image processing proxy server, written in Ruby as a Rack application.}
 
   if s.respond_to? :specification_version then

data/lib/imageproxy/command.rb

@@ -3,13 +3,15 @@ module Imageproxy
     protected
 
     def execute_command(command_line)
-      stdin, stdout, stderr = Open3.popen3(command_line)
+      stdin, stdout, stderr, wait_thr = Open3.popen3(command_line)
+      raise "Child process exited with non-zero exit code" unless wait_thr.value.success?
       [output_to_string(stdout), output_to_string(stderr)].join("")
     end
 
     def curl(url, options={})
       user_agent = options[:user_agent] || "imageproxy"
-      %|curl -L -s -A "#{user_agent}" "#{url}"|
+      timeout = options[:timeout] ? "-m #{options[:timeout]} " : ""
+      %|curl #{timeout}-L -s -A "#{user_agent}" "#{url}"|
     end
 
     def to_path(obj)

data/lib/imageproxy/convert.rb

@@ -11,8 +11,8 @@ module Imageproxy
       end
     end
 
-    def execute(user_agent=nil)
-      execute_command %'#{curl options.source, :user_agent => user_agent} | convert - #{convert_options} #{new_format}#{file.path}'
+    def execute(user_agent=nil, timeout=nil)
+      execute_command %'#{curl options.source, :user_agent => user_agent, :timeout => timeout} | convert - #{convert_options} #{new_format}#{file.path}'
       file
     end
 

data/lib/imageproxy/server.rb

@@ -24,7 +24,7 @@ module Imageproxy
           check_domain options
           check_size options
 
-          file = Convert.new(options).execute(user_agent)
+          file = convert_file(options, user_agent)
           class << file
             alias to_path path
           end
@@ -48,6 +48,10 @@ module Imageproxy
 
     private
 
+    def convert_file(options, user_agent)
+      Convert.new(options).execute(user_agent, config(:timeout))
+    end
+
     def config(symbol)
       ENV["IMAGEPROXY_#{symbol.to_s.upcase}"]
     end
@@ -107,9 +111,13 @@ module Imageproxy
 
     def content_type(file, options)
       format = options.format
-      format = Imageproxy::IdentifyFormat.new(file).execute unless format
+      format = identify_format(file) unless format
       format = options.source unless format
       format ? { "Content-Type" => MIME::Types.of(format).first.content_type } : {}
     end
+
+    def identify_format(file)
+      Imageproxy::IdentifyFormat.new(file).execute
+    end
   end
 end

data/spec/command_spec.rb

@@ -15,5 +15,20 @@ describe Imageproxy::Command do
           %|curl -L -s -A "imageproxy" "http://example.com/dog.jpg"|
       end
     end
+
+    context "when a timeout is supplied" do
+      it "should set the timeout" do
+        Imageproxy::Command.new.send(:curl, "http://example.com/dog.jpg", :timeout => "2").should ==
+          %|curl -m 2 -L -s -A "imageproxy" "http://example.com/dog.jpg"|
+      end
+    end
+
+    context "when the command exits with a non-zero status" do
+      it "should raise an exception" do
+        lambda {
+          Imageproxy::Command.new.send(:execute_command, "ls /asdkljasldkjaskl")
+        }.should raise_exception
+      end
+    end
   end
 end

data/spec/server_spec.rb

@@ -67,6 +67,8 @@ describe "Server" do
   context "when limiting to certain domains" do
     before do
       app.stub!(:config) { |sym| {:allowed_domains => " example.com  ,example.org"}[sym] }
+      app.stub!(:convert_file).and_return(Tempfile.new("fooo"))
+      app.stub!(:content_type).and_return({ "Content-Type" => "image/jpeg"})
     end
 
     it "should parse the allowed domains" do

metadata

@@ -1,127 +1,124 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: imageproxy
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.4
   prerelease: 
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Erik Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-09 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &28077600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28077600
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &28077100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28077100
+- !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &28076620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28076620
+- !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &28076140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28076140
+- !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &28075660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28075660
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &28075180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28075180
+- !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &28074680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28074680
+- !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &28074160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28074160
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &28073640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
-description: A image processing proxy server, written in Ruby as a Rack application. Requires ImageMagick.
+  version_requirements: *28073640
+description: A image processing proxy server, written in Ruby as a Rack application.
+  Requires ImageMagick.
 email: erik@eahanson.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.mdown
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -151,36 +148,32 @@ files:
 - spec/server_spec.rb
 - spec/signature_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/eahanson/imageproxy
-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: 4082526096266678674
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 589623391014226257
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A image processing proxy server, written in Ruby as a Rack application.
 test_files: []
-