lastfm 1.0.1 → 1.1.0

data/Gemfile

@@ -0,0 +1,11 @@
+source 'http://rubygems.org'
+
+gem 'httparty'
+gem 'xml-simple'
+gem 'activesupport', '>= 3.0.3'
+
+group :development do
+  gem 'rspec', '~> 2.3.0'
+  gem 'jeweler', '~> 1.6.4'
+  gem 'rdoc'
+end

data/Gemfile.lock

@@ -0,0 +1,42 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.2.0)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    diff-lcs (1.1.3)
+    git (1.2.5)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
+    i18n (0.6.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    json (1.6.5)
+    multi_json (1.0.4)
+    multi_xml (0.4.1)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+    xml-simple (1.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 3.0.3)
+  httparty
+  jeweler (~> 1.6.4)
+  rdoc
+  rspec (~> 2.3.0)
+  xml-simple

data/README.rdoc

@@ -23,6 +23,7 @@ It supports methods which require {authentication}[http://www.last.fm/api/authen
 
 === Auth
 
+* {auth.getMobileSession}[http://www.lastfm.jp/api/show?service=266]
 * {auth.getToken}[http://www.lastfm.jp/api/show?service=265]
 * {auth.getSession}[http://www.lastfm.jp/api/show?service=125]
 
@@ -66,6 +67,7 @@ It supports methods which require {authentication}[http://www.last.fm/api/authen
 === Library
 
 * {library.getArtists}[http://www.lastfm.jp/api/show?service=322]
+* {library.getTracks}[http://www.last.fm/api/show/library.getTracks]
 
 == Installation
 
@@ -91,6 +93,8 @@ It supports methods which require {authentication}[http://www.last.fm/api/authen
 * {dbolson}[https://github.com/dbolson]
 * {webs}[https://github.com/webs]
 * {magnolia-fan}[https://github.com/magnolia-fan]
+* {garyadamshannon}[https://github.com/garyadamshannon]
+* {Garthex}[https://github.com/Garthex]
 
 == Note on Patches/Pull Requests
 

data/Rakefile

@@ -1,36 +1,35 @@
+# encoding: utf-8
+
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "lastfm"
-    gem.summary = %Q{A Ruby interface for Last.fm Web Services}
-    gem.description = %Q{A ruby interface for Last.fm web services version 2.0}
-    gem.email = "youpy@buycheapviagraonlinenow.com"
-    gem.homepage = "http://github.com/youpy/ruby-lastfm"
-    gem.authors = ["youpy"]
-    gem.add_development_dependency "rspec", ">= 2.0.0"
-    gem.add_dependency "httparty"
-    gem.add_dependency "xml-simple"
-    gem.add_dependency "activesupport", ">= 3.0.3"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  gem.name = "lastfm"
+  gem.summary = %Q{A Ruby interface for Last.fm Web Services}
+  gem.description = %Q{A ruby interface for Last.fm web services version 2.0}
+  gem.email = "youpy@buycheapviagraonlinenow.com"
+  gem.homepage = "http://github.com/youpy/ruby-lastfm"
+  gem.authors = ["youpy"]
 end
 
+require 'rspec/core'
 require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:core) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :core => :check_dependencies
-task :default => :core
+task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.read('VERSION')
 

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/lastfm.rb

@@ -23,7 +23,14 @@ class Lastfm
   attr_accessor :session
 
   class Error < StandardError; end
-  class ApiError < Error; end
+  class ApiError < Error
+    attr_reader :code
+
+    def initialize(message, code = nil)
+      super(message)
+      @code = code
+    end
+  end
 
   def initialize(api_key, api_secret)
     @api_key = api_key
@@ -76,7 +83,7 @@ class Lastfm
 
     response = Response.new(self.class.send(http_method, '/', (http_method == :post ? :body : :query) => params).body)
     unless response.success?
-      raise ApiError.new(response.message)
+      raise ApiError.new(response.message, response.error)
     end
 
     response

data/lib/lastfm/method_category/auth.rb

@@ -8,6 +8,10 @@ class Lastfm
       method_for_authentication :get_session, [:token], [] do |response|
         response.xml['session']
       end
+
+      method_for_authentication :get_mobile_session, [:username, :authToken], [] do |response|
+        response.xml['session']
+      end
     end
   end
 end

data/lib/lastfm/method_category/library.rb

@@ -2,7 +2,11 @@ class Lastfm
   module MethodCategory
     class Library < Base
       regular_method :get_artists, [:user], [[:limit, nil], [:page, nil]] do |response|
-        response.xml['artists']['artist']
+        Util.force_array(response.xml['artists']['artist'])
+      end
+
+      regular_method :get_tracks, [:user], [[:artist, nil], [:album, nil], [:page, nil], [:limit, nil]] do |response|
+        Util.force_array(response.xml['tracks']['track'])
       end
     end
   end

data/lib/lastfm/util.rb

@@ -1,5 +1,9 @@
 class Lastfm
   class Util
+    def self.force_array(array_or_something)
+      array_or_something.kind_of?(Array) ? array_or_something : [array_or_something]
+    end
+
     def self.build_options(args, mandatory, optional)
       options = {}
 

data/spec/fixtures/library_get_tracks.xml

@@ -0,0 +1,20 @@
+<lfm status="ok">
+  <tracks user="RJ" page="1" perPage="50" totalPages="20">
+  <track rank="1">
+    <name>Learning to Live</name>
+    <playcount>44</playcount>
+    <tagcount>0</tagcount>
+    <mbid></mbid>
+    <url>http://www.last.fm/music/Dream+Theater/_/Learning+to+Live</url>
+    <streamable fulltrack="0">1</streamable>
+    <artist>
+        <name>Dream Theater</name>
+        <mbid>28503ab7-8bf2-4666-a7bd-2644bfc7cb1d</mbid>
+        <url>http://www.last.fm/music/Dream+Theater</url>
+    </artist>
+    <image size="small">...</image>
+    <image size="medium">...</image>
+    <image size="large">...</image>
+  </track>
+</tracks>
+</lfm>

data/spec/lastfm_spec.rb

@@ -107,7 +107,9 @@ XML
 
       lambda {
         @lastfm.request('xxx.yyy', { :foo => 'bar' }, :post)
-      }.should raise_error(Lastfm::ApiError, 'Invalid API key - You must be granted a valid key by last.fm')
+      }.should raise_error(Lastfm::ApiError, 'Invalid API key - You must be granted a valid key by last.fm') {|error|
+        error.code.should == 10
+      }
     end
   end
 
@@ -145,6 +147,24 @@ XML
       session['name'].should eql('MyLastFMUsername')
       session['key'].should eql('zzzyyyxxx')
     end
+
+    it 'should get mobile session' do
+      @lastfm.should_receive(:request).
+        with('auth.getMobileSession', { :username => 'xxxyyyzzz', :authToken => 'xxxxAuthTokenxxxx' }, :get, true).
+        and_return(make_response(<<XML))
+<?xml version="1.0" encoding="utf-8"?>
+<lfm status="ok">
+	<session>
+		<name>MyLastFMUsername</name>
+		<key>zzzyyyxxx</key>
+		<subscriber>0</subscriber>
+	</session>
+</lfm>
+XML
+      session = @lastfm.auth.get_mobile_session('xxxyyyzzz', 'xxxxAuthTokenxxxx')
+      session['name'].should eql('MyLastFMUsername')
+      session['key'].should eql('zzzyyyxxx')
+    end
   end
 
   describe '#track' do
@@ -497,6 +517,21 @@ XML
       @lastfm.library.should be_an_instance_of(Lastfm::MethodCategory::Library)
     end
 
+    describe '#get_tracks' do
+      it 'should get the tracks\' info' do
+        @lastfm.should_receive(:request).with('library.getTracks', {
+            :user => 'test',
+            :artist => 'foo',
+            :album => 'bar',
+            :limit => nil,
+            :page => nil
+          }).and_return(make_response('library_get_tracks'))
+        tracks = @lastfm.library.get_tracks('test', 'foo', 'bar')
+        tracks[0]['name'].should eql('Learning to Live')
+        tracks.size.should == 1
+      end
+    end
+
     describe '#get_artists' do
       it 'should get the artists\' info' do
         @lastfm.should_receive(:request).with('library.getArtists', {

metadata

@@ -4,9 +4,10 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  segments_generated: true
+  version: 1.1.0
 platform: ruby
 authors: 
 - youpy
@@ -14,61 +15,93 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-11 00:00:00 +09:00
+date: 2012-01-23 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 0
         - 0
-        version: 2.0.0
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+        segments_generated: true
+        version: "0"
+  requirement: *id001
   name: httparty
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  requirement: *id002
   name: xml-simple
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 3
+        segments_generated: true
+        version: 3.0.3
+  requirement: *id003
+  name: activesupport
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 0
+        segments_generated: true
+        version: 2.3.0
+  requirement: *id004
+  name: rspec
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 6
+        - 4
+        segments_generated: true
+        version: 1.6.4
+  requirement: *id005
+  name: jeweler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 3
         - 0
-        - 3
-        version: 3.0.3
-  type: :runtime
-  version_requirements: *id004
+        segments_generated: true
+        version: "0"
+  requirement: *id006
+  name: rdoc
+  prerelease: false
+  type: :development
 description: A ruby interface for Last.fm web services version 2.0
 email: youpy@buycheapviagraonlinenow.com
 executables: []
@@ -81,6 +114,8 @@ extra_rdoc_files:
 files: 
 - .document
 - .rspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -102,6 +137,7 @@ files:
 - spec/fixtures/artist_get_info.xml
 - spec/fixtures/geo_get_events.xml
 - spec/fixtures/library_get_artists.xml
+- spec/fixtures/library_get_tracks.xml
 - spec/fixtures/ng.xml
 - spec/fixtures/ok.xml
 - spec/fixtures/track_get_correction.xml
@@ -135,6 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -142,6 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []