songkicky 0.0.1 → 0.1.1

data/Rakefile

@@ -11,6 +11,8 @@ begin
     gem.homepage = "http://github.com/saleandro/songkicky"
     gem.authors = ["Sabrina Leandro"]
     gem.add_development_dependency "json", ">= 0"
+    gem.files = [".document",  ".gitignore","LICENSE", "Rakefile", "VERSION",'lib/**/*.rb']
+
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.1

data/lib/artist.rb

@@ -4,10 +4,22 @@ module Songkicky
   class Artist
     include JsonApi
 
+    attr_accessor :name, :mbid
+
     class << self
       def find_by_mbid(mbid)
+        raise Error.new("MusicBrainz id is blank") if mbid.nil? || mbid.strip == ''
+
         Artist.new(mbid)
       end
+
+      def find_by_name(name)
+        raise Error.new("Name is blank") if name.nil? || name.strip == ''
+
+        a = Artist.new(nil)
+        a.name = name
+        a
+      end
     end
 
     def initialize(mbid)

data/lib/event.rb

@@ -7,16 +7,33 @@ module Songkicky
     attr_accessor :id,
                   :name,
                   :date,
+                  :popularity,
+                  :venue,
                   :lat, :lng,
-                  :metro_area
+                  :metro_area,
+                  :headliners,
+                  :festival,
+                  :type
 
     def initialize(hash)
       @id   = hash['id']
+      @type = hash['type']
+
+      @festival = Festival.new(hash['series']) if @type.downcase == 'festival'
+
       @name = hash['displayName']
+
+      @popularity = hash['popularity']
+
       @date = Date.strptime(hash['start']['date'], '%Y-%m-%d')
+
       @lat  = hash['location']['lat']
       @lng  = hash['location']['lng']
+      @venue = Venue.new(hash['venue'])
       @metro_area = MetroArea.new(hash['venue']['metroArea'])
+
+      headlines = hash['performance'].select {|p| p['billing'] == 'headline'}
+      @headliners = headlines.map {|p| Artist.find_by_name(p['artist']['displayName'])}
     end
   end
 end

data/lib/festival.rb

@@ -0,0 +1,9 @@
+module Songkicky
+  class Festival
+    attr_accessor :name
+
+    def initialize(hash)
+      @name = hash['displayName']
+    end
+  end
+end

data/lib/json_api.rb

@@ -34,7 +34,7 @@ module Songkicky
     rescue OpenURI::HTTPError => e
       case e.message
         when /403/
-          raise "Are you sure you set your Songkicky.apikey correctly? It's set to: '#{Songkicky.apikey}'"
+          raise Songkicky::Error.new("Are you sure you set your Songkicky.apikey correctly? It's set to: '#{Songkicky.apikey}'")
         else
           raise e
       end

data/lib/songkicky.rb

@@ -3,11 +3,16 @@ $:.unshift(File.dirname(__FILE__))
 require 'artist'
 require 'event'
 require 'metro_area'
+require 'user'
+require 'venue'
+require 'festival'
 
 module Songkicky
   class << self
     attr_accessor :apikey
   end
+
+  class Error < StandardError; end
 end
 
 

data/lib/user.rb

@@ -0,0 +1,26 @@
+require 'json_api'
+
+module Songkicky
+  class User
+    include JsonApi
+
+    class << self
+      def find_by_username(username)
+        raise Error.new("Username is blank") if username.nil? || username.strip == ''
+        User.new(username)
+      end
+    end
+
+    def initialize(username)
+      @username = username
+      @past_events = nil
+    end
+
+    def past_events
+      return @past_events if @past_events
+
+      events_hash = all("users/#{@username}/gigography.json", 'event')
+      @past_events = events_hash.map {|hash| Event.new(hash) }
+    end
+  end
+end

data/lib/venue.rb

@@ -0,0 +1,10 @@
+module Songkicky
+  class Venue
+
+    attr_accessor :name
+
+    def initialize(hash)
+      @name = hash['displayName']
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: songkicky
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 25
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Sabrina Leandro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 +01:00
+date: 2010-09-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,15 +45,17 @@ files:
 - .document
 - .gitignore
 - LICENSE
-- README
 - Rakefile
 - VERSION
 - lib/artist.rb
 - lib/event.rb
+- lib/festival.rb
 - lib/json_api.rb
 - lib/metro_area.rb
 - lib/songkicky.rb
-- songkicky.gemspec
+- lib/user.rb
+- lib/venue.rb
+- README
 has_rdoc: true
 homepage: http://github.com/saleandro/songkicky
 licenses: []

data/songkicky.gemspec

@@ -1,52 +0,0 @@
-# Generated by jeweler
-# 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{songkicky}
-  s.version = "0.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Sabrina Leandro"]
-  s.date = %q{2010-08-31}
-  s.description = %q{Very simple Ruby wrapper for Songkick's API. (http://developer.songkick.com/)}
-  s.email = %q{saleandro@yahoo.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "lib/artist.rb",
-     "lib/event.rb",
-     "lib/json_api.rb",
-     "lib/metro_area.rb",
-     "lib/songkicky.rb",
-     "songkicky.gemspec"
-  ]
-  s.homepage = %q{http://github.com/saleandro/songkicky}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Wrapper for Songkick's API.}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<json>, [">= 0"])
-    else
-      s.add_dependency(%q<json>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<json>, [">= 0"])
-  end
-end
-