songkickr 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 466c2ed9a8e1754fbcab01c5afefa84905df3e30
-  data.tar.gz: ba7ca8300f533105846088479af33c8429f46b16
+  metadata.gz: 4937790e13d0ecfcd9246b55fa79433b5e7f006f
+  data.tar.gz: 9c072d4a67cb00839454315b9adece71e664464b
 SHA512:
-  metadata.gz: d37cd13c4d59a4ac1ba32b0314059b61223562dc4260d98eec9538c354fa8313147e28fa86da0964dc2256219ea5656860d4ab41f24356ab5c3ff4d512320f89
-  data.tar.gz: e269e9e30298eb0fd8075f1a59c161581585165e46f10e85904fb488b0f92c40830167cb0397679951540531627ee4bb8ba467d5bc95026e0e07793b1e6cf31e
+  metadata.gz: 45e6b36ba9b7590c209c08d8adab48d8e9eb688c27225c9c52f38fb5b07eff392c117d07fb1be026c6abd926de4141146afcf232675e9999a90cfa3f6ff67d7d
+  data.tar.gz: 39d8fa2fcac3e651c7a5b7a971df53932eb6a1682ec3c4f596a60ec7233978d267ee00fde57da2e3864fdb71bdfaf5999a4ebe979f85ae29b13931c3f51cebe3

data/README.rdoc

@@ -19,9 +19,12 @@ or if your environment requires
 
 Then call one of the remote methods such as events, users_events(username), or concert_setlists(event_id)
 
-Get an artists events by name:
+Get an artists events by artist name:
     results = remote.events('Iron Maiden')
 
+Get an artists events by artist name and filter to only festivals:
+    results = remote.events(artist_name: 'Metallica', type: 'festival')
+
 Get a users events by username:
     results = remote.users_events('jrmehle')
 
@@ -30,7 +33,6 @@ Get a the setlists of a concert by event ID:
 
 *More*: As of v0.4.0 songkickr supports all of Songkick's APIs. Check the RDocs for the Songkickr::RemoteApi classes.
 
-
 == Note on Patches/Pull Requests
 
 * Fork the project.

data/lib/songkickr/remote_api/past_events.rb

@@ -13,7 +13,7 @@ module Songkickr
       # * +page+ - Number of page
       # * +order+ - 'asc' or 'desc', 'asc' by default
       def artists_gigography(artist_id, query = {})
-        result = self.class.get("/artists/#{artist_id}/gigography.json", :query => query)
+        result = get("/artists/#{artist_id}/gigography.json", :query => query)
         Songkickr::EventResult.new result
       end
 
@@ -29,7 +29,7 @@ module Songkickr
       # * +page+ - Number of page
       # * +order+ - 'asc' or 'desc', 'asc' by default
       def users_gigography(username, query = {})
-        result = self.class.get("/users/#{username}/gigography.json", :query => query)
+        result = get("/users/#{username}/gigography.json", :query => query)
         Songkickr::EventResult.new result
       end
 

data/lib/songkickr/remote_api/upcoming_events.rb

@@ -41,10 +41,10 @@ module Songkickr
       # * +per_page+ - Number of results per page, max 50.
       def artist_search(query = {})
         if query.is_a? String
-          result = self.class.get("/search/artists.json", :query => { :query => query })
+          result = get("/search/artists.json", :query => { :query => query })
         elsif query.is_a? Hash
           artist_name = query.delete(:artist_name)
-          result      = self.class.get("/search/artists.json", :query => query.merge(:query => artist_name))
+          result      = get("/search/artists.json", :query => query.merge(:query => artist_name))
         end
 
         Songkickr::ArtistResult.new result
@@ -69,7 +69,12 @@ module Songkickr
       # * +max_date+ - Most recent date for which you want to look for events
       # * +location+ - See the Songkick website for instructions on how to use the location parameter http://www.songkick.com/developer/location-search
       def events(query = {})
-        result = get("/events.json", :query => query)
+        if query.is_a? String
+          result = get("/events.json", :query => { :artist_name => query })
+        elsif query.is_a? Hash
+          result = get("/events.json", :query => query)
+        end
+
         Songkickr::EventResult.new result
       end
 

data/lib/songkickr/version.rb

@@ -1,3 +1,3 @@
 module Songkickr
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end