ungulate 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/ungulate/file_upload.rb

@@ -32,7 +32,8 @@ class Ungulate::FileUpload
   end
 
   def condition(key)
-    conditions.find {|condition| condition.first == key}.second
+    found_key, found_value = conditions.find {|condition| condition.first == key}
+    found_value if found_value
   end
 
   def conditions

data/lib/ungulate/job.rb

@@ -45,7 +45,9 @@ module Ungulate
           method, x, y = instruction
           image = Magick::Image.from_blob(source).first
           @logger.info "Performing #{method} with #{x}, #{y}"
-          [name, image.send(method, x, y)]
+          processed_image = image.send(method, x, y)
+          image.destroy!
+          [name, processed_image]
         end
     end
 
@@ -68,6 +70,7 @@ module Ungulate
                    {},
                    'public-read',
                    {'Content-Type' => MIME::Types.type_for(image.format).to_s})
+        image.destroy!
       end
     end
 

data/spec/ungulate/file_upload_spec.rb

@@ -61,6 +61,10 @@ module Ungulate
       it "should return the value of a tuple" do
         subject.condition('colour').should == 'blue'
       end
+
+      it "should cope with missing attribute" do
+        subject.condition('bob').should be_nil
+      end
     end
 
     describe "conditions" do

data/spec/ungulate/job_spec.rb

@@ -6,7 +6,7 @@ module Ungulate
     before do
       ENV['AMAZON_ACCESS_KEY_ID'] = 'test-key-id'
       ENV['AMAZON_SECRET_ACCESS_KEY'] = 'test-secret'
-      @bucket = mock('Bucket')
+      @bucket = mock('Bucket', :put => nil)
       @sqs = mock('Sqs')
       @s3 = mock('S3')
       @q = mock('Queue')
@@ -127,42 +127,50 @@ module Ungulate
     end
 
     describe :processed_versions do
-      subject do
-        job = Job.new
+      before do
+        @job = Job.new
         versions = {
           :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')
+        @job.stub(:versions).and_return(versions)
+        @job.stub(:key).and_return('someimage.jpg')
 
-        job.stub(:source).and_return(:data)
-        @source_image = mock('Image')
+        @job.stub(:source).and_return(:data)
+        @source_image = mock('Image', :destroy! => nil)
         Magick::Image.stub(:from_blob).with(:data).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)
+      end
 
-        job.processed_versions
+      context "result" do
+        subject { @job.processed_versions }
+        it { should include([:large, :large_image]) }
+        it { should include([:small, :small_image]) }
       end
 
-      it { should include([:large, :large_image]) }
-      it { should include([:small, :small_image]) }
+      it "should destroy the image object" do
+        @source_image.should_receive(:destroy!)
+        @job.processed_versions
+      end
 
       it "should memoize" do
-        job = Job.new
-        job.instance_variable_set('@processed_versions', :cache)
-        job.processed_versions.should == :cache
+        @job.instance_variable_set('@processed_versions', :cache)
+        @job.processed_versions.should == :cache
       end
     end
 
     describe :process do
-      subject do
-        job = Job.new
-        @big = mock('Image', :to_blob => 'bigdata', :format => 'JPEG')
-        @little = mock('Image', :to_blob => 'littledata', :format => 'JPEG')
+      before do
+        @big = mock('Image', :destroy! => nil, :to_blob => 'bigdata', :format => 'JPEG')
+        @little = mock('Image', :destroy! => nil, :to_blob => 'littledata', :format => 'JPEG')
         @mime_type = mock('MimeType', :to_s => 'image/jpeg')
         MIME::Types.stub(:type_for).with('JPEG').and_return(@mime_type)
+      end
+
+      subject do
+        job = Job.new
         job.stub(:processed_versions).and_return([[:big, @big], [:little, @little]])
         job.stub(:bucket).and_return(@bucket)
         job.stub(:version_key).with(:big).and_return('path/to/someimage_big.jpg')
@@ -172,6 +180,11 @@ module Ungulate
 
       after { subject.process }
 
+      it "should destroy the image objects" do
+        @big.should_receive(:destroy!)
+        @little.should_receive(:destroy!)
+      end
+
       it "should send each processed version to S3" do
         @bucket.should_receive(:put).with('path/to/someimage_big.jpg', 
                                           'bigdata',

data/ungulate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ungulate}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Bruce"]
-  s.date = %q{2010-04-26}
+  s.date = %q{2010-05-21}
   s.default_executable = %q{ungulate_server.rb}
   s.description = %q{WIP}
   s.email = %q{andrew@camelpunch.com}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Andrew Bruce
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 +01:00
+date: 2010-05-21 00:00:00 +01:00
 default_executable: ungulate_server.rb
 dependencies: 
 - !ruby/object:Gem::Dependency