phish_dot_net_client 0.0.1 → 0.1.0

data/.gitignore

@@ -8,3 +8,5 @@ tmp/*
 doc/*
 .ruby-gemset
 .ruby-version
+*.gem
+Gemfile.lock

data/Gemfile

@@ -1,11 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'rest-client', '~> 1.6.7'
-gem 'json', '~> 1.8.0'
-gem 'nokogiri', '~> 1.6.0'
-
-group :development do
-  gem 'rake'
-  gem 'rspec'
-  gem 'yard'
-end
+gemspec

data/History.md

@@ -0,0 +1,9 @@
+### 0.1.0 / 2013-10-28
+
+* Add code documentation
+* Clean some stuff up
+
+
+### 0.0.1 / 2013-10-28
+
+* Initial release

data/README.md

@@ -1,5 +1,7 @@
 # Phish.net API Client
 
+<a href="http://badge.fury.io/rb/phish_dot_net_client"><img src="https://badge.fury.io/rb/phish_dot_net_client@2x.png" alt="Gem Version" height="18"></a>
+
 A Phish.net API client, with support for parsing the 'setlistdata' field. Inspired by the other Ruby Phish.net API [client](http://api.phish.net/wrappers/ruby.php) written by [Stephen Blackstone](http://phish.net/user/steveb3210).
 
 [rdoc](http://rubydoc.info/github/alexebird/phish_dot_net_client/master/frames/file/README.md)
@@ -34,7 +36,8 @@ Rubygems:
     PhishDotNetClient.shows_query :month => '7', :country => 'USA', :state => 'CA'
 
     # Arguments are not checked for validity before being passed
-    PhishDotNetClient.shows_setlists_get :fluff => 'head'  # returns {"success" => 0,"reason" => "General API Error"}
+    PhishDotNetClient.shows_setlists_get :fluff => 'head'
+    # => returns {"success" => 0,"reason" => "General API Error"}
 
     # All methods return JSON parsed into Ruby Hashes/Arrays
     tweez = PhishDotNetClient.shows_setlists_get :showdate => '2013-07-31'

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rspec/core/rake_task'
 
-
 desc "Parse the documentation from Phish.net to get the current method calls"
 task :parse_method_docs do
   # require 'nokogiri'
@@ -38,18 +37,22 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   # t.verbose = false
 end
 
-desc "Run specs in spec/units"
-RSpec::Core::RakeTask.new('spec:units') do |t|
-  t.pattern = "./spec/units/**/*_spec.rb"
-end
-
-desc "Run specs in spec/integration"
-RSpec::Core::RakeTask.new('spec:integration') do |t|
-  t.pattern = "./spec/integration/**/*_spec.rb"
-end
-
 desc "Generate documentation"
 task :doc do
   require 'yard'
   sh "yard"
 end
+
+desc "Instructions for releasing a new version"
+task :"release:instructions" do
+  version = PhishDotNetClient::VERSION
+  gem_name = File.basename Dir.glob(File.join(File.expand_path('../', __FILE__), '*.gemspec')).first.sub('.gemspec', '')
+  last_release = `git tag | grep --color=never -e "v\\d\\+\\." | sort | tail -n1`.strip
+
+  puts "1. update version.rb"
+  puts "2. update History.md"
+  puts "       git log #{last_release}..HEAD --no-merges --format=%B"
+  puts "3. git commit, git tag v#{version}, git push origin v#{version}"
+  puts "4. gem build #{gem_name}.gemspec ; mv #{gem_name}-#{version}.gem ~/gems/"
+  puts "5. gem push ~/gems/#{gem_name}-#{version}.gem"
+end

data/lib/phish_dot_net_client.rb

@@ -1,99 +1,121 @@
 # encoding: utf-8
 
 require 'restclient'
-require 'json'
+require 'oj'
 require 'nokogiri'
 
+require 'phish_dot_net_client/version'
 require 'phish_dot_net_client/set'
 require 'phish_dot_net_client/setlist'
 require 'phish_dot_net_client/song'
 require 'phish_dot_net_client/song_transition'
-require 'phish_dot_net_client/version'
 
-# @todo write doc
+# This module encapsulates interaction with the Phish.net API. It allows you to
+# call any API method and will parse "setlistdata" fields in the JSON responses.
 module PhishDotNetClient
   extend self
 
   # The possible API methods. Generated from +rake parse_method_docs+.
-  # API_METHODS =
-  #   {
-  #     "pnet.api.authkey.get"        => { :scope => "protected" },
-  #     "pnet.api.authorize"          => { :scope => "protected" },
-  #     "pnet.api.authorized.check"   => { :scope => "protected" },
-  #     "pnet.api.isAuthorized"       => { :scope => "protected" },
-  #     "pnet.artists.get"            => { :scope => "public" },
-  #     "pnet.blog.get"               => { :scope => "public" },
-  #     "pnet.blog.item.get"          => { :scope => "public" },
-  #     "pnet.collections.get"        => { :scope => "protected" },
-  #     "pnet.collections.query"      => { :scope => "protected" },
-  #     "pnet.forum.canpost"          => { :scope => "protected" },
-  #     "pnet.forum.get"              => { :scope => "public" },
-  #     "pnet.forum.thread.get"       => { :scope => "protected" },
-  #     "pnet.forum.thread.new"       => { :scope => "protected" },
-  #     "pnet.forum.thread.respond"   => { :scope => "protected" },
-  #     "pnet.news.comments.get"      => { :scope => "public" },
-  #     "pnet.news.get"               => { :scope => "public" },
-  #     "pnet.reviews.query"          => { :scope => "protected" },
-  #     "pnet.reviews.recent"         => { :scope => "public" },
-  #     "pnet.shows.links.get"        => { :scope => "protected" },
-  #     "pnet.shows.query"            => { :scope => "protected" },
-  #     "pnet.shows.setlists.get"     => { :scope => "protected" },
-  #     "pnet.shows.setlists.latest"  => { :scope => "public" },
-  #     "pnet.shows.setlists.random"  => { :scope => "public" },
-  #     "pnet.shows.setlists.recent"  => { :scope => "public" },
-  #     "pnet.shows.setlists.tiph"    => { :scope => "public" },
-  #     "pnet.shows.upcoming"         => { :scope => "public" },
-  #     "pnet.user.get"               => { :scope => "protected" },
-  #     "pnet.user.myshows.add"       => { :scope => "protected" },
-  #     "pnet.user.myshows.get"       => { :scope => "protected" },
-  #     "pnet.user.myshows.remove"    => { :scope => "protected" },
-  #     "pnet.user.register"          => { :scope => "protected" },
-  #     "pnet.user.shows.rate"        => { :scope => "protected" },
-  #     "pnet.user.uid.get"           => { :scope => "protected" },
-  #     "pnet.user.username.check"    => { :scope => "protected" }
-  #   }
+  API_METHODS =
+    {
+      "pnet.api.authkey.get"        => { :scope => "protected" },
+      "pnet.api.authorize"          => { :scope => "protected" },
+      "pnet.api.authorized.check"   => { :scope => "protected" },
+      "pnet.api.isAuthorized"       => { :scope => "protected" },
+      "pnet.artists.get"            => { :scope => "public" },
+      "pnet.blog.get"               => { :scope => "public" },
+      "pnet.blog.item.get"          => { :scope => "public" },
+      "pnet.collections.get"        => { :scope => "protected" },
+      "pnet.collections.query"      => { :scope => "protected" },
+      "pnet.forum.canpost"          => { :scope => "protected" },
+      "pnet.forum.get"              => { :scope => "public" },
+      "pnet.forum.thread.get"       => { :scope => "protected" },
+      "pnet.forum.thread.new"       => { :scope => "protected" },
+      "pnet.forum.thread.respond"   => { :scope => "protected" },
+      "pnet.news.comments.get"      => { :scope => "public" },
+      "pnet.news.get"               => { :scope => "public" },
+      "pnet.reviews.query"          => { :scope => "protected" },
+      "pnet.reviews.recent"         => { :scope => "public" },
+      "pnet.shows.links.get"        => { :scope => "protected" },
+      "pnet.shows.query"            => { :scope => "protected" },
+      "pnet.shows.setlists.get"     => { :scope => "protected" },
+      "pnet.shows.setlists.latest"  => { :scope => "public" },
+      "pnet.shows.setlists.random"  => { :scope => "public" },
+      "pnet.shows.setlists.recent"  => { :scope => "public" },
+      "pnet.shows.setlists.tiph"    => { :scope => "public" },
+      "pnet.shows.upcoming"         => { :scope => "public" },
+      "pnet.user.get"               => { :scope => "protected" },
+      "pnet.user.myshows.add"       => { :scope => "protected" },
+      "pnet.user.myshows.get"       => { :scope => "protected" },
+      "pnet.user.myshows.remove"    => { :scope => "protected" },
+      "pnet.user.register"          => { :scope => "protected" },
+      "pnet.user.shows.rate"        => { :scope => "protected" },
+      "pnet.user.uid.get"           => { :scope => "protected" },
+      "pnet.user.username.check"    => { :scope => "protected" }
+    }
 
   # The base URL for API calls
   BASE_URL = "https://api.phish.net/api.js"
 
   # "https://api.phish.net/api.js?api=2.0&method=pnet.shows.query&format=json&apikey=920FF765772E442F3E22&year=2011"
 
-  @@default_params = { api: "2.0",
-                    format: "json" }
+  DEFAULT_PARAMS = { api: "2.0",
+                  format: "json" }
 
+  # Set the apikey. The "private api key" from your Phish.net account should be
+  # used.
+  #
+  # @param private_api_key [String] the apikey
+  # @return [void]
   def apikey=(private_api_key)
-    @@default_params.merge!(:apikey => private_api_key)
+    DEFAULT_PARAMS.merge!(:apikey => private_api_key)
   end
 
-  def authorize(username=nil, passwd=nil)
-    resp = call_api_method("pnet.api.authorize", :username => username, :passwd => passwd)
+  # Calls pnet.api.authorize with the specified username and password, then stores
+  # the username and returned authkey if the call was successful. The password is
+  # not stored.
+  #
+  # @param username [String] the username
+  # @param password [String] the password
+  #
+  # @return [void]
+  def authorize(username, password)
+    resp = call_api_method("pnet.api.authorize", :username => username, :passwd => password)
 
     if resp['success'] == 1 && resp.has_key?('authkey')
-      @@default_params.merge!(:username => username, :authkey => resp['authkey'])
+      DEFAULT_PARAMS.merge!(:username => username, :authkey => resp['authkey'])
     end
   end
 
+  # Clears the stored API authentication parameters (apikey, username, authkey)
+  #
+  # @return [void]
   def clear_auth
-    [:apikey, :username, :authkey].each { |key| @@default_params.delete(key) }
+    [:apikey, :username, :authkey].each { |key| DEFAULT_PARAMS.delete(key) }
   end
 
+  # @api private
+  #
+  # Calls the specified Phish.net api method.
+  #
   # @param api_method [String] the method to call
   # @param params [Hash] the url parameters for the api call
   #
+  # @raise [RuntimeError] if the http response status is a 2xx
+  #
   # @return [Hash, Array] the parsed JSON of API response
-  # @api private
   def call_api_method(api_method, params={})
     # method_data = API_METHODS[api_method]
     # ensure_api_key if method_data[:scope] == "protected"
 
     params.merge!(:method => api_method)
-    response = RestClient.get BASE_URL, { :params => @@default_params.merge(params) }
+    response = RestClient.get BASE_URL, { :params => DEFAULT_PARAMS.merge(params) }
 
     if response.code < 200 || response.code > 299
       raise "non 2xx reponse: status=#{response.code}"
     end
 
-    parsed = JSON.parse(response)
+    parsed = Oj.load(response)
 
     if parsed.is_a?(Array)
       parsed.each do |obj|
@@ -106,6 +128,8 @@ module PhishDotNetClient
     return parsed
   end
 
+  # Override method_missing to provide mapping of Ruby methods to API method names.
+  #
   # @api private
   def method_missing(name, *args)
     api_method = get_api_method(name)
@@ -117,9 +141,9 @@ module PhishDotNetClient
     end
   end
 
-  # private
-
   # @api private
+  # @param rb_method_name [Symbol] the Ruby method name
+  # @return [String] the api method name
   def get_api_method(rb_method_name)
     api_method_name = rb_method_name.to_s.gsub("_", ".")
 
@@ -137,6 +161,6 @@ module PhishDotNetClient
   end
 
   # def ensure_api_key
-  #   raise "api key is required" if @@default_params[:apikey].nil?
+  #   raise "api key is required" if DEFAULT_PARAMS[:apikey].nil?
   # end
 end

data/lib/phish_dot_net_client/set.rb

@@ -1,13 +1,27 @@
 # encoding: utf-8
 
-# @api private
 module PhishDotNetClient
+
+  # This class represents a set from the 'setlistdata' field.
   class Set
 
+    # @!attribute [r] position
+    #   @return [Integer] the position of the set, indexed starting at 0
     attr_reader :position
+
+    # @!attribute [r] name
+    #   @return [String] the name of the set
     attr_reader :name
+
+    # @!attribute [r] songs
+    #   @return [Array<Song>] the songs belonging to the set
     attr_reader :songs
 
+    # @param attrs [Hash] the attributes hash
+    # @option attrs [Integer] :position the set position
+    # @option attrs [Integer] :name the set name
+    #
+    # @api private
     def initialize(attrs={})
       @songs = []
       @position = attrs[:position]

data/lib/phish_dot_net_client/setlist.rb

@@ -1,21 +1,37 @@
 # encoding: utf-8
 
-# @api private
 module PhishDotNetClient
+
+  # This class represents the parsed data from the 'setlistdata' field.
   class Setlist
 
+    # @!attribute [r] sets
+    #   @return [Array<Set>] the setlist's sets
     attr_reader :sets
+
+    # @!attribute [r] footnotes
+    #   @return [Hash<Integer, Hash<Symbol, String>>] the setlist's footnotes
     attr_reader :footnotes
 
+    # @param setlistdata [String] the setlistdata string
+    #
+    # @api private
     def initialize(setlistdata)
       @sets, @footnotes = self.class.parse_setlistdata(setlistdata)
     end
 
+    # @return [Array<Song>] all songs in the setlist
     def songs
       return @sets.map(&:songs).reduce([]){|memo,songs| memo += songs }
     end
 
     # @api private
+    #
+    # Does the work of parsing the setlistdata.
+    #
+    # @param setlistdata [String] the setlistdata string
+    #
+    # @return [Array<(Array<Set>, Hash)>] the parsed sets and footnotes
     def self.parse_setlistdata(setlistdata)
       doc = Nokogiri::HTML(setlistdata)
 
@@ -36,14 +52,14 @@ module PhishDotNetClient
       slug_instances = {}
 
       setnodes = doc.css(".pnetset")
-      position_in_show = 1
+      position_in_show = 0
 
       setnodes.each_with_index do |n,set_index|
         setname = n.css(".pnetsetlabel").first.content
-        set = Set.new(:name => setname.sub!(/:\z/, ''), :position => set_index + 1)
+        set = Set.new(:name => setname.sub!(/:\z/, ''), :position => set_index)
         songs_doc = n.css("a")
         songs_doc.each_with_index do |song,song_index|
-          position_in_set = song_index + 1
+          position_in_set = song_index
           title = song.content
           url = song.attr('href')
           slug = URI.parse(url).path
@@ -63,7 +79,7 @@ module PhishDotNetClient
           position_in_show += 1
         end
 
-        transitions_text = n.content
+        transitions_text = n.content  # strips html tags
         transitions_tokens += tokenize_transitions_text(transitions_text, transitions_tokens)
 
         sets << set
@@ -75,6 +91,15 @@ module PhishDotNetClient
     end
 
     # @api private
+    #
+    # Adds footnotes to their associated songs and adds transition information
+    # between songs.
+    #
+    # @param tokens [Array<Hash <Symbol, Object>>] the tokens to augment with
+    # @param songs [Array<Song>] the songs to augment
+    # @param footnotes [Hash<Integer, Hash<Symbol, String>>] the footnotes to augment with
+    #
+    # @return [void]
     def self.augment_songs(tokens, songs, footnotes)
       songs = Array.new(songs)  # make a copy
 
@@ -113,8 +138,18 @@ module PhishDotNetClient
     end
 
     # @api private
+    #
+    # Tokenizes the html-stripped setlistdata text.
+    #
+    # @param transitions_text [String] the text to tokenize
+    # @param existing_tokens [Array<Hash<Symbol, Object>>] tokens of already
+    #   parsed text, so that repeat songs can be detected.
+    #
+    # @raise [RuntimeError] if the transitions_text could not be parsed
+    #
+    # @return [Array<Hash<Symbol, Object>>]
     def self.tokenize_transitions_text(transitions_text, existing_tokens=[])
-      tokens = []
+      rules = []
 
       # Account for multiple songs with the same title in a song list
       song_title_counts = {}
@@ -126,46 +161,47 @@ module PhishDotNetClient
         end
       end
 
-      tokens.push(/\A[a-z0-9\s]+:/i => lambda do |match|
+      rules.push(/\A[a-z0-9\s]+:/i => lambda do |match|
         return { type: :set_name, name: match.to_s.strip.sub(':', '') }
       end)
 
-      tokens.push(/\A[äa-z0-9\-?\.!:\/'\s\(\)]+[a-z0-9\)?!']/i => lambda do |match|
+      rules.push(/\A[äa-z0-9\-?\.!:\/'\s\(\)]+[a-z0-9\)?!']/i => lambda do |match|
         title = match.to_s.strip
         song_title_counts[title] ||= 0
         song_title_counts[title] += 1
         return { type: :song, title: title, instance: song_title_counts[title] }
       end)
 
-      tokens.push(/\A\[(?<num>\d+)\]/ => lambda do |match|
+      rules.push(/\A\[(?<num>\d+)\]/ => lambda do |match|
         return { type: :note_ref, number: match[:num].to_i }
       end)
 
-      tokens.push(/\A,/ => lambda do |match|
+      rules.push(/\A,/ => lambda do |match|
         return { type: :transition, transition_type: :no_segue }
       end)
 
-      tokens.push(/\A>/ => lambda do |match|
+      rules.push(/\A>/ => lambda do |match|
         return { type: :transition, transition_type: :segue }
       end)
 
-      tokens.push(/\A->/ => lambda do |match|
+      rules.push(/\A->/ => lambda do |match|
         return { type: :transition, transition_type: :deep_segue }
       end)
 
-      tokens.push(/\A\s+/ => lambda do |match|
+      rules.push(/\A\s+/ => lambda do |match|
         return nil
       end)
 
       parsed_set = []
 
       until transitions_text.empty?
-        matched = false
+        matched = false  # keeps track of whether the transitions_text matched
+                         # any rule. raise error if there no match.
 
-        tokens.each do |matcher|
-          token_regex, processor = matcher.keys.first, matcher.values.first
+        rules.each do |rule|
+          rule_regex, processor = rule.keys.first, rule.values.first
 
-          if transitions_text.slice!(token_regex)
+          if transitions_text.slice!(rule_regex)
             matched = true
             token = processor.call($~)
             parsed_set.push(token) if token

data/lib/phish_dot_net_client/song.rb

@@ -1,18 +1,58 @@
 # encoding: utf-8
 
-# @api private
 module PhishDotNetClient
+
+  # This class represents a set from the 'setlistdata' field.
   class Song
+
+    # @!attribute [r] title
+    #   @return [String] the song title
     attr_reader :title
+
+    # @!attribute [r] url
+    #   @return [String] the song url
     attr_reader :url
+
+    # @!attribute [r] slug
+    #   @return [String] the song slug (not unique). slug+instance can be used to
+    #     create a unique slug when the setlist has the same song more than once.
     attr_reader :slug
+
+    # @!attribute [r] instance
+    #   @return [Integer] the instance number of the song. Normally will be +1+ since
+    #     most shows don't have multiple instances of the same song.
     attr_reader :instance
+
+    # @!attribute [r] position_in_set
+    #   @return [String] the position of the song in it's set, indexed starting at 0
     attr_reader :position_in_set
+
+    # @!attribute [r] position_in_show
+    #   @return [String] the position of the song in the show, indexed starting at 0
     attr_reader :position_in_show
+
+    # @!attribute [r] footnotes
+    #   @return [Array<Integer>] the song's foonote numbers, used to lookup footnotes
+    #     via {Setlist#footnotes}.
     attr_reader :footnotes
+
+    # @!attribute pre_transition
+    #   @return [SongTransition] the transition to the previous song
     attr_accessor :pre_transition
+
+    # @!attribute post_transition
+    #   @return [SongTransition] the transition to the next song
     attr_accessor :post_transition
 
+    # @api private
+    #
+    # @param  attrs [Hash<Symbol, Object>] the song attributes
+    # @option attrs [String] :title the song title
+    # @option attrs [String] :url the song url
+    # @option attrs [String] :slug the song slug
+    # @option attrs [Integer] :instance the instance number of the song
+    # @option attrs [Integer] :position_in_set set position of the song
+    # @option attrs [Integer] :position_in_show show position of the song
     def initialize(attrs={})
       @title = attrs[:title]
       @url = attrs[:url]
@@ -23,6 +63,7 @@ module PhishDotNetClient
       @footnotes = []
     end
 
+    # @return [String] the song along with pre and post transitions
     def to_s
       s = StringIO.new
 

data/lib/phish_dot_net_client/song_transition.rb

@@ -1,13 +1,33 @@
 # encoding: utf-8
 
-# @api private
 module PhishDotNetClient
+
+  # This class represents a transition between two songs.
   class SongTransition
 
+    # @!attribute [r] type
+    #
+    #  Valid types:
+    #  * :no_segue
+    #  * :segue (aka '>')
+    #  * :deep_segue (aka '->')
+    #
+    #   @return [Symbol] the transition type
     attr_reader :type
+
+    # @!attribute [r] from_song
+    #   @return [Song] the song going into the transition
     attr_reader :from_song
+
+    # @!attribute [r] to_song
+    #   @return [Song] the song going out the transition
     attr_reader :to_song
 
+    # @api private
+    #
+    # @param type [Symbol] the transition type
+    # @param from_song [Song] the from song
+    # @param to_song [Song] the to song
     def initialize(type, from_song, to_song)
       @type = type
       @from_song = from_song

data/lib/phish_dot_net_client/version.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+
 module PhishDotNetClient
-  VERSION = '0.0.1'
+
+  # Gem version
+  VERSION = '0.1.0'
 end

data/phish_dot_net_client.gemspec

@@ -8,24 +8,26 @@ Gem::Specification.new do |spec|
   spec.version     = PhishDotNetClient::VERSION
   spec.date        = Date.today.to_s
   spec.licenses    = ['MIT']
-  spec.authors     = ["Alexander Bird"]
-  spec.email       = ["alexebird@gmail.com"]
-  spec.homepage    = "https://github.com/alexebird/phish_dot_net_client"
+  spec.authors     = ['Alexander Bird']
+  spec.email       = ['alexebird@gmail.com']
+  spec.homepage    = 'https://github.com/alexebird/phish_dot_net_client'
   spec.summary     = %q{Phish.net API client with setlist parsing}
   spec.description = %q{Calls any Phish.net API method. Supports authentication. Parses 'setlistdata' fields.}
 
-  spec.required_ruby_version     = '>= 1.9.1'
+  spec.required_ruby_version     = '>= 1.9.2'
   spec.required_rubygems_version = '>= 1.3.6'
 
-  spec.add_dependency 'rest-client', '~> 1.6.7'
-  spec.add_dependency 'json', '~> 1.8.0'
-  spec.add_dependency 'nokogiri', '~> 1.6.0'
-  spec.add_development_dependency 'rake'
+  spec.add_runtime_dependency 'rest-client', '~> 1.6.7'
+  spec.add_runtime_dependency 'oj', '~> 2.1.7'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.6.0'
+  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 2.14'
   spec.add_development_dependency 'yard', '~> 0.8'
+  spec.add_development_dependency 'redcarpet', '~> 3.0'
+  spec.add_development_dependency 'simplecov', '~> 0.7.1'
 
   spec.files       = `git ls-files`.split($/)
   spec.test_files  = spec.files.grep(%r{^spec/})
 
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 end

data/spec/phish_dot_net_client/setlist_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe PhishDotNetClient::Setlist do
+  # Test setlistdata:
   # Set 1: Runaway Jim[1], Foam, Punch You In the Eye[2] > Bathtub Gin, Cavern
   # Set 2: Also Sprach Zarathustra -> Cavern
   # Encore: Sleeping Monkey

data/spec/phish_dot_net_client_spec.rb

@@ -5,7 +5,7 @@ describe PhishDotNetClient do
   let(:fake_api_key) { "fake-apikey" }
 
   def access_default_params(key)
-    return pnet.class_variable_get(:@@default_params)[key]
+    return PhishDotNetClient::DEFAULT_PARAMS[key]
   end
 
   it "pre-sets the api version to '2.0'" do

data/spec/spec_helper.rb

@@ -1,7 +1,14 @@
+if ENV["COV"]
+  require 'simplecov'
+  SimpleCov.start
+end
+
 require 'bundler'
 Bundler.require :development
 
-require './lib/phish_dot_net_client'
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+require 'phish_dot_net_client'
 
 RSpec.configure do |config|
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Alexander Bird
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-09 00:00:00 -04:00
+date: 2013-10-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: oj
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -41,10 +41,10 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 2
         - 1
-        - 8
-        - 0
-        version: 1.8.0
+        - 7
+        version: 2.1.7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -68,11 +68,12 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 10
         - 0
-        version: "0"
+        version: "10.0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -103,6 +104,35 @@ dependencies:
         version: "0.8"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: redcarpet
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 1
+        version: 0.7.1
+  type: :development
+  version_requirements: *id008
 description: Calls any Phish.net API method. Supports authentication. Parses 'setlistdata' fields.
 email: 
 - alexebird@gmail.com
@@ -116,7 +146,7 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
+- History.md
 - README.md
 - Rakefile
 - lib/phish_dot_net_client.rb
@@ -149,8 +179,8 @@ required_ruby_version: !ruby/object:Gem::Requirement
       segments: 
       - 1
       - 9
-      - 1
-      version: 1.9.1
+      - 2
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 

data/Gemfile.lock

@@ -1,32 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.4)
-    json (1.8.0)
-    mime-types (1.25)
-    mini_portile (0.5.1)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    rake (10.1.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.3)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    yard (0.8.7.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  json (~> 1.8.0)
-  nokogiri (~> 1.6.0)
-  rake
-  rest-client (~> 1.6.7)
-  rspec
-  yard