tootsie 0.9.18 → 0.9.19

data/README.md

@@ -222,25 +222,30 @@ Create a configuration, eg. `tootsie.conf`:
 
 Start the task manager with `tootsie -c tootsie.conf`.
 
+Now create a rackup file, and call it `config.ru`:
+
+    require 'tootsie'
+    Tootsie::Application.new.configure!('tootsie.conf')
+    run Tootsie::WebService
+
 To run the web service, you will need a Rack-compatible web server, such as Unicorn or Thin. To start with Thin on port 9090:
 
-    $ export TOOTSIE_CONFIG=<path to your config>
     $ thin --daemonize --rackup config.ru --port 9090 start
 
 Jobs may now be posted to the web service API. For example:
 
     $ cat << END | curl -d @- http://localhost:9090/job
     {
-      'type': 'video',
-      'notification_url': 'http://example.com/transcoder_notification',
-      'params': {
-        'input_url': 'http://example.com/test.3gp',
-        'versions': {
-          'target_url': 's3:mybucket/test.mp4?acl=public_read',
-          'audio_sample_rate': 44100,
-          'audio_bitrate': 64000,
-          'format': 'flv',
-          'content_type': 'video/x-flv'
+      "type": "video",
+      "notification_url": "http://example.com/transcoder_notification",
+      "params": {
+        "input_url": "http://example.com/test.3gp",
+        "versions": {
+          "target_url": "s3:mybucket/test.mp4?acl=public_read",
+          "audio_sample_rate": 44100,
+          "audio_bitrate": 64000,
+          "format": "flv",
+          "content_type": "video/x-flv"
         }
       }
     }

data/{config.ru → example/config.ru}

@@ -1,4 +1,3 @@
-$:.unshift(File.join(File.dirname(__FILE__), "/lib"))
 require 'tootsie'
 
 config_path = ENV['TOOTSIE_CONFIG']

data/lib/tootsie/queues/amqp_queue.rb

@@ -44,10 +44,13 @@ module Tootsie
               with_reconnect do
                 @queue.ack(:delivery_tag => message[:delivery_details][:delivery_tag])
               end
-              true
             end
           end
-          break unless options[:wait]
+          if item or not options[:wait]
+            true
+          else
+            false
+          end
         end
         break if item
       end

data/lib/tootsie/queues/sqs_queue.rb

@@ -76,11 +76,12 @@ module Tootsie
               # Always destroy, even if parsing fails
               message.destroy
             end
+          end
+          if item or not options[:wait]
             true
           else
             false
           end
-          break unless options[:wait]
         end
         break if item
       end

data/lib/tootsie/version.rb

@@ -1,3 +1,3 @@
 module Tootsie
-  VERSION = '0.9.18'
+  VERSION = '0.9.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tootsie
 version: !ruby/object:Gem::Version
-  version: 0.9.18
+  version: 0.9.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000Z
+date: 2012-01-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70250171425860 !ruby/object:Gem::Requirement
+  requirement: &70163954053580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70250171425860
+  version_requirements: *70163954053580
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70250171425340 !ruby/object:Gem::Requirement
+  requirement: &70163954052580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250171425340
+  version_requirements: *70163954052580
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70250171424860 !ruby/object:Gem::Requirement
+  requirement: &70163954051300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70250171424860
+  version_requirements: *70163954051300
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70250171424380 !ruby/object:Gem::Requirement
+  requirement: &70163954049620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70250171424380
+  version_requirements: *70163954049620
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70250171423900 !ruby/object:Gem::Requirement
+  requirement: &70163954048560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70250171423900
+  version_requirements: *70163954048560
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70250171423420 !ruby/object:Gem::Requirement
+  requirement: &70163954047500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70250171423420
+  version_requirements: *70163954047500
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &70250171422940 !ruby/object:Gem::Requirement
+  requirement: &70163954046700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.12
   type: :runtime
   prerelease: false
-  version_requirements: *70250171422940
+  version_requirements: *70163954046700
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70250171422460 !ruby/object:Gem::Requirement
+  requirement: &70163954039800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70250171422460
+  version_requirements: *70163954039800
 - !ruby/object:Gem::Dependency
   name: s3
-  requirement: &70250171421980 !ruby/object:Gem::Requirement
+  requirement: &70163954038080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.3.8
   type: :runtime
   prerelease: false
-  version_requirements: *70250171421980
+  version_requirements: *70163954038080
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70250171421500 !ruby/object:Gem::Requirement
+  requirement: &70163954036280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.7.8
   type: :runtime
   prerelease: false
-  version_requirements: *70250171421500
+  version_requirements: *70163954036280
 - !ruby/object:Gem::Dependency
   name: sqs
-  requirement: &70250171421020 !ruby/object:Gem::Requirement
+  requirement: &70163954034480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70250171421020
+  version_requirements: *70163954034480
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70250171420540 !ruby/object:Gem::Requirement
+  requirement: &70163954032900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 4.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70250171420540
+  version_requirements: *70163954032900
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70250171420060 !ruby/object:Gem::Requirement
+  requirement: &70163954031420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70250171420060
+  version_requirements: *70163954031420
 - !ruby/object:Gem::Dependency
   name: scashin133-syslog_logger
-  requirement: &70250171419580 !ruby/object:Gem::Requirement
+  requirement: &70163954030040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 1.7.3
   type: :runtime
   prerelease: false
-  version_requirements: *70250171419580
+  version_requirements: *70163954030040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70250171419200 !ruby/object:Gem::Requirement
+  requirement: &70163954028800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250171419200
+  version_requirements: *70163954028800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70250171418740 !ruby/object:Gem::Requirement
+  requirement: &70163954026760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250171418740
+  version_requirements: *70163954026760
 description: Tootsie is a simple audio/video/image transcoding/modification application.
 email:
 - alex@origo.no
@@ -202,7 +202,7 @@ files:
 - Rakefile
 - Tootsie.gemspec
 - bin/tootsie
-- config.ru
+- example/config.ru
 - lib/tootsie.rb
 - lib/tootsie/application.rb
 - lib/tootsie/client.rb