zencoder 1.0.3 → 1.0.4

data/History.txt

@@ -11,3 +11,11 @@
 === 1.0.2 / 2010-04-29
 
 * Fixed manifest
+
+=== 1.0.3 / 2010-04-29
+
+* First actual working version. probably should have held off on pushing the others to gemcutter. c'est la vie.
+
+=== 1.0.4 / 2010-05-03
+
+* Jobid hash now returned from the rest request to the api. Useful for receiving callbacks & such

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.3' #:nodoc:
+  VERSION = '1.0.4' #: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.
@@ -23,8 +23,7 @@ class Zencoder
     def submit_job(apikey, src, *recipes)
       jorb = {:api_key=>apikey, :input => src, :output=>[recipes].flatten}
       yield jorb if block_given?
-      RestClient.post(API_URL+'/jobs', jorb.to_json, {:content_type=>:json, :accept=>:json})
-
+      JSON.parse(RestClient.post(API_URL+'/jobs', jorb.to_json, {:content_type=>:json, :accept=>:json}))
     end
   end
 

data/test/test_zencoder.rb

@@ -9,17 +9,25 @@ class TestZencoder < Test::Unit::TestCase
 
   context "the zn lib" do 
     setup do
-      @src='s3://gkt_sophia_development/spark.avi'
+      @src='s3://test_development/spark.avi'
       @api = 'https://app.zencoder.com'
       @apikey = ENV['ZC_APIKEY']
-      @base_url = 's3://gkt_sophia_development/zencoder_asset'
+      @base_url = 's3://test_development/zencoder_asset'
       @recipe = ZencoderAPI::Recipes.iphone('base_url' =>@base_url)
       @recipe2 = ZencoderAPI::Recipes.web('base_url' =>@base_url)
       assert_not_nil @apikey, "export ZC_APIKEY before you run the tests"
     end
     context "posting a new job" do
-      setup do
+
+      should "return jobid" 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)
+        h = Zencoder.submit_job(@apikey, @src, [@recipe, @recipe2])
+        assert_equal Hash, h.class
       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'

metadata

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