zencoder 1.0.4 → 1.0.5

data/History.txt

@@ -19,3 +19,7 @@
 === 1.0.4 / 2010-05-03
 
 * Jobid hash now returned from the rest request to the api. Useful for receiving callbacks & such
+
+=== 1.0.5 / 2010-05-20
+
+* Pulled some recipes contributed by Brian Maddy

data/Rakefile

@@ -4,7 +4,7 @@
 require 'rake/clean'
 require 'rubygems'
 require 'hoe'
-
+CLEAN.include %w(**/*.orig)
 Hoe.plugins.delete :rubyforge
 Hoe.plugin :hg
 

data/lib/recipes.rb

@@ -4,7 +4,7 @@ module ZencoderAPI #:nodoc:
 
   # This class implements a couple of bogus recipes, mainly as an example of usage. Recipe isntances can be passed in to Zencoder#submit_job
   class Recipe
-    @@keys = [:label, :base_url, :filename, :width, :height, :quality, :speed, 
+    @@keys = [:label, :base_url, :filename, :width, :height, :size, :quality, :speed, 
       :upscale, :stretch, :frame_rate, :max_frame_rate, :keyframe_interval, 
       :video_bitrate, :bitrate_cap, :buffer_size, :h264_profile, :h264_level, 
       :skip_video, :audio_codec, :audio_bitrate, :audio_channels, :audio_sample_rate, 
@@ -22,11 +22,14 @@ module ZencoderAPI #:nodoc:
       raise RecipeError.new("no recipe parameters?") if params.empty?
       raise RecipeError.new("unknown recipe parameter #{params.keys - @@keys}") unless (params.keys - @@keys).empty?
       if params[:thumbnails]
-        raise RecipeError.new("unknown thumb keys #{params[:thumbnails].keys - @@thumb_keys}") if (params[:thumbnails].keys - @@thumb_keys).empty?
+        raise RecipeError.new("unknown thumb keys #{params[:thumbnails].keys - @@thumb_keys}") unless (params[:thumbnails].keys - @@thumb_keys).empty?
       end
       @o = params
     end
 
+    def to_hash
+      @o
+    end
 
     def to_json(*arg) #:nodoc:
       @o.to_json(*arg)
@@ -43,7 +46,7 @@ module ZencoderAPI #:nodoc:
       raise "Base_url unset." unless params['base_url']
       defaults = { 
         "label"=> "iphone",
-        "width"=> 240,
+        "size"=> "480x320",
         "frame_rate"=> 24,
         "max_frame_rate"=> 24,
         "video_bitrate"=> 40,

data/lib/zencoder.rb

@@ -13,7 +13,7 @@ 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.4' #:nodoc:
+  VERSION = '1.0.5' #: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.
@@ -21,7 +21,7 @@ class Zencoder
   # If a block is provided, it is yielded the job configuration as a hash.
   class <<self
     def submit_job(apikey, src, *recipes)
-      jorb = {:api_key=>apikey, :input => src, :output=>[recipes].flatten}
+      jorb = {:api_key=>apikey, :input => src, :output=>[recipes].flatten.map(&:to_hash)}
       yield jorb if block_given?
       JSON.parse(RestClient.post(API_URL+'/jobs', jorb.to_json, {:content_type=>:json, :accept=>:json}))
     end

data/test/test_zencoder.rb

@@ -14,16 +14,21 @@ class TestZencoder < Test::Unit::TestCase
       @apikey = ENV['ZC_APIKEY']
       @base_url = 's3://test_development/zencoder_asset'
       @recipe = ZencoderAPI::Recipes.iphone('base_url' =>@base_url)
-      @recipe2 = ZencoderAPI::Recipes.web('base_url' =>@base_url)
+      @recipe2 = ZencoderAPI::Recipes.web('base_url' =>@base_url,
+        :thumbnails => {
+          :number => 1,
+          :size => "75x75"})
       assert_not_nil @apikey, "export ZC_APIKEY before you run the tests"
     end
     context "posting a new job" do
-
-      should "return jobid" do 
-        resp  =<<-EOS
+      setup do
+        @resp  =<<-EOS
         {"id":36119,"outputs":[{"url":"s3://test_development/zencoder_asset/cf398a309f648f99c41a2c0573f40baf.mp4","label":"iphone","id":36174},{"url":"s3://test_development/zencoder_asset/253fae410b1262ef3a76296cbfdb8b44.mp4","label":"web","id":36175}]}
         EOS
-        RestClient.expects(:post).returns(resp)
+      end
+
+      should "return jobid" do 
+        RestClient.expects(:post).returns(@resp)
         h = Zencoder.submit_job(@apikey, @src, [@recipe, @recipe2])
         assert_equal Hash, h.class
       end
@@ -41,7 +46,7 @@ class TestZencoder < Test::Unit::TestCase
           assert_equal z[:content_type], :json
           assert_equal z[:accept], :json
           true
-        }
+        }.returns(@resp)
         Zencoder.submit_job(@apikey, @src, [@recipe, @recipe2])
       end
       should "be able to muck the config " do
@@ -49,9 +54,10 @@ class TestZencoder < Test::Unit::TestCase
           body = JSON.parse(y)
           assert_equal body['foo'],'bar'
           true
-        }
+        }.returns(@resp)
         Zencoder.submit_job(@apikey, @src, @recipe) do |config|
           config[:foo]='bar'
+          assert config[:output].first.is_a? Hash
         end
       end
       should "be able to submit a job with 1 recipe" do
@@ -65,9 +71,17 @@ class TestZencoder < Test::Unit::TestCase
           assert_equal z[:content_type], :json
           assert_equal z[:accept], :json
           true
-        }
+        }.returns(@resp)
         Zencoder.submit_job(@apikey, @src, @recipe)
       end
     end
+    should "raise error when given bad data" do
+      assert_raise ZencoderAPI::RecipeError do
+        ZencoderAPI::Recipes.web('base_url' =>@base_url, :bad_key => 'wtf?')
+      end
+      assert_raise ZencoderAPI::RecipeError do
+        ZencoderAPI::Recipes.web('base_url' =>@base_url, :thumbnails => {:bad_key => 'wtf?'})
+      end
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - McClain Looney
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -05:00
+date: 2010-05-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency