songkickr 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/songkickr/remote.rb

@@ -32,6 +32,16 @@ module Songkickr
       result = self.class.get("#{path}/events.json", :query => query)
       Songkickr::EventResult.new result
     end
+    
+    
+    # Getting detailed information of a single event
+    # http://www.songkick.com/developer/upcoming-events
+    
+    def event(event_id)
+      result = self.class.get("/events/#{event_id}.json")
+      # and now for some dirrty hack
+      Songkickr::Event.new result["resultsPage"]["results"]["event"]
+    end
  
     # Parameters - http://groups.google.com/group/songkick-api/browse_thread/thread/af15b9a6ad3c3513#
     #   artist_id - Songkick artist_id, use artist_search to get it

data/songkickr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{songkickr}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jared Mehle"]
-  s.date = %q{2011-05-10}
+  s.date = %q{2011-05-11}
   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 = [
@@ -36,10 +36,13 @@ Gem::Specification.new do |s|
     "lib/songkickr/venue.rb",
     "songkickr.gemspec",
     "test.rb",
+    "test/fixtures/event_7391451.json",
     "test/fixtures/events.json",
+    "test/fixtures/invalid_api_key.json",
     "test/fixtures/no_events.json",
     "test/helper.rb",
     "test/songkickr/test_artist.rb",
+    "test/songkickr/test_event.rb",
     "test/songkickr/test_remote.rb",
     "test/test_songkickr.rb"
   ]
@@ -50,6 +53,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/helper.rb",
     "test/songkickr/test_artist.rb",
+    "test/songkickr/test_event.rb",
     "test/songkickr/test_remote.rb",
     "test/test_songkickr.rb"
   ]

data/test/fixtures/event_7391451.json

@@ -0,0 +1 @@
+{"resultsPage":{"results":{"event":{"popularity":0.00283,"uri":"http:\/\/www.songkick.com\/concerts\/7391451-17-hippies-at-muffathalle?utm_source=4961&utm_medium=partner","location":{"city":"Munich, Germany","lng":11.58971,"lat":48.13321},"displayName":"17 Hippies at Muffathalle (May 11, 2011)","id":7391451,"type":"Concert","start":{"time":"20:00:00","date":"2011-05-11","datetime":"2011-05-11T20:00:00+0100"},"performance":[{"artist":{"uri":"http:\/\/www.songkick.com\/artists\/306885-17-hippies?utm_source=4961&utm_medium=partner","displayName":"17 Hippies","id":306885,"identifier":[{"href":"http:\/\/api.songkick.com\/api\/3.0\/artists\/mbid:8315641a-6dca-40fd-a893-d247e4db84c3.json","mbid":"8315641a-6dca-40fd-a893-d247e4db84c3"}]},"displayName":"17 Hippies","billingIndex":1,"id":13542731,"billing":"headline"}],"venue":{"city":{"uri":"http:\/\/www.songkick.com\/metro_areas\/28549-germany-munich?utm_source=4961&utm_medium=partner","country":{"displayName":"Germany"},"displayName":"Munich","id":28549},"zip":"81667","uri":"http:\/\/www.songkick.com\/venues\/33264-muffathalle?utm_source=4961&utm_medium=partner","displayName":"Muffathalle","street":"Zellstr. 4, Munich","lng":11.58971,"id":33264,"phone":"+49 89 458750-7","website":"www.muffathalle.de","capacity":null,"metroArea":{"uri":"http:\/\/www.songkick.com\/metro_areas\/28549-germany-munich?utm_source=4961&utm_medium=partner","country":{"displayName":"Germany"},"displayName":"Munich","id":28549},"description":"","lat":48.13321},"status":"ok"}},"status":"ok"}}

data/test/fixtures/invalid_api_key.json

@@ -0,0 +1 @@
+{"resultsPage":{"status":"error","error":{"message":"Invalid or missing apikey"}}}

data/test/songkickr/test_event.rb

@@ -0,0 +1,19 @@
+require 'helper'
+
+class TestArtist < Test::Unit::TestCase
+  context "Given an Event from fixture" do
+    setup do
+      fixture_hash = Crack::JSON.parse(fixture_file('event_7391451.json')) # extract to helper?
+      @event = Songkickr::Event.new(fixture_hash["resultsPage"]["results"]["event"])
+    end
+
+    should "properly load data from JSON" do
+      assert_equal "Concert", @event.type
+      assert_equal "Munich, Germany", @event.location.city
+      assert_equal "Muffathalle", @event.venue.display_name
+      assert_equal 1, @event.performance.size
+      assert_equal "17 Hippies", @event.performance.first.display_name 
+    end
+    
+  end  
+end

data/test/songkickr/test_remote.rb

@@ -9,22 +9,27 @@ class TestRemote < Test::Unit::TestCase
     end
   end
   
-  # TODO: Fix this later
-  # context "Given a remote with an invalid api key" do
-  #   setup do
-  #     stub_get('http://api.songkick.com/api/3.0/events.json', 'events.json')
-  #     @remote = Songkickr::Remote.new 'omgwtfbbq_fake_key'
-  #   end
-  # 
-  #   should "generate a remote" do
-  #     assert_not_nil @remote
-  #   end
-  #   
-  #   should "generate nil results" do
-  #     [nil, ':artist_name => ""', ':artist_name => "Madonna"'].each do |remote_params|
-  #       assert_nil @remote.send(:events, remote_params).results
-  #     end
-  #   end
-  # end
+# TODO: Fix this later
+  context "Given a remote with an invalid api key" do
+    setup do
+      stub_get('http://api.songkick.com/api/3.0/events.json', 'events.json')
+      @remote = Songkickr::Remote.new 'omgwtfbbq_fake_key'
+    end
+    
+    should "generate a remote" do
+      assert_not_nil @remote
+    end
+    
+    # to make it work it needs:
+    # 1) registering GET http://api.songkick.com/api/3.0/events.json?apikey=omgwtfbbq_fake_key
+    #    and its variants with fakeweb OR allowing real http connections
+    # 2) checking that returned json equals fixtures/invalid_api_key.json
+    # 
+    #should "generate nil results" do
+    #  [{}, ':artist_name => ""', ':artist_name => "Madonna"'].each do |remote_params|
+    #    assert_nil @remote.send(:events, remote_params).results
+    #  end
+    #end
+  end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: songkickr
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jared Mehle
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 Z
+date: 2011-05-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -62,10 +62,13 @@ files:
 - lib/songkickr/venue.rb
 - songkickr.gemspec
 - test.rb
+- test/fixtures/event_7391451.json
 - test/fixtures/events.json
+- test/fixtures/invalid_api_key.json
 - test/fixtures/no_events.json
 - test/helper.rb
 - test/songkickr/test_artist.rb
+- test/songkickr/test_event.rb
 - test/songkickr/test_remote.rb
 - test/test_songkickr.rb
 homepage: http://github.com/jrmehle/songkickr
@@ -104,5 +107,6 @@ summary: A Ruby wrapper around the Songkick API.
 test_files: 
 - test/helper.rb
 - test/songkickr/test_artist.rb
+- test/songkickr/test_event.rb
 - test/songkickr/test_remote.rb
 - test/test_songkickr.rb