ungulate 0.1.4 → 0.2.0

data/spec/{ungulate → lib/ungulate}/view_helpers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 require 'ungulate/view_helpers'
 require 'active_support/core_ext'
 

data/spec/lib/ungulate_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'ungulate'
+
+describe Ungulate do
+  describe "configuration" do
+    it "returns the same object every time" do
+      Ungulate.configuration.should equal(Ungulate.configuration)
+    end
+
+    it "yields the current configuration" do
+      Ungulate.configure do |config|
+        config.should == Ungulate::configuration
+      end
+    end
+
+    it "allows setting and retrieving values" do
+      Ungulate.configure do |config|
+        config.bob = 'tree'
+      end
+
+      Ungulate.configuration.bob.should == 'tree'
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,76 @@
 require 'ungulate'
 require 'rspec'
 
+RSpec.configure do |config|
+  def fixture_path(filename)
+    File.expand_path("fixtures/#{filename}", File.dirname(__FILE__))
+  end
+
+  def fixture(filename)
+    File.read fixture_path(filename)
+  end
+
+  def clear(queue)
+    puts "CLEAR"
+    (1..240).each do
+      queue.clear
+      size = queue.size
+      puts "queue size: #{size}"
+      return if size.zero?
+      sleep 1
+      puts "slept 1 second"
+    end
+    queue.size.should be_zero
+  end
+
+  def wait_for_non_empty(queue)
+    puts "WAIT FOR NON EMPTY"
+    (1..240).each do
+      size = queue.size
+      puts "queue size: #{size}"
+      return if size > 0
+      sleep 1
+      puts "slept 1 second"
+    end
+    queue.size.should_not be_zero
+  end
+
+  shared_examples_for "a message queue" do
+    it "has a name" do
+      new_queue.name.should be_present
+    end
+
+    it "can send and receive one deletable message at a time" do
+      queue = new_queue
+      clear(queue)
+
+      sent_bodies = Set.new %w(hello there how are you)
+
+      sent_bodies.each do |message|
+        puts "pushing #{message}"
+        queue.push(message)
+      end
+
+      queue = nil
+
+      new_queue_instance = new_queue
+      wait_for_non_empty(new_queue_instance)
+
+      received_bodies = Set.new
+
+      iterations = 0
+      messages = []
+      while (received_bodies != sent_bodies) && iterations < 30 do
+        messages << new_queue_instance.receive
+        bodies = messages.map(&:to_s)
+        received_bodies += bodies.select(&:present?)
+        iterations += 1
+        puts "iteration: #{iterations} :: messages: #{received_bodies.to_a.join(',')}"
+      end
+
+      messages.compact.each(&:delete)
+
+      received_bodies.should == sent_bodies
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ungulate
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andrew Bruce
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-19 00:00:00 +01:00
+date: 2011-10-28 00:00:00 +01:00
 default_executable: ungulate_server.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,9 +98,25 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: hashie
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,11 +126,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,11 +142,11 @@ dependencies:
         - 0
         version: 2.4.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,11 +158,11 @@ dependencies:
         - 0
         version: 0.10.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: i18n
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -158,11 +174,11 @@ dependencies:
         - 0
         version: 0.5.0
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -172,7 +188,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 description: |
   = Ungulate
   
@@ -225,22 +241,44 @@ files:
 - features/camels.jpg
 - features/cope_with_empty_queue.feature
 - features/image_resize.feature
+- features/notification_url.feature
 - features/resize_then_composite.feature
+- features/step_definitions/bucket_steps.rb
 - features/step_definitions/command_steps.rb
+- features/step_definitions/notification_steps.rb
 - features/step_definitions/queue_steps.rb
 - features/step_definitions/version_steps.rb
 - features/superhugwatermark.png
-- features/support.rb
+- features/support/config.rb
+- features/support/helpers.rb
+- features/support/put_server.rb
+- lib/ungulate/blob_processor.rb
+- lib/ungulate/curl_http.rb
 - lib/ungulate/file_upload.rb
 - lib/ungulate/job.rb
+- lib/ungulate/rmagick_version_creator.rb
+- lib/ungulate/s3_storage.rb
 - lib/ungulate/server.rb
