rockstar 0.5.0 → 0.5.1
Sign up to get free protection for your applications and to get access to all the features.
- data/README.rdoc +5 -27
- data/VERSION +1 -1
- data/lib/rockstar/album.rb +2 -2
- data/lib/rockstar/base.rb +7 -2
- data/lib/rockstar/scrobble.rb +2 -1
- data/lib/rockstar/venue.rb +9 -1
- data/rockstar.gemspec +113 -111
- data/test/fixtures/xml/album/getinfo_album_Radio_Retalation_artist_Thievery_Corporation.xml +21 -0
- data/test/fixtures/xml/venue/getevents_venue_8807850.xml +280 -0
- data/test/fixtures/xml/venue/search_country__limit__page__venue_country_DE_venue_cotton.xml +72 -0
- data/test/mocks/rest.rb +10 -2
- data/test/unit/test_album.rb +6 -0
- data/test/unit/test_track.rb +2 -2
- data/test/unit/test_venue.rb +20 -0
- metadata +18 -30
- data/.gitignore +0 -3
data/README.rdoc
CHANGED
|
@@ -94,8 +94,7 @@ If you want to use the api in an rails app, you could add an initializer in conf
|
|
|
94
94
|
geo.metros("germany").each{|m| p m.name}
|
|
95
95
|
|
|
96
96
|
|
|
97
|
-
==
|
|
98
|
-
|
|
97
|
+
== Get rights to access the user data for scrobbing, now playing, events etc...
|
|
99
98
|
a = Rockstar::Auth.new
|
|
100
99
|
token = a.token
|
|
101
100
|
|
|
@@ -107,37 +106,16 @@ If you want to use the api in an rails app, you could add an initializer in conf
|
|
|
107
106
|
gets
|
|
108
107
|
|
|
109
108
|
session = a.session(token)
|
|
110
|
-
|
|
111
|
-
auth = Rockstar::TokenAuth.new({:username => session.username, :token => session.key})
|
|
112
|
-
auth.handshake!
|
|
113
|
-
|
|
114
|
-
More details can be found in in Rockstar::TokenAuth
|
|
115
109
|
|
|
116
110
|
== Scrobbling
|
|
117
111
|
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
:artist => 'Coldplay',
|
|
121
|
-
:track => 'Viva La Vida',
|
|
122
|
-
:album => "Viva La Vida",
|
|
123
|
-
:time => Time.new,
|
|
124
|
-
:length => 244,
|
|
125
|
-
:track_number => 7)
|
|
126
|
-
scrobble.submit!
|
|
127
|
-
puts "Rockstar Submission Status: #{scrobble.status}"
|
|
112
|
+
track = Rockstar::Track.new('Carrie Underwood', 'Before He Cheats')
|
|
113
|
+
track.scrobble(Time.now, session.key)
|
|
128
114
|
|
|
129
115
|
== Now Playing Submission
|
|
130
116
|
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
:artist => 'Anberlin',
|
|
134
|
-
:track => 'Readyfuels',
|
|
135
|
-
:album => 'Blueprints For the Black Market',
|
|
136
|
-
:length => 218,
|
|
137
|
-
:track_number => 1)
|
|
138
|
-
|
|
139
|
-
playing.submit!
|
|
140
|
-
puts "Playing Submission Status: #{playing.status}"
|
|
117
|
+
track = Rockstar::Track.new('Carrie Underwood', 'Before He Cheats')
|
|
118
|
+
track.updateNowPlaying(Time.now, session.key)
|
|
141
119
|
|
|
142
120
|
== Note on Patches/Pull Requests
|
|
143
121
|
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.5.
|
|
1
|
+
0.5.1
|
data/lib/rockstar/album.rb
CHANGED
|
@@ -87,8 +87,8 @@ module Rockstar
|
|
|
87
87
|
@image_small = @images['small']
|
|
88
88
|
|
|
89
89
|
@mbid = (doc).at(:mbid).inner_html
|
|
90
|
-
@summary = (doc).at(:summary).to_plain_text
|
|
91
|
-
@content = (doc).at(:content).to_plain_text
|
|
90
|
+
@summary = (doc).at(:summary).to_plain_text if (doc).at(:summary)
|
|
91
|
+
@content = (doc).at(:content).to_plain_text if (doc).at(:content)
|
|
92
92
|
end
|
|
93
93
|
|
|
94
94
|
def tracks
|
data/lib/rockstar/base.rb
CHANGED
|
@@ -12,12 +12,17 @@ module Rockstar
|
|
|
12
12
|
def fetch_and_parse(resource, params = {}, sign_request = false)
|
|
13
13
|
Hpricot::XML(connection.get(resource, sign_request, params))
|
|
14
14
|
end
|
|
15
|
-
|
|
15
|
+
|
|
16
|
+
def get_instance(api_method, instance_name, element, params, sign_request = false)
|
|
17
|
+
rockstar_class = "rockstar/#{element.to_s}".camelize.constantize
|
|
18
|
+
doc = self.fetch_and_parse(api_method, params, sign_request)
|
|
19
|
+
(doc/element).inject([]) { |elements, el| elements << rockstar_class.new_from_xml(el, doc); elements }
|
|
20
|
+
end
|
|
16
21
|
end
|
|
17
22
|
|
|
18
23
|
private
|
|
19
24
|
# in order for subclass to use, it must have api_path method
|
|
20
|
-
def get_instance(api_method, instance_name, element, params, force=false, sign_request = false)
|
|
25
|
+
def get_instance(api_method, instance_name, element, params, force = false, sign_request = false)
|
|
21
26
|
rockstar_class = "rockstar/#{element.to_s}".camelize.constantize
|
|
22
27
|
|
|
23
28
|
if instance_variable_get("@#{instance_name}").nil? || force
|
data/lib/rockstar/scrobble.rb
CHANGED
|
@@ -39,7 +39,8 @@ module Rockstar
|
|
|
39
39
|
end
|
|
40
40
|
|
|
41
41
|
def submit!
|
|
42
|
-
|
|
42
|
+
warn "[DEPRECATION] the `scrobble` class is deprecated. Please use track.scrobble"
|
|
43
|
+
query = { :s => @session_id,
|
|
43
44
|
'a[0]' => @artist,
|
|
44
45
|
't[0]' => @track,
|
|
45
46
|
'i[0]' => @time.utc.to_i,
|
data/lib/rockstar/venue.rb
CHANGED
|
@@ -2,7 +2,7 @@ module Rockstar
|
|
|
2
2
|
class Venue < Base
|
|
3
3
|
|
|
4
4
|
attr_accessor :vid, :name, :city, :country, :street, :postalcode, :lat, :long, :url,
|
|
5
|
-
:website, :phonenumber, :images
|
|
5
|
+
:website, :phonenumber, :images, :events
|
|
6
6
|
|
|
7
7
|
class << self
|
|
8
8
|
def new_from_xml(xml, doc)
|
|
@@ -45,6 +45,14 @@ module Rockstar
|
|
|
45
45
|
end
|
|
46
46
|
self.images[which]
|
|
47
47
|
end
|
|
48
|
+
|
|
49
|
+
def self.find(name, country = nil, limit = nil, page = nil)
|
|
50
|
+
get_instance("venue.search", :venues, :venue, {:venue => name, :country => country, :limit => limit, :page => page})
|
|
51
|
+
end
|
|
52
|
+
|
|
53
|
+
def events
|
|
54
|
+
@events ||= get_instance("venue.getEvents", :events, :event, {:venue => vid})
|
|
55
|
+
end
|
|
48
56
|
end
|
|
49
57
|
end
|
|
50
58
|
|
data/rockstar.gemspec
CHANGED
|
@@ -1,138 +1,140 @@
|
|
|
1
1
|
# Generated by jeweler
|
|
2
2
|
# DO NOT EDIT THIS FILE DIRECTLY
|
|
3
|
-
# Instead, edit Jeweler::Tasks in Rakefile, and run
|
|
3
|
+
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
|
|
4
4
|
# -*- encoding: utf-8 -*-
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{rockstar}
|
|
8
|
-
s.version = "0.5.
|
|
8
|
+
s.version = "0.5.1"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Bodo Tasche"]
|
|
12
|
-
s.date = %q{
|
|
12
|
+
s.date = %q{2011-02-20}
|
|
13
13
|
s.description = %q{This gem is an updated version of jnunemakers scrobbler gem. Rockstar uses v2.0 of the last.fm api.}
|
|
14
14
|
s.email = %q{bodo@bitboxer.de}
|
|
15
15
|
s.extra_rdoc_files = [
|
|
16
16
|
"README.rdoc"
|
|
17
17
|
]
|
|
18
18
|
s.files = [
|
|
19
|
-
".
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
19
|
+
"History.txt",
|
|
20
|
+
"MIT-LICENSE",
|
|
21
|
+
"Manifest",
|
|
22
|
+
"README.rdoc",
|
|
23
|
+
"Rakefile",
|
|
24
|
+
"VERSION",
|
|
25
|
+
"examples/.gitignore",
|
|
26
|
+
"examples/album.rb",
|
|
27
|
+
"examples/artist.rb",
|
|
28
|
+
"examples/geo.rb",
|
|
29
|
+
"examples/lastfm.yml_example",
|
|
30
|
+
"examples/scrobble.rb",
|
|
31
|
+
"examples/tag.rb",
|
|
32
|
+
"examples/track.rb",
|
|
33
|
+
"examples/user.rb",
|
|
34
|
+
"lib/rockstar.rb",
|
|
35
|
+
"lib/rockstar/album.rb",
|
|
36
|
+
"lib/rockstar/artist.rb",
|
|
37
|
+
"lib/rockstar/auth.rb",
|
|
38
|
+
"lib/rockstar/base.rb",
|
|
39
|
+
"lib/rockstar/chart.rb",
|
|
40
|
+
"lib/rockstar/event.rb",
|
|
41
|
+
"lib/rockstar/geo.rb",
|
|
42
|
+
"lib/rockstar/metro.rb",
|
|
43
|
+
"lib/rockstar/playing.rb",
|
|
44
|
+
"lib/rockstar/rest.rb",
|
|
45
|
+
"lib/rockstar/scrobble.rb",
|
|
46
|
+
"lib/rockstar/session.rb",
|
|
47
|
+
"lib/rockstar/simpleauth.rb",
|
|
48
|
+
"lib/rockstar/tag.rb",
|
|
49
|
+
"lib/rockstar/tokenauth.rb",
|
|
50
|
+
"lib/rockstar/track.rb",
|
|
51
|
+
"lib/rockstar/user.rb",
|
|
52
|
+
"lib/rockstar/venue.rb",
|
|
53
|
+
"lib/rockstar/version.rb",
|
|
54
|
+
"rockstar.gemspec",
|
|
55
|
+
"test/fixtures/xml/album/getinfo_album_Radio_Retalation_artist_Thievery_Corporation.xml",
|
|
56
|
+
"test/fixtures/xml/album/getinfo_album_Some_Hearts_artist_Carrie_Underwood.xml",
|
|
57
|
+
"test/fixtures/xml/artist/getsimilar_artist_Metallica.xml",
|
|
58
|
+
"test/fixtures/xml/artist/gettopalbums_artist_Metallica.xml",
|
|
59
|
+
"test/fixtures/xml/artist/gettopfans_artist_Metallica.xml",
|
|
60
|
+
"test/fixtures/xml/artist/gettoptags_artist_Metallica.xml",
|
|
61
|
+
"test/fixtures/xml/artist/gettoptracks_artist_Metallica.xml",
|
|
62
|
+
"test/fixtures/xml/geo/getevents_location_london.xml",
|
|
63
|
+
"test/fixtures/xml/geo/getmetros_country_germany.xml",
|
|
64
|
+
"test/fixtures/xml/tag/gettopalbums_tag_rock.xml",
|
|
65
|
+
"test/fixtures/xml/tag/gettopartists_tag_rock.xml",
|
|
66
|
+
"test/fixtures/xml/tag/gettoptags.xml",
|
|
67
|
+
"test/fixtures/xml/tag/gettoptracks_tag_rock.xml",
|
|
68
|
+
"test/fixtures/xml/track/gettopfans_artist_Carrie_Underwood_track_Before_He_Cheats.xml",
|
|
69
|
+
"test/fixtures/xml/track/gettoptags_artist_Carrie_Underwood_track_Before_He_Cheats.xml",
|
|
70
|
+
"test/fixtures/xml/track/love_artist_Carrie_Underwood_sk_tag_track_Before_He_Cheats.xml",
|
|
71
|
+
"test/fixtures/xml/track/updatenowplaying_artist_Carrie_Underwood_sk_tag_track_Before_He_Cheats.xml",
|
|
72
|
+
"test/fixtures/xml/user/getevents_sk_token_user_bodot.xml",
|
|
73
|
+
"test/fixtures/xml/user/getfriends_user_jnunemaker.xml",
|
|
74
|
+
"test/fixtures/xml/user/getinfo_user_jnunemaker.xml",
|
|
75
|
+
"test/fixtures/xml/user/getinfo_user_oaknd1.xml",
|
|
76
|
+
"test/fixtures/xml/user/getinfo_user_wharle.xml",
|
|
77
|
+
"test/fixtures/xml/user/getlovedtracks_user_jnunemaker.xml",
|
|
78
|
+
"test/fixtures/xml/user/getneighbours_user_jnunemaker.xml",
|
|
79
|
+
"test/fixtures/xml/user/getrecenttracks_user_jnunemaker.xml",
|
|
80
|
+
"test/fixtures/xml/user/getrecommendedartists_sk_token_user_jnunemaker.xml",
|
|
81
|
+
"test/fixtures/xml/user/gettopalbums_user_jnunemaker.xml",
|
|
82
|
+
"test/fixtures/xml/user/gettopartists_user_jnunemaker.xml",
|
|
83
|
+
"test/fixtures/xml/user/gettoptags_user_jnunemaker.xml",
|
|
84
|
+
"test/fixtures/xml/user/gettoptracks_user_jnunemaker.xml",
|
|
85
|
+
"test/fixtures/xml/user/getweeklyalbumchart_from_1138536002_to_1139140802_user_jnunemaker.xml",
|
|
86
|
+
"test/fixtures/xml/user/getweeklyalbumchart_from__to__user_jnunemaker.xml",
|
|
87
|
+
"test/fixtures/xml/user/getweeklyartistchart_from_1138536002_to_1139140802_user_jnunemaker.xml",
|
|
88
|
+
"test/fixtures/xml/user/getweeklyartistchart_from__to__user_jnunemaker.xml",
|
|
89
|
+
"test/fixtures/xml/user/getweeklychartlist_user_jnunemaker.xml",
|
|
90
|
+
"test/fixtures/xml/user/getweeklytrackchart_from_1138536002_to_1139140802_user_jnunemaker.xml",
|
|
91
|
+
"test/fixtures/xml/user/getweeklytrackchart_from__to__user_jnunemaker.xml",
|
|
92
|
+
"test/fixtures/xml/venue/getevents_venue_8807850.xml",
|
|
93
|
+
"test/fixtures/xml/venue/search_country__limit__page__venue_country_DE_venue_cotton.xml",
|
|
94
|
+
"test/mocks/rest.rb",
|
|
95
|
+
"test/test_helper.rb",
|
|
96
|
+
"test/unit/test_album.rb",
|
|
97
|
+
"test/unit/test_artist.rb",
|
|
98
|
+
"test/unit/test_chart.rb",
|
|
99
|
+
"test/unit/test_geo.rb",
|
|
100
|
+
"test/unit/test_playing.rb",
|
|
101
|
+
"test/unit/test_scrobble.rb",
|
|
102
|
+
"test/unit/test_simpleauth.rb",
|
|
103
|
+
"test/unit/test_tag.rb",
|
|
104
|
+
"test/unit/test_tokenauth.rb",
|
|
105
|
+
"test/unit/test_track.rb",
|
|
106
|
+
"test/unit/test_user.rb",
|
|
107
|
+
"test/unit/test_venue.rb"
|
|
105
108
|
]
|
|
106
109
|
s.homepage = %q{http://github.com/bitboxer/rockstar}
|
|
107
|
-
s.rdoc_options = ["--charset=UTF-8"]
|
|
108
110
|
s.require_paths = ["lib"]
|
|
109
|
-
s.rubygems_version = %q{1.
|
|
111
|
+
s.rubygems_version = %q{1.5.2}
|
|
110
112
|
s.summary = %q{wrapper for audioscrobbler (last.fm) web services}
|
|
111
113
|
s.test_files = [
|
|
114
|
+
"examples/album.rb",
|
|
115
|
+
"examples/artist.rb",
|
|
116
|
+
"examples/geo.rb",
|
|
117
|
+
"examples/scrobble.rb",
|
|
118
|
+
"examples/tag.rb",
|
|
119
|
+
"examples/track.rb",
|
|
120
|
+
"examples/user.rb",
|
|
112
121
|
"test/mocks/rest.rb",
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
"examples/artist.rb",
|
|
127
|
-
"examples/geo.rb",
|
|
128
|
-
"examples/scrobble.rb",
|
|
129
|
-
"examples/tag.rb",
|
|
130
|
-
"examples/track.rb",
|
|
131
|
-
"examples/user.rb"
|
|
122
|
+
"test/test_helper.rb",
|
|
123
|
+
"test/unit/test_album.rb",
|
|
124
|
+
"test/unit/test_artist.rb",
|
|
125
|
+
"test/unit/test_chart.rb",
|
|
126
|
+
"test/unit/test_geo.rb",
|
|
127
|
+
"test/unit/test_playing.rb",
|
|
128
|
+
"test/unit/test_scrobble.rb",
|
|
129
|
+
"test/unit/test_simpleauth.rb",
|
|
130
|
+
"test/unit/test_tag.rb",
|
|
131
|
+
"test/unit/test_tokenauth.rb",
|
|
132
|
+
"test/unit/test_track.rb",
|
|
133
|
+
"test/unit/test_user.rb",
|
|
134
|
+
"test/unit/test_venue.rb"
|
|
132
135
|
]
|
|
133
136
|
|
|
134
137
|
if s.respond_to? :specification_version then
|
|
135
|
-
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
|
|
136
138
|
s.specification_version = 3
|
|
137
139
|
|
|
138
140
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
+
<lfm status="ok">
|
|
3
|
+
<album>
|
|
4
|
+
<name>Radio Retalation</name>
|
|
5
|
+
<artist>Thievery Corporation</artist>
|
|
6
|
+
<id>18206109</id>
|
|
7
|
+
<mbid></mbid>
|
|
8
|
+
<url>http://www.last.fm/music/Thievery+Corporation/Radio+Retalation</url>
|
|
9
|
+
<releasedate> </releasedate>
|
|
10
|
+
<image size="small"></image>
|
|
11
|
+
<image size="medium"></image>
|
|
12
|
+
<image size="large"></image>
|
|
13
|
+
<image size="extralarge"></image>
|
|
14
|
+
<image size="mega"></image>
|
|
15
|
+
<listeners>21</listeners>
|
|
16
|
+
<playcount>573</playcount>
|
|
17
|
+
<tracks>
|
|
18
|
+
</tracks>
|
|
19
|
+
<toptags>
|
|
20
|
+
</toptags>
|
|
21
|
+
</album></lfm>
|
|
@@ -0,0 +1,280 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
+
<lfm status="ok">
|
|
3
|
+
<events venue="INDRA" xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#">
|
|
4
|
+
<event xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" >
|
|
5
|
+
<id>1784430</id>
|
|
6
|
+
<title>Jamaica</title>
|
|
7
|
+
<artists>
|
|
8
|
+
<artist>Jamaica</artist>
|
|
9
|
+
<headliner>Jamaica</headliner>
|
|
10
|
+
</artists>
|
|
11
|
+
<venue>
|
|
12
|
+
<id>8807850</id>
|
|
13
|
+
<name>INDRA</name>
|
|
14
|
+
<location>
|
|
15
|
+
<city>Hamburg</city>
|
|
16
|
+
<country>Germany</country>
|
|
17
|
+
<street>Große Freiheit 64</street>
|
|
18
|
+
<postalcode>22767</postalcode>
|
|
19
|
+
<geo:point>
|
|
20
|
+
<geo:lat>53.551911</geo:lat>
|
|
21
|
+
<geo:long>9.958009</geo:long>
|
|
22
|
+
</geo:point>
|
|
23
|
+
</location>
|
|
24
|
+
<url>http://www.last.fm/venue/8807850+INDRA</url>
|
|
25
|
+
<website>http://www.indramusikclub.com/</website>
|
|
26
|
+
<phonenumber>Telefonnummer:</phonenumber>
|
|
27
|
+
<image size="small">http://userserve-ak.last.fm/serve/34/41493001.jpg</image>
|
|
28
|
+
<image size="medium">http://userserve-ak.last.fm/serve/64/41493001.jpg</image>
|
|
29
|
+
<image size="large">http://userserve-ak.last.fm/serve/126/41493001.jpg</image>
|
|
30
|
+
<image size="extralarge">http://userserve-ak.last.fm/serve/252/41493001.jpg</image>
|
|
31
|
+
<image size="mega">http://userserve-ak.last.fm/serve/_/41493001/INDRA.jpg</image>
|
|
32
|
+
</venue> <startDate>Sat, 19 Feb 2011 14:13:01</startDate>
|
|
33
|
+
<description></description>
|
|
34
|
+
<image size="small">http://userserve-ak.last.fm/serve/34/42524197.png</image>
|
|
35
|
+
<image size="medium">http://userserve-ak.last.fm/serve/64/42524197.png</image>
|
|
36
|
+
<image size="large">http://userserve-ak.last.fm/serve/126/42524197.png</image>
|
|
37
|
+
<image size="extralarge">http://userserve-ak.last.fm/serve/252/42524197.png</image>
|
|
38
|
+
<attendance>33</attendance>
|
|
39
|
+
<reviews>0</reviews>
|
|
40
|
+
<tag>lastfm:event=1784430</tag>
|
|
41
|
+
<url>http://www.last.fm/event/1784430+Jamaica+at+INDRA+on+19+February+2011</url>
|
|
42
|
+
<website></website>
|
|
43
|
+
<tickets>
|
|
44
|
+
</tickets>
|
|
45
|
+
<cancelled>0</cancelled>
|
|
46
|
+
<tags>
|
|
47
|
+
<tag>synthpop</tag>
|
|
48
|
+
<tag>indie pop</tag>
|
|
49
|
+
<tag>electronic</tag>
|
|
50
|
+
<tag>indie</tag>
|
|
51
|
+
<tag>french</tag>
|
|
52
|
+
</tags>
|
|
53
|
+
</event> <event xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" >
|
|
54
|
+
<id>1784433</id>
|
|
55
|
+
<title>Gold Panda</title>
|
|
56
|
+
<artists>
|
|
57
|
+
<artist>Gold Panda</artist>
|
|
58
|
+
<artist>Dam Mantle</artist>
|
|
59
|
+
<artist>Seams</artist>
|
|
60
|
+
<headliner>Gold Panda</headliner>
|
|
61
|
+
</artists>
|
|
62
|
+
<venue>
|
|
63
|
+
<id>8807850</id>
|
|
64
|
+
<name>INDRA</name>
|
|
65
|
+
<location>
|
|
66
|
+
<city>Hamburg</city>
|
|
67
|
+
<country>Germany</country>
|
|
68
|
+
<street>Große Freiheit 64</street>
|
|
69
|
+
<postalcode>22767</postalcode>
|
|
70
|
+
<geo:point>
|
|
71
|
+
<geo:lat>53.551911</geo:lat>
|
|
72
|
+
<geo:long>9.958009</geo:long>
|
|
73
|
+
</geo:point>
|
|
74
|
+
</location>
|
|
75
|
+
<url>http://www.last.fm/venue/8807850+INDRA</url>
|
|
76
|
+
<website>http://www.indramusikclub.com/</website>
|
|
77
|
+
<phonenumber>Telefonnummer:</phonenumber>
|
|
78
|
+
<image size="small">http://userserve-ak.last.fm/serve/34/41493001.jpg</image>
|
|
79
|
+
<image size="medium">http://userserve-ak.last.fm/serve/64/41493001.jpg</image>
|
|
80
|
+
<image size="large">http://userserve-ak.last.fm/serve/126/41493001.jpg</image>
|
|
81
|
+
<image size="extralarge">http://userserve-ak.last.fm/serve/252/41493001.jpg</image>
|
|
82
|
+
<image size="mega">http://userserve-ak.last.fm/serve/_/41493001/INDRA.jpg</image>
|
|
83
|
+
</venue> <startDate>Thu, 03 Mar 2011 14:17:01</startDate>
|
|
84
|
+
<description></description>
|
|
85
|
+
<image size="small">http://userserve-ak.last.fm/serve/34/44555395.jpg</image>
|
|
86
|
+
<image size="medium">http://userserve-ak.last.fm/serve/64/44555395.jpg</image>
|
|
87
|
+
<image size="large">http://userserve-ak.last.fm/serve/126/44555395.jpg</image>
|
|
88
|
+
<image size="extralarge">http://userserve-ak.last.fm/serve/252/44555395.jpg</image>
|
|
89
|
+
<attendance>38</attendance>
|
|
90
|
+
<reviews>0</reviews>
|
|
91
|
+
<tag>lastfm:event=1784433</tag>
|
|
92
|
+
<url>http://www.last.fm/event/1784433+Gold+Panda+at+INDRA+on+3+March+2011</url>
|
|
93
|
+
<website></website>
|
|
94
|
+
<tickets>
|
|
95
|
+
</tickets>
|
|
96
|
+
<cancelled>0</cancelled>
|
|
97
|
+
<tags>
|
|
98
|
+
<tag>experimental</tag>
|
|
99
|
+
<tag>dubstep</tag>
|
|
100
|
+
</tags>
|
|
101
|
+
</event> <event xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" >
|
|
102
|
+
<id>1779451</id>
|
|
103
|
+
<title>Fenech-Soler</title>
|
|
104
|
+
<artists>
|
|
105
|
+
<artist>Fenech-Soler</artist>
|
|
106
|
+
<headliner>Fenech-Soler</headliner>
|
|
107
|
+
</artists>
|
|
108
|
+
<venue>
|
|
109
|
+
<id>8807850</id>
|
|
110
|
+
<name>INDRA</name>
|
|
111
|
+
<location>
|
|
112
|
+
<city>Hamburg</city>
|
|
113
|
+
<country>Germany</country>
|
|
114
|
+
<street>Große Freiheit 64</street>
|
|
115
|
+
<postalcode>22767</postalcode>
|
|
116
|
+
<geo:point>
|
|
117
|
+
<geo:lat>53.551911</geo:lat>
|
|
118
|
+
<geo:long>9.958009</geo:long>
|
|
119
|
+
</geo:point>
|
|
120
|
+
</location>
|
|
121
|
+
<url>http://www.last.fm/venue/8807850+INDRA</url>
|
|
122
|
+
<website>http://www.indramusikclub.com/</website>
|
|
123
|
+
<phonenumber>Telefonnummer:</phonenumber>
|
|
124
|
+
<image size="small">http://userserve-ak.last.fm/serve/34/41493001.jpg</image>
|
|
125
|
+
<image size="medium">http://userserve-ak.last.fm/serve/64/41493001.jpg</image>
|
|
126
|
+
<image size="large">http://userserve-ak.last.fm/serve/126/41493001.jpg</image>
|
|
127
|
+
<image size="extralarge">http://userserve-ak.last.fm/serve/252/41493001.jpg</image>
|
|
128
|
+
<image size="mega">http://userserve-ak.last.fm/serve/_/41493001/INDRA.jpg</image>
|
|
129
|
+
</venue> <startDate>Fri, 11 Mar 2011 21:00:00</startDate>
|
|
130
|
+
<description><![CDATA[<div class="bbcode">Kopf & Gebeine präsentiert:<br />
|
|
131
|
+
FENECH-SOLER (UK)<br />
|
|
132
|
+
<a href="http://www.myspace.com/fenechsoler" rel="nofollow">http://www.myspace.com/fenechsoler</a><br />
|
|
133
|
+
Einlass: 21.00 Uhr | Showtime: 22.00 Uhr | VVK: 10 € + VVK-G<br />
|
|
134
|
+
<br />
|
|
135
|
+
<a href="http://www.ticketmaster.de/event/23004591F71BA2BB?artistid=1021107&majorcatid=10001&minorcatid=1" rel="nofollow">http://www.ticketmaster.de/event/23004591F71BA2BB?artistid=1021107&majorcatid=10001&minorcatid=1</a><br />
|
|
136
|
+
<br />
|
|
137
|
+
Fenech-Soler „Das Quartett Fenech-Soler aus dem englischen Flecken King’s Cliffe, United Kingdom möchte anspruchsvollen Indierock machen. Ein bisschen weniger kopflastig als Delphic. Kunstvoll arrangieren sie ihre Songs, glänzende Melodien legen sie über tanzbodenfreundliche Bässe, treibende Rhythmen und schneidende Synthesizer-Linien.<br />
|
|
138
|
+
Alan Braxe, der Meister des French House, war von Fenech-Soler so angetan, dass er ihre Debütsingle auf seinem Label Vulture Music veröffentlichte. Und er ist nicht der einzige prominente Fan. Groove Armada haben den Sänger Ben Duffy um eine Gastrolle auf ihrem demnächst erscheinenden Album engagiert. Fragt sich nur, wer da von wem profitiert.<br />
|
|
139
|
+
<a href="http://www.zeit.de" rel="nofollow">www.zeit.de</a><br />
|
|
140
|
+
<br />
|
|
141
|
+
Fenech-Soler. Die neuen Phoenix?<br />
|
|
142
|
+
„Gewagte These zum Pfingstmontag: Phoenix können abtreten. Da sie mit ihrem neuen Album ohnehin auf dem Zenith angekommen sind, könnten sie sich auch einfach auf eine einsame Insel absetzen und dort ihr Geld verprassen, vorausgesetzt es gibt eine Bar dort. Ihre Nachfolger, sagt jedenfalls die hysterische englische Musikpresse hier und hier und hier und auch hier, stehen nämlich bereits bereit. Ihr Name: Fenech-Soler, aus King’s Cliffe. Und ich glaube, man spricht das nicht „finde ich so leer“ aus, sondern vielleicht Finitsch-Solihr.<br />
|
|
143
|
+
<br />
|
|
144
|
+
Wie auch immer: Die noch nicht mal 20 Jahre alten Drei der Band machen eindeutig tanzbaren, elektronischen Pop, der die derangierten Musikjournalisten dazu bringt, so einen Stuss wie „We have seen the future of white dancefloor-scorching electro funk…“ zu schreiben.<br />
|
|
145
|
+
<br />
|
|
146
|
+
<a href="http://www.youtube.com/watch?v=as9zyYZ0D4M" rel="nofollow">http://www.youtube.com/watch?v=as9zyYZ0D4M</a></div>]]></description>
|
|
147
|
+
<image size="small">http://userserve-ak.last.fm/serve/34/23763827.jpg</image>
|
|
148
|
+
<image size="medium">http://userserve-ak.last.fm/serve/64/23763827.jpg</image>
|
|
149
|
+
<image size="large">http://userserve-ak.last.fm/serve/126/23763827.jpg</image>
|
|
150
|
+
<image size="extralarge">http://userserve-ak.last.fm/serve/252/23763827.jpg</image>
|
|
151
|
+
<attendance>41</attendance>
|
|
152
|
+
<reviews>0</reviews>
|
|
153
|
+
<tag>lastfm:event=1779451</tag>
|
|
154
|
+
<url>http://www.last.fm/event/1779451+Fenech-Soler+at+INDRA+on+11+March+2011</url>
|
|
155
|
+
<website>http://www.ticketmaster.de/Indra-tickets-Hamburg/venue/291395</website>
|
|
156
|
+
<tickets>
|
|
157
|
+
</tickets>
|
|
158
|
+
<cancelled>0</cancelled>
|
|
159
|
+
<tags>
|
|
160
|
+
<tag>electropop</tag>
|
|
161
|
+
<tag>electronic</tag>
|
|
162
|
+
<tag>indie</tag>
|
|
163
|
+
<tag>dance</tag>
|
|
164
|
+
<tag>electro</tag>
|
|
165
|
+
</tags>
|
|
166
|
+
</event> <event xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" >
|
|
167
|
+
<id>1787278</id>
|
|
168
|
+
<title>kakkmaddafakka</title>
|
|
169
|
+
<artists>
|
|
170
|
+
<artist>kakkmaddafakka</artist>
|
|
171
|
+
<artist>Razika</artist>
|
|
172
|
+
<headliner>kakkmaddafakka</headliner>
|
|
173
|
+
</artists>
|
|
174
|
+
<venue>
|
|
175
|
+
<id>8807850</id>
|
|
176
|
+
<name>INDRA</name>
|
|
177
|
+
<location>
|
|
178
|
+
<city>Hamburg</city>
|
|
179
|
+
<country>Germany</country>
|
|
180
|
+
<street>Große Freiheit 64</street>
|
|
181
|
+
<postalcode>22767</postalcode>
|
|
182
|
+
<geo:point>
|
|
183
|
+
<geo:lat>53.551911</geo:lat>
|
|
184
|
+
<geo:long>9.958009</geo:long>
|
|
185
|
+
</geo:point>
|
|
186
|
+
</location>
|
|
187
|
+
<url>http://www.last.fm/venue/8807850+INDRA</url>
|
|
188
|
+
<website>http://www.indramusikclub.com/</website>
|
|
189
|
+
<phonenumber>Telefonnummer:</phonenumber>
|
|
190
|
+
<image size="small">http://userserve-ak.last.fm/serve/34/41493001.jpg</image>
|
|
191
|
+
<image size="medium">http://userserve-ak.last.fm/serve/64/41493001.jpg</image>
|
|
192
|
+
<image size="large">http://userserve-ak.last.fm/serve/126/41493001.jpg</image>
|
|
193
|
+
<image size="extralarge">http://userserve-ak.last.fm/serve/252/41493001.jpg</image>
|
|
194
|
+
<image size="mega">http://userserve-ak.last.fm/serve/_/41493001/INDRA.jpg</image>
|
|
195
|
+
</venue> <startDate>Sat, 02 Apr 2011 13:29:01</startDate>
|
|
196
|
+
<description><![CDATA[<div class="bbcode">2. April 2011 | ab 20 Uhr | INDRA (Große Freiheit 64 - HH).<br />
|
|
197
|
+
Kopf & Gebeine präsentiert:<br />
|
|
198
|
+
KAKKMADDAFAKKA (NOR)<br />
|
|
199
|
+
+ Support: RAZIKA (NOR)<br />
|
|
200
|
+
VVK: 10 Euro + VVK-Gebühr<br />
|
|
201
|
+
Infos: <a href="http://www.myspace.com/kakkmaddafakka" rel="nofollow">www.myspace.com/kakkmaddafakka</a><br />
|
|
202
|
+
<br />
|
|
203
|
+
<a href="http://www.ticketmaster.de/event/2300462394DDA2F9" rel="nofollow">http://www.ticketmaster.de/event/2300462394DDA2F9</a><br />
|
|
204
|
+
<br />
|
|
205
|
+
Ihr wollt sie? Ihr bekommt sie: Kakkmaddafakka! Eine der überzeugendsten Bands auf dem Dockville 2010! Die großartige Performance der Norweger hat uns so überzeugt, dass wir die Damen und Herren ein weiteres Mal nach Hamburg eingeladen haben: Am 2. April werden sie das INDRA (Große Freiheit 64) zum Bersten bringen - stellt Euch auf eine mitreißende Show ein!<br />
|
|
206
|
+
Der Vorverkauf wird schon in wenigen Tagen beginnen, wir halten Euch via facebook und <a href="http://www.msdockville.de" rel="nofollow">www.msdockville.de</a> auf dem Laufenden...<br />
|
|
207
|
+
<br />
|
|
208
|
+
Neu als Support dabei: RAZIKA - die weibliche Version von Kakkmaddafakka! Es lohnt sich also mindestens doppelt :)<br />
|
|
209
|
+
<a href="http://www.myspace.com/razika" rel="nofollow">http://www.myspace.com/razika</a></div>]]></description>
|
|
210
|
+
<image size="small">http://userserve-ak.last.fm/serve/34/34104589.jpg</image>
|
|
211
|
+
<image size="medium">http://userserve-ak.last.fm/serve/64/34104589.jpg</image>
|
|
212
|
+
<image size="large">http://userserve-ak.last.fm/serve/126/34104589.jpg</image>
|
|
213
|
+
<image size="extralarge">http://userserve-ak.last.fm/serve/252/34104589.jpg</image>
|
|
214
|
+
<attendance>27</attendance>
|
|
215
|
+
<reviews>0</reviews>
|
|
216
|
+
<tag>lastfm:event=1787278</tag>
|
|
217
|
+
<url>http://www.last.fm/event/1787278+kakkmaddafakka+at+INDRA+on+2+April+2011</url>
|
|
218
|
+
<website></website>
|
|
219
|
+
<tickets>
|
|
220
|
+
</tickets>
|
|
221
|
+
<cancelled>0</cancelled>
|
|
222
|
+
<tags>
|
|
223
|
+
<tag>bergen</tag>
|
|
224
|
+
<tag>alternative</tag>
|
|
225
|
+
<tag>indie</tag>
|
|
226
|
+
<tag>under 2000 listeners</tag>
|
|
227
|
+
<tag>norwegian</tag>
|
|
228
|
+
<tag>rock</tag>
|
|
229
|
+
<tag>female</tag>
|
|
230
|
+
<tag>norway</tag>
|
|
231
|
+
</tags>
|
|
232
|
+
</event> <event xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" >
|
|
233
|
+
<id>1799891</id>
|
|
234
|
+
<title>Mondial Club</title>
|
|
235
|
+
<artists>
|
|
236
|
+
<artist>Chikinki</artist>
|
|
237
|
+
<headliner>Chikinki</headliner>
|
|
238
|
+
</artists>
|
|
239
|
+
<venue>
|
|
240
|
+
<id>8807850</id>
|
|
241
|
+
<name>INDRA</name>
|
|
242
|
+
<location>
|
|
243
|
+
<city>Hamburg</city>
|
|
244
|
+
<country>Germany</country>
|
|
245
|
+
<street>Große Freiheit 64</street>
|
|
246
|
+
<postalcode>22767</postalcode>
|
|
247
|
+
<geo:point>
|
|
248
|
+
<geo:lat>53.551911</geo:lat>
|
|
249
|
+
<geo:long>9.958009</geo:long>
|
|
250
|
+
</geo:point>
|
|
251
|
+
</location>
|
|
252
|
+
<url>http://www.last.fm/venue/8807850+INDRA</url>
|
|
253
|
+
<website>http://www.indramusikclub.com/</website>
|
|
254
|
+
<phonenumber>Telefonnummer:</phonenumber>
|
|
255
|
+
<image size="small">http://userserve-ak.last.fm/serve/34/41493001.jpg</image>
|
|
256
|
+
<image size="medium">http://userserve-ak.last.fm/serve/64/41493001.jpg</image>
|
|
257
|
+
<image size="large">http://userserve-ak.last.fm/serve/126/41493001.jpg</image>
|
|
258
|
+
<image size="extralarge">http://userserve-ak.last.fm/serve/252/41493001.jpg</image>
|
|
259
|
+
<image size="mega">http://userserve-ak.last.fm/serve/_/41493001/INDRA.jpg</image>
|
|
260
|
+
</venue> <startDate>Fri, 29 Apr 2011 19:00:00</startDate>
|
|
261
|
+
<description></description>
|
|
262
|
+
<image size="small">http://userserve-ak.last.fm/serve/34/122401.jpg</image>
|
|
263
|
+
<image size="medium">http://userserve-ak.last.fm/serve/64/122401.jpg</image>
|
|
264
|
+
<image size="large">http://userserve-ak.last.fm/serve/126/122401.jpg</image>
|
|
265
|
+
<image size="extralarge">http://userserve-ak.last.fm/serve/252/122401.jpg</image>
|
|
266
|
+
<attendance>10</attendance>
|
|
267
|
+
<reviews>0</reviews>
|
|
268
|
+
<tag>lastfm:event=1799891</tag>
|
|
269
|
+
<url>http://www.last.fm/event/1799891+Mondial+Club</url>
|
|
270
|
+
<website></website>
|
|
271
|
+
<tickets>
|
|
272
|
+
</tickets>
|
|
273
|
+
<cancelled>0</cancelled>
|
|
274
|
+
<tags>
|
|
275
|
+
<tag>indie rock</tag>
|
|
276
|
+
<tag>alternative</tag>
|
|
277
|
+
<tag>electronic</tag>
|
|
278
|
+
<tag>indie</tag>
|
|
279
|
+
</tags>
|
|
280
|
+
</event></events></lfm>
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
+
<lfm status="ok">
|
|
3
|
+
<results for="cotton" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#">
|
|
4
|
+
<opensearch:Query role="request" searchTerms="cotton" startPage="1" />
|
|
5
|
+
<opensearch:totalResults>3</opensearch:totalResults>
|
|
6
|
+
<opensearch:startIndex>0</opensearch:startIndex>
|
|
7
|
+
<opensearch:itemsPerPage>50</opensearch:itemsPerPage><venuematches>
|
|
8
|
+
<venue>
|
|
9
|
+
<id>8891678</id>
|
|
10
|
+
<name>Cotton Club</name>
|
|
11
|
+
<location>
|
|
12
|
+
<city>Hamburg</city>
|
|
13
|
+
<country>Germany</country>
|
|
14
|
+
<street>Alter Steinweg 10</street>
|
|
15
|
+
<postalcode>20459</postalcode>
|
|
16
|
+
<geo:point>
|
|
17
|
+
<geo:lat>53.550374</geo:lat>
|
|
18
|
+
<geo:long>9.98205</geo:long>
|
|
19
|
+
</geo:point>
|
|
20
|
+
</location>
|
|
21
|
+
<url>http://www.last.fm/venue/8891678+Cotton+Club</url>
|
|
22
|
+
<website>http://www.cotton-club.de/</website>
|
|
23
|
+
<phonenumber>+49 (0)40 343878</phonenumber>
|
|
24
|
+
<image size="small"></image>
|
|
25
|
+
<image size="medium"></image>
|
|
26
|
+
<image size="large"></image>
|
|
27
|
+
<image size="extralarge"></image>
|
|
28
|
+
<image size="mega"></image>
|
|
29
|
+
</venue> <venue>
|
|
30
|
+
<id>9036090</id>
|
|
31
|
+
<name>Cotton Club</name>
|
|
32
|
+
<location>
|
|
33
|
+
<city>Künzelsau</city>
|
|
34
|
+
<country>Germany</country>
|
|
35
|
+
<street></street>
|
|
36
|
+
<postalcode></postalcode>
|
|
37
|
+
<geo:point>
|
|
38
|
+
<geo:lat>49.280909</geo:lat>
|
|
39
|
+
<geo:long>9.690339</geo:long>
|
|
40
|
+
</geo:point>
|
|
41
|
+
</location>
|
|
42
|
+
<url>http://www.last.fm/venue/9036090+Cotton+Club</url>
|
|
43
|
+
<website></website>
|
|
44
|
+
<phonenumber></phonenumber>
|
|
45
|
+
<image size="small"></image>
|
|
46
|
+
<image size="medium"></image>
|
|
47
|
+
<image size="large"></image>
|
|
48
|
+
<image size="extralarge"></image>
|
|
49
|
+
<image size="mega"></image>
|
|
50
|
+
</venue> <venue>
|
|
51
|
+
<id>9087817</id>
|
|
52
|
+
<name>CottonClub</name>
|
|
53
|
+
<location>
|
|
54
|
+
<city>Kaiserslautern</city>
|
|
55
|
+
<country>Germany</country>
|
|
56
|
+
<street></street>
|
|
57
|
+
<postalcode></postalcode>
|
|
58
|
+
<geo:point>
|
|
59
|
+
<geo:lat>49.44702</geo:lat>
|
|
60
|
+
<geo:long>7.756832</geo:long>
|
|
61
|
+
</geo:point>
|
|
62
|
+
</location>
|
|
63
|
+
<url>http://www.last.fm/venue/9087817+CottonClub</url>
|
|
64
|
+
<website></website>
|
|
65
|
+
<phonenumber></phonenumber>
|
|
66
|
+
<image size="small"></image>
|
|
67
|
+
<image size="medium"></image>
|
|
68
|
+
<image size="large"></image>
|
|
69
|
+
<image size="extralarge"></image>
|
|
70
|
+
<image size="mega"></image>
|
|
71
|
+
</venue></venuematches>
|
|
72
|
+
</results></lfm>
|
data/test/mocks/rest.rb
CHANGED
|
@@ -4,6 +4,14 @@ require 'digest/md5'
|
|
|
4
4
|
module Rockstar
|
|
5
5
|
module REST
|
|
6
6
|
class Connection
|
|
7
|
+
|
|
8
|
+
def flatten(arg)
|
|
9
|
+
if arg.class == Hash
|
|
10
|
+
return arg.keys.sort_by{|a|a.to_s}.collect { |k| "%s_%s" % [k.to_s, flatten(arg[k])] }.join("_").gsub(" ", "_")
|
|
11
|
+
end
|
|
12
|
+
arg.to_s
|
|
13
|
+
end
|
|
14
|
+
|
|
7
15
|
# reads xml fixture file instead of hitting up the internets
|
|
8
16
|
def request(resource, method = "get", args = {}, sign_request=false)
|
|
9
17
|
@now_playing_url = 'http://62.216.251.203:80/nowplaying'
|
|
@@ -15,8 +23,8 @@ module Rockstar
|
|
|
15
23
|
|
|
16
24
|
query = ""
|
|
17
25
|
if args.size > 0
|
|
18
|
-
query = "_" + args
|
|
19
|
-
|
|
26
|
+
query = "_" + flatten(args)
|
|
27
|
+
end
|
|
20
28
|
|
|
21
29
|
file = File.dirname(__FILE__) + "/../fixtures/xml/#{folder}/#{file}#{query}.xml"
|
|
22
30
|
|
data/test/unit/test_album.rb
CHANGED
|
@@ -64,4 +64,10 @@ class TestAlbum < Test::Unit::TestCase
|
|
|
64
64
|
test 'should load info when trying to access an image if the info has not been loaded' do
|
|
65
65
|
assert_equal('http://userserve-ak.last.fm/serve/34s/34894445.png', @album.image(:small))
|
|
66
66
|
end
|
|
67
|
+
|
|
68
|
+
test 'should parse empty album' do
|
|
69
|
+
album = Rockstar::Album.new('Thievery Corporation', 'Radio Retalation')
|
|
70
|
+
album.load_info
|
|
71
|
+
assert_nil album.summary
|
|
72
|
+
end
|
|
67
73
|
end
|
data/test/unit/test_track.rb
CHANGED
|
@@ -41,7 +41,7 @@ class TestTrack < Test::Unit::TestCase
|
|
|
41
41
|
assert_equal('ok', @track.love("tag"))
|
|
42
42
|
end
|
|
43
43
|
|
|
44
|
-
test 'raise missing parameter error' do
|
|
44
|
+
test 'raise missing parameter error in scrobble' do
|
|
45
45
|
assert_raises(ArgumentError) { Rockstar::Track.scrobble() }
|
|
46
46
|
end
|
|
47
47
|
|
|
@@ -49,7 +49,7 @@ class TestTrack < Test::Unit::TestCase
|
|
|
49
49
|
assert_equal('ok', @track.scrobble(Time.new(2010,10,10,10,10), 'tag'))
|
|
50
50
|
end
|
|
51
51
|
|
|
52
|
-
test 'raise missing parameter error' do
|
|
52
|
+
test 'raise missing parameter error in update now playing' do
|
|
53
53
|
assert_raises(ArgumentError) { Rockstar::Track.updateNowPlaying() }
|
|
54
54
|
end
|
|
55
55
|
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
require File.expand_path('../../test_helper.rb', __FILE__)
|
|
2
|
+
|
|
3
|
+
class TestVenue < Test::Unit::TestCase
|
|
4
|
+
|
|
5
|
+
test "should get venues by name and country" do
|
|
6
|
+
venues = Rockstar::Venue.find({:venue => 'cotton', :country => 'DE'})
|
|
7
|
+
assert_equal(3, venues.size)
|
|
8
|
+
assert_equal("Cotton Club", venues.first.name)
|
|
9
|
+
assert_equal("Hamburg", venues.first.city)
|
|
10
|
+
assert_equal("Germany", venues.first.country)
|
|
11
|
+
end
|
|
12
|
+
|
|
13
|
+
test "should get events for venue" do
|
|
14
|
+
venue = Rockstar::Venue.new(8807850, "INDRA")
|
|
15
|
+
events = venue.events
|
|
16
|
+
assert_equal(5, events.size)
|
|
17
|
+
assert_equal(venue.name, events.first.venue.name)
|
|
18
|
+
end
|
|
19
|
+
|
|
20
|
+
end
|
metadata
CHANGED
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: rockstar
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
prerelease:
|
|
5
|
-
|
|
6
|
-
- 0
|
|
7
|
-
- 5
|
|
8
|
-
- 0
|
|
9
|
-
version: 0.5.0
|
|
4
|
+
prerelease:
|
|
5
|
+
version: 0.5.1
|
|
10
6
|
platform: ruby
|
|
11
7
|
authors:
|
|
12
8
|
- Bodo Tasche
|
|
@@ -14,7 +10,7 @@ autorequire:
|
|
|
14
10
|
bindir: bin
|
|
15
11
|
cert_chain: []
|
|
16
12
|
|
|
17
|
-
date:
|
|
13
|
+
date: 2011-02-20 00:00:00 +01:00
|
|
18
14
|
default_executable:
|
|
19
15
|
dependencies:
|
|
20
16
|
- !ruby/object:Gem::Dependency
|
|
@@ -25,10 +21,6 @@ dependencies:
|
|
|
25
21
|
requirements:
|
|
26
22
|
- - ">="
|
|
27
23
|
- !ruby/object:Gem::Version
|
|
28
|
-
segments:
|
|
29
|
-
- 0
|
|
30
|
-
- 4
|
|
31
|
-
- 86
|
|
32
24
|
version: 0.4.86
|
|
33
25
|
type: :runtime
|
|
34
26
|
version_requirements: *id001
|
|
@@ -40,10 +32,6 @@ dependencies:
|
|
|
40
32
|
requirements:
|
|
41
33
|
- - ">="
|
|
42
34
|
- !ruby/object:Gem::Version
|
|
43
|
-
segments:
|
|
44
|
-
- 1
|
|
45
|
-
- 4
|
|
46
|
-
- 2
|
|
47
35
|
version: 1.4.2
|
|
48
36
|
type: :runtime
|
|
49
37
|
version_requirements: *id002
|
|
@@ -56,7 +44,6 @@ extensions: []
|
|
|
56
44
|
extra_rdoc_files:
|
|
57
45
|
- README.rdoc
|
|
58
46
|
files:
|
|
59
|
-
- .gitignore
|
|
60
47
|
- History.txt
|
|
61
48
|
- MIT-LICENSE
|
|
62
49
|
- Manifest
|
|
@@ -93,6 +80,7 @@ files:
|
|
|
93
80
|
- lib/rockstar/venue.rb
|
|
94
81
|
- lib/rockstar/version.rb
|
|
95
82
|
- rockstar.gemspec
|
|
83
|
+
- test/fixtures/xml/album/getinfo_album_Radio_Retalation_artist_Thievery_Corporation.xml
|
|
96
84
|
- test/fixtures/xml/album/getinfo_album_Some_Hearts_artist_Carrie_Underwood.xml
|
|
97
85
|
- test/fixtures/xml/artist/getsimilar_artist_Metallica.xml
|
|
98
86
|
- test/fixtures/xml/artist/gettopalbums_artist_Metallica.xml
|
|
@@ -129,6 +117,8 @@ files:
|
|
|
129
117
|
- test/fixtures/xml/user/getweeklychartlist_user_jnunemaker.xml
|
|
130
118
|
- test/fixtures/xml/user/getweeklytrackchart_from_1138536002_to_1139140802_user_jnunemaker.xml
|
|
131
119
|
- test/fixtures/xml/user/getweeklytrackchart_from__to__user_jnunemaker.xml
|
|
120
|
+
- test/fixtures/xml/venue/getevents_venue_8807850.xml
|
|
121
|
+
- test/fixtures/xml/venue/search_country__limit__page__venue_country_DE_venue_cotton.xml
|
|
132
122
|
- test/mocks/rest.rb
|
|
133
123
|
- test/test_helper.rb
|
|
134
124
|
- test/unit/test_album.rb
|
|
@@ -142,13 +132,14 @@ files:
|
|
|
142
132
|
- test/unit/test_tokenauth.rb
|
|
143
133
|
- test/unit/test_track.rb
|
|
144
134
|
- test/unit/test_user.rb
|
|
135
|
+
- test/unit/test_venue.rb
|
|
145
136
|
has_rdoc: true
|
|
146
137
|
homepage: http://github.com/bitboxer/rockstar
|
|
147
138
|
licenses: []
|
|
148
139
|
|
|
149
140
|
post_install_message:
|
|
150
|
-
rdoc_options:
|
|
151
|
-
|
|
141
|
+
rdoc_options: []
|
|
142
|
+
|
|
152
143
|
require_paths:
|
|
153
144
|
- lib
|
|
154
145
|
required_ruby_version: !ruby/object:Gem::Requirement
|
|
@@ -156,25 +147,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
156
147
|
requirements:
|
|
157
148
|
- - ">="
|
|
158
149
|
- !ruby/object:Gem::Version
|
|
159
|
-
segments:
|
|
160
|
-
- 0
|
|
161
150
|
version: "0"
|
|
162
151
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
163
152
|
none: false
|
|
164
153
|
requirements:
|
|
165
154
|
- - ">="
|
|
166
155
|
- !ruby/object:Gem::Version
|
|
167
|
-
segments:
|
|
168
|
-
- 0
|
|
169
156
|
version: "0"
|
|
170
157
|
requirements: []
|
|
171
158
|
|
|
172
159
|
rubyforge_project:
|
|
173
|
-
rubygems_version: 1.
|
|
160
|
+
rubygems_version: 1.5.2
|
|
174
161
|
signing_key:
|
|
175
162
|
specification_version: 3
|
|
176
163
|
summary: wrapper for audioscrobbler (last.fm) web services
|
|
177
164
|
test_files:
|
|
165
|
+
- examples/album.rb
|
|
166
|
+
- examples/artist.rb
|
|
167
|
+
- examples/geo.rb
|
|
168
|
+
- examples/scrobble.rb
|
|
169
|
+
- examples/tag.rb
|
|
170
|
+
- examples/track.rb
|
|
171
|
+
- examples/user.rb
|
|
178
172
|
- test/mocks/rest.rb
|
|
179
173
|
- test/test_helper.rb
|
|
180
174
|
- test/unit/test_album.rb
|
|
@@ -188,10 +182,4 @@ test_files:
|
|
|
188
182
|
- test/unit/test_tokenauth.rb
|
|
189
183
|
- test/unit/test_track.rb
|
|
190
184
|
- test/unit/test_user.rb
|
|
191
|
-
-
|
|
192
|
-
- examples/artist.rb
|
|
193
|
-
- examples/geo.rb
|
|
194
|
-
- examples/scrobble.rb
|
|
195
|
-
- examples/tag.rb
|
|
196
|
-
- examples/track.rb
|
|
197
|
-
- examples/user.rb
|
|
185
|
+
- test/unit/test_venue.rb
|
data/.gitignore
DELETED