brightcove-api 1.0.8 → 1.0.9

data/.rvmrc

@@ -0,0 +1,2 @@
+rvm --create 1.8.7@brightcove-api_gem
+rvm --create 1.9.2@brightcove-api_gem

data/CHANELOG.markdown

@@ -1,3 +1,7 @@
+# 1.0.9 (2011-06-22)
+
+ * Added `post_file_streaming` method 
+ 
 # 1.0.7 (2011-03-21)
 
  * Allow for hash to be ordered when using the create_video call under Ruby 1.8.7

data/Gemfile

@@ -1,9 +1,9 @@
 source :rubygems
 
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", "~> 0.9.9"
+  gem 'bundler', '~> 1.0.0'
+  gem 'jeweler', '~> 1.5.1'
+  gem 'rcov', '~> 0.9.9'
 end
 
 group :test do
@@ -11,7 +11,8 @@ group :test do
 	gem 'mocha'
 end
 
-gem 'httparty', "~> 0.7.7"
-gem 'json', "~> 1.4.6"
-gem 'rest-client', "~> 1.6.1"
-gem 'orderedhash', "~> 0.0.6"
+gem 'httparty', '~> 0.7.7'
+gem 'json', '~> 1.4.6'
+gem 'rest-client', '~> 1.6.1'
+gem 'multipart-post', '~> 1.1.2'
+gem 'orderedhash', '~> 0.0.6'

data/Rakefile

@@ -36,8 +36,6 @@ Rcov::RcovTask.new do |test|
   test.verbose = true
 end
 
-task :default => :test
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
@@ -48,6 +46,8 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+task :default => :test_rubies
+
 task :test_rubies do
-  system "rvm 1.8.7,1.9.2 rake test"
+  system "rvm 1.8.7@brightcove-api_gem,1.9.2@brightcove-api_gem rake test"
 end

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/brightcove-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{brightcove-api}
-  s.version = "1.0.8"
+  s.version = "1.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Czarnecki"]
-  s.date = %q{2011-05-10}
+  s.date = %q{2011-06-22}
   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 = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".rvmrc",
     "CHANELOG.markdown",
     "Gemfile",
     "LICENSE",
@@ -35,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/BrightcoveOS/Ruby-MAPI-Wrapper}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Ruby gem for interacting with the Brightcove media API}
   s.test_files = [
     "test/helper.rb",
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<httparty>, ["~> 0.7.7"])
       s.add_runtime_dependency(%q<json>, ["~> 1.4.6"])
       s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.1"])
+      s.add_runtime_dependency(%q<multipart-post>, ["~> 1.1.2"])
       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"])
@@ -57,6 +59,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<httparty>, ["~> 0.7.7"])
       s.add_dependency(%q<json>, ["~> 1.4.6"])
       s.add_dependency(%q<rest-client>, ["~> 1.6.1"])
