ungulate 0.1.3 → 0.1.4

data/VERSION

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

data/lib/ungulate/job.rb

@@ -10,6 +10,9 @@ module Ungulate
   class Job
     attr_accessor :bucket, :key, :notification_url, :queue, :versions
 
+    @@blobs_from_urls = {}
+    cattr_accessor :blobs_from_urls
+
     def self.s3
       @s3 ||=
         RightAws::S3.new(ENV['AMAZON_ACCESS_KEY_ID'],
@@ -50,12 +53,24 @@ module Ungulate
         end
     end
 
+    def blob_from_url(url)
+      Job.blobs_from_urls[url] ||=
+        begin
+          @logger.info "Grabbing blob from URL #{url}"
+          Curl::Easy.http_get(url).body_str
+        end
+    end
+
+    def magick_image_from_url(url)
+      Magick::Image.from_blob(blob_from_url(url)).first
+    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
+          magick_image_from_url(arg)
         else
           arg
         end

data/spec/ungulate/job_spec.rb

@@ -156,6 +156,7 @@ module Ungulate
       before do
         Curl::Easy.stub(:http_get).and_return(curl_easy)
         Magick::Image.stub(:from_blob).and_return([overlay])
+        source_image.stub(:composite).and_return(processed_image_1)
       end
 
       context "when an argument is a URL" do
@@ -169,6 +170,19 @@ module Ungulate
           subject.image_from_instruction(source_image, instruction).
             should == processed_image_1
         end
+
+        it "caches the image blob in a hash for later reuse" do
+          subject.image_from_instruction(source_image, instruction)
+          Ungulate::Job.blobs_from_urls[url].should == 'blob'
+        end
+
+        context "image is already cached" do
+          it "reuses the cached image" do
+            subject.class.blobs_from_urls[url] = 'cachedblob'
+            Magick::Image.should_receive(:from_blob).with('cachedblob').and_return([overlay])
+            subject.image_from_instruction(source_image, instruction)
+          end
+        end
       end
 
       context "when argument isn't a valid http URL" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ungulate
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Andrew Bruce
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-17 00:00:00 +01:00
+date: 2011-09-19 00:00:00 +01:00
 default_executable: ungulate_server.rb
 dependencies: 
 - !ruby/object:Gem::Dependency