zencoder 2.1.8 → 2.1.9

data/lib/zencoder/job.rb

@@ -2,7 +2,7 @@ class Zencoder
   class Job < Zencoder
 
     def self.create(params={}, options={})
-      params = {:api_key => api_key}.merge(params) if api_key
+      params = apply_api_key(params, options[:format])
       HTTP.post("#{base_url}/jobs",
                            encode(params, options[:format]),
                            options)

data/lib/zencoder/version.rb

@@ -1,3 +1,3 @@
 class Zencoder
-  VERSION = '2.1.8'
+  VERSION = '2.1.9'
 end

data/lib/zencoder/zencoder.rb

@@ -9,7 +9,11 @@ class Zencoder
     if content.is_a?(String)
       content
     elsif format.to_s == 'xml'
-      content.to_xml
+      if content.is_a?(Hash) && content.keys.size == 1
+        content[content.keys.first].to_xml(:root => content.keys.first)
+      else
+        content.to_xml
+      end
     else
       content.to_json
     end
@@ -38,6 +42,29 @@ class Zencoder
 
 protected
 
+  def self.apply_api_key(params, format=nil)
+    if api_key
+      decoded_params = decode(params, format).with_indifferent_access
+
+      if decoded_params[:api_request]
+        decoded_params[:api_request] = decoded_params[:api_request].with_indifferent_access
+      end
+
+      if format.to_s == 'xml'
+        if !(decoded_params[:api_request] && decoded_params[:api_request][:api_key])
+          decoded_params[:api_request] ||= {}.with_indifferent_access
+          decoded_params[:api_request][:api_key] = api_key
+        end
+      else
+        decoded_params['api_key'] = api_key unless decoded_params['api_key']
+      end
+
+      decoded_params
+    else
+      params
+    end
+  end
+
   def self.merge_params(options, params)
     if options[:params]
       options[:params] = options[:params].merge(params)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 1
-  - 8
-  version: 2.1.8
+  - 9
+  version: 2.1.9
 platform: ruby
 authors: 
 - Nathan Sutton