+- lib/ungulate/sqs_message_queue.rb
 - lib/ungulate/view_helpers.rb
 - lib/ungulate.rb
+- spec/fixtures/chuckle.jpg
+- spec/fixtures/chuckle.png
+- spec/fixtures/chuckle_converted.png
+- spec/fixtures/chuckle_converted_badly.png
+- spec/fixtures/chuckle_thumbnail.png
+- spec/fixtures/watermark.png
+- spec/lib/ungulate/blob_processor_spec.rb
+- spec/lib/ungulate/curl_http_spec.rb
+- spec/lib/ungulate/file_upload_spec.rb
+- spec/lib/ungulate/job_spec.rb
+- spec/lib/ungulate/rmagick_version_creator_spec.rb
+- spec/lib/ungulate/s3_storage_spec.rb
+- spec/lib/ungulate/server_spec.rb
+- spec/lib/ungulate/sqs_message_queue_spec.rb
+- spec/lib/ungulate/view_helpers_spec.rb
+- spec/lib/ungulate_spec.rb
 - spec/spec_helper.rb
-- spec/ungulate/file_upload_spec.rb
-- spec/ungulate/job_spec.rb
-- spec/ungulate/server_spec.rb
-- spec/ungulate/view_helpers_spec.rb
 has_rdoc: true
 homepage: http://github.com/camelpunch/ungulate
 licenses: []
@@ -276,8 +314,12 @@ signing_key:
 specification_version: 3
 summary: Process images using Amazon SQS and S3
 test_files: 
-- spec/spec_helper.rb
-- spec/ungulate/file_upload_spec.rb
-- spec/ungulate/job_spec.rb
-- spec/ungulate/server_spec.rb
-- spec/ungulate/view_helpers_spec.rb
+- spec/lib/ungulate/file_upload_spec.rb
+- spec/lib/ungulate/job_spec.rb
+- spec/lib/ungulate/server_spec.rb
+- spec/lib/ungulate/blob_processor_spec.rb
+- spec/lib/ungulate/curl_http_spec.rb
+- spec/lib/ungulate/rmagick_version_creator_spec.rb
+- spec/lib/ungulate/s3_storage_spec.rb
+- spec/lib/ungulate/sqs_message_queue_spec.rb
+- spec/lib/ungulate/view_helpers_spec.rb

data/spec/ungulate/job_spec.rb

