honkster-encosion 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/honkster-encosion.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{honkster-encosion}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Cameron"]

data/lib/encosion/base.rb

@@ -86,7 +86,7 @@ module Encosion
         body = JSON.parse(response.body.content.strip)
         header = response.header
 
-        error_check(header,body)
+        error_check(header, body)
         # if we get here then no exceptions were raised
         return body
       end
@@ -96,12 +96,15 @@ module Encosion
       def error_check(header,body)
         if header.status_code == 200
           return true if body.nil?
-#          puts body['error']
-          if body.has_key? 'error' && !body['error'].nil?
-            message = "Brightcove responded with an error: #{body['error']} (code #{body['code']})"
+          error = body['error']
+
+          unless error.nil?
+            message = "#{body['error']["name"]}: #{body['error']["message"]} (code #{body['error']['code']})"
+
             body['errors'].each do |error|
               message += "\n#{error.values.first} (code #{error.values.last})"
             end if body.has_key? 'errors'
+
             raise BrightcoveException, message
           end
         else

data/lib/encosion/video.rb

@@ -242,7 +242,7 @@ module Encosion
         r[:encodingRate]
       end.sort.reverse.select { |rate| rate <= max_rate }.first
 
-      urls[best_rate] || flv_url
+      urls[best_rate] || flv_url || urls.values.first
     end
 
     #

data/test/encosion_test.rb

@@ -7,7 +7,7 @@ class EncosionTest < Test::Unit::TestCase
     Encosion.options[:read_token] = 'WZvNvOA-dhN8Q1VCBfJlAH1GNbk-fp48rG7r0LnRNvd1nuRvwJy6uw..'
     Encosion.options[:write_token] = 'UuVyFQ0u58r_1FBxTmmt1bp640RvkkOQjNK9UCBTFH2VW3DA2o_Itw..'
 
-    p Encosion::Video.delete_by_reference_id("testvideo")
+#    p Encosion::Video.delete_by_reference_id("testvideo")
     
     new_video = Encosion::Video.new(
       :file => File.new("/home/honk/workspace/honkster-encosion/test/movie.mov"),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: honkster-encosion
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Rob Cameron