zencoder 2.1.11 → 2.1.12

data/lib/zencoder.rb

@@ -7,6 +7,7 @@ require 'timeout'
 require 'active_support' # JSON and XML parsing/encoding
 
 # Zencoder
+require 'zencoder/extensions'
 require 'zencoder/zencoder'
 require 'zencoder/http/net_http'
 require 'zencoder/http/typhoeus'

data/lib/zencoder/extensions.rb

@@ -0,0 +1,11 @@
+class Hash
+  def recursive_with_indifferent_access
+    hash = with_indifferent_access
+    hash.each do |key, value|
+      if value.is_a?(Hash)
+        hash[key] = value.recursive_with_indifferent_access
+      end
+    end
+    return hash
+  end
+end

data/lib/zencoder/http.rb

@@ -10,7 +10,7 @@ class Zencoder
 
     self.default_options = {:timeout => 10000,
                             :headers => {'Accept' => 'application/json',
-                                         'Content-Type' => 'application/json'}}
+                                         'Content-Type' => 'application/json'}}.recursive_with_indifferent_access
 
     def initialize(method, url, options={})
       self.method  = method
@@ -43,7 +43,7 @@ class Zencoder
     end
 
     def options=(value)
-      @options = default_options.merge(value || {})
+      @options = default_options.recursive_with_indifferent_access.merge(value || {})
 
       options[:headers] ||= {}
       options[:headers]['Accept'] = "application/#{format}"
@@ -65,7 +65,7 @@ class Zencoder
     end
 
     def default_options
-      self.class.default_options
+      self.class.default_options.recursive_with_indifferent_access
     end
 
 

data/lib/zencoder/version.rb

@@ -1,3 +1,3 @@
 class Zencoder
-  VERSION = '2.1.11'
+  VERSION = '2.1.12'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 1
-  - 11
-  version: 2.1.11
+  - 12
+  version: 2.1.12
 platform: ruby
 authors: 
 - Nathan Sutton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 -05:00
+date: 2010-07-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ extra_rdoc_files: []
 files: 
 - lib/zencoder/account.rb
 - lib/zencoder/errors.rb
+- lib/zencoder/extensions.rb
 - lib/zencoder/http/net_http.rb
 - lib/zencoder/http/typhoeus.rb
 - lib/zencoder/http.rb