zencoder 1.0.5 → 1.0.6

data/History.txt

@@ -23,3 +23,7 @@
 === 1.0.5 / 2010-05-20
 
 * Pulled some recipes contributed by Brian Maddy
+
+=== 1.0.6 / 2010-05-28
+
+* Added support for toplevel options. {:test=>1} for example. This breaks the old api. The recipes argument to submit_job() must be present, and an optional :opts hash will be merged into the toplevel Zencoder request hash.

data/Rakefile

@@ -10,8 +10,8 @@ Hoe.plugin :hg
 
 Hoe.spec 'zencoder' do
   developer('McClain Looney', 'm@loonsoft.com')
-  extra_deps <<  %w(rest-client >=1.2.0)
-  extra_deps <<  %w(json >=1.2.3)
+  extra_deps <<  %w(rest-client >=1.5.1)
+  extra_deps <<  %w(json >=1.4.3)
   extra_dev_deps << %w(shoulda >=2.10.0)
 end
 

data/lib/zencoder.rb

@@ -13,18 +13,20 @@ class Zencoder
   # Currently https://app.zencoder.com/api This means you have to have ssl built into your ruby!
   API_URL = 'https://app.zencoder.com/api'
   
-  VERSION = '1.0.5' #:nodoc:
+  VERSION = '1.0.6' #:nodoc:
   # Submits a job to zencoder. 
   # The recipe should be an instance or array of instances of ZencoderAPI::Recipe
   # Exceptions are not handled, but rather propagated upwards.
   #
   # If a block is provided, it is yielded the job configuration as a hash.
+  # Recipes is an array of Recipe objects.
+  # opts can be used to override toplevel Zencoder api options
   class <<self
-    def submit_job(apikey, src, *recipes)
+    def submit_job(apikey, src, recipes, opts={})
       jorb = {:api_key=>apikey, :input => src, :output=>[recipes].flatten.map(&:to_hash)}
+      jorb.merge!(opts)
       yield jorb if block_given?
       JSON.parse(RestClient.post(API_URL+'/jobs', jorb.to_json, {:content_type=>:json, :accept=>:json}))
     end
   end
-
 end

data/test/test_zencoder.rb

@@ -33,6 +33,24 @@ class TestZencoder < Test::Unit::TestCase
         assert_equal Hash, h.class
       end
 
+      should "be able to submit a job with opts" do
+        RestClient.expects(:post).with(kind_of(String), kind_of(String), kind_of(Hash)){|x,y,z| 
+          assert_equal x, 'https://app.zencoder.com/api/jobs'
+          body =  JSON.parse(y)
+          assert_equal body['input'], @src
+          assert_equal @base_url, body['output'][0]['base_url']
+          assert_equal @base_url, body['output'][1]['base_url']
+          assert_equal 'web', body['output'][1]['label']
+          assert_equal 'iphone', body['output'][0]['label']
+          assert_equal @apikey, body['api_key']
+          assert_equal 1, body['test']
+          assert_equal :json, z[:content_type]
+          assert_equal :json, z[:accept]
+          true
+        }.returns(@resp)
+        Zencoder.submit_job(@apikey, @src, [@recipe, @recipe2], :test => 1)
+      end
+
       should "be able to submit a job" do
         RestClient.expects(:post).with(kind_of(String), kind_of(String), kind_of(Hash)){|x,y,z| 
           assert_equal x, 'https://app.zencoder.com/api/jobs'
@@ -43,6 +61,7 @@ class TestZencoder < Test::Unit::TestCase
           assert_equal body['output'][1]['label'], 'web'
           assert_equal body['output'][0]['label'], 'iphone'
           assert_equal body['api_key'], @apikey
+          assert_nil body['test']
           assert_equal z[:content_type], :json
           assert_equal z[:accept], :json
           true

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - McClain Looney
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-20 00:00:00 -05:00
+date: 2010-05-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 2
-        - 0
-        version: 1.2.0
+        - 5
+        - 1
+        version: 1.5.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,9 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 2
+        - 4
         - 3
-        version: 1.2.3
+        version: 1.4.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency