songkickr 0.3.3 → 0.4.0

data/lib/songkickr/setlist.rb

@@ -18,30 +18,25 @@ module Songkickr
   #     "setlistItem": []
   #   }
   class Setlist
-    attr_accessor :event, :setlist_items, :artist, :playlist_uri, :display_name, :id
-    
+    attr_accessor :setlist_items, :artist, :playlist_uri, :display_name, :id
+
     # Takes the setlist hash and parses out an Event and Artist and an array of SetlistItems.
     def initialize(setlist_hash)
-      @event         = Songkickr::Event.new setlist_hash["event"]
       @setlist_items = parse_setlist_items setlist_hash["setlistItem"]
       @artist        = Songkickr::Artist.new setlist_hash["artist"]
       @playlist_uri  = setlist_hash["playlistUri"]
       @display_name  = setlist_hash["displayName"]
       @id            = setlist_hash["id"]
     end
-    
+
     protected
-      
+
       # Takes the array of setlist items and create SetLists
       def parse_setlist_items(setlist_item_array = nil)
-        setlist_items = []
-        if setlist_item_array
-          setlist_item_array.each do |item|
-            setlist_items << Songkickr::SetlistItem.new(item)
-          end
+        return [] unless setlist_item_array
+        setlist_item_array.inject([]) do |setlist_items, item|
+          setlist_items << Songkickr::SetlistItem.new(item)
         end
-        
-        setlist_items
       end
   end
 end

data/lib/songkickr/setlist_item.rb

@@ -9,7 +9,7 @@ module Songkickr
     
     # Takes the set list item hash and parses a boolean out for encore.
     def initialize(setlist_item_hash)
-      @encore = !!setlist_item_hash["encore"]
+      @encore = !setlist_item_hash["encore"].zero?
       @name   = setlist_item_hash["name"]
     end
   end

data/lib/songkickr/tracking.rb

@@ -0,0 +1,18 @@
+module Songkickr
+  # "tracking": {
+  #   "username": "username",
+  #   "id": "artist:231185",
+  #   "createdAt": "2010-04-17T17:27:45Z",
+  #   "attendance": "i_might_go"
+  # }
+  class Tracking
+    attr_accessor :attendance, :created_at, :id, :username
+
+    def initialize(tracking_hash)
+      @attendance = tracking_hash["attendance"] if tracking_hash.include? "attendance"
+      @id         = tracking_hash["id"]
+      @username   = tracking_hash["username"]
+      @created_at = tracking_hash["created_at"]
+    end
+  end
+end

data/lib/songkickr/tracking_result.rb

@@ -0,0 +1,24 @@
+module Songkickr
+  # A class to represent the result hash of a Tracking search.
+  class TrackingResult
+    attr_accessor :results
+
+    # Takes the result hash directly and parses out the page and total entries and finally passes off to the parse_results method to get the results.
+    def initialize(result_hash = {})
+      results_page = result_hash["resultsPage"]
+
+      if results_page
+        @results = parse_results results_page["results"]
+      end
+    end
+
+    protected
+
+      # Take the results hash directly and parse the tracking into Tracking objects.
+      #
+      # Returns an array of Trackings.
+      def parse_results(results = {})
+        Songkickr::Tracking.new(results["tracking"])
+      end
+  end
+end

data/lib/songkickr/venue.rb

@@ -1,12 +1,20 @@
 module Songkickr
   class Venue
-    attr_accessor :display_name, :id, :lat, :lng
-    
+    attr_accessor :capacity, :display_name, :description, :id, :lat, :lng, :phone, :street, :uri, :website, :zip
+
     def initialize(venue_hash)
+      @capacity     = venue_hash["capacity"]
       @display_name = venue_hash["displayName"]
+      @description  = venue_hash["description"]
       @id           = venue_hash["id"]
       @lat          = venue_hash["lat"]
       @lng          = venue_hash["lng"]
+      @metro_area   = Songkickr::MetroArea.new venue_hash["metroArea"] if venue_hash.include?("metroArea")
+      @phone        = venue_hash["phone"]
+      @street       = venue_hash["street"]
+      @uri          = venue_hash["uri"]
+      @website      = venue_hash["website"]
+      @zip          = venue_hash["zip"]
     end
   end
 end

data/lib/songkickr/venue_result.rb

@@ -0,0 +1,32 @@
+module Songkickr
+  # A class to represent the result hash of a Venue search.
+
+  # {"resultsPage":
+  #   {"results":
+  #     {"venue":
+  #       [{"id":17522,
+  #         "displayName":"O2 Academy Brixton",
+  #         "city":{"uri":"http://www.songkick.com/metro_areas/24426-uk-london",
+  #                 "displayName":"London","country":{"displayName":"UK"},"id":24426},
+  #         "metroArea":{"uri":"http://www.songkick.com/metro_areas/24426-uk-london",
+  #                      "displayName":"London","country":{"displayName":"UK"},"id":24426},
+  #         "uri":"http://www.songkick.com/venues/17522-o2-academy-brixton",
+  #         "street":"211 Stockwell Road", "zip":"SW9 9SL",
+  #         "lat":51.4651268, "lng":-0.115187,
+  #         "phone":"020 7771 3000",
+  #         "website":"http://www.brixton-academy.co.uk",
+  #         "capacity":4921,
+  #         "description": "Brixton Academy is an award winning music venue situated in the heart of Brixton, South London."
+  #       } ]
+  #     },"totalEntries":1,"perPage":50,"page":1,"status":"ok"}}
+
+  class VenueResult < ResultSet
+    # Takes the result hash directly and parses out the page and total entries and finally passes off to the parse_results method to get the results.
+    def initialize(result_hash = {})
+      @result_type       = "Venue"
+      @result_key_string = "venue"
+
+      super
+    end
+  end
+end

data/lib/songkickr/version.rb

@@ -1,3 +1,3 @@
 module Songkickr
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/lib/songkickr.rb

@@ -1,21 +1,28 @@
-require 'rubygems'
-gem 'httparty'
 require 'httparty'
 
-require "songkickr/version"
-dir = File.dirname(__FILE__)
-require dir + '/songkickr/performance'
-require dir + '/songkickr/artist'
-require dir + '/songkickr/location'
-require dir + '/songkickr/location_result'
-require dir + '/songkickr/venue'
-require dir + '/songkickr/event'
-require dir + '/songkickr/setlist_item'
-require dir + '/songkickr/setlist'
-require dir + '/songkickr/event_result'
-require dir + '/songkickr/concert_setlist_result'
-require dir + '/songkickr/remote'
-require dir + '/songkickr/artist_result'
+require 'songkickr/remote'
+
+require 'songkickr/performance'
+require 'songkickr/artist'
+require 'songkickr/location'
+require 'songkickr/venue'
+require 'songkickr/event'
+require 'songkickr/setlist_item'
+require 'songkickr/setlist'
+require 'songkickr/metro_area'
+require 'songkickr/tracking'
+require 'songkickr/calendar_entry'
+
+require 'songkickr/result_set'
+require 'songkickr/artist_result'
+require 'songkickr/calendar_result'
+require 'songkickr/concert_setlist_result'
+require 'songkickr/event_result'
+require 'songkickr/location_result'
+require 'songkickr/metro_area_result'
+require 'songkickr/tracking_result'
+require 'songkickr/venue_result'
+
 
 class APIKeyNotSet < StandardError;
   # Warns of missing API key
@@ -61,7 +68,7 @@ module Songkickr
   # Set the API key. In the event you need to set the API key after initializing the the remote.
   # === Parameters
   #
-  # * +api_key+ - A developer key from Songkick. Get an API key for your app from http://developer.songkick.com/
+  # * +api_key+ - A developer key from Songkick. Get an API key for your app from http://www.songkick.com/developer/
   def self.api_key=(api_key)
     @api_key = api_key
   end

data/songkickr.gemspec

@@ -4,59 +4,32 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'songkickr/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "songkickr"
-  gem.version       = Songkickr::VERSION
-  gem.authors       = ["Jared Mehle"]
-  gem.email         = ["jrmehle@gmail.com"]
+  gem.name        = "songkickr"
+  gem.version     = Songkickr::VERSION
+  gem.authors     = ["Jared Mehle"]
+  gem.email       = ["jrmehle@gmail.com"]
   gem.description = "A Ruby wrapper around the Songkick API. Visit www.songkick.com/developer for documentation on the Songkick API. "
-  gem.summary = "A Ruby wrapper around the Songkick API."
-  gem.homepage = "http://github.com/jrmehle/songkickr"
+  gem.summary     = "A Ruby wrapper around the Songkick API."
+  gem.homepage    = "http://github.com/jrmehle/songkickr"
+
+  gem.add_development_dependency 'shoulda',   ">= 2.11.0"
+  gem.add_development_dependency 'fakeweb',   ">= 1.3.0"
+  gem.add_development_dependency 'rdoc',      "~> 4.0.1"
+  gem.add_development_dependency 'crack',     ">= 0"
+  gem.add_development_dependency 'rake',      "~> 10.0.0"
+  gem.add_development_dependency 'test-unit', "~> 2.5.5"
+  gem.add_development_dependency 'vcr',       "~> 2.5.0"
+  gem.add_development_dependency 'pry'
+
+  gem.add_dependency 'httparty', '~> 0.8.3'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.rubygems_version = "1.8.25"
-  gem.required_rubygems_version = Gem::Requirement.new(">= 0") if gem.respond_to? :required_rubygems_version=
-  gem.date = "2013-02-16"
-  gem.executables = ["autospec", "convert_to_should_syntax", "guard", "htmldiff", "httparty", "ldiff", "rake", "rake2thor", "rg", "ri", "rspec", "thor"]
   gem.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
   ]
-
-  if gem.respond_to? :specification_version then
-    gem.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      gem.add_development_dependency(%q<shoulda>, [">= 2.11.0"])
-      gem.add_development_dependency(%q<fakeweb>, [">= 1.3.0"])
-      gem.add_development_dependency(%q<redgreen>, [">= 1.2.2"])
-      gem.add_development_dependency(%q<crack>, [">= 0"])
-      gem.add_development_dependency(%q<httparty>, [">= 0"])
-      gem.add_development_dependency(%q<test-unit>, [">= 0"])
-      gem.add_development_dependency(%q<rake>, [">= 0"])
-      gem.add_development_dependency(%q<vcr>, [">= 0"])
-    else
-      gem.add_dependency(%q<shoulda>, [">= 2.11.0"])
-      gem.add_dependency(%q<fakeweb>, [">= 1.3.0"])
-      gem.add_dependency(%q<redgreen>, [">= 1.2.2"])
-      gem.add_dependency(%q<crack>, [">= 0"])
-      gem.add_dependency(%q<httparty>, [">= 0"])
-      gem.add_dependency(%q<test-unit>, [">= 0"])
-      gem.add_dependency(%q<rake>, [">= 0"])
-      gem.add_dependency(%q<vcr>, [">= 0"])
-    end
-  else
-    gem.add_dependency(%q<crack>, [">= 0"])
-    gem.add_dependency(%q<httparty>, [">= 0"])
-    gem.add_dependency(%q<test-unit>, [">= 0"])
-    gem.add_dependency(%q<rake>, [">= 0"])
-    gem.add_dependency(%q<jeweler>, [">= 0"])
-    gem.add_dependency(%q<vcr>, [">= 0"])
-    gem.add_dependency(%q<shoulda>, [">= 2.11.0"])
-    gem.add_dependency(%q<fakeweb>, [">= 1.3.0"])
-    gem.add_dependency(%q<redgreen>, [">= 1.2.2"])
-  end
 end