@@ -1,386 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-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'
-      @bucket = mock('Bucket', :put => nil)
-      @sqs = mock('SqsGen2')
-      @s3 = mock('S3')
-      @q = mock('Queue')
-      @versions = {
-        :thumb => [ :resize_to_fit, 100, 200 ],
-        :large => [ :resize_to_fit, 200, 300 ],
-      }
-
-      Curl::Easy.stub(:http_get)
-    end
-
-    its(:versions) { should == [] }
-
-    describe :sqs do
-      before do
-        RightAws::SqsGen2.stub(:new).with('test-key-id', 'test-secret').and_return(@sqs)
-      end
-
-      it "should return a SqsGen2 instance using environment variables" do
-        Job.sqs.should == @sqs
-      end
-
-      it "should memoize" do
-        Job.instance_variable_set('@sqs', :cache)
-        Job.sqs.should == :cache
-      end
-    end
-
-    describe :pop do
-      before do
-        @job_attributes = {
-          :bucket => 'test-bucket', 
-          :key => 'test-key', 
-          :versions => @versions
-        }
-
-        @sqs.stub(:queue).with('test-queue').and_return(@q)
-
-        message = mock('Message', :to_s => :message_data)
-
-        @q.stub(:pop).and_return(message)
-        YAML.stub(:load).with(:message_data).and_return(:attributes)
-
-        Job.stub(:sqs).and_return(@sqs)
-        Job.stub(:s3).and_return(@s3)
-
-        @job = mock('Job', :attributes= => nil, :queue= => nil, :queue => @q)
-        Job.stub(:new).and_return(@job)
-      end
-
-      after { Job.pop('test-queue') }
-
-      it "should set attributes" do
-        @job.should_receive(:attributes=).with(:attributes)
-      end
-
-      it "should set the queue" do
-        @job.should_receive(:queue=).with(@q)
-      end
-
-      context "when YAML.load returns false" do
-        before do
-          YAML.stub(:load).with(:message_data).and_return(false)
-        end
-
-        it "should not set attributes" do
-          @job.should_not_receive(:attributes=)
-        end
-      end
-    end
-
-    describe :s3 do
-      before do
-        RightAws::S3.stub(:new).with('test-key-id', 'test-secret').and_return(@s3)
-      end
-
-      it "should return a S3 instance using environment variables" do
-        Job.s3.should == @s3
-      end
-
-      it "should memoize" do
-        Job.instance_variable_set('@s3', :cache)
-        Job.s3.should == :cache
-      end
-    end
-
-    describe :attributes= do
-      subject do
-        Job.stub_chain(:s3, :bucket).with('hello').and_return(@bucket)
-
-        job = Job.new
-        job.attributes = { 
-          :bucket => 'hello', 
-          :key => 'path/to/filename.gif', 
-          :versions => @versions,
-          :notification_url => 'http://some.host/with/simple/path',
-        }
-        job
-      end
-
-      its(:bucket) { should == @bucket }
-      its(:key) { should == 'path/to/filename.gif' }
-      its(:versions) { should == @versions }
-      its(:notification_url) { should == 'http://some.host/with/simple/path' }
-    end
-
-    describe :source do
-      subject do
-        job = Job.new
-        job.stub(:key).and_return('test-key')
-        job.stub_chain(:bucket, :get).with('test-key').and_return(:s3_data)
-        job.source
-      end
-
-      it { should == :s3_data }
-
-      it "should memoize" do
-        job = Job.new
-        job.instance_variable_set('@source', :cache)
-        job.source.should == :cache
-      end
-    end
-
-    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
-        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
-        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
-
-        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
-        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 ],
-        }
-      end
-
-      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(processed_image_1)
-        source_image.stub(:resize_to_fill).with(64, 64).and_return(processed_image_2)
-      end
-
-      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 "destroys the image object" do
-        source_image.should_receive(:destroy!)
-        subject.processed_versions
-      end
-
-      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
-
-    describe :process do
-      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')
-        job.stub(:version_key).with(:little).and_return('path/to/someimage_little.jpg')
-        job.stub(:send_notification)
-        job
-      end
-
-      it "should destroy the image objects" do
-        @big.should_receive(:destroy!)
-        @little.should_receive(:destroy!)
-        subject.process
-      end
-
-      it "should send each processed version to S3" do
-        expected_headers = {
-          'Content-Type' => 'image/jpeg',
-          'Cache-Control' => 'max-age=2629743',
-        }
-
-        @bucket.should_receive(:put).with('path/to/someimage_big.jpg', 
-                                          'bigdata',
-                                          {},
-                                          'public-read',
-                                          expected_headers)
-        @bucket.should_receive(:put).with('path/to/someimage_little.jpg', 
-                                          'littledata',
-                                          {},
-                                          'public-read',
-                                          expected_headers)
-        subject.process
-      end
-
-      it "should notify" do
-        subject.should_receive(:send_notification)
-        subject.process
-      end
-
-      context "send_notification returns false" do
-        before do
-          subject.stub(:send_notification).and_return(false)
-        end
-
-        it "should return true" do
-          subject.process.should be_true
-        end
-      end
-
-      context "empty array" do
-        before do
-          subject.stub(:processed_versions).and_return([])
-        end
-
-        it "should not break" do
-          subject.process
-        end
-      end
-    end
-
-    describe :send_notification do
-      let(:url) { 'https://some-url' }
-
-      context "notification URL provided" do
-        it "should PUT to the URL" do
-          subject.stub(:notification_url).and_return(url)
-          Curl::Easy.should_receive(:http_put).with(url, '')
-          subject.send_notification
-        end
-      end
-    end
-
-    describe :version_key do
-      subject do
-        job = Job.new
-        job.stub(:key).and_return('path/to/some/file_name.png')
-        job.version_key(:extra_large)
-      end
-
-      it { should == 'path/to/some/file_name_extra_large.png' }
-
-      context "no leading path" do
-        subject do
-          job = Job.new
-          job.stub(:key).and_return('file_name.png')
-          job.version_key(:extra_large)
-        end
-
-        it { should == 'file_name_extra_large.png' }
-      end
-    end
-  end
-end