ungulate 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/ungulate_server.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'ungulate'
+require 'ungulate/server'
 
 if ARGV[0].nil?
   $stderr.puts "Must provide a queue name after calling the server"
@@ -11,8 +11,8 @@ logger = Logger.new STDERR
 
 loop do
   begin
-    sleep 1
-    Ungulate.run(ARGV[0]) 
+    sleep ENV['SLEEP'] || 2
+    Ungulate::Server.run(ARGV[0]) 
   rescue StandardError => e
     logger.error e.message
   end

data/lib/ungulate/job.rb

@@ -0,0 +1,81 @@
+require 'rubygems'
+require 'right_aws'
+require 'RMagick'
+require 'mime/types'
+
+module Ungulate
+  class Job
+    attr_accessor :bucket, :key, :queue, :versions
+
+    def self.s3
+      @s3 ||=
+        RightAws::S3.new(ENV['AMAZON_ACCESS_KEY_ID'],
+                         ENV['AMAZON_SECRET_ACCESS_KEY'])
+    end
+
+    def self.sqs
+      @sqs ||= 
+        RightAws::SqsGen2.new(ENV['AMAZON_ACCESS_KEY_ID'],
+                              ENV['AMAZON_SECRET_ACCESS_KEY'])
+    end
+
+    def self.pop(queue_name)
+      job = new
+      job.queue = sqs.queue queue_name
+      message = job.queue.pop
+      attributes = YAML.load message.to_s
+      job.attributes = attributes if attributes
+      job
+    end
+
+    def initialize
+      @logger = Ungulate::Server.logger
+      self.versions = []
+    end
+
+    def attributes=(options)
+      self.bucket = Job.s3.bucket(options[:bucket])
+      self.key = options[:key]
+      self.versions = options[:versions]
+    end
+
+    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}"
+          [name, image.send(method, x, y)]
+        end
+    end
+
+    def source
+      if @source
+        @source
+      else
+        @logger.info "Grabbing source image #{key}"
+        @source = bucket.get key
+      end
+    end
+
+    def process
+      return false if processed_versions.empty?
+      processed_versions.each do |version, image|
+        version_key = version_key version
+        @logger.info "Storing #{version} @ #{version_key}"
+        bucket.put(version_key, 
+                   image.to_blob, 
+                   {},
+                   'public-read',
+                   {'Content-Type' => MIME::Types.type_for(image.format).to_s})
+      end
+    end
+
+    def version_key(version)
+      dirname = File.dirname(key)
+      extname = File.extname(key)
+      basename = File.basename(key, extname)
+      "#{dirname}/#{basename}_#{version}#{extname}".sub(/^\.\//, '')
+    end
+  end
+end

data/lib/ungulate/server.rb

@@ -0,0 +1,16 @@
+require 'logger'
+require 'ungulate/job'
+
+module Ungulate
+  module Server
+    def self.logger
+      @logger ||= ::Logger.new STDOUT
+    end
+
+    def self.run(queue_name)
+      logger.info "Checking for job on #{queue_name}"
+      Job.pop(queue_name).process
+    end
+  end
+end
+

data/lib/ungulate/view_helpers.rb

@@ -0,0 +1,15 @@
+module ViewHelpers
+  def ungulate_upload_form_for(upload, &block)
+    concat(%Q(<form action="#{upload.bucket_url}" enctype="multipart/form-data" method="post">\n))
+    concat("<div>\n")
+    concat(%Q(<input name="key" type="hidden" value="#{upload.key}" />\n))
+    concat(%Q(<input name="AWSAccessKeyId" type="hidden" value="#{upload.access_key_id}" />\n))
+    concat(%Q(<input name="acl" type="hidden" value="#{upload.acl}" />\n))
+    concat(%Q(<input name="policy" type="hidden" value="#{upload.policy}" />\n))
+    concat(%Q(<input name="signature" type="hidden" value="#{upload.signature}" />\n))
+    concat(%Q(<input name="success_action_redirect" type="hidden" value="#{upload.success_action_redirect}" />\n))
+    yield
+    concat("\n</div>\n")
+    concat("</form>\n")
+  end
+end

data/lib/ungulate.rb

@@ -1,90 +1,11 @@
 require 'rubygems'
-require 'right_aws'
-require 'RMagick'
-require 'mime/types'
+require 'ungulate/server'
 
 module Ungulate
-  def self.logger
-    @logger ||= Logger.new STDOUT
-  end
-
-  def self.run(queue_name)
-    logger.info "Checking for job on #{queue_name}"
-    Job.pop(queue_name).process
-  end
-
-  class Job
-    attr_accessor :bucket, :key, :queue, :versions
-
-    def self.s3
-      @s3 ||=
-        RightAws::S3.new(ENV['AMAZON_ACCESS_KEY_ID'],
-                         ENV['AMAZON_SECRET_ACCESS_KEY'])
-    end
-
-    def self.sqs
-      @sqs ||= 
-        RightAws::SqsGen2.new(ENV['AMAZON_ACCESS_KEY_ID'],
-                              ENV['AMAZON_SECRET_ACCESS_KEY'])
-    end
-
-    def self.pop(queue_name)
-      job = new
-      job.queue = sqs.queue queue_name
-      message = job.queue.pop
-      attributes = YAML.load message.to_s
-      job.attributes = attributes if attributes
-      job
-    end
-
-    def initialize
-      @logger = Ungulate.logger
-      self.versions = []
-    end
-
-    def attributes=(options)
-      self.bucket = Job.s3.bucket(options[:bucket])
-      self.key = options[:key]
-      self.versions = options[:versions]
-    end
-
-    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}"
-          [name, image.send(method, x, y)]
-        end
-    end
-
-    def source
-      if @source
-        @source
-      else
-        @logger.info "Grabbing source image #{key}"
-        @source = bucket.get key
-      end
-    end
-
-    def process
-      return false if processed_versions.empty?
-      processed_versions.each do |version, image|
-        version_key = version_key version
-        @logger.info "Storing #{version} @ #{version_key}"
-        bucket.put(version_key, 
-                   image.to_blob, 
-                   {},
-                   'public-read',
-                   {'Content-Type' => MIME::Types.type_for(image.format).to_s})
-      end
-    end
+end
 
-    def version_key(version)
-      dirname = File.dirname(key)
-      extname = File.extname(key)
-      basename = File.basename(key, extname)
-      "#{dirname}/#{basename}_#{version}#{extname}".sub(/^\.\//, '')
-    end
-  end
+if defined? Rails
+  return if ActionView::Base.instance_methods.include_method? :ungulate_upload_form_for
+  require 'ungulate/view_helpers'
+  ActionView::Base.send :include, ViewHelpers
 end

data/spec/{ungulate_spec.rb → ungulate/job_spec.rb}

@@ -1,41 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'ungulate/job'
 
 module Ungulate
-  describe "run" do
-    before do
-      @versions = {
-        :thumb => [ :resize_to_fit, 100, 200 ],
-        :large => [ :resize_to_fit, 200, 300 ],
-      }
-
-      @data = mock('Data')
-      @job = mock('Job', 
-                  :versions => @versions,
-                  :source => @data,
-                  :process => nil,
-                  :store => nil)
-
-      Job.stub(:pop).and_return(@job)
-
-      @image = mock('RMagick::Image')
-
-      @datum = mock('Datum')
-      @data_array = [@datum]
-
-      Magick::Image.stub(:from_blob).with(@data).and_return(@data_array)
-    end
-
-    after { Ungulate.run('queuename') }
-
-    it "should pop a job from the provided queue" do
-      Job.should_receive(:pop).with('queuename')
-    end
-
-    it "should process the job" do
-      @job.should_receive(:process)
-    end
-  end
-
   describe Job do
     before do
       ENV['AMAZON_ACCESS_KEY_ID'] = 'test-key-id'

data/spec/ungulate/server_spec.rb

@@ -0,0 +1,42 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'ungulate/server'
+
+module Ungulate
+  describe Server do
+    describe "run" do
+      before do
+        @versions = {
+          :thumb => [ :resize_to_fit, 100, 200 ],
+          :large => [ :resize_to_fit, 200, 300 ],
+        }
+
+        @data = mock('Data')
+        @job = mock('Job', 
+                    :versions => @versions,
+                    :source => @data,
+                    :process => nil,
+                    :store => nil)
+
+        Job.stub(:pop).and_return(@job)
+
+        @image = mock('RMagick::Image')
+
+        @datum = mock('Datum')
+        @data_array = [@datum]
+
+        Magick::Image.stub(:from_blob).with(@data).and_return(@data_array)
+      end
+
+      after { Ungulate::Server.run('queuename') }
+
+      it "should pop a job from the provided queue" do
+        Job.should_receive(:pop).with('queuename')
+      end
+
+      it "should process the job" do
+        @job.should_receive(:process)
+      end
+    end
+  end
+end
+

data/spec/ungulate/view_helpers_spec.rb

@@ -0,0 +1,52 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'ungulate/view_helpers'
+
+class Includer
+  include ViewHelpers
+  attr_accessor :output_buffer
+
+  def concat(string)
+    self.output_buffer << string
+  end
+end
+
+module Ungulate
+  describe ViewHelpers do
+    describe "ungulate_upload_form_for" do
+      def helper
+        @helper ||= Includer.new
+      end
+
+      before do
+        @file_upload = mock('Ungulate::FileUpload',
+                            :access_key_id => 'awsaccesskeyid',
+                            :acl => 'private',
+                            :bucket_url => 'http://static.test.s3.amazonaws.com/',
+                            :key => 'some/key',
+                            :policy => 'thepolicy',
+                            :signature => 'thesignature',
+                            :success_action_redirect => '/some/place')
+        helper.output_buffer = ''
+        helper.ungulate_upload_form_for(@file_upload) do
+          helper.concat('text in the middle')
+        end
+      end
+
+      it "should have a complete form" do
+        helper.output_buffer.should == <<-HTML
+<form action="http://static.test.s3.amazonaws.com/" enctype="multipart/form-data" method="post">
+<div>
+<input name="key" type="hidden" value="some/key" />
+<input name="AWSAccessKeyId" type="hidden" value="awsaccesskeyid" />
+<input name="acl" type="hidden" value="private" />
+<input name="policy" type="hidden" value="thepolicy" />
+<input name="signature" type="hidden" value="thesignature" />
+<input name="success_action_redirect" type="hidden" value="/some/place" />
+text in the middle
+</div>
+</form>
+HTML
+      end
+    end
+  end
+end

data/ungulate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ungulate}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Bruce"]
-  s.date = %q{2010-04-11}
+  s.date = %q{2010-04-15}
   s.default_executable = %q{ungulate_server.rb}
   s.description = %q{WIP}
   s.email = %q{andrew@camelpunch.com}
@@ -35,10 +35,15 @@ Gem::Specification.new do |s|
      "features/support.rb",
      "lib/ungulate.rb",
      "lib/ungulate/file_upload.rb",
+     "lib/ungulate/job.rb",
+     "lib/ungulate/server.rb",
+     "lib/ungulate/view_helpers.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/ungulate/file_upload_spec.rb",
-     "spec/ungulate_spec.rb",
+     "spec/ungulate/job_spec.rb",
+     "spec/ungulate/server_spec.rb",
+     "spec/ungulate/view_helpers_spec.rb",
      "ungulate.gemspec"
   ]
   s.homepage = %q{http://github.com/camelpunch/ungulate}
@@ -49,7 +54,9 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/spec_helper.rb",
      "spec/ungulate/file_upload_spec.rb",
-     "spec/ungulate_spec.rb"
+     "spec/ungulate/job_spec.rb",
+     "spec/ungulate/server_spec.rb",
+     "spec/ungulate/view_helpers_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Andrew Bruce
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-11 00:00:00 +01:00
+date: 2010-04-15 00:00:00 +01:00
 default_executable: ungulate_server.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -126,10 +126,15 @@ files:
 - features/support.rb
 - lib/ungulate.rb
 - lib/ungulate/file_upload.rb
+- lib/ungulate/job.rb
+- lib/ungulate/server.rb
+- lib/ungulate/view_helpers.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/ungulate/file_upload_spec.rb
-- spec/ungulate_spec.rb
+- spec/ungulate/job_spec.rb
+- spec/ungulate/server_spec.rb
+- spec/ungulate/view_helpers_spec.rb
 - ungulate.gemspec
 has_rdoc: true
 homepage: http://github.com/camelpunch/ungulate
@@ -164,4 +169,6 @@ summary: Process images using Amazon SQS and S3
 test_files: 
 - spec/spec_helper.rb
 - spec/ungulate/file_upload_spec.rb
-- spec/ungulate_spec.rb
+- spec/ungulate/job_spec.rb
+- spec/ungulate/server_spec.rb
+- spec/ungulate/view_helpers_spec.rb