limelight_video 0.0.2 → 0.0.3

data/lib/limelight_video.rb

@@ -2,6 +2,7 @@ require 'faraday'
 require 'json'
 require 'base64'
 require 'openssl'
+require 'tempfile'
 require 'mime/types'
 
 class Limelight
@@ -21,19 +22,25 @@ class Limelight
   end
 
   def upload(filename_or_io, attributes = {})
-    if filename_or_io.is_a?(String) && File.exists?(filename_or_io)
-      filename = filename_or_io
-    elsif filename_or_io.respond_to?(:read)
-      filename = attributes.fetch(:filename)
-      raise KeyError.new("filename") if !filename
-    else
-      raise Errno::ENOENT
-    end
+    case filename_or_io
+      when String
+        file = File.open(filename_or_io)
+        filename = filename_or_io
+        mime = MIME::Types.of(filename_or_io)
+      when Tempfile, StringIO
+        file = filename_or_io
+        filename = attributes.fetch(:filename)
+        mime = attributes[:type] || MIME::Types.of(filename)
+      else
+        raise Errno::ENOENT
+      end
 
     url = generate_signature('post', @base_url)
-    mime = MIME::Types.type_for(filename)
-    file = Faraday::UploadIO.new(filename_or_io, mime)
-    response = @client.post(url, title: attributes.fetch(:title, 'Unnamed'), media_file: file)
+    media_file = Faraday::UploadIO.new(file, mime, filename)
+    options = { title: attributes.fetch(:title, 'Unnamed'), media_file: media_file}
+    response = @client.post(url, options) do |req|
+      req.options[:open_timeout] = 60*60
+    end
     JSON.parse response.body
   end
 

data/limelight_video.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "limelight_video"
-  s.version           = "0.0.2"
+  s.version           = "0.0.3"
   s.summary           = "Limelight video client"
   s.description       = "Interact with the Limelight CDN platform"
   s.authors           = ["elcuervo"]

data/test/integration/limelight_test.rb

@@ -1,5 +1,6 @@
 require 'test_helper'
 require 'test_fixtures'
+require 'stringio'
 
 describe Limelight do
   before do
@@ -19,7 +20,7 @@ describe Limelight do
 
   it 'should upload an io stream' do
     VCR.use_cassette("limelight upload io", match_requests_on: [:host, :path]) do
-      io = File.open(sample_mp4_file)
+      io = StringIO.new << File.read(sample_mp4_file)
       video = @limelight.upload(io, title: 'test', filename: sample_mp4_file)
       video["media_id"].size.must_equal 32
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: limelight_video
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: