imageproxy 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/imageproxy.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "imageproxy"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erik Hanson"]

data/lib/imageproxy/command.rb

@@ -11,7 +11,8 @@ module Imageproxy
     def curl(url, options={})
       user_agent = options[:user_agent] || "imageproxy"
       timeout = options[:timeout] ? "-m #{options[:timeout]} " : ""
-      %|curl #{timeout}-L -s -A "#{user_agent}" "#{url}"|
+      output = options[:output]
+      %|curl #{timeout}-L -s -A "#{user_agent}" #{output ? "-o #{output} ": ""}"#{url}"|
     end
 
     def to_path(obj)

data/lib/imageproxy/convert.rb

@@ -6,16 +6,26 @@ module Imageproxy
 
     def initialize(options)
       @options = options
-      if (!(options.resize || options.thumbnail || options.rotate || options.flip || options.format || options.quality))
+      if (!(options.resize || options.thumbnail || options.rotate || options.flip || options.format ||
+        options.quality || options.overlay))
         raise "Missing action or illegal parameter value"
       end
     end
 
     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
+      if options.overlay
+        @overlay_file ||= Tempfile.new("imageproxy").tap(&:close)
+        execute_command(curl options.overlay, :user_agent => user_agent, :timeout => timeout, :output => @overlay_file.path)
+        execute_command curl(options.source, :user_agent => user_agent, :timeout => timeout) +
+                          "| composite #{@overlay_file.path} - - | convert - #{convert_options} #{new_format}#{file.path}"
+        file
+      else
+        execute_command %'#{curl options.source, :user_agent => user_agent, :timeout => timeout} | convert - #{convert_options} #{new_format}#{file.path}'
+        file
+      end
     end
 
+
     def convert_options
       convert_options = []
       convert_options << "-resize #{resize_thumbnail_options(options.resize)}" if options.resize

data/lib/imageproxy/options.rb

@@ -15,6 +15,7 @@ module Imageproxy
       @hash["source"] = @hash.delete("src") if @hash.has_key?("src")
 
       unescape_source
+      unescape_overlay
       unescape_signature
       check_parameters
     end
@@ -48,6 +49,10 @@ module Imageproxy
       @hash['source'] &&= CGI.unescape(CGI.unescape(@hash['source']))
     end
 
+    def unescape_overlay
+      @hash['overlay'] &&= CGI.unescape(CGI.unescape(@hash['overlay']))
+    end
+
     def unescape_signature
       @hash['signature'] &&= URI.unescape(@hash['signature'])
     end

data/lib/imageproxy/selftest.rb

@@ -19,6 +19,9 @@ module Imageproxy
       raw_source = "http://eahanson.s3.amazonaws.com/imageproxy/sample.png"
       source = CGI.escape(URI.escape(URI.escape(raw_source)))
 
+      raw_overlay = "http://www.imagemagick.org/image/smile.gif"
+      overlay = CGI.escape(URI.escape(URI.escape(raw_overlay)))
+
       html += <<-HTML
       <h3>Original Image</h3>
       <a href="#{raw_source}">#{raw_source}</a>
@@ -41,7 +44,10 @@ module Imageproxy
         ["Rotating to a non-90-degree increment", "/convert?rotate=120&source=#{source}"],
         ["Rotating to a non-90-degree increment with a background color", "/convert?rotate=120&background=%23ff00ff&source=#{source}"],
 
-        ["Combo", "/convert?resize=100x100&shape=cut&rotate=45&background=%23ff00ff&source=#{source}"]
+        ["Combo", "/convert?resize=100x100&shape=cut&rotate=45&background=%23ff00ff&source=#{source}"],
+
+        ["Compositing", "/convert?source=#{source}&overlay=#{overlay}"],
+        ["Composite and then do something else", "/convert?source=#{source}&overlay=#{overlay}&rotate=50"]
       ]
 
       examples.each do |example|

data/spec/convert_spec.rb

@@ -148,4 +148,24 @@ describe Imageproxy::Convert do
       command({:resize => "10x10"}).convert_options.should_not match /interlace/
     end
   end
+
+  context "when compositing" do
+    before do
+      @command = command("overlay" => "http%3A%2F%2Fexample.com%2Fframe.jpg")
+      @command.stub!(:file).and_return(@mock_file)
+      @command.stub!(:system)
+    end
+
+    it "should fetch both the overlay and the source, and call the composite command to composit the overlay on top of the source" do
+      @command.should_receive(:execute_command).with(%r|curl -L -s -A "imageproxy" -o [^ ]+ "http://example.com/frame.jpg"|)
+      @command.should_receive(:execute_command).with(
+        %r{curl -L -s -A "imageproxy" "http://example.com/dog.jpg" | composite [^ ]+ - - | convert - png:/mock/file/path})
+      @command.execute
+    end
+
+    it "should return the output file" do
+      @command.stub!(:execute_command)
+      @command.execute.should == @mock_file
+    end
+  end
 end

data/spec/options_spec.rb

@@ -32,6 +32,23 @@ describe Imageproxy::Options do
       end
     end
 
+    context "overlay" do
+      context "when double-escaped" do
+        subject { Imageproxy::Options.new "/convert/overlay/http%253A%252F%252Fexample.com%252Fframe.jpg", {} }
+        it("should unescape") { subject.overlay.should == "http://example.com/frame.jpg" }
+      end
+
+      context "when escaped" do
+        subject { Imageproxy::Options.new "/convert/overlay/http%3A%2F%2Fexample.com%2Fframe.jpg", {} }
+        it("should unescape") { subject.overlay.should == "http://example.com/frame.jpg" }
+      end
+
+      context "when not escaped" do
+        subject { Imageproxy::Options.new "/convert/overlay/foo", {} }
+        it("should not unescape") { subject.overlay.should == "foo" }
+      end
+    end
+
     context "signature" do
       context "when escaped with + signs" do
         subject { Imageproxy::Options.new "/process/source/foo/signature/foo+bar", {} }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imageproxy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &31896780 !ruby/object:Gem::Requirement
+  requirement: &18224420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *31896780
+  version_requirements: *18224420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &31896260 !ruby/object:Gem::Requirement
+  requirement: &18223400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *31896260
+  version_requirements: *18223400
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &31895740 !ruby/object:Gem::Requirement
+  requirement: &18222140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *31895740
+  version_requirements: *18222140
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &31895220 !ruby/object:Gem::Requirement
+  requirement: &18220740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *31895220
+  version_requirements: *18220740
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &31894620 !ruby/object:Gem::Requirement
+  requirement: &18219680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *31894620
+  version_requirements: *18219680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &31894020 !ruby/object:Gem::Requirement
+  requirement: &18218480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *31894020
+  version_requirements: *18218480
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &31893420 !ruby/object:Gem::Requirement
+  requirement: &18214760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *31893420
+  version_requirements: *18214760
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &31892720 !ruby/object:Gem::Requirement
+  requirement: &18213580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *31892720
+  version_requirements: *18213580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &31892240 !ruby/object:Gem::Requirement
+  requirement: &18212420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *31892240
+  version_requirements: *18212420
 description: A image processing proxy server, written in Ruby as a Rack application.
   Requires ImageMagick.
 email: erik@eahanson.com
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4468213037548042789
+      hash: 2692885004862731431
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: