lastfm 0.0.1 → 0.1.0

data/.rspec

@@ -0,0 +1,2 @@
+-c
+-fs

data/README.rdoc

@@ -38,6 +38,10 @@ It supports methods which require {authentication}[http://www.last.fm/api/authen
 * track.search
 * track.share
 
+=== Artist
+
+* artist.getEvents
+
 == Installation
 
 === Archive Installation

data/Rakefile

@@ -10,8 +10,10 @@ begin
     gem.email = "youpy@buycheapviagraonlinenow.com"
     gem.homepage = "http://github.com/youpy/ruby-lastfm"
     gem.authors = ["youpy"]
-    gem.add_development_dependency "rspec"
+    gem.add_development_dependency "rspec", ">= 2.0.0"
     gem.add_dependency "httparty"
+    gem.add_dependency "xml-simple"
+    gem.add_dependency "activesupport"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -19,21 +21,14 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+require 'rspec/core/rake_task'
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:core) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
 end
 
-task :spec => :check_dependencies
-
-task :default => :spec
+task :core => :check_dependencies
+task :default => :core
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/lastfm.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{lastfm}
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["youpy"]
-  s.date = %q{2010-01-11}
+  s.date = %q{2010-11-18}
   s.description = %q{A ruby interface for Last.fm web services version 2.0}
   s.email = %q{youpy@buycheapviagraonlinenow.com}
   s.extra_rdoc_files = [
@@ -19,16 +19,29 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     ".rspec",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
      "lastfm.gemspec",
      "lib/lastfm.rb",
-     "lib/lastfm/method_category.rb",
+     "lib/lastfm/method_category/artist.rb",
      "lib/lastfm/method_category/auth.rb",
+     "lib/lastfm/method_category/base.rb",
      "lib/lastfm/method_category/track.rb",
      "lib/lastfm/response.rb",
+     "lib/lastfm/util.rb",
+     "spec/fixtures/artist_get_events.xml",
+     "spec/fixtures/ng.xml",
+     "spec/fixtures/ok.xml",
+     "spec/fixtures/track_get_info.xml",
+     "spec/fixtures/track_get_info_force_array.xml",
+     "spec/fixtures/track_get_similar.xml",
+     "spec/fixtures/track_get_tags.xml",
+     "spec/fixtures/track_get_top_fans.xml",
+     "spec/fixtures/track_get_top_tags.xml",
+     "spec/fixtures/track_search.xml",
      "spec/lastfm_spec.rb",
      "spec/method_category_spec.rb",
      "spec/response_spec.rb",
@@ -37,7 +50,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/youpy/ruby-lastfm}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A Ruby interface for Last.fm Web Services}
   s.test_files = [
     "spec/lastfm_spec.rb",
@@ -51,14 +64,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
+      s.add_runtime_dependency(%q<xml-simple>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_dependency(%q<httparty>, [">= 0"])
+      s.add_dependency(%q<xml-simple>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0"])
     s.add_dependency(%q<httparty>, [">= 0"])
+    s.add_dependency(%q<xml-simple>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
   end
 end
+

data/lib/lastfm.rb

@@ -1,12 +1,14 @@
+require 'lastfm/util'
 require 'lastfm/response'
-require 'lastfm/method_category'
-
+require 'lastfm/method_category/base'
 require 'lastfm/method_category/auth'
 require 'lastfm/method_category/track'
+require 'lastfm/method_category/artist'
 
 require 'rubygems'
 require 'digest/md5'
 require 'httparty'
+require 'active_support'
 
 class Lastfm
   API_ROOT = 'http://ws.audioscrobbler.com/2.0'
@@ -25,11 +27,15 @@ class Lastfm
   end
 
   def auth
-    Auth.new(self)
+    MethodCategory::Auth.new(self)
   end
 
   def track
-    Track.new(self)
+    MethodCategory::Track.new(self)
+  end
+
+  def artist
+    MethodCategory::Artist.new(self)
   end
 
   def request(method, params = {}, http_method = :get, with_signature = false, with_session = false)
@@ -41,7 +47,6 @@ class Lastfm
 
     params.update(:sk => @session) if with_session
     params.update(:api_sig => Digest::MD5.hexdigest(build_method_signature(params))) if with_signature
-    params.update(:format => 'json')
 
     response = Response.new(self.class.send(http_method, '/', (http_method == :post ? :body : :query) => params).body)
     unless response.success?

data/lib/lastfm/method_category/artist.rb

@@ -0,0 +1,9 @@
+class Lastfm
+  module MethodCategory
+    class Artist < Base
+      regular_method :get_events, [:artist], [] do |response|
+        response.xml['events']['event']
+      end
+    end
+  end
+end

data/lib/lastfm/method_category/auth.rb

@@ -1,11 +1,13 @@
 class Lastfm
-  class Auth < MethodCategory
-    def get_token
-      request_for_authentication('getToken')['token']
-    end
+  module MethodCategory
+    class Auth < Base
+      method_for_authentication :get_token, [], [] do |response|
+        response.xml['token']
+      end
 
-    def get_session(token)
-      request_for_authentication('getSession', { :token => token })['session']['key']
+      method_for_authentication :get_session, [:token], [] do |response|
+        response.xml['session']['key']
+      end
     end
   end
 end

data/lib/lastfm/method_category/base.rb

@@ -0,0 +1,58 @@
+class Lastfm
+  module MethodCategory
+    class Base
+      class << self
+        def write_method(id, mandatory, optional = [])
+          __define_method(:write_request, id, mandatory, optional) do |response|
+            response.success?
+          end
+        end
+
+        def method_with_authentication(id, mandatory, optional = [], &block)
+          __define_method(:request_with_authentication, id, mandatory, optional, &block)
+        end
+
+        def method_for_authentication(id, mandatory, optional = [], &block)
+          __define_method(:request_for_authentication, id, mandatory, optional, &block)
+        end
+
+        def regular_method(id, mandatory, optional = [], &block)
+          __define_method(:request, id, mandatory, optional, &block)
+        end
+
+        def __define_method(method, id, mandatory, optional, &block)
+          unless block
+            block = Proc.new { |response| response.xml }
+          end
+
+          define_method(id) do |*args|
+            block.call(send(method, id.to_s.camelize(:lower), Lastfm::Util.build_options(args, mandatory, optional)))
+          end
+        end
+      end
+
+      def initialize(lastfm)
+        @lastfm = lastfm
+      end
+
+      def write_request(method, params = {})
+        request(method, params, :post, true, true)
+      end
+
+      def request_with_authentication(method, params = {})
+        request(method, params, :get, true, true)
+      end
+
+      def request_for_authentication(method, params = {})
+        request(method, params, :get, true)
+      end
+
+      def request(*args)
+        method, *rest = args
+        method = [self.class.name.split(/::/).last.downcase, method].join('.')
+
+        @lastfm.request(method, *rest)
+      end
+    end
+  end
+end

data/lib/lastfm/method_category/track.rb

@@ -1,87 +1,29 @@
 class Lastfm
-  class Track < MethodCategory
-    def add_tags(artist, track, tags)
-      write_request('addTags', {
-          :artist => artist,
-          :track => track,
-          :tags => tags
-        })
-    end
-
-    def ban(artist, track)
-      write_request('ban', {
-          :artist => artist,
-          :track => track,
-        })
-    end
-
-    def get_info(artist, track, username = nil)
-      request('getInfo', {
-          :artist => artist,
-          :track => track,
-          :username => username
-        })
-    end
-
-    def get_similar(artist, track)
-      request('getSimilar', {
-          :artist => artist,
-          :track => track,
-        })
-    end
-
-    def get_tags(artist, track)
-      request_with_authentication('getTags', {
-          :artist => artist,
-          :track => track,
-        })
-    end
-
-    def get_top_fans(artist, track)
-      request('getTopFans', {
-          :artist => artist,
-          :track => track,
-        })
-    end
-
-    def get_top_tags(artist, track)
-      request('getTopTags', {
-          :artist => artist,
-          :track => track,
-        })
-    end
-
-    def love(artist, track)
-      write_request('love', {
-          :artist => artist,
-          :track => track,
-        })
-    end
-
-    def remove_tag(artist, track, tag)
-      write_request('removeTag', {
-          :artist => artist,
-          :track => track,
-          :tag => tag
-        })
-    end
-
-    def search(artist, track, limit = nil, page = nil)
-      request('search', {
-          :artist => artist,
-          :track => track,
-          :limit => limit,
-          :page => page
-        })
-    end
-
-    def share(artist, track, recipient, message = nil)
-      write_request('share', {
-          :artist => artist,
-          :track => track,
-          :recipient => recipient,
-          :message => message
-        })
+  module MethodCategory
+    class Track < Base
+      write_method :add_tags, [:artist, :track, :tags]
+      write_method :remove_tag, [:artist, :track, :tag]
+      write_method :ban, [:artist, :track]
+      write_method :love, [:artist, :track]
+      write_method :share, [:artist, :track, :recipient], [[:message, nil]]
+
+      regular_method :get_info, [:artist, :track], [[:username, nil]] do |response|
+        response.xml['track']
+      end
+      regular_method :get_top_fans, [:artist, :track], [] do |response|
+        response.xml['topfans']['user']
+      end
+      regular_method :get_top_tags, [:artist, :track], [] do |response|
+        response.xml['toptags']['tag']
+      end
+      regular_method :get_similar, [:artist, :track], [] do |response|
+        response.xml['similartracks']['track'][1 .. -1]
+      end
+      regular_method :search, [:track], [[:artist, nil], [:limit, nil], [:page, nil]]
+
+      method_with_authentication :get_tags, [:artist, :track], [] do |response|
+        response.xml['tags']['tag']
+      end
     end
   end
 end

data/lib/lastfm/response.rb

@@ -1,34 +1,24 @@
 require 'rubygems'
-require 'json'
+require 'xmlsimple'
 
 class Lastfm
   class Response
-    def initialize(body)
-      # API returns XML response when no child node?
-      if body == '<?xml version="1.0" encoding="utf-8"?>
-<lfm status="ok">
-</lfm>
-'
-        @parsed_body = {}
-      else
-        @parsed_body = JSON.parse(body)
-      end
-    end
+    attr_reader :xml
 
-    def [](key)
-      @parsed_body[key]
+    def initialize(body)
+      @xml = XmlSimple.xml_in(body, 'ForceArray' => ['image', 'tag', 'user', 'event'])
     end
 
     def success?
-      !self['error']
+      @xml['status'] == 'ok'
     end
 
     def message
-      self['message']
+      @xml['error']['content']
     end
 
     def error
-      self['error']
+      @xml['error']['code'].to_i
     end
   end
 end

data/lib/lastfm/util.rb

@@ -0,0 +1,18 @@
+class Lastfm
+  class Util
+    def self.build_options(args, mandatory, optional)
+      options = {}
+
+      mandatory.each_with_index do |name, index|
+        raise ArgumentError.new('%s is required' % name) unless args[index]
+        options[name] = args[index]
+      end
+
+      optional.each_with_index do |name, index|
+        options[name[0]] = args[index + mandatory.size] || name[1]
+      end
+
+      options
+    end
+  end
+end