songkickr 0.1.0 → 0.1.1

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "jrmehle@gmail.com"
     gem.homepage = "http://github.com/jrmehle/songkickr"
     gem.authors = ["Jared Mehle"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_development_dependency "shoulda", ">= 2.11.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/songkickr/artist.rb

@@ -1,10 +1,13 @@
 module Songkickr
   class Artist
-    attr_accessor :href, :display_name
+    attr_accessor :href, :display_name, :id, :uri, :onTourUntil
     
     def initialize(artist_hash = {})
       @href         = artist_hash["href"]
       @display_name = artist_hash["displayName"]
+      @id			= artist_hash["id"]
+      @uri 			= artist_hash["uri"]
+      @onTourUntil	= artist_hash["onTourUntil"]
     end
   end
 end

data/lib/songkickr/artist_result.rb

@@ -0,0 +1,29 @@
+module Songkickr
+  class ArtistResult
+  	attr_accessor :page, :total_entries, :results
+
+  	def initialize(result_hash = {})
+  		results_page = result_hash["resultsPage"]
+
+  		if results_page
+  			@page 			= results_page["page"]
+  			@total_entries	= results_page["totalEntries"]
+  			@results 		= parse_results results_page["results"]
+  		end
+  	end
+
+  	protected
+
+  	def parse_results(results = {})
+  		artists = []
+  		if results.include?("artist")
+  			results["artist"].each do |artist|
+  				artists << Songkickr::Artist.new(artist)
+  			end
+  		end
+
+  		artists
+  	end
+
+  end
+end

data/lib/songkickr/remote.rb

@@ -28,10 +28,31 @@ module Songkickr
     #     location - see the Songkick website for instructions on how to use the location parameter
     
     def events(query = {})
-      result = self.class.get('/events.json', :query => query)
+      path = extract_path_from_query(query)
+      result = self.class.get("#{path}/events.json", :query => query)
       Songkickr::EventResult.new result
     end
-    
+ 
+    # Parameters - http://groups.google.com/group/songkick-api/browse_thread/thread/af15b9a6ad3c3513#
+    #   artist_id - Songkick artist_id, use artist_search to get it
+    #   min_date
+    #   max_date
+    #   per_page
+    #   page
+
+    def gigography (artist_id, query= {})
+      result = self.class.get("/artists/#{artist_id}/gigography.json",:query=>query)
+      Songkickr::EventResult.new result
+    end
+
+    # Parameters - http://www.songkick.com/developer/artist-search
+    #   full_text (full text of a search)
+    # returns artist
+
+    def artist_search(query={})
+        result = self.class.get("/search/artists.json?query=#{query[:artist_name]}", :query=>query)
+        Songkickr::ArtistResult.new result
+    end
     
     # Parameters - http://www.songkick.com/developer/events-for-user
     #
@@ -60,5 +81,12 @@ module Songkickr
       result = self.class.get("/events/#{event_id}/setlists.json")
       Songkickr::ConcertSetlistResult.new result
     end
+    
+    private
+    
+    def extract_path_from_query(query = {})
+      mbid = query.delete :mbid
+      "/artists/mbid:#{mbid}" if mbid
+    end
   end
 end

data/lib/songkickr.rb

@@ -13,6 +13,7 @@ require dir + '/songkickr/setlist'
 require dir + '/songkickr/event_result'
 require dir + '/songkickr/concert_setlist_result'
 require dir + '/songkickr/remote'
+require dir + '/songkickr/artist_result'
 
 class APIKeyNotSet < StandardError; 
   def to_s

data/songkickr.gemspec

@@ -1,70 +1,69 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{songkickr}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jared Mehle"]
-  s.date = %q{2010-05-03}
+  s.date = %q{2011-05-03}
   s.description = %q{A Ruby wrapper around the Songkick API. Visit www.songkick.com/developer for documentation on the Songkick API. }
   s.email = %q{jrmehle@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/songkickr.rb",
-     "lib/songkickr/artist.rb",
-     "lib/songkickr/concert_setlist_result.rb",
-     "lib/songkickr/event.rb",
-     "lib/songkickr/event_result.rb",
-     "lib/songkickr/location.rb",
-     "lib/songkickr/performance.rb",
-     "lib/songkickr/remote.rb",
-     "lib/songkickr/setlist.rb",
-     "lib/songkickr/setlist_item.rb",
-     "lib/songkickr/venue.rb",
-     "songkickr.gemspec",
-     "test/fixtures/events.json",
-     "test/fixtures/no_events.json",
-     "test/helper.rb",
-     "test/songkickr/test_artist.rb",
-     "test/songkickr/test_remote.rb",
-     "test/test_songkickr.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/songkickr.rb",
+    "lib/songkickr/artist.rb",
+    "lib/songkickr/artist_result.rb",
+    "lib/songkickr/concert_setlist_result.rb",
+    "lib/songkickr/event.rb",
+    "lib/songkickr/event_result.rb",
+    "lib/songkickr/location.rb",
+    "lib/songkickr/performance.rb",
+    "lib/songkickr/remote.rb",
+    "lib/songkickr/setlist.rb",
+    "lib/songkickr/setlist_item.rb",
+    "lib/songkickr/venue.rb",
+    "songkickr.gemspec",
+    "test.rb",
+    "test/fixtures/events.json",
+    "test/fixtures/no_events.json",
+    "test/helper.rb",
+    "test/songkickr/test_artist.rb",
+    "test/songkickr/test_remote.rb",
+    "test/test_songkickr.rb"
   ]
   s.homepage = %q{http://github.com/jrmehle/songkickr}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{A Ruby wrapper around the Songkick API.}
   s.test_files = [
     "test/helper.rb",
-     "test/songkickr/test_artist.rb",
-     "test/songkickr/test_remote.rb",
-     "test/test_songkickr.rb"
+    "test/songkickr/test_artist.rb",
+    "test/songkickr/test_remote.rb",
+    "test/test_songkickr.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 2.11.0"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 2.11.0"])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 2.11.0"])
   end
 end
 

data/test.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# This is a simple comand line test to make sure everything is working
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'songkickr'
+require 'httparty'
+
+ 	remote = Songkickr::Remote.new 'hFYxiInE4DBpH5KL'
+ 	@results = remote.artist_search(:artist_name => "Muse", :per_page=>'10' ).results
+ 	@results.each do |result|
+ 		print result.display_name + "\n"
+ 	end
+
+ 	print "\n"
+
+ 	@gigography_results = remote.gigography(@results[0].id, :per_page=>'50', :page=>'1', :min_date=>'2010-01-01').results
+ 	
+ 	@gigography_results.each do |gig|
+ 		print gig.display_name + "\n"
+ 	end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: songkickr
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jared Mehle
@@ -14,19 +15,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -05:00
-default_executable: 
+date: 2011-05-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 35
         segments: 
+        - 2
+        - 11
         - 0
-        version: "0"
+        version: 2.11.0
   type: :development
   version_requirements: *id001
 description: "A Ruby wrapper around the Songkick API. Visit www.songkick.com/developer for documentation on the Songkick API. "
@@ -40,13 +44,13 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - lib/songkickr.rb
 - lib/songkickr/artist.rb
+- lib/songkickr/artist_result.rb
 - lib/songkickr/concert_setlist_result.rb
 - lib/songkickr/event.rb
 - lib/songkickr/event_result.rb
@@ -57,39 +61,43 @@ files:
 - lib/songkickr/setlist_item.rb
 - lib/songkickr/venue.rb
 - songkickr.gemspec
+- test.rb
 - test/fixtures/events.json
 - test/fixtures/no_events.json
 - test/helper.rb
 - test/songkickr/test_artist.rb
 - test/songkickr/test_remote.rb
 - test/test_songkickr.rb
-has_rdoc: true
 homepage: http://github.com/jrmehle/songkickr
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A Ruby wrapper around the Songkick API.

data/.gitignore

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