meta-spotify 0.1.6 → 0.2.0

data/.gitignore

@@ -0,0 +1,22 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+Gemfile.lock
+
+## PROJECT::SPECIFIC

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/HISTORY

@@ -1,13 +1,27 @@
+=== 0.2.0 / 2012-08-31
+
+* 1 major update
+
+  * Updated to use Httparty > 0.8
+
+Also removed Jeweler and dependency on Crack.
+
+=== 0.1.6 / 2012-03-12
+
+* 1 bug fix
+
+  * restricted Httparty to < 0.8
+
 === 0.1.5 / 2009-12-19
 
 * 1 minor enhancement
- 
+
   * Added access to musicbrainz and allmusic ids for tracks
 
 === 0.1.4 / 2009-11-19
 
 * 2 minor enhancements
- 
+
   * Now stores the URI of the original object looked up
   * Tests for an album lookup with track details
 
@@ -16,11 +30,11 @@
 * 1 minor enhancement
 
   * Added popularity to artists and albums when they are a result of a search
-  
+
 * 1 bug fix
 
   * Search results with only one result were failing
-  
+
 === 0.1.2 / 2009-11-15
 
 * 2 minor enhancements

data/README.markdown

@@ -19,6 +19,7 @@ To look up an artist, album or track, simply call:
     MetaSpotify::Artist.lookup(spotify_uri)
     MetaSpotify::Album.lookup(spotify_uri)
 or
+
     MetaSpotify::Track.lookup(spotify_uri)
 
 e.g.

data/Rakefile

@@ -1,55 +1,11 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "meta-spotify"
-    gem.summary = %Q{A ruby wrapper for the Spotify Metadata API}
-    gem.email = "philnash@gmail.com"
-    gem.homepage = "http://github.com/philnash/meta-spotify"
-    gem.authors = ["Phil Nash"]
-    gem.add_dependency 'httparty', [">= 0.4.5", "< 0.8"]
-    gem.add_dependency 'crack', ">= 0.1.4"
-    gem.add_development_dependency "shoulda", ">= 2.10.2"
-    gem.add_development_dependency "fakeweb", ">= 1.2.4"
-    # 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"
-end
-
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 require 'rake/testtask'
+
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "meta-spotify #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/meta-spotify.rb

@@ -3,15 +3,15 @@ $:.unshift File.dirname(__FILE__)
 require 'httparty'
 
 module MetaSpotify
-  
+
   API_VERSION = '1'
-  
+
   class Base
     include HTTParty
     base_uri 'http://ws.spotify.com'
-    
+
     attr_reader :name, :uri, :popularity
-    
+
     def self.search(string, opts={})
       item_name = self.name.downcase.gsub(/^.*::/,'')
       query = {:q => string}
@@ -31,16 +31,16 @@ module MetaSpotify
       end
       return { (item_name+'s').to_sym => items,
                :query => {
-                 :start_page => result["opensearch:Query"]["startPage"].to_i,
-                 :role => result["opensearch:Query"]["role"],
-                 :search_terms => result["opensearch:Query"]["searchTerms"]
+                 :start_page => result["Query"]["startPage"].to_i,
+                 :role => result["Query"]["role"],
+                 :search_terms => result["Query"]["searchTerms"]
                },
-               :items_per_page => result["opensearch:itemsPerPage"].to_i,
-               :start_index => result["opensearch:startIndex"].to_i,
-               :total_results => result["opensearch:totalResults"].to_i
+               :items_per_page => result["itemsPerPage"].to_i,
+               :start_index => result["startIndex"].to_i,
+               :total_results => result["totalResults"].to_i
               }
     end
-    
+
     def self.lookup(uri, opts={})
       uri = uri.strip
       raise URIError.new("Spotify URI not in the correct syntax") unless self::URI_REGEX.match(uri)
@@ -55,14 +55,14 @@ module MetaSpotify
           return Artist.new(v)
         when "album"
           return Album.new(v)
