imageproxy 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/imageproxy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{imageproxy}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erik Hanson"]
-  s.date = %q{2011-06-08}
+  s.date = %q{2011-06-09}
   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 = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/imageproxy/compare.rb",
     "lib/imageproxy/convert.rb",
     "lib/imageproxy/identify.rb",
+    "lib/imageproxy/identify_format.rb",
     "lib/imageproxy/options.rb",
     "lib/imageproxy/selftest.rb",
     "lib/imageproxy/server.rb",
@@ -40,6 +41,7 @@ Gem::Specification.new do |s|
     "public/sample_10x20.png",
     "spec/command_spec.rb",
     "spec/convert_spec.rb",
+    "spec/identify_format_spec.rb",
     "spec/options_spec.rb",
     "spec/server_spec.rb",
     "spec/signature_spec.rb",

data/lib/imageproxy/command.rb

@@ -9,7 +9,7 @@ module Imageproxy
 
     def curl(url, options={})
       user_agent = options[:user_agent] || "imageproxy"
-      %|curl -s -A "#{user_agent}" "#{url}"|
+      %|curl -L -s -A "#{user_agent}" "#{url}"|
     end
 
     def to_path(obj)

data/lib/imageproxy/identify_format.rb

@@ -0,0 +1,14 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), "command")
+
+module Imageproxy
+  class IdentifyFormat < Imageproxy::Command
+    def initialize(file)
+      @file = file
+    end
+
+    def execute
+      result = execute_command %'identify -format "%m" #{@file.path}'
+      result.start_with?("identify:") ? nil : result
+    end
+  end
+end

data/lib/imageproxy/options.rb

@@ -42,10 +42,6 @@ module Imageproxy
       @hash[symbol.to_s] || @hash[symbol]
     end
 
-    def content_type
-      MIME::Types.of(@hash['source']).first.content_type
-    end
-
     private
 
     def unescape_source

data/lib/imageproxy/server.rb

@@ -1,6 +1,7 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), "options")
 require File.join(File.expand_path(File.dirname(__FILE__)), "convert")
 require File.join(File.expand_path(File.dirname(__FILE__)), "identify")
+require File.join(File.expand_path(File.dirname(__FILE__)), "identify_format")
 require File.join(File.expand_path(File.dirname(__FILE__)), "selftest")
 require File.join(File.expand_path(File.dirname(__FILE__)), "signature")
 require 'uri'
@@ -29,7 +30,7 @@ module Imageproxy
           end
 
           file.open
-          [200, {"Content-Type" => options.content_type, "Cache-Control" => "max-age=#{cachetime}, must-revalidate"}, file]
+          [200, {"Cache-Control" => "max-age=#{cachetime}, must-revalidate"}.merge(content_type(file, options)), file]
         when "identify"
           check_signature request, options
           check_domain options
@@ -103,5 +104,12 @@ module Imageproxy
         sizes[0].to_i
       end
     end
+
+    def content_type(file, options)
+      format = options.format
+      format = Imageproxy::IdentifyFormat.new(file).execute unless format
+      format = options.source unless format
+      format ? { "Content-Type" => MIME::Types.of(format).first.content_type } : {}
+    end
   end
 end

data/spec/command_spec.rb

@@ -5,14 +5,14 @@ describe Imageproxy::Command do
     context "when a user agent is supplied" do
       it "should send that user agent" do
         Imageproxy::Command.new.send(:curl, "http://example.com/dog.jpg", :user_agent => "some user agent").should ==
-          %|curl -s -A "some user agent" "http://example.com/dog.jpg"|
+          %|curl -L -s -A "some user agent" "http://example.com/dog.jpg"|
       end
     end
 
     context "when no user agent is supplied" do
       it "should send a default user agent" do
         Imageproxy::Command.new.send(:curl, "http://example.com/dog.jpg").should ==
-          %|curl -s -A "imageproxy" "http://example.com/dog.jpg"|
+          %|curl -L -s -A "imageproxy" "http://example.com/dog.jpg"|
       end
     end
   end

data/spec/convert_spec.rb

@@ -21,7 +21,7 @@ describe Imageproxy::Convert do
     end
 
     it "should generate the proper command-line" do
-      @command.should_receive(:execute_command).with(%'curl -s -A "imageproxy" "http://example.com/dog.jpg" | convert - -resize 10x20 png:/mock/file/path')
+      @command.should_receive(:execute_command).with(%'curl -L -s -A "imageproxy" "http://example.com/dog.jpg" | convert - -resize 10x20 png:/mock/file/path')
       @command.execute
     end
 

data/spec/identify_format_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Imageproxy::IdentifyFormat do
+  before do
+    @mock_file = mock("file")
+    @mock_file.stub!(:path).and_return("/tmp/foo")
+  end
+
+  context "when the format looks valid" do
+    it "should return the format" do
+      command = Imageproxy::IdentifyFormat.new(@mock_file)
+      command.stub!(:execute_command).and_return("JPEG")
+      command.execute.should == "JPEG"
+    end
+  end
+
+  context "when the format looks like an error message" do
+    it "should return nil" do
+      command = Imageproxy::IdentifyFormat.new(@mock_file)
+      command.stub!(:execute_command).and_return("identify: some error message")
+      command.execute.should == nil
+    end
+  end
+end

data/spec/options_spec.rb

@@ -46,14 +46,6 @@ describe Imageproxy::Options do
     it("should keep params from path") { subject.source.should == "foo" }
   end
 
-  describe "content type" do
-    context "when guessing based on source filename" do
-      it("should understand .png") { Imageproxy::Options.new("/convert", "source" => "foo.png").content_type.should == "image/png" }
-      it("should understand .jpg") { Imageproxy::Options.new("/convert", "source" => "foo.jpg").content_type.should == "image/jpeg" }
-      it("should understand .JPEG") { Imageproxy::Options.new("/convert", "source" => "foo.JPEG").content_type.should == "image/jpeg" }
-    end
-  end
-
   describe "obfuscation" do
     it "should allow the query string to be encoded in base64" do
       encoded = CGI.escape(Base64.encode64("resize=20x20&source=http://example.com/dog.jpg"))

data/spec/server_spec.rb

@@ -118,5 +118,46 @@ describe "Server" do
     end
 
   end
+
+  describe "#content_type" do
+    before do
+      @options = Imageproxy::Options.new("/", {})
+
+      @mock_file = mock("file")
+      @mock_file.stub!(:path).and_return("/tmp/foo")
+
+      @mock_identify_format = Imageproxy::IdentifyFormat.new(@mock_file)
+      @mock_identify_format.stub!(:execute_command).and_return("identify: some error message\n")
+      Imageproxy::IdentifyFormat.stub!(:new).and_return(@mock_identify_format)
+    end
+
+    context "when the output format is specified" do
+      it "should return that format's mime type" do
+        @options = Imageproxy::Options.new("/", :format => "jpg")
+        app.send(:content_type, @mock_file, @options).should == { "Content-Type" => "image/jpeg" }
+      end
+    end
+
+    context "when 'identify' knows the format" do
+      it "should return that format's mime type" do
+        @mock_identify_format.stub!(:execute_command).and_return("JPEG\n")
+        app.send(:content_type, @mock_file, @options).should == { "Content-Type" => "image/jpeg" }
+      end
+    end
+
+    context "when the input source has a file extension" do
+      it "should return that format's mime type" do
+        @options = Imageproxy::Options.new("/", :source => "foo.jpg")
+        app.send(:content_type, @mock_file, @options).should == { "Content-Type" => "image/jpeg" }
+      end
+    end
+
+    context "when nothing is known about the format" do
+      it "should not return a mime type" do
+        app.send(:content_type, @mock_file, @options).should == {}
+      end
+    end
+
+  end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: imageproxy
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Erik Hanson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 -07:00
+date: 2011-06-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -136,6 +136,7 @@ files:
 - lib/imageproxy/compare.rb
 - lib/imageproxy/convert.rb
 - lib/imageproxy/identify.rb
+- lib/imageproxy/identify_format.rb
 - lib/imageproxy/options.rb
 - lib/imageproxy/selftest.rb
 - lib/imageproxy/server.rb
@@ -145,6 +146,7 @@ files:
 - public/sample_10x20.png
 - spec/command_spec.rb
 - spec/convert_spec.rb
+- spec/identify_format_spec.rb
 - spec/options_spec.rb
 - spec/server_spec.rb
 - spec/signature_spec.rb
@@ -163,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3737548046343188877
+      hash: 4082526096266678674
       segments: 
       - 0
       version: "0"