zencoder-flix_cloud-gem 0.5.1 → 0.5.2

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.authors = ["Nathan Sutton"]
     gem.add_dependency('builder', '>= 2.1.2')
     gem.add_dependency('crack', '>= 0.1.1')
-    gem.add_dependency('rest-client', '>= 0.9.2')
+    gem.add_dependency('sevenwire-http_client', '>= 0.1.0')
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 5
-:patch: 1
+:patch: 2

data/lib/flix_cloud/exceptions.rb

@@ -3,3 +3,4 @@ class FlixCloud::SaveError < FlixCloud::Error; end
 class FlixCloud::CreateError < FlixCloud::Error; end
 class FlixCloud::ServerBrokeConnection < FlixCloud::Error; end
 class FlixCloud::RequestTimeout < FlixCloud::Error; end
+class FlixCloud::ConnectionRefused < FlixCloud::Error; end

data/lib/flix_cloud/record.rb

@@ -32,12 +32,14 @@ protected
 
   def post(path, body)
     begin
-      FlixCloud::Response.new(RestClient::Resource.new("https://flixcloud.com/#{path}",
+      FlixCloud::Response.new(HttpClient::Resource.new("https://flixcloud.com/#{path}",
                                                        :verify_ssl => OpenSSL::SSL::VERIFY_PEER).post(body, :content_type => 'application/xml', :accept => 'application/xml'))
-    rescue RestClient::ServerBrokeConnection
-      raise FlixCloud::ServerBrokeConnection
-    rescue RestClient::RequestTimeout
-      raise FlixCloud::RequestTimeout
+    rescue HttpClient::ServerBrokeConnection
+      raise FlixCloud::ServerBrokeConnection, $!.message
+    rescue HttpClient::RequestTimeout
+      raise FlixCloud::RequestTimeout, $!.message
+    rescue HttpClient::ConnectionRefused
+      raise FlixCloud::ConnectionRefused, $!.message
     end
   end
 

data/lib/flix_cloud.rb

@@ -1,5 +1,5 @@
 require 'builder'
-require 'restclient'
+require 'http_client'
 require 'crack/xml'
 
 module FlixCloud; end

data/test/flix_cloud/job_test.rb

@@ -460,7 +460,7 @@ class FlixCloud::JobTest < Test::Unit::TestCase
 
   context "When calling save on a valid job and the server connection gets interrupted" do
     setup do
-      RestClient::Resource.expects(:new).raises(RestClient::ServerBrokeConnection)
+      HttpClient::Resource.expects(:new).raises(HttpClient::ServerBrokeConnection)
       @job = FlixCloud::Job.new(:api_key => 'your-api-key',
                                 :recipe_id => 2,
                                 :input_url          => 'your-input-url',
@@ -481,9 +481,10 @@ class FlixCloud::JobTest < Test::Unit::TestCase
     end
   end
 
+
   context "When calling save on a valid job and the connection times out" do
     setup do
-      RestClient::Resource.expects(:new).raises(RestClient::RequestTimeout)
+      HttpClient::Resource.expects(:new).raises(HttpClient::RequestTimeout)
       @job = FlixCloud::Job.new(:api_key => 'your-api-key',
                                 :recipe_id => 2,
                                 :input_url          => 'your-input-url',
@@ -497,11 +498,35 @@ class FlixCloud::JobTest < Test::Unit::TestCase
                                 :watermark_password => 'your-watermark-password')
     end
 
-    should "railse a FlixCloud::ServerBrokeConnection exception" do
+    should "railse a FlixCloud::RequestTimeout exception" do
       assert_raises FlixCloud::RequestTimeout do
         @job.save
       end
     end
   end
 
+
+  context "When calling save on a valid job and the connection is refused" do
+    setup do
+      HttpClient::Resource.expects(:new).raises(HttpClient::ConnectionRefused)
+      @job = FlixCloud::Job.new(:api_key => 'your-api-key',
+                                :recipe_id => 2,
+                                :input_url          => 'your-input-url',
+                                :input_user         => 'your-input-user',
+                                :input_password     => 'your-input-password',
+                                :output_url         => 'your-output-url',
+                                :output_user        => 'your-output-user',
+                                :output_password    => 'your-output-password',
+                                :watermark_url      => 'your-watermark-url',
+                                :watermark_user     => 'your-watermark-user',
+                                :watermark_password => 'your-watermark-password')
+    end
+
+    should "railse a FlixCloud::ConnectionRefused exception" do
+      assert_raises FlixCloud::ConnectionRefused do
+        @job.save
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zencoder-flix_cloud-gem
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Nathan Sutton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-16 00:00:00 -07:00
+date: 2009-04-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,14 +33,14 @@ dependencies:
         version: 0.1.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: sevenwire-http_client
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.1.0
     version: 
 description: 
 email: nate@sevenwire.com