zencoder 2.1.10 → 2.1.11

Sign up to get free protection for your applications and to get access to all the features.
@@ -2,22 +2,22 @@ class Zencoder
2
2
  class Account < Zencoder
3
3
 
4
4
  def self.create(params={}, options={})
5
- HTTP.post("#{base_url}/account", encode(params, options[:format]), options)
5
+ HTTP.post("#{options[:base_url] || base_url}/account", encode(params, options[:format]), options)
6
6
  end
7
7
 
8
8
  def self.details(options={})
9
9
  params = {:api_key => options.delete(:api_key) || api_key}
10
- HTTP.get("#{base_url}/account", merge_params(options, params))
10
+ HTTP.get("#{options[:base_url] || base_url}/account", merge_params(options, params))
11
11
  end
12
12
 
13
13
  def self.integration(options={})
14
14
  params = {:api_key => options.delete(:api_key) || api_key}
15
- HTTP.get("#{base_url}/account/integration", merge_params(options, params))
15
+ HTTP.get("#{options[:base_url] || base_url}/account/integration", merge_params(options, params))
16
16
  end
17
17
 
18
18
  def self.live(options={})
19
19
  params = {:api_key => options.delete(:api_key) || api_key}
20
- HTTP.get("#{base_url}/account/live", merge_params(options, params))
20
+ HTTP.get("#{options[:base_url] || base_url}/account/live", merge_params(options, params))
21
21
  end
22
22
 
23
23
  end
data/lib/zencoder/job.rb CHANGED
@@ -3,7 +3,7 @@ class Zencoder
3
3
 
4
4
  def self.create(params={}, options={})
5
5
  params = apply_api_key(params, options[:format])
6
- HTTP.post("#{base_url}/jobs",
6
+ HTTP.post("#{options[:base_url] || base_url}/jobs",
7
7
  encode(params, options[:format]),
8
8
  options)
9
9
  end
@@ -13,27 +13,27 @@ class Zencoder
13
13
  :page => options.delete(:page) || 1,
14
14
  :per_page => options.delete(:per_page) || 50 }
15
15
 
16
- HTTP.get("#{base_url}/jobs", merge_params(options, params))
16
+ HTTP.get("#{options[:base_url] || base_url}/jobs", merge_params(options, params))
17
17
  end
18
18
 
19
19
  def self.details(job_id, options={})
20
20
  params = {:api_key => options.delete(:api_key) || api_key}
21
- HTTP.get("#{base_url}/jobs/#{job_id}", merge_params(options, params))
21
+ HTTP.get("#{options[:base_url] || base_url}/jobs/#{job_id}", merge_params(options, params))
22
22
  end
23
23
 
24
24
  def self.resubmit(job_id, options={})
25
25
  params = {:api_key => options.delete(:api_key) || api_key}
26
- HTTP.get("#{base_url}/jobs/#{job_id}/resubmit", merge_params(options, params))
26
+ HTTP.get("#{options[:base_url] || base_url}/jobs/#{job_id}/resubmit", merge_params(options, params))
27
27
  end
28
28
 
29
29
  def self.cancel(job_id, options={})
30
30
  params = {:api_key => options.delete(:api_key) || api_key}
31
- HTTP.get("#{base_url}/jobs/#{job_id}/cancel", merge_params(options, params))
31
+ HTTP.get("#{options[:base_url] || base_url}/jobs/#{job_id}/cancel", merge_params(options, params))
32
32
  end
33
33
 
34
34
  def self.delete(job_id, options={})
35
35
  params = {:api_key => options.delete(:api_key) || api_key}
36
- HTTP.delete("#{base_url}/jobs/#{job_id}", merge_params(options, params))
36
+ HTTP.delete("#{options[:base_url] || base_url}/jobs/#{job_id}", merge_params(options, params))
37
37
  end
38
38
 
39
39
  end
@@ -6,7 +6,7 @@ class Zencoder
6
6
  :page => options.delete(:page) || 1,
7
7
  :per_page => options.delete(:per_page) || 50 }
8
8
 
9
- HTTP.get("#{base_url}/notifications", merge_params(options, params))
9
+ HTTP.get("#{options[:base_url] || base_url}/notifications", merge_params(options, params))
10
10
  end
11
11
 
12
12
  end
@@ -3,7 +3,7 @@ class Zencoder
3
3
 
4
4
  def self.progress(output_id, options={})
5
5
  params = {:api_key => options.delete(:api_key) || api_key}
6
- HTTP.get("#{base_url}/outputs/#{output_id}/progress", merge_params(options, params))
6
+ HTTP.get("#{options[:base_url] || base_url}/outputs/#{output_id}/progress", merge_params(options, params))
7
7
  end
8
8
 
9
9
  end
@@ -1,3 +1,3 @@
1
1
  class Zencoder
2
- VERSION = '2.1.10'
2
+ VERSION = '2.1.11'
3
3
  end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 2
7
7
  - 1
8
- - 10
9
- version: 2.1.10
8
+ - 11
9
+ version: 2.1.11
10
10
  platform: ruby
11
11
  authors:
12
12
  - Nathan Sutton
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2010-07-21 00:00:00 -05:00
17
+ date: 2010-07-22 00:00:00 -05:00
18
18
  default_executable:
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency