rivendell-api 0.6 → 0.7

data/lib/rivendell/api/version.rb

@@ -1,5 +1,5 @@
 module Rivendell
   module Api
-    VERSION = "0.6"
+    VERSION = "0.7"
   end
 end

data/lib/rivendell/api/xport.rb

@@ -141,6 +141,8 @@ module Rivendell::API
     end
 
     def import(cart_number, cut_number, file, options = {})
+      timeout = (options.delete(:timeout) || 10)*60
+
       arguments = {
         :channels => 2,
         :normalization_level => -13,
@@ -152,7 +154,7 @@ module Rivendell::API
 
       arguments[:use_metadata] = 1 if arguments[:use_metadata]
 
-      post COMMAND_IMPORT, arguments, :timeout => 10*60
+      post COMMAND_IMPORT, arguments, :timeout => timeout
     end
 
     def add_cut(cart_number)

data/spec/rivendell/api/xport_spec.rb

@@ -113,11 +113,16 @@ describe Rivendell::API::Xport do
       FakeWeb.register_uri(:post, "http://localhost/rd-bin/rdxport.cgi", :body => xml_response)
     end
 
-    it "should use a timeout of 10 minutes" do
+    it "should use a default timeout of 10 minutes" do
       subject.should_receive(:post).with(anything, anything, hash_including(:timeout => 600))
       subject.import 123, 001, fixture_file("empty.wav")
     end
 
+    it "should use a given timeout" do
+      subject.should_receive(:post).with(anything, anything, hash_including(:timeout => 1200))
+      subject.import 123, 001, fixture_file("empty.wav"), timeout: 20
+    end
+
     it "should use COMMAND 2" do
       subject.import 123, 001, fixture_file("empty.wav")
       FakeWeb.last_request["COMMAND"] == "2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rivendell-api
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httmultiparty
@@ -206,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4594079732758632000
+      hash: 1535084425241020234
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4594079732758632000
+      hash: 1535084425241020234
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23