songkick_ruby 1.0.0 → 1.1.0

data/lib/songkick/client/calendar.rb

@@ -2,16 +2,16 @@ module Songkick
   class Client
     module Calendar
 
-      def artist_calendar(artist_id)
-        get "artists/#{artist_id}/calendar.#{format}"
+      def artist_calendar(artist_id, page = 1)
+        get "artists/#{artist_id}/calendar.#{format}", page
       end
 
-      def location_calendar(location_id)
-        get "metro_areas/#{location_id}/calendar.#{format}"
+      def location_calendar(location_id, page = 1)
+        get "metro_areas/#{location_id}/calendar.#{format}", page
       end
 
-      def user_calendar(username)
-        get "users/#{artist_id}/calendar.#{format}"
+      def user_calendar(username, page = 1)
+        get "users/#{artist_id}/calendar.#{format}", page
       end
 
     end

data/lib/songkick/client/event.rb

@@ -2,8 +2,8 @@ module Songkick
   class Client
     module Event
 
-      def find_event(event_id)
-        get "events/#{event_id}.#{format}"
+      def find_event(event_id, page = 1)
+        get "events/#{event_id}.#{format}", page
       end
 
     end

data/lib/songkick/client/request.rb

@@ -4,14 +4,21 @@ module Songkick
 
       private
       
-      def get(url)
-        uri = API_URL + url
-        uri = URI.parse uri.include?("?") ? uri + "&apikey=#{api_key}" : uri + "?apikey=#{api_key}"
-        
+      def get(url, page)
+        uri = generate_uri(url, page)
+
         response = Net::HTTP.get_response(uri)
         json? ? JSON.parse(response.body) : response.body
       end
 
+      def generate_uri(url, page)
+        uri = API_URL + url
+        uri += uri.include?("?") ? "&page=#{page}" : "?page=#{page}" if page.to_i > 1
+        uri = URI.parse uri.include?("?") ? uri + "&apikey=#{api_key}" : uri + "?apikey=#{api_key}"
+        print 
+        uri
+      end
+
     end
   end
 end

data/lib/songkick/client/search.rb

@@ -2,21 +2,21 @@ module Songkick
   class Client
     module Search
 
-      def search_events(opts)
+      def search_events(opts, page = 1)
         _opts = opts.collect{|k, v| "#{k}=#{v.gsub(" ", "%20")}"}.join("&")
-        get "events.#{format}?#{_opts}"
+        get "events.#{format}?#{_opts}", page
       end
       alias_method :search_event, :search_events
 
 
-      def search_locations(opts)
+      def search_locations(opts, page = 1)
         _opts = opts.collect{|k, v| "#{k}=#{v.gsub(" ", "%20")}"}.join("&")
-        get "search/locations.#{format}?#{_opts}"
+        get "search/locations.#{format}?#{_opts}", page
       end
       alias_method :search_location, :search_locations
 
-      def search_artists(text)
-        get "search/artists.#{format}?query=#{text.gsub(" ","%20")}"
+      def search_artists(text, page = 1)
+        get "search/artists.#{format}?query=#{text.gsub(" ","%20")}", page
       end
       alias_method :search_artist, :search_artists
 

data/lib/songkick/client.rb

@@ -10,7 +10,7 @@ module Songkick
     
     attr_accessor :api_key, :format
 
-    def initialize(api_key, format)
+    def initialize(api_key, format = :json)
       @api_key = api_key
       @format = format
     end

data/lib/songkick/version.rb

@@ -1,3 +1,3 @@
 module Songkick
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/songkick.rb

@@ -7,8 +7,8 @@ require "songkick/client.rb"
 
 module Songkick
   class << self
-    
-    def new(api_key, format)
+   
+    def new(api_key, format = :json)
       Songkick::Client.new(api_key, format)
     end
 

data/songkick_ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "songkick_ruby"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
   s.author = "Gregory Marcilhacy"
   s.email = "g.marcilhacy@gmail.com"
   s.homepage = "http://github.com/gregorym/songkick_ruby"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: songkick_ruby
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Gregory Marcilhacy