lastfm 1.21.0 → 1.22.0

data/.travis.yml

@@ -2,3 +2,5 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0

data/lastfm.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = %q{lastfm}
   gem.require_paths = ["lib"]
-  gem.version       = "1.21.0"
+  gem.version       = "1.22.0"
   gem.license       = 'MIT'
 
   gem.add_dependency "xml-simple"

data/lib/lastfm/method_category/artist.rb

@@ -63,9 +63,8 @@ class Lastfm
 
       regular_method(
         :get_top_tags,
-        :required => [:artist],
+        :required => any_params([:artist], [:mbid]),
         :optional => [
-          [:mbid, nil],
           [:autocorrect, nil]
         ]
       ) do |response|

data/spec/method_specs/artist_spec.rb

@@ -131,21 +131,40 @@ describe '#artist' do
   end
 
   describe '#get_top_tags' do
-    it 'should get artist top tags' do
-      @lastfm.should_receive(:request).with('artist.getTopTags', {
-        :artist => 'Giorgio Moroder',
-        :mbid => nil,
-        :autocorrect => nil
-      }).and_return(make_response('artist_get_top_tags'))
-      
-      tags = @lastfm.artist.get_top_tags(:artist => 'Giorgio Moroder')
-      tags.size.should == 5
-      tags[0]['name'].should == 'electronic'
-      tags[0]['count'].should == '100'
-      tags[0]['url'].should == 'http://www.last.fm/tag/electronic'
-      tags[1]['name'].should == 'Disco'
-      tags[1]['count'].should == '97'
-      tags[1]['url'].should == 'http://www.last.fm/tag/disco'
+    context 'with artist' do
+      it 'should get artist top tags' do
+        @lastfm.should_receive(:request).with('artist.getTopTags', {
+            :artist => 'Giorgio Moroder',
+            :autocorrect => nil
+          }).and_return(make_response('artist_get_top_tags'))
+
+        tags = @lastfm.artist.get_top_tags(:artist => 'Giorgio Moroder')
+        tags.size.should == 5
+        tags[0]['name'].should == 'electronic'
+        tags[0]['count'].should == '100'
+        tags[0]['url'].should == 'http://www.last.fm/tag/electronic'
+        tags[1]['name'].should == 'Disco'
+        tags[1]['count'].should == '97'
+        tags[1]['url'].should == 'http://www.last.fm/tag/disco'
+      end
+    end
+
+    context 'with mbid' do
+      it 'should get artist top tags' do
+        @lastfm.should_receive(:request).with('artist.getTopTags', {
+            :mbid => 'xxxxx',
+            :autocorrect => nil
+          }).and_return(make_response('artist_get_top_tags'))
+
+        tags = @lastfm.artist.get_top_tags(:mbid => 'xxxxx')
+        tags.size.should == 5
+        tags[0]['name'].should == 'electronic'
+        tags[0]['count'].should == '100'
+        tags[0]['url'].should == 'http://www.last.fm/tag/electronic'
+        tags[1]['name'].should == 'Disco'
+        tags[1]['count'].should == '97'
+        tags[1]['url'].should == 'http://www.last.fm/tag/disco'
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lastfm
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.22.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-01 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2108820607274849613
+      hash: -4186265295065313550
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2108820607274849613
+      hash: -4186265295065313550
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24