lastfm 1.26.0 → 1.27.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d75da0eb84e97b713db6269b03898aa030dd269
-  data.tar.gz: e634865474c9d7f0942537d34c059bac4a030d3e
+  metadata.gz: 97fb464cf27713555c45f696a2c7489906c6d8dc
+  data.tar.gz: 93856d36bde02f40e1b9180f151e29363fc51ef8
 SHA512:
-  metadata.gz: 31bd09f2c32dfb2a080cf4f543a2efe8b64a117993308e97051547f4ca8129b7def45e9fbbf824a7e4bcfc9b15b142dd77570a8282748cdc1e80f477b6faa4c9
-  data.tar.gz: 8950457ca4a2fdcbd0f113979152dadaec1ae293f25ecae9f8b6acac977289e0d288a585881bbef92993707be9f4831703630b96070d568e86d8b13a76512286
+  metadata.gz: 0f0c940d644e5fd4f4c55d0c77ef4e1fa8be5e5252e9e00a2552296745ab4f892478da72d09021b752a7770035c76e065cd8941d900b3d16c2bf6afaa04e3259
+  data.tar.gz: 874c706e479275dbff678f62bee3dd87767e8c074722dd4bc08161a1981becbb80608a118f35abdd536353781cbed9c654be7de32a98cb06786289ad29db9d8e

data/.rspec

@@ -1,2 +1,2 @@
--c
--fs
+--color
+--format documentation

data/.travis.yml

@@ -1,3 +1,6 @@
+language: ruby
+before_install:
+  - gem update bundler
 rvm:
   - 1.9.3
   - 2.0.0

data/README.md

@@ -24,6 +24,7 @@ lastfm.track.update_now_playing(artist: 'Hujiko Pro', track: 'acid acid 7riddim'
 * 1.9.3
 * 2.0.0
 * 2.1.0
+* 2.2.0
 
 ## Supported API Methods
 
@@ -31,11 +32,19 @@ It supports methods which require [authentication](http://www.last.fm/api/authen
 
 ### Album
 
+* [album.addTags](http://www.last.fm/api/show/album.addTags)
+* [album.getBuylinks](http://www.last.fm/api/show/album.getBuylinks)
 * [album.getInfo](http://www.last.fm/api/show?service=290)
+* [album.getShouts](http://www.last.fm/api/show/album.getShouts)
+* [album.getTags](http://www.last.fm/api/show/album.getTags)
+* [album.getTopTags](http://www.last.fm/api/show/album.getTopTags)
+* [album.removeTag](http://www.last.fm/api/show/album.removeTag)
+* [album.search](http://www.last.fm/api/show/album.search)
+* [album.share](http://www.last.fm/api/show/album.share)
 
 ### Artist
 
-* [artist.getEvents](http://www.last.fm/api/show?service=117)
+* ~~[artist.gets](http://www.last.fm/api/show?service=117)~~ deleted
 * [artist.getInfo](http://www.last.fm/api/show?service=267)
 * [artist.getSimilar](http://www.last.fm/api/show?service=267)
 * [artist.getTags](http://www.last.fm/api/show?service=267)
@@ -53,7 +62,7 @@ It supports methods which require [authentication](http://www.last.fm/api/authen
 
 ### Event
 
-* [event.getInfo](http://www.last.fm/api/show/event.getInfo)
+* ~~[event.getInfo](http://www.last.fm/api/show/event.getInfo)~~ deleted
 
 ### Radio
 
@@ -69,7 +78,7 @@ It supports methods which require [authentication](http://www.last.fm/api/authen
 
 ### Tasteometer
 
-* [tasteometer.compare](http://www.last.fm/api/show/tasteometer.compare)
+* ~~[tasteometer.compare](http://www.last.fm/api/show/tasteometer.compare)~~ deleted
 
 ### Track
 
@@ -97,7 +106,7 @@ It supports methods which require [authentication](http://www.last.fm/api/authen
 * [user.getNeighbours](http://www.last.fm/api/show?service=264)
 * [user.getPersonalTags](http://www.last.fm/api/show/user.getPersonalTags)
 * [user.getRecentTracks](http://www.last.fm/api/show?service=278)
-* [user.getRecommendedEvents](http://www.last.fm/api/show/user.getRecommendedEvents)
+* ~~[user.getRecommendedEvents](http://www.last.fm/api/show/user.getRecommendedEvents)~~ deleted
 * [user.getRecommendedArtists](http://www.last.fm/api/show/user.getRecommendedArtists)
 * [user.getTopArtists](http://www.last.fm/api/show/user.getTopArtists)
 * [user.getTopAlbums](http://www.last.fm/api/show/user.getTopAlbums)
@@ -110,7 +119,7 @@ It supports methods which require [authentication](http://www.last.fm/api/authen
 
 ### Geo
 
-* [geo.getEvents](http://www.last.fm/api/show?service#270)
+* ~~[geo.getEvents](http://www.last.fm/api/show?service#270)~~ deleted
 
 ### Group
 

data/lastfm.gemspec

@@ -12,13 +12,12 @@ 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.26.0"
+  gem.version       = "1.27.4"
   gem.license       = 'MIT'
 
   gem.add_dependency "xml-simple"
   gem.add_dependency "httparty"
-  gem.add_dependency 'activesupport', '>= 3.2.0'
 
-  gem.add_development_dependency('rspec', ['~> 2.8.0'])
-  gem.add_development_dependency('rake')
+  gem.add_development_dependency('rspec', ['~> 3.4.0'])
+  gem.add_development_dependency('rake', '< 12.3.3')
 end

data/lib/lastfm.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'digest/md5'
 require 'httparty'
-require 'active_support/core_ext/string/inflections'
 
 require 'lastfm/util'
 require 'lastfm/response'

data/lib/lastfm/method_category/album.rb

@@ -1,15 +1,82 @@
 class Lastfm
   module MethodCategory
     class Album < Base
+      write_method :add_tags, :required => [:artist, :album, :tags]
+
+      write_method :remove_tag, :required => [:artist, :album, :tag]
+
+      write_method(
+        :share,
+        :required => [:artist, :album, :recipient],
+        :optional => [
+          [:public, nil],
+          [:message, nil]
+        ]
+      )
+
+      regular_method(
+        :get_buylinks,
+        :required => any_params([:artist, :album, :country], [:mbid, :country]),
+        :optional => [
+          [:autocorrect, nil]
+        ]
+      ) do |response|
+        response.xml['affiliations']
+      end
+
       regular_method(
         :get_info,
         :required => any_params([:artist, :album], :mbid)
       ) do |response|
         result = response.xml['album']
 
-        result['releasedate'].lstrip! unless result['releasedate'].empty?
+        result['releasedate'].lstrip! unless result.nil? || result['releasedate'].nil? || result['releasedate'].empty?
         result
       end
+
+      regular_method(
+        :get_shouts,
+        :required => any_params([:artist, :album], :mbid),
+        :optional => [
+          [:limit, nil],
+          [:autocorrect, nil],
+          [:page, nil]
+        ]
+      ) do |response|
+        response.xml['shouts']['shout'] = Util.force_array(response.xml['shouts']['shout'])
+      end
+
+      regular_method(
+        :get_top_tags,
+        :required => [:artist, :album],
+        :optional => [
+          [:autocorrect, nil]
+        ]
+      ) do |response|
+        response.xml['toptags']['tag'] = Util.force_array(response.xml['toptags']['tag'])
+      end
+
+      regular_method(
+        :search,
+        :required => [:album],
+        :optional => [
+          [:limit, nil],
+          [:page, nil]
+        ]
+      ) do |response|
+        response.xml['results']['albummatches']['album'] = Util.force_array(response.xml['results']['albummatches']['album'])
+        response.xml
+      end
+
+      method_with_authentication(
+        :get_tags,
+        :required => any_params([:artist, :album], :mbid),
+        :optional => [
+          [:autocorrect, nil],
+        ]
+      ) do |response|
+        response.xml['tags']['tag'] = Util.force_array(response.xml['tags']['tag'])
+      end
     end
   end
 end

data/lib/lastfm/method_category/artist.rb

@@ -22,6 +22,13 @@ class Lastfm
         response.xml['artist']
       end
 
+      regular_method(
+        :get_correction,
+        :required => [:artist]
+      ) do |response|
+        response.xml['corrections']['correction']
+      end
+
       regular_method(
         :get_events,
         :required => any_params([:artist], [:mbid])

data/lib/lastfm/method_category/base.rb

@@ -45,7 +45,7 @@ class Lastfm
             block.call(
               send(
                 method,
-                id.to_s.camelize(:lower),
+                id.to_s.gsub(/_[a-z]/){ |s| s[1].upcase },
                 Lastfm::Util.build_options(
                   args,
                   params[:required],

data/lib/lastfm/method_category/track.rb

@@ -71,7 +71,10 @@ class Lastfm
 
       regular_method(
         :get_similar,
-        :required => [:artist, :track]
+        :required => [:artist, :track],
+        :optional => [
+          [:limit, nil]
+        ]
       ) do |response|
         response.xml['similartracks']['track'][1 .. -1]
       end
@@ -89,7 +92,7 @@ class Lastfm
         response.xml
       end
 
-      method_with_authentication(
+      regular_method(
         :get_tags,
         :required => [:artist, :track]
       ) do |response|

data/lib/lastfm/method_category/user.rb

@@ -14,7 +14,7 @@ class Lastfm
       end
 
       def get_info(*args)
-        method = :get_info.to_s.camelize(:lower)
+        method = 'getInfo'
         response = if args.any?
           options = Lastfm::Util.build_options(args, [:user], [])
           request(method, options)
@@ -33,7 +33,7 @@ class Lastfm
           [:page, nil]
         ]
       ) do |response|
-        response.xml['lovedtracks']['track']
+        response.xml['lovedtracks']['track'] = Util.force_array(response.xml['lovedtracks']['track'])
       end
 
       regular_method(

data/lib/lastfm/response.rb

@@ -6,9 +6,13 @@ class Lastfm
     attr_reader :xml
 
     def initialize(body)
+      # workaround for https://github.com/youpy/ruby-lastfm/issues/83
+      body = fix_body(body)
+
       @xml = XmlSimple.xml_in(body, 'ForceArray' => ['image', 'tag', 'user', 'event', 'correction'])
     rescue REXML::ParseException
-      @xml = XmlSimple.xml_in(body.encode(Encoding.find("ISO-8859-1"), :undef => :replace), 'ForceArray' => ['image', 'tag', 'user', 'event', 'correction'])
+      @xml = XmlSimple.xml_in(body.encode(Encoding.find("ISO-8859-1"), :undef => :replace),
+                              'ForceArray' => ['image', 'tag', 'user', 'event', 'correction'])
     end
 
     def success?
@@ -22,5 +26,19 @@ class Lastfm
     def error
       @xml['error']['code'].to_i
     end
+
+    private
+
+    def fix_body(body)
+      namespace_attr = 'xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"'
+
+      body.sub(/(<results[^>]*)/) do |str|
+        if str.match(namespace_attr)
+          str
+        else
+          '%s %s' % [str, namespace_attr]
+        end
+      end
+    end
   end
 end

data/lib/lastfm/util.rb

@@ -1,7 +1,7 @@
 class Lastfm
   class Util
     def self.force_array(array_or_something)
-      array_or_something.kind_of?(Array) ? array_or_something : [array_or_something]
+      array_or_something.kind_of?(Array) ? array_or_something : [array_or_something].compact
     end
 
     def self.build_options(args, mandatory, optional)
@@ -14,18 +14,13 @@ class Lastfm
 
     def self.build_options_from_hash(options, mandatory, optional)
       candidates = mandatory.kind_of?(AnyParams) ? mandatory.candidates : [mandatory]
-      candidates.each_with_index do |params, index|
-        Array(params).each do |param|
-          if !options.has_key?(param)
-            if params.equal? candidates.last
-              raise ArgumentError.new("%s is required" % param)
-            else
-              next
-            end
-          end
+      candidates.each do |params|
+        missing_param = Array(params).any? { |param| !options.key?(param) }
+        if missing_param && params.equal?(candidates.last)
+          raise ArgumentError.new("%s is required" % candidates.map{ |c| Array(c).join(', ')}.join(' or '))
         end
 
-        break
+        break unless missing_param
       end
 
       optional.each do |name, value|

data/spec/fixtures/album_get_buylinks.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lfm status="ok">
+  <affiliations>
+    <physicals>
+      <affiliation>
+        <supplierName>Amazon</supplierName>
+        <price>
+          <currency>GBP</currency>
+          <amount>6.34</amount>
+          <formatted>£6.34</formatted>
+        </price>
+        <buyLink>http://www.last.fm/affiliate/byid/8/3418994/1/ws.album.buylinks.f4e2585261d8d10d3297e181d68940fc</buyLink>
+        <supplierIcon>http://cdn.last.fm/favicons/1/amazon.gif</supplierIcon>
+        <isSearch>0</isSearch>
+      </affiliation>
+    </physicals>
+    <downloads>
+      <affiliation>
+        <supplierName>Amazon MP3</supplierName>
+        <price>
+          <currency>GBP</currency>
+          <amount>7.99</amount>
+          <formatted>£7.99</formatted>
+        </price>
+        <buyLink>http://www.last.fm/affiliate/byid/8/3418994/44/ws.album.buylinks.f4e2585261d8d10d3297e181d68940fc</buyLink>
+        <supplierIcon>http://cdn.last.fm/favicons/amazon-mp3-16x16-a.gif</supplierIcon>
+        <isSearch>0</isSearch>
+      </affiliation>
+    </downloads>
+  </affiliations>
+</lfm>

data/spec/fixtures/album_get_info_without_release_date.xml

@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lfm status="ok">
+  <album>
+    <name>Believe</name>
+    <artist>Cher</artist>
+    <id>2026126</id>
+    <mbid>61bf0388-b8a9-48f4-81d1-7eb02706dfb0</mbid>
+    <url>http://www.last.fm/music/Cher/Believe</url>
+    <image size="small">http://userserve-ak.last.fm/serve/34s/42806845.png</image>
+    <image size="medium">http://userserve-ak.last.fm/serve/64s/42806845.png</image>
+    <image size="large">http://userserve-ak.last.fm/serve/174s/42806845.png</image>
+    <image size="extralarge">http://userserve-ak.last.fm/serve/300x300/42806845.png</image>
+    <image size="mega">http://userserve-ak.last.fm/serve/_/42806845/Believe++600++600+PNG.png</image>
+    <listeners>179749</listeners>
+    <playcount>838056</playcount>
+    <tracks>
+      <track rank="1">
+        <name>Believe</name>
+        <duration>239</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Cher/_/Believe</url>
+        <streamable fulltrack="0">1</streamable>
+        <artist>
+          <name>Cher</name>
+          <mbid>bfcc6d75-a6a5-4bc6-8282-47aec8531818</mbid>
+          <url>http://www.last.fm/music/Cher</url>
+        </artist>
+      </track>
+      <track rank="2">
+        <name>The Power</name>
+        <duration>235</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Cher/_/The+Power</url>
+        <streamable fulltrack="0">0</streamable>
+        <artist>
+          <name>Cher</name>
+          <mbid>bfcc6d75-a6a5-4bc6-8282-47aec8531818</mbid>
+          <url>http://www.last.fm/music/Cher</url>
+        </artist>
+      </track>
+      <track rank="3">
+        <name>Runaway</name>
+        <duration>285</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Cher/_/Runaway</url>
+        <streamable fulltrack="0">0</streamable>
+        <artist>
+          <name>Cher</name>
+          <mbid>bfcc6d75-a6a5-4bc6-8282-47aec8531818</mbid>
+          <url>http://www.last.fm/music/Cher</url>
+        </artist>
+      </track>
+      <track rank="4">
+        <name>All Or Nothing</name>
+        <duration>237</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Cher/_/All+Or+Nothing</url>
+        <streamable fulltrack="0">1</streamable>
+        <artist>
+          <name>Cher</name>
+          <mbid>bfcc6d75-a6a5-4bc6-8282-47aec8531818</mbid>
+          <url>http://www.last.fm/music/Cher</url>
+        </artist>
+      </track>
+      <track rank="5">
+        <name>Strong Enough</name>
+        <duration>223</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Cher/_/Strong+Enough</url>
+        <streamable fulltrack="0">1</streamable>
+        <artist>
+          <name>Cher</name>
+          <mbid>bfcc6d75-a6a5-4bc6-8282-47aec8531818</mbid>
+          <url>http://www.last.fm/music/Cher</url>
+        </artist>
+      </track>
+      <track rank="6">
+        <name>Dov'è l'amore</name>
+        <duration>257</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Cher/_/Dov%27%C3%A8+l%27amore</url>
+        <streamable fulltrack="0">0</streamable>
+        <artist>
+          <name>Cher</name>
+          <mbid>bfcc6d75-a6a5-4bc6-8282-47aec8531818</mbid>
+          <url>http://www.last.fm/music/Cher</url>
+        </artist>
+      </track>
+      <track rank="7">
+        <name>Takin' Back My Heart</name>
+        <duration>271</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Cher/_/Takin%27+Back+My+Heart</url>
+        <streamable fulltrack="0">0</streamable>
+        <artist>
+          <name>Cher</name>
+          <mbid>bfcc6d75-a6a5-4bc6-8282-47aec8531818</mbid>
+          <url>http://www.last.fm/music/Cher</url>
+        </artist>
+      </track>
+      <track rank="8">
+        <name>Taxi Taxi</name>
+        <duration>302</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Cher/_/Taxi+Taxi</url>
+        <streamable fulltrack="0">0</streamable>
+        <artist>
+          <name>Cher</name>
+          <mbid>bfcc6d75-a6a5-4bc6-8282-47aec8531818</mbid>
+          <url>http://www.last.fm/music/Cher</url>
+        </artist>
+      </track>
+      <track rank="9">
+        <name>Love Is the Groove</name>
+        <duration>270</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Cher/_/Love+Is+the+Groove</url>
+        <streamable fulltrack="0">0</streamable>
+        <artist>
+          <name>Cher</name>
+          <mbid>bfcc6d75-a6a5-4bc6-8282-47aec8531818</mbid>
+          <url>http://www.last.fm/music/Cher</url>
+        </artist>
+      </track>
+      <track rank="10">
+        <name>We All Sleep Alone</name>
+        <duration>233</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Cher/_/We+All+Sleep+Alone</url>
+        <streamable fulltrack="0">1</streamable>
+        <artist>
+          <name>Cher</name>
+          <mbid>bfcc6d75-a6a5-4bc6-8282-47aec8531818</mbid>
+          <url>http://www.last.fm/music/Cher</url>
+        </artist>
+      </track>
+    </tracks>
+    <toptags>
+      <tag>
+        <name>pop</name>
+        <url>http://www.last.fm/tag/pop</url>
+      </tag>
+      <tag>
+        <name>90s</name>
+        <url>http://www.last.fm/tag/90s</url>
+      </tag>
+      <tag>
+        <name>dance</name>
+        <url>http://www.last.fm/tag/dance</url>
+      </tag>
+      <tag>
+        <name>1998</name>
+        <url>http://www.last.fm/tag/1998</url>
+      </tag>
+      <tag>
+        <name>albums i own</name>
+        <url>http://www.last.fm/tag/albums%20i%20own</url>
+      </tag>
+    </toptags>
+    <wiki>
+      <published>Sat, 6 Mar 2010 16:48:03 +0000</published>
+      <summary><![CDATA[Believe is the twenty-third studio album by American  singer-actress Cher, released on November 10, 1998 by Warner Bros. Records. The RIAA certified it Quadruple Platinum on December 23, 1999, recognizing four million shipments in the United States; Worldwide, the album has sold more than 20 million copies, making it the biggest-selling album of her career. In 1999 the album received three Grammy Awards nominations including &quot;Record of the Year&quot;, &quot;Best Pop Album&quot; and winning &quot;Best Dance Recording&quot; for the single &quot;Believe&quot;. ]]></summary>
+      <content><![CDATA[Believe is the twenty-third studio album by American  singer-actress Cher, released on November 10, 1998 by Warner Bros. Records. The RIAA certified it Quadruple Platinum on December 23, 1999, recognizing four million shipments in the United States; Worldwide, the album has sold more than 20 million copies, making it the biggest-selling album of her career. In 1999 the album received three Grammy Awards nominations including &quot;Record of the Year&quot;, &quot;Best Pop Album&quot; and winning &quot;Best Dance Recording&quot; for the single &quot;Believe&quot;.
+ 
+ It was released by Warner Bros. Records at the end of 1998. The album was executive produced by Rob Dickens. Upon its debut, critical reception was generally positive. Believe became Cher's most commercially-successful release, reached number one and Top 10 all over the world. In the United States, the album was released on November 10, 1998, and reached number four on the Billboard 200 chart, where it was certified four times platinum.
+ 
+ The album featured a change in Cher's music; in addition, Believe presented a vocally stronger Cher and a massive use of vocoder and Auto-Tune. In 1999, the album received 3 Grammy Awards nominations for &quot;Record of the Year&quot;, &quot;Best Pop Album&quot; and winning &quot;Best Dance Recording&quot;. Throughout 1999 and into 2000 Cher was nominated and winning many awards for the album including a Billboard Music Award for &quot;Female Vocalist of the Year&quot;, Lifelong Contribution Awards and a Star on the Walk of Fame shared with former Sonny Bono. The boost in Cher's popularity led to a very successful Do You Believe? Tour.
+ 
+ The album was dedicated to Sonny Bono, Cher's former husband who died earlier that year from a skiing accident.
+ 
+ Cher also recorded a cover version of &quot;Love Is in the Air&quot; during early sessions for this album. Although never officially released, the song has leaked on file sharing networks.
+ 
+ Singles
+ 
+ 
+ &quot;Believe&quot;
+ &quot;Strong Enough&quot;
+ &quot;All or Nothing&quot;
+ &quot;Dov'è L'Amore&quot;
+        
+User-contributed text is available under the Creative Commons By-SA License and may also be available under the GNU FDL.]]></content>
+    </wiki>
+  </album>
+</lfm>