ungulate 0.1.2 → 0.1.3

data/VERSION

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

data/features/resize_then_composite.feature

@@ -0,0 +1,11 @@
+Feature: Image resize
+  As a site owner
+  I want Ungulate to resize then composite images
+  So that I don't have to watermark images by hand
+
+  Scenario: Run queue on image key with no path separator
+    Given an empty queue
+    And a request to resize "image.jpg" and then composite with "https://dmxno528jhfy0.cloudfront.net/superhug-watermark.png"
+    When I run Ungulate
+    Then there should be a public watermarked version
+

data/features/step_definitions/queue_steps.rb

@@ -30,3 +30,24 @@ Given /^a request to resize "([^\"]*)" to sizes:$/ do |key, table|
   @q.send_message(message)
 end
 
+Given /^a request to resize "([^"]*)" and then composite with "([^"]*)"$/ do |key, composite_url|
+  @bucket_name = "ungulate-test"
+
+  @s3 = RightAws::S3.new(ENV['AMAZON_ACCESS_KEY_ID'],
+                         ENV['AMAZON_SECRET_ACCESS_KEY'])
+  @bucket = @s3.bucket @bucket_name
+  @bucket.put key, File.open('features/camels.jpg').read
+
+  message = {
+    :bucket => @bucket_name,
+    :key => key,
+    :versions => {
+      :watermarked => [
+        [:resize_to_fill, 100, 100],
+        [:composite, composite_url, :center_gravity, :soft_light_composite_op]
+      ]
+    }
+  }.to_yaml
+
+  @q.send_message(message)
+end

data/features/step_definitions/version_steps.rb

@@ -7,3 +7,10 @@ Then /^there should be the following public versions:$/ do |table|
   end
 end
 
+Then /^there should be a public watermarked version$/ do
+  Net::HTTP.start("#{@bucket_name}.s3.amazonaws.com", 80) do |http|
+    response = http.get("/image_watermarked.jpg")
+    response.should be_a(Net::HTTPSuccess)
+  end
+end
+

data/lib/ungulate/file_upload.rb

@@ -2,8 +2,7 @@ require 'active_support/core_ext/class/attribute_accessors'
 class Ungulate::FileUpload
   attr_accessor(
     :bucket_url,
-    :key,
-    :policy
+    :key
   )
 
   cattr_accessor(
@@ -21,10 +20,13 @@ class Ungulate::FileUpload
     sqs.queue(queue_name)
   end
 
-  def initialize(params)
-    self.bucket_url = params[:bucket_url]
-    self.key = params[:key]
-    self.policy = params[:policy]
+  def initialize(options = {})
+    self.bucket_url = options[:bucket_url]
+    self.key = options[:key]
+
+    if options[:policy]
+      self.policy = options[:policy]
+    end
   end
 
   def acl
@@ -41,11 +43,16 @@ class Ungulate::FileUpload
       @policy_ruby['conditions'].map {|condition| condition.to_a.flatten}
   end
 
-  def policy=(policy)
-    @policy_ruby = policy
-    @policy_ruby['expiration'] = @policy_ruby['expiration'].utc
-    policy_json = ActiveSupport::JSON.encode(@policy_ruby)
-    @policy = Base64.encode64(policy_json).gsub("\n", '')
+  def policy
+    Base64.encode64(
+      ActiveSupport::JSON.encode(@policy_ruby)
+    ).gsub("\n", '')
+  end
+
+  def policy=(new_policy)
+    new_policy['expiration'] = new_policy['expiration'].utc
+    @policy_ruby = new_policy
+    policy
   end
 
   def success_action_redirect
@@ -55,7 +62,7 @@ class Ungulate::FileUpload
   def signature
     Base64.encode64(
       OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'),
-                           secret_access_key, 
+                           secret_access_key,
                            policy)
     ).gsub("\n", '')
   end

data/lib/ungulate/job.rb

@@ -4,6 +4,7 @@ require 'RMagick'
 require 'mime/types'
 require 'yaml'
 require 'active_support/core_ext'
+require 'curb'
 
 module Ungulate
   class Job
@@ -45,15 +46,56 @@ module Ungulate
     def processed_versions
       @processed_versions ||=
         versions.map do |name, instruction|
-          method, x, y = instruction
-          image = Magick::Image.from_blob(source).first
-          @logger.info "Performing #{method} with #{x}, #{y}"
-          processed_image = image.send(method, x, y)
-          image.destroy!
-          [name, processed_image]
+          [name, processed_image(source_image, instruction)]
         end
     end
 
+    def instruction_args(args)
+      args.map do |arg|
+        if arg.is_a?(Symbol)
+          "Magick::#{arg.to_s.classify}".constantize
+        elsif arg.respond_to?(:match) && arg.match(/^http/)
+          Magick::Image.from_blob(Curl::Easy.http_get(arg).body_str).first
+        else
+          arg
+        end
+      end
+    end
+
+    def image_from_instruction(original, instruction)
+      method, *args = instruction
+      send_args = instruction_args(args)
+
+      @logger.info "Performing #{method} with #{args.join(', ')}"
+      original.send(method, *send_args).tap do |new_image|
+        original.destroy!
+        send_args.select {|arg| arg.is_a?(Magick::Image)}.each(&:destroy!)
+      end
+    end
+
+    def image_from_instruction_chain(original, chain)
+      if chain.one?
+        image_from_instruction(original, chain.first)
+      else
+        image_from_instruction_chain(
+          image_from_instruction(original, chain.shift),
+          chain
+        )
+      end
+    end
+
+    def processed_image(original, instruction)
+      if instruction.first.respond_to?(:entries)
+        image_from_instruction_chain(original, instruction)
+      else
+        image_from_instruction(original, instruction)
+      end
+    end
+
+    def source_image
+      Magick::Image.from_blob(source).first
+    end
+
     def source
       if @source
         @source
@@ -92,12 +134,7 @@ module Ungulate
       return false if notification_url.blank?
 
       @logger.info "Sending notification to #{notification_url}"
-
-      url = URI.parse(notification_url)
-
-      http = Net::HTTP.new(url.host, url.port)
-      http.use_ssl = true if url.scheme == 'https'
-      http.start {|http| http.put(url.path, nil) }
+      Curl::Easy.http_put(notification_url, '')
     end
 
     def version_key(version)

data/spec/ungulate/file_upload_spec.rb

@@ -3,54 +3,61 @@ require 'ungulate/file_upload'
 
 module Ungulate
   describe FileUpload do
+    let(:expiration) { 10.hours.from_now }
+    let(:bucket_url) { "http://images.bob.com/" }
+    let(:key) { "new-file" }
+    let(:access_key_id) { "asdf" }
+    let(:secret_access_key) { 'uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o' }
+    let(:queue_name) { 'some-queue-name' }
+
     before do
-      @expiration = 10.hours.from_now
-      @bucket_url = "http://images.bob.com/"
-      @key = "new-file"
-
-      @policy = { 
-        "expiration" => @expiration,
-        "conditions" => [
-          {"bucket" => "johnsmith" },
-          ["starts-with", "$key", "user/eric/"],
-          {"acl" => "public-read" },
-          {"success_action_redirect" => "http://johnsmith.s3.amazonaws.com/successful_upload.html" },
-          ["starts-with", "$Content-Type", "image/"],
-          {"x-amz-meta-uuid" => "14365123651274"},
-          ["starts-with", "$x-amz-meta-tag", ""] 
-        ]
-      }
-
-      @access_key_id = "asdf"
-      @secret_access_key = 'uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o'
-      FileUpload.access_key_id = @access_key_id
-      FileUpload.secret_access_key = @secret_access_key
-      FileUpload.queue_name = 'some-queue-name'
+      FileUpload.access_key_id = access_key_id
+      FileUpload.secret_access_key = secret_access_key
+      FileUpload.queue_name = queue_name
     end
 
-    subject do
-      FileUpload.new(
-        :bucket_url => @bucket_url,
-        :policy => @policy,
-        :key => @key
-      )
-    end
+    its(:access_key_id) { should == access_key_id }
+    its(:queue_name) { should == queue_name }
+    its(:secret_access_key) { should == secret_access_key }
+
+    context "policy set directly" do
+      let(:policy) do
+        {
+          "expiration" => expiration,
+          "conditions" => [
+            {"bucket" => "johnsmith" },
+            ["starts-with", "$key", "user/eric/"],
+            {"acl" => "public-read" },
+            {"success_action_redirect" => "http://johnsmith.s3.amazonaws.com/successful_upload.html" },
+            ["starts-with", "$Content-Type", "image/"],
+            {"x-amz-meta-uuid" => "14365123651274"},
+            ["starts-with", "$x-amz-meta-tag", ""]
+          ]
+        }
+      end
 
-    its(:acl) { should == 'public-read' }
-    its(:bucket_url) { should == @bucket_url }
-    its(:conditions) { should == [
-      ['bucket', 'johnsmith'], 
-      ['starts-with', '$key', 'user/eric/'],
-      ['acl', 'public-read'],
-      ['success_action_redirect', 'http://johnsmith.s3.amazonaws.com/successful_upload.html'],
-      ['starts-with', '$Content-Type', 'image/'],
-      ["x-amz-meta-uuid", "14365123651274"],
-      ["starts-with", "$x-amz-meta-tag", ""]
-    ] }
-    its(:access_key_id) { should == @access_key_id }
-    its(:key) { should == @key }
-    its(:queue_name) { should == 'some-queue-name' }
-    its(:success_action_redirect) { should == 'http://johnsmith.s3.amazonaws.com/successful_upload.html' }
+      subject do
+        FileUpload.new(
+          :bucket_url => bucket_url,
+          :policy => policy,
+          :key => key
+        )
+      end
+
+      its(:acl) { should == 'public-read' }
+      its(:bucket_url) { should == bucket_url }
+      its(:conditions) { should == [
+        ['bucket', 'johnsmith'],
+        ['starts-with', '$key', 'user/eric/'],
+        ['acl', 'public-read'],
+        ['success_action_redirect', 'http://johnsmith.s3.amazonaws.com/successful_upload.html'],
+        ['starts-with', '$Content-Type', 'image/'],
+        ["x-amz-meta-uuid", "14365123651274"],
+        ["starts-with", "$x-amz-meta-tag", ""]
+      ] }
+      its(:key) { should == key }
+      its(:success_action_redirect) { should == 'http://johnsmith.s3.amazonaws.com/successful_upload.html' }
+    end
 
     describe "condition" do
       before do
@@ -58,28 +65,28 @@ module Ungulate
           and_return([ ['colour', 'blue'], ['predicate', 'subject', 'object'] ])
       end
 
-      it "should return value of index 1 in a two-item array" do
+      it "returns value of index 1 in a two-item array" do
         subject.condition('colour').should == 'blue'
       end
 
-      it "should cope with missing attribute" do
+      it "copes with missing attribute" do
         subject.condition('bob').should be_nil
       end
     end
 
     describe "conditions" do
-      it "should memoize" do
+      it "memoizes" do
         subject.instance_variable_set('@conditions', :cache)
         subject.conditions.should == :cache
       end
 
-      it "should convert mixed hash and array policy to nested arrays" do
+      it "converts mixed hash and array policy to nested arrays" do
         subject.
-          instance_variable_set('@policy_ruby', 
-                                { 
-                                  'conditions' => [ 
-                                    {'colour' => 'blue'}, 
-                                    ['predicate', 'subject', 'object'] 
+          instance_variable_set('@policy_ruby',
+                                {
+                                  'conditions' => [
+                                    {'colour' => 'blue'},
+                                    ['predicate', 'subject', 'object']
                                   ]
                                 })
         subject.conditions.should == [ ['colour', 'blue'], ['predicate', 'subject', 'object'] ]
@@ -87,73 +94,94 @@ module Ungulate
     end
 
     describe "enqueue" do
-      before do
-        @q = mock('queue')
-        Ungulate::FileUpload.stub(:queue).and_return(@q)
-        @job_hash = mock('Hash', :to_yaml => :some_yaml)
+      let(:q) { stub 'queue' }
+      let(:job_hash) { stub('Hash', :to_yaml => :some_yaml) }
+      before { Ungulate::FileUpload.stub(:queue).and_return(q) }
+
+      it "queues the yamlised version of the passed job hash" do
+        q.should_receive(:send_message).with(:some_yaml)
+        Ungulate::FileUpload.enqueue(job_hash)
       end
+    end
 
-      it "should queue the yamlised version of the passed job hash" do
-        @q.should_receive(:send_message).with(:some_yaml)
-        Ungulate::FileUpload.enqueue(@job_hash)
+    describe "policy" do
+      it "returns base64 encoded JSON version of stored policy" do
+        subject.instance_variable_set('@policy_ruby', :some_policy)
+        ActiveSupport::JSON.stub(:encode).with(:some_policy).and_return(:json)
+        Base64.stub(:encode64).with(:json).and_return("ENCODED\nLINE\nLINE")
+        subject.policy.should == "ENCODEDLINELINE"
       end
     end
 
     describe "policy=" do
-      it "should store the ruby version for later use" do
-        subject.policy = @policy
-        subject.instance_variable_get('@policy_ruby').should_not be_blank
+      let(:policy) do
+        {
+          "expiration" => expiration,
+          "conditions" => [
+            {"bucket" => "johnsmith" },
+            ["starts-with", "$key", "user/eric/"],
+            {"acl" => "public-read" },
+            {"success_action_redirect" => "http://johnsmith.s3.amazonaws.com/successful_upload.html" },
+            ["starts-with", "$Content-Type", "image/"],
+            {"x-amz-meta-uuid" => "14365123651274"},
+            ["starts-with", "$x-amz-meta-tag", ""]
+          ]
+        }
       end
 
-      it "should store the base64 encoded JSON" do
-        subject # load subject without stubs
-
-        ActiveSupport::JSON.stub(:encode).with(@policy).and_return(:some_json)
-        Base64.stub(:encode64).with(:some_json).and_return("ENCODED\nLINE\nLINE")
-        subject.policy = @policy
-        subject.policy.should == "ENCODEDLINELINE"
+      it "stores the ruby version for later use" do
+        subject.policy = policy
+        subject.instance_variable_get('@policy_ruby').should_not be_blank
       end
 
-      it "should ensure the expiration is utc" do
+      it "ensures the expiration is utc" do
         utc_time = Time.now.utc
 
-        @expiration.stub(:utc).and_return(utc_time)
+        expiration.stub(:utc).and_return(utc_time)
         Base64.stub(:encode64).and_return('')
 
         ActiveSupport::JSON.should_receive(:encode).
           with(hash_including('expiration' => utc_time)).
           any_number_of_times
 
-        subject.policy = @policy
+        subject.policy = policy
+      end
+
+      it "returns the encoded policy" do
+        subject.stub(:policy).and_return(:encoded_policy)
+        subject.send(:policy=, policy).should == :encoded_policy
       end
     end
 
     describe "queue" do
+      let(:sqs) do
+        sqs = stub 'SQS'
+        sqs.stub(:queue).with(queue_name).and_return(:queue_instance)
+        sqs
+      end
+
+      subject { Ungulate::FileUpload.queue }
+
       before do
-        sqs = mock('sqs')
-        FileUpload.queue_name = 'somequeuename'
-        FileUpload.access_key_id = 'someaccesskey'
-        FileUpload.secret_access_key = 'somesecret'
-        RightAws::SqsGen2.stub(:new).with('someaccesskey', 'somesecret').
+        RightAws::SqsGen2.stub(:new).
+          with(access_key_id, secret_access_key).
           and_return(sqs)
-        sqs.stub(:queue).with('somequeuename').and_return(:queue_instance)
       end
 
-      it "should return a queue instance" do
-        Ungulate::FileUpload.queue.should == :queue_instance
-      end
+      it { should == :queue_instance }
     end
 
     describe "signature" do
+      let(:sha1) { stub 'SHA1' }
+
       before do
         subject.stub(:policy).and_return(:policy)
-        @sha1 = mock('SHA1')
-        OpenSSL::Digest::Digest.stub(:new).with('sha1').and_return(@sha1)
-        OpenSSL::HMAC.stub(:digest).with(@sha1, @secret_access_key, :policy).and_return(:digest)
+        OpenSSL::Digest::Digest.stub(:new).with('sha1').and_return(sha1)
+        OpenSSL::HMAC.stub(:digest).with(sha1, secret_access_key, :policy).and_return(:digest)
         Base64.stub(:encode64).with(:digest).and_return("str\nipme\n")
       end
 
-      it "should return the stripped base64 encoded digest" do
+      it "returns the stripped base64 encoded digest" do
         subject.signature.should == "stripme"
       end
     end

data/spec/ungulate/job_spec.rb

@@ -3,6 +3,11 @@ require 'ungulate/job'
 
 module Ungulate
   describe Job do
+    let(:source_image) { stub('Source Image', :destroy! => nil) }
+    let(:processed_image_1) { stub('Image 1', :destroy! => nil) }
+    let(:processed_image_2) { stub('Image 2', :destroy! => nil) }
+    let(:curl_easy) { stub('Curl::Easy', :body_str => body_str) }
+
     before do
       ENV['AMAZON_ACCESS_KEY_ID'] = 'test-key-id'
       ENV['AMAZON_SECRET_ACCESS_KEY'] = 'test-secret'
@@ -14,6 +19,8 @@ module Ungulate
         :thumb => [ :resize_to_fit, 100, 200 ],
         :large => [ :resize_to_fit, 200, 300 ],
       }
+
+      Curl::Easy.stub(:http_get)
     end
 
     its(:versions) { should == [] }
@@ -128,38 +135,136 @@ module Ungulate
       end
     end
 
-    describe :processed_versions do
+    describe :image do
+      let(:blob) { 'asdf' }
+
+      it "returns a Magick::Image from the source" do
+        subject.stub(:source).and_return(blob)
+        Magick::Image.should_receive(:from_blob).with(blob).and_return([source_image])
+        subject.source_image.should == source_image
+      end
+    end
+
+    describe :image_from_instruction do
+      let(:instruction) { [ :composite, url, arg1, arg2 ] }
+      let(:overlay) { stub('Overlay', :destroy! => nil) }
+      let(:arg1) { 1 }
+      let(:arg2) { 2 }
+      let(:url) { 'https://www.some.url/' }
+      let(:body_str) { 'blob' }
+
       before do
-        @job = Job.new
-        versions = {
+        Curl::Easy.stub(:http_get).and_return(curl_easy)
+        Magick::Image.stub(:from_blob).and_return([overlay])
+      end
+
+      context "when an argument is a URL" do
+        it "converts the URL to an Image" do
+          Curl::Easy.should_receive(:http_get).with(url).and_return(curl_easy)
+          Magick::Image.should_receive(:from_blob).with('blob').and_return([overlay])
+          source_image.should_receive(:composite).
+            with(overlay, arg1, arg2).
+            and_return(processed_image_1)
+
+          subject.image_from_instruction(source_image, instruction).
+            should == processed_image_1
+        end
+      end
+
+      context "when argument isn't a valid http URL" do
+        let(:url) { 'somethingwithhttpinit' }
+
+        it "passes the argument through to the method" do
+          source_image.should_receive(:composite).
+            with(url, arg1, arg2).
+            and_return(processed_image_1)
+
+          subject.image_from_instruction(source_image, instruction)
+        end
+      end
+
+      context "when arguments are symbols" do
+        let(:arg1) { :center_gravity }
+        let(:arg2) { :soft_light_composite_op }
+
+        it "converts the symbols to Magick::XxXx constants" do
+          source_image.should_receive(:composite).
+            with(anything, Magick::CenterGravity, Magick::SoftLightCompositeOp).
+            and_return(processed_image_1)
+
+          subject.image_from_instruction(source_image, instruction)
+        end
+      end
+    end
+
+    describe :processed_versions do
+      let(:versions) do
+        {
           :large => [ :resize_to_fit, 100, 200 ],
           :small => [ :resize_to_fill, 64, 64 ],
         }
-        @job.stub(:versions).and_return(versions)
-        @job.stub(:key).and_return('someimage.jpg')
+      end
 
-        @job.stub(:source).and_return(:data)
-        @source_image = mock('Image', :destroy! => nil)
-        Magick::Image.stub(:from_blob).with(:data).and_return([@source_image])
+      before do
+        subject.stub(:versions).and_return(versions)
+        subject.stub(:key).and_return('someimage.jpg')
+        subject.stub(:source_image).and_return(source_image)
 
-        @source_image.stub(:resize_to_fit).with(100, 200).and_return(:large_image)
-        @source_image.stub(:resize_to_fill).with(64, 64).and_return(:small_image)
+        source_image.stub(:resize_to_fit).with(100, 200).and_return(processed_image_1)
+        source_image.stub(:resize_to_fill).with(64, 64).and_return(processed_image_2)
       end
 
-      context "result" do
-        subject { @job.processed_versions }
-        it { should include([:large, :large_image]) }
-        it { should include([:small, :small_image]) }
+      it "processes multiple versions" do
+        subject.processed_versions.should include([:large, processed_image_1])
+        subject.processed_versions.should include([:small, processed_image_2])
       end
 
-      it "should destroy the image object" do
-        @source_image.should_receive(:destroy!)
-        @job.processed_versions
+      it "destroys the image object" do
+        source_image.should_receive(:destroy!)
+        subject.processed_versions
       end
 
-      it "should memoize" do
-        @job.instance_variable_set('@processed_versions', :cache)
-        @job.processed_versions.should == :cache
+      it "memoizes" do
+        subject.instance_variable_set('@processed_versions', :cache)
+        subject.processed_versions.should == :cache
+      end
+
+      context "with three 'method' arguments" do
+        let(:versions) do
+          { :large => [ :some_method, 'some-value', 1, 2 ] }
+        end
+
+        it "passes each value" do
+          source_image.should_receive(:some_method).
+            with('some-value', 1, 2).
+            and_return(processed_image_1)
+          subject.processed_versions.should == [[:large, processed_image_1]]
+        end
+      end
+
+      context "with multiple instructions in a version" do
+        let(:versions) do
+          {
+            :large => [
+              [ :method_1, 'value-1' ],
+              [ :method_2, 'value-2' ]
+            ]
+          }
+        end
+
+        before do
+          source_image.stub(:method_1).and_return(processed_image_1)
+          processed_image_1.stub(:method_2).and_return(processed_image_2)
+        end
+
+        it "chains the processing" do
+          subject.processed_versions.should == [[:large, processed_image_2]]
+        end
+
+        it "destroys intermediate images" do
+          processed_image_1.should_receive(:destroy!)
+          subject.processed_versions
+        end
       end
     end
 
@@ -233,48 +338,13 @@ module Ungulate
     end
 
     describe :send_notification do
-      after { subject.send_notification }
-
-      let(:http_instance) { mock('Net::HTTP', :start => nil) }
-      let(:http_block_instance) { mock('Net::HTTP', :put => nil) }
+      let(:url) { 'https://some-url' }
 
       context "notification URL provided" do
-        before do
-          subject.stub(:notification_url).and_return('http://some.host/processing_images/some/path')
-        end
-
         it "should PUT to the URL" do
-          Net::HTTP.should_receive(:new).with('some.host', 80).and_return(http_instance)
-          http_instance.should_receive(:start).and_yield(http_block_instance)
-          http_block_instance.should_receive(:put).with('/processing_images/some/path', nil)
-        end
-      end
-
-      context "https notification URL provided" do
-        before do
-          subject.stub(:notification_url).and_return('https://some.host/processing_images/some/path')
-          http_instance.stub(:use_ssl=)
-        end
-
-        it "should PUT to the URL" do
-          Net::HTTP.should_receive(:new).with('some.host', 443).and_return(http_instance)
-          http_instance.should_receive(:start).and_yield(http_block_instance)
-          http_block_instance.should_receive(:put).with('/processing_images/some/path', nil)
-        end
-
-        it "should use SSL" do
-          Net::HTTP.should_receive(:new).with('some.host', 443).and_return(http_instance)
-          http_instance.should_receive(:use_ssl=).with(true)
-        end
-      end
-
-      context "notification URL not provided" do
-        before do
-          subject.stub(:notification_url).and_return(nil)
-        end
-
-        it "should not PUT" do
-          Net::HTTP.should_not_receive(:put)
+          subject.stub(:notification_url).and_return(url)
+          Curl::Easy.should_receive(:http_put).with(url, '')
+          subject.send_notification
         end
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ungulate
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Andrew Bruce
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 +01:00
+date: 2011-09-17 00:00:00 +01:00
 default_executable: ungulate_server.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,9 +82,25 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: curb
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 7
+        - 15
+        version: 0.7.15
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,11 +110,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,11 +126,11 @@ dependencies:
         - 0
         version: 2.4.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,11 +142,11 @@ dependencies:
         - 0
         version: 0.10.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: i18n
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,7 +158,21 @@ dependencies:
         - 0
         version: 0.5.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: |
   = Ungulate
   
@@ -195,16 +225,17 @@ files:
 - features/camels.jpg
 - features/cope_with_empty_queue.feature
 - features/image_resize.feature
+- features/resize_then_composite.feature
 - features/step_definitions/command_steps.rb
 - features/step_definitions/queue_steps.rb
 - features/step_definitions/version_steps.rb
+- features/superhugwatermark.png
 - features/support.rb
 - lib/ungulate/file_upload.rb
 - lib/ungulate/job.rb
 - lib/ungulate/server.rb
 - lib/ungulate/view_helpers.rb
 - lib/ungulate.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/ungulate/file_upload_spec.rb
 - spec/ungulate/job_spec.rb

data/spec/spec.opts

@@ -1,3 +0,0 @@
---color
---debugger
--b