flixit 0.0.19 → 0.0.20

data/VERSION

@@ -1 +1 @@
-0.0.19
+0.0.20

data/lib/flixit/record.rb

@@ -33,20 +33,33 @@ protected
   def post(path, body)
     begin
       flixcloud = RestClient::Resource.new(
-        "https://flixcloud.com/#{path}",
+        "https://www.flixcloud.com/#{path}",
         # :ssl_client_cert  =>  OpenSSL::X509::Certificate.new(File.read("host.cert")),
         # :ssl_client_key   =>  OpenSSL::PKey::RSA.new(File.read("host.key"), ""),
         # :ssl_ca_file => Flixit::CA_FILE,
         # :verify_ssl => OpenSSL::SSL::VERIFY_PEER
         :verify_ssl => false
       )
-      Flixit::Response.new(flixcloud.post  body, :content_type => 'application/xml', :accept => 'text/xml')
-    # rescue HTTPClient::KeepAliveDisconnected
-    #   raise Flixit::ServerBrokeConnection, $!.message
-    # rescue HTTPClient::ReceiveTimeoutError
-    #   raise Flixit::RequestTimeout, $!.message
-    # rescue HTTPClient::ConnectTimeoutError
-    #   raise Flixit::ConnectionRefused, $!.message
+      Flixit::Response.new(flixcloud.post(body, :content_type => 'application/xml', :accept => 'text/xml') do |response, &block|
+        if [301, 302, 303].include? response.code
+          response.follow_redirection &block
+        else
+          response.return! &block
+        end
+      end)
+      # flixcloud.post  body |response, &block|
+      #    if [301, 302].include? response.code
+      #      response.follow_redirection &block
+      #    else
+      #      response.return! &block
+      #    end
+      #  }
+      # rescue HTTPClient::KeepAliveDisconnected
+      #   raise Flixit::ServerBrokeConnection, $!.message
+      # rescue HTTPClient::ReceiveTimeoutError
+      #   raise Flixit::RequestTimeout, $!.message
+      # rescue HTTPClient::ConnectTimeoutError
+      #   raise Flixit::ConnectionRefused, $!.message
     end
   end
 

data/spec/job_spec.rb

@@ -9,7 +9,7 @@ context "Create a Job" do
                                                 :output =>     {:url => 's3://flixcloud/somefile.flv'},
                                                 :thumbnails => {:url => "s3://flixcloud/somefile/",:prefix => 'thumbnail'}})
     Fredo.post "https://www.flixcloud.com/jobs" do
-      %{<?xml version="1.0" encoding="UTF-8"?><job><id type="integer">3254</id><initialized-job-at type="datetime">2009-02-11T01:23:54Z</initialized-job-at></job>}
+      [201, {}, %{<?xml version="1.0" encoding="UTF-8"?><job><id type="integer">3254</id><initialized-job-at type="datetime">2009-02-11T01:23:54Z</initialized-job-at></job>}]
     end
 
   end
@@ -19,7 +19,7 @@ context "Create a Job" do
   end
   
   it "posts a message to flixcloud" do    
-    @job.save
+    @job.save.should be_true
   end
   
   it "has a passthrough option" do    
@@ -35,4 +35,18 @@ context "Create a Job" do
    YAML.load(request['api_request']['pass_through']).should eql({:key => 'value'})
   end
   
+  it "should follow redirects" do
+    # Setup redirection to http
+    Fredo.forget
+    Fredo.post "https://www.flixcloud.com/jobs" do
+      if env['rack.url_scheme'] == 'https'
+        [303, {'LOCATION' => "http://www.flixcloud.com/jobs"}, 'This item has moved permanently']
+      else
+        [201, {}, %{<?xml version="1.0" encoding="UTF-8"?><job><id type="integer">3254</id><initialized-job-at type="datetime">2009-02-11T01:23:54Z</initialized-job-at></job>}]
+      end
+    end
+    
+    @job.should be_valid
+    @job.save.should be_true
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 19
-  version: 0.0.19
+  - 20
+  version: 0.0.20
 platform: ruby
 authors: 
 - Leandro Pedroni