lastfm 0.0.1 → 0.1.0

data/spec/response_spec.rb

@@ -1,36 +1,35 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Lastfm::Response" do
+  before do
+    @ok = open(fixture('ok.xml')).read
+    @ng = open(fixture('ng.xml')).read
+  end
+
   describe '.new' do
     it 'should instantiate' do
-      Lastfm::Response.new('{ "foo": "bar" }').should be_an_instance_of(Lastfm::Response)
+      Lastfm::Response.new(@ok).should be_an_instance_of(Lastfm::Response)
     end
   end
 
   describe 'success' do
     before do
-      @response = Lastfm::Response.new('{ "foo": "bar" }')
+      @response = Lastfm::Response.new(@ok)
     end
 
     it 'should be success' do
       @response.should be_success
     end
 
-    it 'should parse response body as json' do
-      @response['foo'].should eql('bar')
+    it 'should parse response body as xml' do
+      xml = @response.xml
+      xml['similartracks']['track'].size.should eql(7)
     end
-
-    it 'should ignore unexpected xml response' do
-       Lastfm::Response.new('<?xml version="1.0" encoding="utf-8"?>
-<lfm status="ok">
-</lfm>
-').should be_success
-     end
   end
 
   describe 'failure' do
     before do
-      @response = Lastfm::Response.new('{"message": "Invalid Method - No method with that name in this package", "error": 3}')
+      @response = Lastfm::Response.new(@ng)
     end
 
     it 'should not be success' do
@@ -38,11 +37,11 @@ describe "Lastfm::Response" do
     end
 
     it 'should have message' do
-      @response.message.should eql('Invalid Method - No method with that name in this package')
+      @response.message.should eql('Invalid API key - You must be granted a valid key by last.fm')
     end
 
     it 'should have error number' do
-      @response.error.should eql(3)
+      @response.error.should eql(10)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,15 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'lastfm'
-require 'spec'
-require 'spec/autorun'
 
-Spec::Runner.configure do |config|
-  
+RSpec.configure do |config|
+  def fixture(filename)
+    File.dirname(__FILE__) + '/fixtures/' + filename
+  end
+
+  def make_response(xml_filename_or_string)
+    if xml_filename_or_string !~ /</
+      xml_filename_or_string = open(fixture(xml_filename_or_string + '.xml')).read
+    end
+
+    Lastfm::Response.new(xml_filename_or_string)
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: lastfm
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - youpy
@@ -9,29 +14,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 +09:00
+date: 2010-11-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  name: xml-simple
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: A ruby interface for Last.fm web services version 2.0
 email: youpy@buycheapviagraonlinenow.com
 executables: []
@@ -44,16 +79,29 @@ extra_rdoc_files:
 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
@@ -71,18 +119,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Ruby interface for Last.fm Web Services

data/lib/lastfm/method_category.rb

@@ -1,26 +0,0 @@
-class Lastfm
-  class MethodCategory
-    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