amara 0.0.1 → 0.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/amara/api.rb +2 -2
- data/lib/amara/client.rb +3 -3
- data/lib/amara/connection.rb +13 -10
- data/lib/amara/teams.rb +8 -4
- data/lib/amara/teams/safe_members.rb +6 -0
- data/lib/amara/version.rb +1 -1
- data/lib/amara/videos.rb +2 -2
- data/lib/amara/videos/languages.rb +1 -1
- data/test/client_test.rb +10 -0
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7596fc5964396ba836a4a4cda6a466c228ba8d0f
|
4
|
+
data.tar.gz: 10376cc8986eeea646c7c22bf0bb9d06487316ac
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c7fbe2bcbf185039429c1b7d763bd118367faad6c6cc98f3ff1b55bea0b4a9c36dba6f9a7b22cd9c85f4df4ba62468c36d1faf47f97a81ce451b8a30ae3af413
|
7
|
+
data.tar.gz: dddf4b661e45472565d4316fe8f920161a4592c6976e6fbe89984cd76ac24aa71f85e5753bbb6dd8de82d18fbbe87b7ae2cc41dda2e31b7848579d7867808d78
|
data/lib/amara/api.rb
CHANGED
@@ -54,8 +54,8 @@ module Amara
|
|
54
54
|
def base_path
|
55
55
|
parts = self.class.name.split("::").inject([]){|a, c|
|
56
56
|
if c != 'Amara'
|
57
|
-
base = c.
|
58
|
-
a << base
|
57
|
+
base = c.underscore
|
58
|
+
a << base.tr('_','-')
|
59
59
|
a << current_options["#{base.singularize}_id"] if current_options["#{base.singularize}_id"]
|
60
60
|
end
|
61
61
|
a
|
data/lib/amara/client.rb
CHANGED
@@ -7,9 +7,9 @@ module Amara
|
|
7
7
|
@teams ||= ApiFactory.api('Amara::Teams', self, params, &block)
|
8
8
|
end
|
9
9
|
|
10
|
-
|
11
|
-
|
12
|
-
|
10
|
+
def videos(params={}, &block)
|
11
|
+
@videos ||= ApiFactory.api('Amara::Videos', self, params, &block)
|
12
|
+
end
|
13
13
|
|
14
14
|
def languages(params={}, &block)
|
15
15
|
@languages ||= ApiFactory.api('Amara::Languages', self, params, &block)
|
data/lib/amara/connection.rb
CHANGED
@@ -15,22 +15,25 @@ module Amara
|
|
15
15
|
|
16
16
|
def merge_default_options(opts={})
|
17
17
|
headers = opts.delete(:headers) || {}
|
18
|
-
options =
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
18
|
+
options = HashWithIndifferentAccess.new(
|
19
|
+
{
|
20
|
+
:headers => {
|
21
|
+
'User-Agent' => user_agent,
|
22
|
+
'Accept' => "application/json",
|
23
|
+
'Content-Type' => "application/json"
|
24
|
+
},
|
25
|
+
:ssl => {:verify => false},
|
26
|
+
:url => endpoint
|
27
|
+
}
|
28
|
+
).merge(opts)
|
27
29
|
options[:headers] = options[:headers].merge(headers)
|
28
|
-
Amara::HEADERS.each{|k,v| options[:headers][v] = options.delete(k) if options.key?(k)}
|
30
|
+
Amara::HEADERS.each{|k,v| options[:headers][v] = options.delete(k) if options.key?(k)}
|
29
31
|
options
|
30
32
|
end
|
31
33
|
|
32
34
|
def connection(options={})
|
33
35
|
opts = merge_default_options(options)
|
36
|
+
# puts "connection:\n\toptions: #{options.inspect}\n\topts: #{opts.inspect}"
|
34
37
|
Faraday::Connection.new(opts) do |connection|
|
35
38
|
connection.request :url_encoded
|
36
39
|
|
data/lib/amara/teams.rb
CHANGED
@@ -3,12 +3,16 @@
|
|
3
3
|
module Amara
|
4
4
|
class Teams < API
|
5
5
|
|
6
|
-
def members(
|
7
|
-
@members ||= Teams::Members
|
6
|
+
def members(params={}, &block)
|
7
|
+
@members ||= ApiFactory.api('Amara::Teams::Members', self, params, &block)
|
8
8
|
end
|
9
9
|
|
10
|
-
def projects(
|
11
|
-
@projects ||= Teams::Projects
|
10
|
+
def projects(params={}, &block)
|
11
|
+
@projects ||= ApiFactory.api('Amara::Teams::Projects', self, params, &block)
|
12
|
+
end
|
13
|
+
|
14
|
+
def safe_members(params={}, &block)
|
15
|
+
@safe_members ||= ApiFactory.api('Amara::Teams::SafeMembers', self, params, &block)
|
12
16
|
end
|
13
17
|
|
14
18
|
end
|
data/lib/amara/version.rb
CHANGED
data/lib/amara/videos.rb
CHANGED
@@ -9,11 +9,11 @@ module Amara
|
|
9
9
|
VIDEO_ORDERING = [:created, :title]
|
10
10
|
|
11
11
|
def languages(options={}, &block)
|
12
|
-
@languages ||= Videos::Languages
|
12
|
+
@languages ||= ApiFactory.api('Amara::Videos::Languages', self, params, &block)
|
13
13
|
end
|
14
14
|
|
15
15
|
def urls(options={}, &block)
|
16
|
-
@urls ||= Videos::Urls
|
16
|
+
@urls ||= ApiFactory.api('Amara::Videos::Urls', self, params, &block)
|
17
17
|
end
|
18
18
|
|
19
19
|
end
|
@@ -4,7 +4,7 @@ module Amara
|
|
4
4
|
class Videos::Languages < API
|
5
5
|
|
6
6
|
def subtitles(options={}, &block)
|
7
|
-
@subtitles ||= Videos::Languages::Subtitles
|
7
|
+
@subtitles ||= ApiFactory.api('Amara::Videos::Languages::Subtitles', self, params, &block)
|
8
8
|
end
|
9
9
|
|
10
10
|
end
|
data/test/client_test.rb
CHANGED
@@ -9,4 +9,14 @@ describe Amara::Client do
|
|
9
9
|
amara.teams.wont_be_nil
|
10
10
|
end
|
11
11
|
|
12
|
+
it "returns a videos api object" do
|
13
|
+
amara = Amara::Client.new
|
14
|
+
amara.videos.wont_be_nil
|
15
|
+
end
|
16
|
+
|
17
|
+
it "returns a languages api object" do
|
18
|
+
amara = Amara::Client.new
|
19
|
+
amara.languages.wont_be_nil
|
20
|
+
end
|
21
|
+
|
12
22
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: amara
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Andrew Kuklewicz
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-08-
|
11
|
+
date: 2013-08-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: faraday
|
@@ -161,6 +161,7 @@ files:
|
|
161
161
|
- lib/amara/teams.rb
|
162
162
|
- lib/amara/teams/members.rb
|
163
163
|
- lib/amara/teams/projects.rb
|
164
|
+
- lib/amara/teams/safe_members.rb
|
164
165
|
- lib/amara/version.rb
|
165
166
|
- lib/amara/videos.rb
|
166
167
|
- lib/amara/videos/languages.rb
|