encoding-dot-com 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/encoding-dot-com.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{encoding-dot-com}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roland Swingler", "Alan Kennedy", "Levent Ali"]
-  s.date = %q{2009-12-08}
+  s.date = %q{2009-12-17}
   s.description = %q{A ruby wrapper for the encoding.com API}
   s.email = %q{roland.swingler@gmail.com}
   s.extra_rdoc_files = [

data/lib/encoding_dot_com/queue.rb

@@ -23,7 +23,8 @@ module EncodingDotCom
     # various formats. Item will be processed after being added.
     #
     # +source+:: the source url
-    # +formats+:: a hash of destination urls => format objects
+    # +formats+:: a hash of destination urls => format objects/format
+    #             attribute hashes
     def add_and_process(source, formats={})
       add_request("AddMedia", source, formats)
     end
@@ -32,7 +33,8 @@ module EncodingDotCom
     # various formats.
     #
     # +source+:: the source url
-    # +formats+:: a hash of destination urls => format objects
+    # +formats+:: a hash of destination urls => format objects/format
+    #             attribute hashes
     def add(source, formats={})
       add_request("AddMediaBenchmark", source, formats)
     end
@@ -93,7 +95,10 @@ module EncodingDotCom
     def add_request(action, source, formats)
       response = make_request(action) do |q|
         q.source source
-        formats.each {|url, format| format.build_xml(q, url) }
+        formats.each do |url, format|
+          format_builder = (format.kind_of?(Format)) ? format : Format.create(format)
+          format_builder.build_xml(q, url)
+        end
       end
       media_id = response.xpath("/response/MediaID").text
       media_id.to_i if media_id

data/spec/queue_spec.rb

@@ -85,6 +85,11 @@ describe "Encoding.com Queue facade" do
       expect_response_xml("<response><MediaID>1234</MediaID></response>")
       @facade.add_and_process(stub("source"), {}).should == 1234
     end
+
+    it "should accept formats as a hash of format attributes" do
+      expect_xml_with_xpath("/query/format/output[text()='flv']")
+      @facade.add_and_process(stub("source"), "http://example.com" => {"output" => "flv"})
+    end
   end
 
   describe "xml sent to encoding.com to get the status of a job" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: encoding-dot-com
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Roland Swingler
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 +00:00
+date: 2009-12-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency