songkickr 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4581bfc8e007dc92b33a241ea3a813a9a0a93b8c
-  data.tar.gz: 062653e46ba44836d3e4f8a8924bdcc3dfceae7b
+  metadata.gz: b1d85b5ac57cc872af5cd999361ed6db3f6ba770
+  data.tar.gz: e1141d61a1db87418f4dc90ae8c95f5a6c118195
 SHA512:
-  metadata.gz: f0a07087bd6f0f6270e7d196ddf479304bd08028d7aeddc08ecbc67cd484c37e58b801632814d576e8c9ad1fb4cc9834eb3272df15cff3d9118ce66f0f21afc6
-  data.tar.gz: 60acb523bb6ebdd4a9704283a387bbf57958cc26e0e186a4909ddd8ef6ee375bd79742beca623f04aa37d5b7d2e0c43efa679e0a96b654c4f8707de468b9ec27
+  metadata.gz: ef00633f92e217671ba8469f0f8da0830b4b8cb2536ccc1c67923c2e17a2ca3bd19663290a21e92085fbeb7bb946187d3c03ce9b82c35c5dafe98dd5c5466257
+  data.tar.gz: 5d10685ebc1d908193f5543a49e70a8ae4b5bda7b237d3e31057b9999bae389d3e22e3bdb599e2af08e172c3b49c3ed67005eef19a0330b4e1f668d76ce86d77

data/.ruby-version

@@ -0,0 +1 @@
+jruby-9.0.5.0

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.4
+  - 1.9.3-p545
+  - 2.0.0-p648
+  - 2.1.9
+  - 2.2.4
+  - 2.3.0
   - jruby-19mode

data/README.rdoc

@@ -45,11 +45,11 @@ Get a the setlists of a concert by event ID:
 
 == Copyright
 
-Copyright (c) 2010-2013 Jared Mehle. See LICENSE for details.
+Copyright (c) 2010-2016 Jared Mehle. See LICENSE for details.
 
 == Contributors
 
-Thanks to Andrew Chen, Akshay Dodeja, Tomasz Stachewicz, Dave Knapik, Matt Ruzicka, and Alex Beregszaszi for submitting code and pull requests.
+Thanks to Andrew Chen, Akshay Dodeja, Tomasz Stachewicz, Dave Knapik, Matt Ruzicka, Alex Beregszaszi, and Github user bibliotechy for submitting code and pull requests.
 
 A special thank you to Jon Nunemaker for httparty which is used extensively within this
 gem and for the twitter gem as inspiration.

data/Rakefile

@@ -8,7 +8,7 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|

data/lib/songkickr/remote.rb

@@ -25,7 +25,7 @@ module Songkickr
       @api_key ||= Songkickr.api_key
       @debug = options[:debug] || false
 
-      self.class.default_params :apikey => @api_key
+      self.class.default_params apikey: @api_key
       if @debug
         self.class.debug_output $stderr
       end

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 = 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 = 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

@@ -4,7 +4,7 @@ module Songkickr
       # ==== Artist calendar (Upcoming)
       # Returns an array of Events.
       #
-      # ex. remote.artist_events('mbid:5bac9b4f-2f1c-4d39-8d11-231d5b6650ce', :page => 1, :per_page => 5, :order => 'desc')
+      # ex. remote.artist_events('mbid:5bac9b4f-2f1c-4d39-8d11-231d5b6650ce', page: 1, per_page: 5, order: 'desc')
       #
       # http://www.songkick.com/developer/upcoming-events-for-artist
       #
@@ -23,7 +23,7 @@ module Songkickr
           url = "/artists/#{artist_id_or_music_brainz_id}/calendar.json"
         end
 
-        result = get(url, :query => query)
+        result = get(url, query: query)
         Songkickr::EventResult.new result
       end
 
@@ -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 = 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      = 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
@@ -56,7 +56,7 @@ module Songkickr
       # === Parameters
       # * +query+ - A hash of query parameters, see below for options.
       #
-      # _Example:_ <code>{ :type => 'concert', :artists => 'Coolio' }</code>
+      # _Example:_ <code>{ type: 'concert', artists: 'Coolio' }</code>
       #
       # ==== Query Parameters
       # * +type+ - valid types: concert or festival
@@ -70,9 +70,9 @@ module Songkickr
       # * +location+ - See the Songkick website for instructions on how to use the location parameter http://www.songkick.com/developer/location-search
       def events(query = {})
         if query.is_a? String
-          result = get("/events.json", :query => { :artist_name => query })
+          result = get("/events.json", query: { artist_name: query })
         elsif query.is_a? Hash
-          result = get("/events.json", :query => query)
+          result = get("/events.json", query: query)
         end
 
         Songkickr::EventResult.new result
@@ -91,7 +91,7 @@ module Songkickr
       # * +page+ - Page number
       # * +per_page+ - Number of results per page, max 50.
       def location_search(query = {})
-        result = get("/search/locations.json", :query => query)
+        result = get("/search/locations.json", query: query)
         Songkickr::LocationResult.new result
       end
 
@@ -102,7 +102,7 @@ module Songkickr
       # * +longitude+ - float <em>Ex. -19.35</em>
       # * +options+ - hash of additional options such as page and per_page
       def location_search_geo(latitude, longitude, options = {})
-        location_search(options.merge(:location => "geo:#{latitude},#{longitude}"))
+        location_search(options.merge(location: "geo:#{latitude},#{longitude}"))
       end
 
       # Location Search by IP address
@@ -110,8 +110,8 @@ module Songkickr
       # === Parameters
       # * +ip_address+ string <em>Ex. '123.123.123.123'</em>
       # * +options+ - hash of additional options such as page and per_page
-      def location_search_ip(ip_address, options)
-        location_search(options.merge(:location => "ip:#{ip_address}"))
+      def location_search_ip(ip_address, options = {})
+        location_search(options.merge(location: "ip:#{ip_address}"))
       end
 
       # Location Search by metro area name
@@ -119,8 +119,8 @@ module Songkickr
       # === Parameters
       # * +metro_area_name+ - Metro area or city named 'location_name' string <em>Ex. 'Minneapolis', 'Nashville', or 'London'</em>.
       # * +options+ - hash of additional options such as page and per_page
-      def location_search_metro_area_name(metro_area_name)
-        location_search(options.merge(:query => metro_area_name))
+      def location_search_metro_area_name(metro_area_name, options = {})
+        location_search(options.merge(query: metro_area_name))
       end
 
       # ==== Metro Area Events (Upcoming)
@@ -136,7 +136,7 @@ module Songkickr
       # * +page+ - Page number
       # * +per_page+ - Number of results per page, max 50.
       def metro_areas_events(metro_area_id, query = {})
-        result = get("/metro_areas/#{metro_area_id}/calendar.json", :query => query)
+        result = get("/metro_areas/#{metro_area_id}/calendar.json", query: query)
         Songkickr::EventResult.new result
       end
 
@@ -163,7 +163,7 @@ module Songkickr
       # * +page+ - Page number
       # * +per_page+ - Number of results per page, max 50.
       def venue_search(query)
-        result = get("/search/venues.json", :query => query)
+        result = get("/search/venues.json", query: query)
         Songkickr::VenueResult.new result
       end
     end

data/lib/songkickr/remote_api/user_events_and_trackings.rb

@@ -13,7 +13,7 @@ module Songkickr
       # * +page+ - Page number
       # * +per_page+ - Number of results per page, max 50.
       def users_tracked_events_calendar(username, query = {})
-        result = get("/users/#{username}/calendar.json?reason=tracked_artist", :query => query)
+        result = get("/users/#{username}/calendar.json?reason=tracked_artist", query: query)
         Songkickr::CalendarResult.new result
       end
 
@@ -29,7 +29,7 @@ module Songkickr
       # * +page+ - Page number
       # * +per_page+ - Number of results per page, max 50.
       def users_attendance_calendar(username, query = {})
-        result = get("/users/#{username}/calendar.json?reason=attendance", :query => query)
+        result = get("/users/#{username}/calendar.json?reason=attendance", query: query)
         Songkickr::CalendarResult.new result
       end
 
@@ -45,7 +45,7 @@ module Songkickr
       # * +page+ - Page number
       # * +per_page+ - Number of results per page, max 50.
       def users_tracked_metro_areas(username, query = {})
-        result = get("/users/#{username}/metro_areas/tracked.json", :query => query)
+        result = get("/users/#{username}/metro_areas/tracked.json", query: query)
         Songkickr::MetroAreaResult.new result
       end
 
@@ -57,7 +57,7 @@ module Songkickr
       # * +metro_area_id+ - A Songkick metro area ID.
       # * +query+ - A hash of query parameters, see below for options.
       def users_metro_area_tracking(username, metro_area_id, query = {})
-        result = get("/users/#{username}/trackings/metro_area:#{metro_area_id}.json", :query => query)
+        result = get("/users/#{username}/trackings/metro_area:#{metro_area_id}.json", query: query)
         Songkickr::MetroAreaResult.new result
       end
 
@@ -72,7 +72,7 @@ module Songkickr
       # * +page+ - Page number
       # * +per_page+ - Number of results per page, max 50.
       def users_tracked_artists(username, query = {})
-        result = get("/users/#{username}/artists/tracked.json", :query => query)
+        result = get("/users/#{username}/artists/tracked.json", query: query)
         Songkickr::ArtistResult.new result
       end
 
@@ -98,7 +98,7 @@ module Songkickr
       # * +page+ - Page number
       # * +per_page+ - Number of results per page, max 50.
       def users_muted_artists(username, query = {})
-        result = get("/users/#{username}/artists/muted.json", :query => query)
+        result = get("/users/#{username}/artists/muted.json", query: query)
         Songkickr::ArtistResult.new result
       end
 
@@ -124,7 +124,7 @@ module Songkickr
       # * +order+ - 'asc' or 'desc', 'asc' by default
       # * +created_after+ - timestamp using ISO8601 format, e.g. 2012-02-29T13:37:00Z
       def users_events(username, query = {})
-        result = get("/users/#{username}/events.json", :query => query)
+        result = get("/users/#{username}/events.json", query: query)
         Songkickr::EventResult.new result
       end
 

data/lib/songkickr/version.rb

@@ -1,3 +1,3 @@
 module Songkickr
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/test.rb

@@ -6,14 +6,14 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'songkickr'
 
 remote = Songkickr::Remote.new 'hFYxiInE4DBpH5KL'
-@results = remote.artist_search(:artist_name => "Muse", :per_page => '10').results
+@results = remote.artist_search(artist_name: "Muse", per_page: '10').results
 @results.each do |result|
   print result.display_name + "\n"
 end
 
 print "\n"
 
-@gigography_results = remote.gigography(@results[0].id, :per_page => '50', :page => '1', :min_date => '2010-01-01').results
+@gigography_results = remote.gigography(@results[0].id, per_page: '50', page: '1', min_date: '2010-01-01').results
 
 @gigography_results.each do |gig|
   print gig.display_name + "\n"

data/test/songkickr/test_artist.rb

@@ -3,19 +3,19 @@ require 'helper'
 class TestArtist < Test::Unit::TestCase
   context "Given a new Artist" do
     setup do
-      @uri = 'http://jrmehle.com/'
+      @uri          = 'http://jrmehle.com/'
       @display_name = 'Artist Name'
-      @artist = Songkickr::Artist.new({'uri' => @uri, 'displayName' => @display_name})
+      @artist       = Songkickr::Artist.new({'uri' => @uri, 'displayName' => @display_name})
     end
 
     should "init uri" do
       assert_not_nil @artist
       assert_equal @uri, @artist.uri
     end
-    
+
     should "init display_name" do
       assert_not_nil @artist
       assert_equal @display_name, @artist.display_name
     end
-  end  
+  end
 end

data/test/songkickr/test_remote.rb

@@ -140,14 +140,14 @@ class TestRemote < Test::Unit::TestCase
 
     should "return the artist with paged results when searched as a hash" do
       VCR.use_cassette('paged_artist_search') do
-        result = @remote.artist_search(:artist_name => 'Counterparts', :per_page => 2)
+        result = @remote.artist_search(artist_name: 'Counterparts', per_page: 2)
         assert_equal 2, result.results.size
       end
     end
 
     should "return the artist when searched as a hash" do
       VCR.use_cassette('artist_search_hash') do
-        result = @remote.artist_search(:artist_name => 'Counterparts')
+        result = @remote.artist_search(artist_name: 'Counterparts')
         assert_equal "Counterparts", result.results.first.display_name
       end
     end
@@ -161,14 +161,14 @@ class TestRemote < Test::Unit::TestCase
 
     should "return the event when searched as a hash" do
       VCR.use_cassette('event_search_hash') do
-        result = @remote.events(:artist_name => 'Counterparts')
+        result = @remote.events(artist_name: 'Counterparts')
         assert_equal "Amnesia Rockfest 2014", result.results.first.display_name
       end
     end
 
     should "return the location when searched" do
       VCR.use_cassette('location_search') do
-        result = @remote.location_search(:query => 'St. Paul, MN')
+        result = @remote.location_search(query: 'St. Paul, MN')
         assert_equal "St. Paul", result.results.first.city
         assert_equal Songkickr::MetroArea, result.results.first.metro_area.class
       end
@@ -176,7 +176,7 @@ class TestRemote < Test::Unit::TestCase
 
     should "return the locations when searched with pagination" do
       VCR.use_cassette('location_search_paged') do
-        result = @remote.location_search(:query => 'St. Paul, MN', :per_page => 2)
+        result = @remote.location_search(query: 'St. Paul, MN', per_page: 2)
         assert_equal "St. Paul", result.results.first.city
         assert_equal Songkickr::MetroArea, result.results.first.metro_area.class
         assert_equal 2, result.results.size
@@ -207,14 +207,14 @@ class TestRemote < Test::Unit::TestCase
 
     should "return the search venue" do
       VCR.use_cassette('venue_search') do
-        result = @remote.venue_search(:query => 'Xcel Energy Center')
+        result = @remote.venue_search(query: 'Xcel Energy Center')
         assert_equal "Xcel Energy Center", result.results.first.display_name
       end
     end
 
     should "return the searched venue with paged results" do
       VCR.use_cassette('venue_search_paged') do
-        result = @remote.venue_search(:query => 'Xcel Energy Center', :per_page => 2)
+        result = @remote.venue_search(query: 'Xcel Energy Center', per_page: 2)
         assert_equal "Xcel Energy Center", result.results.first.display_name
         assert_equal 2, result.results.size
       end

data/test/vcr_helper.rb

@@ -3,5 +3,5 @@ require 'vcr'
 VCR.configure do |c|
   c.hook_into :webmock
   c.cassette_library_dir = 'test/fixtures/vcr'
-  c.default_cassette_options = { :record => :new_episodes }
+  c.default_cassette_options = { record: :new_episodes }
 end

metadata

@@ -1,136 +1,136 @@
 --- !ruby/object:Gem::Specification
 name: songkickr
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Jared Mehle
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
-  type: :development
+  name: shoulda
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
-  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
-  type: :development
+  name: webmock
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
-  type: :development
+  name: rdoc
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: crack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: crack
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 10.3.0
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 10.3.0
 - !ruby/object:Gem::Dependency
-  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :development
+  name: test-unit
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.9.0
-  type: :development
+  name: vcr
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.9.0
 - !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: pry
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-  type: :runtime
+  name: httparty
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -149,6 +149,7 @@ files:
 - ".bundle/config"
 - ".document"
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -244,7 +245,7 @@ files:
 homepage: http://github.com/jrmehle/songkickr
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -259,9 +260,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.3
+signing_key:
 specification_version: 4
 summary: A Ruby wrapper around the Songkick API.
 test_files: