omniauth-lastfm 0.0.2 → 0.0.3

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.
Files changed (3) hide show
  1. data/lib/omniauth-lastfm/version.rb +1 -1
  2. data/lib/omniauth/strategies/lastfm.rb +41 -18
  3. metadata +45 -15
data/lib/omniauth-lastfm/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Omniauth
2
2
  module Lastfm
3
- VERSION = "0.0.2"
3
+ VERSION = "0.0.3"
4
4
  end
5
5
  end
data/lib/omniauth/strategies/lastfm.rb CHANGED
@@ -14,7 +14,8 @@ module OmniAuth
14
14
  option :name, "lastfm"
15
15
  option :client_options, {
16
16
  :authorize_path => "/api/auth",
17
- :site => "http://www.last.fm"
17
+ :site => "http://www.last.fm",
18
+ :api_url => "http://ws.audioscrobbler.com/2.0/",
18
19
  }
19
20
 
20
21
  attr_reader :json
@@ -29,38 +30,60 @@ module OmniAuth
29
30
  end
30
31
 
31
32
  def callback_phase
33
+ @json = {}
32
34
  token = request.params["token"]
33
- params = { :api_key => options.api_key }
34
- params[:token] = token
35
- params[:api_sig] = signature(token)
36
- params[:method] = "auth.getSession"
37
- params[:format] = "json"
38
- response = RestClient.get("http://ws.audioscrobbler.com/2.0/", { :params => params })
39
- @json = MultiJson.decode(response.to_s)
35
+ begin
36
+ params = { :api_key => options.api_key,
37
+ :token => token,
38
+ :api_sig => signature(token),
39
+ :method => "auth.getSession",
40
+ :format => 'json'}
41
+ response = RestClient.get(options.client_options.api_url, { :params => params })
42
+ session = MultiJson.decode(response.to_s)
43
+ @json.merge!(session)
44
+
45
+ params = {:api_key => options.api_key,
46
+ :user => @json['session']['name'],
47
+ :method => 'user.getInfo',
48
+ :format => 'json'}
49
+ response = RestClient.get(options.client_options.api_url, { :params => params })
50
+ user = MultiJson.decode(response.to_s)
51
+ @json.merge!(user)
52
+ rescue ::RestClient::Exception
53
+ raise ::Timeout::Error
54
+ end
40
55
  super
41
56
  end
42
57
 
43
- uid { raw_info["name"] }
58
+ uid do
59
+ @json['session']['name']
60
+ end
44
61
 
45
62
  info do
46
- { :name => raw_info["name"] }
63
+ {
64
+ :nickname => @json['user']['name'],
65
+ :name => @json['user']['realname'],
66
+ :url => @json['user']['url'],
67
+ :image => @json['user']['image'].instance_of?(Array) ? @json['user']['image'].last['#text'] : @json['user']['image'],
68
+ :country => @json['user']['country'],
69
+ :age => @json['user']['age'],
70
+ :gender => @json['user']['age'],
71
+ }
47
72
  end
48
73
 
49
74
  extra do
50
- { :raw_info => raw_info }
75
+ { :raw_info => @json['user'] }
51
76
  end
52
77
 
53
78
  credentials do
54
- { :token => raw_info["key"] }
55
- end
56
-
57
- def raw_info
58
- @raw_info ||= @json["session"]
59
- rescue ::RestClient::Exception
60
- raise ::Timeout::Error
79
+ {
80
+ :token => @json['session']['key'],
81
+ :name => @json['session']['name'],
82
+ }
61
83
  end
62
84
 
63
85
  protected
86
+
64
87
  def signature(token)
65
88
  sign = "api_key#{options.api_key}methodauth.getSessiontoken#{token}#{options.secret_key}"
66
89
  Digest::MD5.hexdigest(sign)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: omniauth-lastfm
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
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-03-08 00:00:00.000000000 Z
12
+ date: 2012-05-23 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec
16
- requirement: &70181137236140 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,15 @@ dependencies:
21
21
  version: '2.7'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *70181137236140
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ~>
28
+ - !ruby/object:Gem::Version
29
+ version: '2.7'
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: rack-test
27
- requirement: &70181137235280 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
35
  - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
32
37
  version: '0'
33
38
  type: :development
34
39
  prerelease: false
35
- version_requirements: *70181137235280
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '0'
36
46
  - !ruby/object:Gem::Dependency
37
47
  name: simplecov
38
- requirement: &70181137234260 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
39
49
  none: false
40
50
  requirements:
41
51
  - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
43
53
  version: '0'
44
54
  type: :development
45
55
  prerelease: false
46
- version_requirements: *70181137234260
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ! '>='
60
+ - !ruby/object:Gem::Version
61
+ version: '0'
47
62
  - !ruby/object:Gem::Dependency
48
63
  name: webmock
49
- requirement: &70181137233520 !ruby/object:Gem::Requirement
64
+ requirement: !ruby/object:Gem::Requirement
50
65
  none: false
51
66
  requirements:
52
67
  - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
54
69
  version: '0'
55
70
  type: :development
56
71
  prerelease: false
57
- version_requirements: *70181137233520
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ! '>='
76
+ - !ruby/object:Gem::Version
77
+ version: '0'
58
78
  - !ruby/object:Gem::Dependency
59
79
  name: omniauth-oauth
60
- requirement: &70181137232920 !ruby/object:Gem::Requirement
80
+ requirement: !ruby/object:Gem::Requirement
61
81
  none: false
62
82
  requirements:
63
83
  - - ~>
@@ -65,10 +85,15 @@ dependencies:
65
85
  version: '1.0'
66
86
  type: :runtime
67
87
  prerelease: false
68
- version_requirements: *70181137232920
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ~>
92
+ - !ruby/object:Gem::Version
93
+ version: '1.0'
69
94
  - !ruby/object:Gem::Dependency
70
95
  name: rest-client
71
- requirement: &70181137232220 !ruby/object:Gem::Requirement
96
+ requirement: !ruby/object:Gem::Requirement
72
97
  none: false
73
98
  requirements:
74
99
  - - ~>
@@ -76,7 +101,12 @@ dependencies:
76
101
  version: 1.6.6
77
102
  type: :runtime
78
103
  prerelease: false
79
- version_requirements: *70181137232220
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ~>
108
+ - !ruby/object:Gem::Version
109
+ version: 1.6.6
80
110
  description: OmniAuth strategy for Last.fm
81
111
  email:
82
112
  - claudio@audiobox.fm
@@ -111,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
111
141
  version: '0'
112
142
  requirements: []
113
143
  rubyforge_project: omniauth-lastfm
114
- rubygems_version: 1.8.17
144
+ rubygems_version: 1.8.24
115
145
  signing_key:
116
146
  specification_version: 3
117
147
  summary: OmniAuth strategy for Last.fm