officialfm 0.2.1 → 0.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Gemfile.lock +2 -2
- data/lib/officialfm/client.rb +6 -3
- data/lib/officialfm/version.rb +1 -1
- metadata +18 -18
data/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
officialfm (0.2.
|
|
4
|
+
officialfm (0.2.1)
|
|
5
5
|
faraday (~> 0.8.1)
|
|
6
6
|
faraday_middleware (~> 0.8.8)
|
|
7
7
|
hashie (~> 1.2)
|
|
@@ -9,7 +9,7 @@ PATH
|
|
|
9
9
|
GEM
|
|
10
10
|
remote: http://rubygems.org/
|
|
11
11
|
specs:
|
|
12
|
-
faraday (0.8.
|
|
12
|
+
faraday (0.8.4)
|
|
13
13
|
multipart-post (~> 1.1)
|
|
14
14
|
faraday_middleware (0.8.8)
|
|
15
15
|
faraday (>= 0.7.4, < 0.9)
|
data/lib/officialfm/client.rb
CHANGED
|
@@ -72,14 +72,17 @@ module OfficialFM
|
|
|
72
72
|
def resource_url(id, options={})
|
|
73
73
|
raise "Resource id cannot be nil" unless id
|
|
74
74
|
|
|
75
|
+
# Remove query parameters from resource URL
|
|
76
|
+
clean_id = Faraday.new(id).url_prefix.to_s
|
|
77
|
+
|
|
75
78
|
parent = options.fetch(:parent, nil)
|
|
76
79
|
child = options.fetch(:child, nil)
|
|
77
80
|
|
|
78
|
-
if
|
|
79
|
-
return [
|
|
81
|
+
if clean_id.start_with? 'http'
|
|
82
|
+
return [clean_id, child].join '/'
|
|
80
83
|
end
|
|
81
84
|
|
|
82
|
-
url = [parent,
|
|
85
|
+
url = [parent, clean_id, child].join('/').chomp('/')
|
|
83
86
|
url = "/#{url}" unless url.start_with? '/'
|
|
84
87
|
|
|
85
88
|
url
|
data/lib/officialfm/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: officialfm
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.2
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,11 +9,11 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2012-08-
|
|
12
|
+
date: 2012-08-29 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: faraday
|
|
16
|
-
requirement: &
|
|
16
|
+
requirement: &12505040 !ruby/object:Gem::Requirement
|
|
17
17
|
none: false
|
|
18
18
|
requirements:
|
|
19
19
|
- - ~>
|
|
@@ -21,10 +21,10 @@ dependencies:
|
|
|
21
21
|
version: 0.8.1
|
|
22
22
|
type: :runtime
|
|
23
23
|
prerelease: false
|
|
24
|
-
version_requirements: *
|
|
24
|
+
version_requirements: *12505040
|
|
25
25
|
- !ruby/object:Gem::Dependency
|
|
26
26
|
name: faraday_middleware
|
|
27
|
-
requirement: &
|
|
27
|
+
requirement: &12502720 !ruby/object:Gem::Requirement
|
|
28
28
|
none: false
|
|
29
29
|
requirements:
|
|
30
30
|
- - ~>
|
|
@@ -32,10 +32,10 @@ dependencies:
|
|
|
32
32
|
version: 0.8.8
|
|
33
33
|
type: :runtime
|
|
34
34
|
prerelease: false
|
|
35
|
-
version_requirements: *
|
|
35
|
+
version_requirements: *12502720
|
|
36
36
|
- !ruby/object:Gem::Dependency
|
|
37
37
|
name: hashie
|
|
38
|
-
requirement: &
|
|
38
|
+
requirement: &12502120 !ruby/object:Gem::Requirement
|
|
39
39
|
none: false
|
|
40
40
|
requirements:
|
|
41
41
|
- - ~>
|
|
@@ -43,10 +43,10 @@ dependencies:
|
|
|
43
43
|
version: '1.2'
|
|
44
44
|
type: :runtime
|
|
45
45
|
prerelease: false
|
|
46
|
-
version_requirements: *
|
|
46
|
+
version_requirements: *12502120
|
|
47
47
|
- !ruby/object:Gem::Dependency
|
|
48
48
|
name: bundler
|
|
49
|
-
requirement: &
|
|
49
|
+
requirement: &12501100 !ruby/object:Gem::Requirement
|
|
50
50
|
none: false
|
|
51
51
|
requirements:
|
|
52
52
|
- - ~>
|
|
@@ -54,10 +54,10 @@ dependencies:
|
|
|
54
54
|
version: '1.0'
|
|
55
55
|
type: :development
|
|
56
56
|
prerelease: false
|
|
57
|
-
version_requirements: *
|
|
57
|
+
version_requirements: *12501100
|
|
58
58
|
- !ruby/object:Gem::Dependency
|
|
59
59
|
name: rake
|
|
60
|
-
requirement: &
|
|
60
|
+
requirement: &12500040 !ruby/object:Gem::Requirement
|
|
61
61
|
none: false
|
|
62
62
|
requirements:
|
|
63
63
|
- - ~>
|
|
@@ -65,10 +65,10 @@ dependencies:
|
|
|
65
65
|
version: '0.8'
|
|
66
66
|
type: :development
|
|
67
67
|
prerelease: false
|
|
68
|
-
version_requirements: *
|
|
68
|
+
version_requirements: *12500040
|
|
69
69
|
- !ruby/object:Gem::Dependency
|
|
70
70
|
name: shoulda
|
|
71
|
-
requirement: &
|
|
71
|
+
requirement: &12498640 !ruby/object:Gem::Requirement
|
|
72
72
|
none: false
|
|
73
73
|
requirements:
|
|
74
74
|
- - ~>
|
|
@@ -76,10 +76,10 @@ dependencies:
|
|
|
76
76
|
version: '2.11'
|
|
77
77
|
type: :development
|
|
78
78
|
prerelease: false
|
|
79
|
-
version_requirements: *
|
|
79
|
+
version_requirements: *12498640
|
|
80
80
|
- !ruby/object:Gem::Dependency
|
|
81
81
|
name: jnunemaker-matchy
|
|
82
|
-
requirement: &
|
|
82
|
+
requirement: &12487520 !ruby/object:Gem::Requirement
|
|
83
83
|
none: false
|
|
84
84
|
requirements:
|
|
85
85
|
- - ~>
|
|
@@ -87,10 +87,10 @@ dependencies:
|
|
|
87
87
|
version: '0.4'
|
|
88
88
|
type: :development
|
|
89
89
|
prerelease: false
|
|
90
|
-
version_requirements: *
|
|
90
|
+
version_requirements: *12487520
|
|
91
91
|
- !ruby/object:Gem::Dependency
|
|
92
92
|
name: test-unit
|
|
93
|
-
requirement: &
|
|
93
|
+
requirement: &12486460 !ruby/object:Gem::Requirement
|
|
94
94
|
none: false
|
|
95
95
|
requirements:
|
|
96
96
|
- - ~>
|
|
@@ -98,7 +98,7 @@ dependencies:
|
|
|
98
98
|
version: '2.1'
|
|
99
99
|
type: :development
|
|
100
100
|
prerelease: false
|
|
101
|
-
version_requirements: *
|
|
101
|
+
version_requirements: *12486460
|
|
102
102
|
description: Official Ruby bindings for the official.fm v2 API
|
|
103
103
|
email:
|
|
104
104
|
- dimiter@official.fm
|