+      s.add_dependency(%q<multipart-post>, ["~> 1.1.2"])
       s.add_dependency(%q<orderedhash>, ["~> 0.0.6"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
@@ -66,6 +69,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<httparty>, ["~> 0.7.7"])
     s.add_dependency(%q<json>, ["~> 1.4.6"])
     s.add_dependency(%q<rest-client>, ["~> 1.6.1"])
+    s.add_dependency(%q<multipart-post>, ["~> 1.1.2"])
     s.add_dependency(%q<orderedhash>, ["~> 0.0.6"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])

data/lib/brightcove-api.rb

@@ -2,13 +2,14 @@ require 'httparty'
 require 'json'
 require 'rest-client'
 require 'orderedhash'
+require 'net/http/post/multipart'
 
 module Brightcove
   class API
     include HTTParty
     disable_rails_query_string_format
 
-    VERSION = '1.0.8'.freeze
+    VERSION = '1.0.9'.freeze
 
     DEFAULT_HEADERS = {
       'User-Agent' => "brightcove-api gem #{VERSION}"
@@ -22,6 +23,11 @@ module Brightcove
     attr_accessor :read_api_url
     attr_accessor :write_api_url
     attr_accessor :token
+    
+    # RestClient POST timeout for reading conection
+    attr_accessor :timeout
+    # RestClient POST timeout for opening connection
+    attr_accessor :open_timeout
 
     # Brightcove returns text/html as the Content-Type for a response even though the response is JSON.
     # So, let's just parse the response as JSON
@@ -93,9 +99,43 @@ module Brightcove
       payload[:json] = body.to_json
       payload[:file] = File.new(file, 'rb')
 
-      response = RestClient.post(@write_api_url, payload, :content_type => :json, :accept => :json, :multipart => true)
+      response = RestClient::Request.execute(
+        :method => :post,
+        :url => @write_api_url,
+        :payload => payload,
+        :content_type => :json,
+        :accept => :json,
+        :multipart => true,
+        :timeout => @timeout,
+        :open_timeout => @open_timeout
+      )
 
       JSON.parse(response)
     end
+    
+    def post_file_streaming(api_method, upload_file, content_type, parameters)
+      parameters.merge!({"token" => @token})
+
+      body = {}
+      body.merge!({:method => api_method})
+      body.merge!({:params => parameters})
+
+      url = URI.parse(@write_api_url)
+      response = nil
+      File.open(upload_file) do |file|
+        request = Net::HTTP::Post::Multipart.new(
+        url.path,
+        {
+          :json => body.to_json,
+          :file => UploadIO.new(file, content_type)
+        })
+        
+        response = Net::HTTP.start(url.host, url.port) do |http|
+          http.request(request)
+        end
+      end
+
+      JSON.parse(response.body)
+    end
   end
 end

data/test/fakeweb/delete_video_response.json

@@ -1 +1 @@
-{"result":{}, "id":nil, "error":nil}
+{"result":{}, "id":null, "error":null}

data/test/test_brightcove-api.rb

@@ -12,7 +12,7 @@ class TestBrightcoveApi < Test::Unit::TestCase
   end
 
   def test_api_version
-    assert_equal '1.0.8', Brightcove::API::VERSION
+    assert_equal '1.0.9', Brightcove::API::VERSION
   end
 
   def test_can_set_read_api_url
@@ -124,7 +124,7 @@ class TestBrightcoveApi < Test::Unit::TestCase
     brightcove_response = brightcove.post('delete_video', {:video_id => '595153261337'})
 
     assert brightcove_response.has_key?('result')
-    assert_equal brightcove_response['error'], 'nil'
+    assert_equal brightcove_response['error'], nil
   end
 
   def test_create_video_using_post_file
@@ -142,4 +142,20 @@ class TestBrightcoveApi < Test::Unit::TestCase
     assert_equal '653155417001', brightcove_response['result'].to_s
     assert_equal brightcove_response['error'], nil
   end
+
+  def test_create_video_using_post_file_streaming
+    FakeWeb.register_uri(:post,
+                         'http://api.brightcove.com/services/post',
+                         :body => File.join(File.dirname(__FILE__), 'fakeweb', 'create_video_response.json'),
+                         :content_type => "application/json")
+
+    brightcove = Brightcove::API.new('0Z2dtxTdJAxtbZ-d0U7Bhio2V1Rhr5Iafl5FFtDPY8E.')
+    brightcove_response = brightcove.post_file_streaming('create_video',
+      File.join(File.dirname(__FILE__), 'fakeweb', 'movie.mov'), 'video/quicktime',
+      :video => {:shortDescription => "Short Description", :name => "Video"})
+
+    assert brightcove_response.has_key?('result')
+    assert_equal '653155417001', brightcove_response['result'].to_s
+    assert_equal brightcove_response['error'], nil
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: brightcove-api
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors: 
 - David Czarnecki
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 Z
+date: 2011-06-22 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
@@ -46,19 +47,30 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: orderedhash
+  name: multipart-post
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.0.6
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: orderedhash
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,10 +78,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,10 +89,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -88,7 +100,7 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 description: Ruby gem for interacting with the Brightcove media API. http://docs.brightcove.com/en/media/
 email: dczarnecki@agoragames.com
 executables: []
@@ -99,6 +111,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
+- .rvmrc
 - CHANELOG.markdown
 - Gemfile
 - LICENSE
@@ -113,6 +126,7 @@ files:
 - test/fakeweb/movie.mov
 - test/helper.rb
 - test/test_brightcove-api.rb
+has_rdoc: true
 homepage: http://github.com/BrightcoveOS/Ruby-MAPI-Wrapper
 licenses: 
 - MIT
@@ -126,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4201101218495079525
+      hash: 1985167017172697863
       segments: 
       - 0
       version: "0"
@@ -139,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Ruby gem for interacting with the Brightcove media API