-        when "track"          
+        when "track"
           return Track.new(v)
         end
       end
     end
-    
+
     private
-    
+
     def self.raise_errors(response)
       case response.code
       when 400
@@ -79,12 +79,12 @@ module MetaSpotify
         raise ServerError.new('503 - The API is temporarily unavailable')
       end
     end
-    
+
   end
-  
+
   class MetaSpotifyError < StandardError
     attr_reader :data
-    
+
     def initialize(data)
       @data = data
       super
@@ -99,4 +99,5 @@ end
 
 require 'meta-spotify/artist'
 require 'meta-spotify/track'
-require 'meta-spotify/album'
+require 'meta-spotify/album'
+require 'meta-spotify/version'

data/lib/meta-spotify/album.rb

@@ -31,15 +31,15 @@ module MetaSpotify
       if hash['id'].is_a? Array
         
         hash['id'].each do |id|
-          case id.attributes['type']
+          case id['type']
             when 'upc' then 
-              @upc = id
+              @upc = id['__content__']
             when 'mbid' then
-              @musicbrainz_id = id
-              @musicbrainz_uri = id.attributes['href']
+              @musicbrainz_id = id['__content__']
+              @musicbrainz_uri = id['href']
             when 'amgid' then 
-              @allmusic_id = id
-              @allmusic_uri = id.attributes['href']
+              @allmusic_id = id['__content__']
+              @allmusic_uri = id['href']
           end
         end
       end
@@ -59,4 +59,4 @@ module MetaSpotify
       !is_available_in?(territory)
     end
   end
-end
+end

data/lib/meta-spotify/track.rb

@@ -25,16 +25,16 @@ module MetaSpotify
       if hash['id'].is_a? Array
         
         hash['id'].each do |id|
-          case id.attributes['type']
+          case id['type']
             when 'mbid' then
-              @musicbrainz_id = id
-              @musicbrainz_uri = id.attributes['href']
+              @musicbrainz_id = id['__content__']
+              @musicbrainz_uri = id['href']
             when 'amgid' then 
               @allmusic_id = id
-              @allmusic_uri = id.attributes['href']
+              @allmusic_uri = id['href']
           end
         end
       end
     end
   end
-end
+end

data/lib/meta-spotify/version.rb

@@ -0,0 +1,3 @@
+module MetaSpotify
+  VERSION = "0.2.0"
+end

data/meta-spotify.gemspec

@@ -1,81 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/meta-spotify/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = %q{meta-spotify}
-  s.version = "0.1.5"
+Gem::Specification.new do |gem|
+  gem.name          = "meta-spotify"
+  gem.authors       = ["Phil Nash"]
+  gem.email         = ["philnash@gmail.com"]
+  gem.description   = %q{A ruby wrapper for the Spotify Metadata API.
+                         See https://developer.spotify.com/technologies/web-api/
+                         for API documentation.}
+  gem.summary       = %q{A ruby wrapper for the Spotify Metadata API}
+  gem.homepage      = "http://github.com/philnash/meta-spotify"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Phil Nash"]
-  s.date = %q{2009-12-19}
-  s.email = %q{philnash@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.markdown"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "HISTORY",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "lib/meta-spotify.rb",
-     "lib/meta-spotify/album.rb",
-     "lib/meta-spotify/artist.rb",
-     "lib/meta-spotify/track.rb",
-     "meta-spotify.gemspec",
-     "test/fixtures/album.xml",
-     "test/fixtures/album_search.xml",
-     "test/fixtures/album_with_trackdetail.xml",
-     "test/fixtures/artist.xml",
-     "test/fixtures/artist_search.xml",
-     "test/fixtures/artist_search_one_result.xml",
-     "test/fixtures/artist_with_albumdetail.xml",
-     "test/fixtures/track.xml",
-     "test/fixtures/track_search.xml",
-     "test/fixtures/track_search_page_2.xml",
-     "test/helper.rb",
-     "test/test_album.rb",
-     "test/test_artist.rb",
-     "test/test_track.rb"
-  ]
-  s.homepage = %q{http://github.com/philnash/meta-spotify}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{meta-spotify}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{A ruby wrapper for the Spotify Metadata API}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_album.rb",
-     "test/test_artist.rb",
-     "test/test_track.rb"
-  ]
+  gem.files         = `git ls-files`.split($\)
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+  gem.version       = MetaSpotify::VERSION
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  gem.add_dependency 'httparty', '> 0.8'
+
+  gem.add_development_dependency 'shoulda', '>= 2.10.2'
+  gem.add_development_dependency 'fakeweb', '>= 1.2.4'
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0.4.5"])
-      s.add_runtime_dependency(%q<crack>, [">= 0.1.4"])
-      s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_development_dependency(%q<fakeweb>, [">= 1.2.4"])
-    else
-      s.add_dependency(%q<httparty>, [">= 0.4.5"])
-      s.add_dependency(%q<crack>, [">= 0.1.4"])
-      s.add_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_dependency(%q<fakeweb>, [">= 1.2.4"])
-    end
-  else
-    s.add_dependency(%q<httparty>, [">= 0.4.5"])
-    s.add_dependency(%q<crack>, [">= 0.1.4"])
-    s.add_dependency(%q<shoulda>, [">= 2.10.2"])
-    s.add_dependency(%q<fakeweb>, [">= 1.2.4"])
-  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meta-spotify
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,36 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2152533500 !ruby/object:Gem::Requirement
+  requirement: &70293660427780 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *2152533500
-- !ruby/object:Gem::Dependency
-  name: crack
-  requirement: &2152532300 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *2152532300
+  version_requirements: *70293660427780
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2152531620 !ruby/object:Gem::Requirement
+  requirement: &70293660427280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +32,10 @@ dependencies:
         version: 2.10.2
   type: :development
   prerelease: false
-  version_requirements: *2152531620
+  version_requirements: *70293660427280
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2152530980 !ruby/object:Gem::Requirement
+  requirement: &70293660426760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,25 +43,27 @@ dependencies:
         version: 1.2.4
   type: :development
   prerelease: false
-  version_requirements: *2152530980
-description: 
-email: philnash@gmail.com
+  version_requirements: *70293660426760
+description: ! "A ruby wrapper for the Spotify Metadata API.\n                         See
+  https://developer.spotify.com/technologies/web-api/\n                         for
+  API documentation."
+email:
+- philnash@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.markdown
+extra_rdoc_files: []
 files:
-- .document
+- .gitignore
+- Gemfile
 - HISTORY
 - LICENSE
 - README.markdown
 - Rakefile
-- VERSION
 - lib/meta-spotify.rb
 - lib/meta-spotify/album.rb
 - lib/meta-spotify/artist.rb
 - lib/meta-spotify/track.rb
+- lib/meta-spotify/version.rb
 - meta-spotify.gemspec
 - test/fixtures/album.xml
 - test/fixtures/album_search.xml
@@ -111,8 +99,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A ruby wrapper for the Spotify Metadata API
-test_files: []
+test_files:
+- test/fixtures/album.xml
+- test/fixtures/album_search.xml
+- test/fixtures/album_with_trackdetail.xml
+- test/fixtures/artist.xml
+- test/fixtures/artist_search.xml
+- test/fixtures/artist_search_one_result.xml
+- test/fixtures/artist_with_albumdetail.xml
+- test/fixtures/track.xml
+- test/fixtures/track_search.xml
+- test/fixtures/track_search_page_2.xml
+- test/helper.rb
+- test/test_album.rb
+- test/test_artist.rb
+- test/test_track.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/VERSION

@@ -1 +0,0 @@
-0.1.6