brightcove-api 1.0.6 → 1.0.7

data/CHANELOG.markdown

@@ -1,3 +1,7 @@
+# 1.0.7 (2011-03-21)
+
+ * Allow for hash to be ordered when using the create_video call under Ruby 1.8.7
+
 # 1.0.6 (2011-02-16)
 
  * `set_timeout` can be used to set an HTTP timeout in seconds.

data/Gemfile

@@ -14,3 +14,4 @@ end
 gem 'httparty', "~> 0.6.1"
 gem 'json', "~> 1.4.6"
 gem 'rest-client', "~> 1.6.1"
+gem 'orderedhash', "~> 0.0.6"

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/brightcove-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{brightcove-api}
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Czarnecki"]
-  s.date = %q{2011-02-16}
+  s.date = %q{2011-03-21}
   s.description = %q{Ruby gem for interacting with the Brightcove media API. http://docs.brightcove.com/en/media/}
   s.email = %q{dczarnecki@agoragames.com}
   s.extra_rdoc_files = [
@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<httparty>, ["~> 0.6.1"])
       s.add_runtime_dependency(%q<json>, ["~> 1.4.6"])
       s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.1"])
+      s.add_runtime_dependency(%q<orderedhash>, ["~> 0.0.6"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rcov>, ["~> 0.9.9"])
@@ -57,6 +58,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<httparty>, ["~> 0.6.1"])
       s.add_dependency(%q<json>, ["~> 1.4.6"])
       s.add_dependency(%q<rest-client>, ["~> 1.6.1"])
+      s.add_dependency(%q<orderedhash>, ["~> 0.0.6"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<rcov>, ["~> 0.9.9"])
@@ -65,6 +67,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<httparty>, ["~> 0.6.1"])
     s.add_dependency(%q<json>, ["~> 1.4.6"])
     s.add_dependency(%q<rest-client>, ["~> 1.6.1"])
+    s.add_dependency(%q<orderedhash>, ["~> 0.0.6"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     s.add_dependency(%q<rcov>, ["~> 0.9.9"])

data/lib/brightcove-api.rb

@@ -1,12 +1,13 @@
 require 'httparty'
 require 'json'
 require 'rest-client'
+require 'orderedhash'
 
 module Brightcove
   class API
     include HTTParty
     
-    VERSION = '1.0.6'.freeze
+    VERSION = '1.0.7'.freeze
     
     DEFAULT_HEADERS = {
       'User-Agent' => "brightcove-api gem #{VERSION}"
@@ -49,10 +50,9 @@ module Brightcove
     def get(api_method, options = {})
       options.merge!({:command => api_method})
       options.merge!({:token => @token})
-
       query = {}
       query.merge!({:query => options})
-            
+
       self.class.get(@read_api_url, query)
     end
     
@@ -73,11 +73,19 @@ module Brightcove
       body = {}
       body.merge!({:method => api_method})          
       body.merge!({:params => parameters})
+      
+      # Brightcove requires that the JSON-RPC call absolutely
+      # be the first part of a multi-part POST like create_video.
+      if RUBY_VERSION >= '1.9'
+        payload = {}
+      else
+        payload = OrderedHash.new
+      end
+      
+      payload[:json] = body.to_json
+      payload[:file] = File.new(file, 'rb')
           
-      response = RestClient.post(@write_api_url, {
-        :json => body.to_json,
-        :file => File.new(file, 'rb')
-      }, :content_type => :json, :accept => :json, :multipart => true)
+      response = RestClient.post(@write_api_url, payload, :content_type => :json, :accept => :json, :multipart => true)
       
       JSON.parse(response)
     end

data/test/test_brightcove-api.rb

@@ -12,7 +12,7 @@ class TestBrightcoveApi < Test::Unit::TestCase
   end
   
   def test_api_version
-    assert_equal '1.0.6', Brightcove::API::VERSION
+    assert_equal '1.0.7', Brightcove::API::VERSION
   end
   
   def test_can_set_read_api_url
@@ -88,7 +88,7 @@ class TestBrightcoveApi < Test::Unit::TestCase
                          :content_type => "application/json")
 
     brightcove = Brightcove::API.new('0Z2dtxTdJAxtbZ-d0U7Bhio2V1Rhr5Iafl5FFtDPY8E.')
-    brightcove_response = brightcove.post_file('delete_video', 
+    brightcove_response = brightcove.post_file('create_video', 
       File.join(File.dirname(__FILE__), 'fakeweb', 'movie.mov'), 
       :video => {:shortDescription => "Short Description", :name => "Video"})
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brightcove-api
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - David Czarnecki
@@ -14,99 +15,121 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 -05:00
+date: 2011-03-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
   name: httparty
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 0
         - 6
         - 1
         version: 0.6.1
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 4
         - 6
         version: 1.4.6
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 6
         - 1
         version: 1.6.1
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: *id003
+  name: orderedhash
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 0
+        - 6
+        version: 0.0.6
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 5
         - 1
         version: 1.5.1
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 41
         segments: 
         - 0
         - 9
         - 9
         version: 0.9.9
-  type: :development
-  prerelease: false
-  version_requirements: *id006
+  requirement: *id007
 description: Ruby gem for interacting with the Brightcove media API. http://docs.brightcove.com/en/media/
 email: dczarnecki@agoragames.com
 executables: []
@@ -145,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2943453376308896196
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -154,6 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"