zencoder 1.0.6 → 1.0.7

data/History.txt

@@ -27,3 +27,7 @@
 === 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.
+
+=== 1.0.7 / 2010-06-10
+
+* Merged in changes from Cory Preus for compatibility with upstream API changes.

data/lib/recipes.rb

@@ -8,7 +8,8 @@ module ZencoderAPI #:nodoc:
       :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, 
-      :skip_audio, :start_clip, :clip_length, :thumbnails, :notifications]
+      :skip_audio, :start_clip, :clip_length, :thumbnails, :notifications, :tuning, 
+      :autolevel, :audio_quality, :deblock, :public, :denoise, :video_codec]
 
     @@thumb_keys = [:number, :size, :base_url, :prefix]
 
@@ -20,7 +21,7 @@ module ZencoderAPI #:nodoc:
         m
       end
       raise RecipeError.new("no recipe parameters?") if params.empty?
-      raise RecipeError.new("unknown recipe parameter #{params.keys - @@keys}") unless (params.keys - @@keys).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}") unless (params[:thumbnails].keys - @@thumb_keys).empty?
       end
@@ -71,7 +72,7 @@ module ZencoderAPI #:nodoc:
       }
       params = defaults.merge(params)
 
-       Recipe.new(:web, params)
+      Recipe.new(:web, params)
     end
   end
 end

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.6' #:nodoc:
+  VERSION = '1.0.7' #: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.

data/test/test_zencoder.rb

@@ -102,5 +102,21 @@ class TestZencoder < Test::Unit::TestCase
         ZencoderAPI::Recipes.web('base_url' =>@base_url, :thumbnails => {:bad_key => 'wtf?'})
       end
     end
+    context "with the following request" do 
+      setup do 
+        @params = JSON.parse(IO.readlines('test/fixtures/sample_request.json').to_s)
+        @params['output'] = @params['output'][0]
+        # Change string keys to symbols, no HashWithIndifferentAccess
+        @params['output']['thumbnails'].each_pair do |key, value|
+          @params['output']['thumbnails'][key.to_sym] = value
+          @params['output']['thumbnails'].delete(key)
+        end
+      end
+      should "have the output keys" do
+        assert_nothing_raised do
+          ZencoderAPI::Recipes.web({'base_url' => @base_url}.merge(@params['output']))
+        end
+      end
+    end 
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - McClain Looney
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-28 00:00:00 -05:00
+date: 2010-06-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency