jammed 0.1.0 → 0.1.1

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem "httparty", ">= 0.8.2"
+gem "json"
 
 group :development do
   gem "rake", ">= 0.8.7"

data/README.md

@@ -1,4 +1,5 @@
-#Jammed [![Build Status](https://secure.travis-ci.org/seanslerner/Jammed.png?branch=master)](http://travis-ci.org/seanslerner/Jammed)
+#Jammed [![Build History][2]][1] [![Dependency Status][4]][3]
+
 ###A Ruby API wrapper for [This Is My Jam](http://www.thisismyjam.com/).
 
 Note: The API for This Is My Jam is stil in beta, so if you'd like to use it please email the Jam team at api@thisismyjam.com to get on their mailing list.
@@ -52,3 +53,8 @@ Also, pagination is not supported at the moment. So, at most you will get the fi
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+[1]: http://travis-ci.org/seanslerner/Jammed
+[2]: https://secure.travis-ci.org/seanslerner/Jammed.png?branch=master
+[3]: https://gemnasium.com/seanslerner/jammed
+[4]: https://gemnasium.com/seanslerner/Jammed.png

data/jammed.gemspec

@@ -0,0 +1,115 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "jammed"
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Sean Lerner", "Rob Young", "Mike Chlipala"]
+  s.date = "2012-05-07"
+  s.description = "Jammed wraps the This Is My Jam API. More information about the This Is My Jam API can be found on their website (http://www.thisismyjam.com/developers)."
+  s.email = ["seanslerner@gmail.com"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+    ".rspec",
+    ".travis.yml",
+    "Gemfile",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "examples/basics.rb",
+    "jammed.gemspec",
+    "lib/jammed.rb",
+    "lib/jammed/api.rb",
+    "lib/jammed/base.rb",
+    "lib/jammed/errors.rb",
+    "lib/jammed/followers.rb",
+    "lib/jammed/following.rb",
+    "lib/jammed/jams.rb",
+    "lib/jammed/likes.rb",
+    "lib/jammed/people_search.rb",
+    "lib/jammed/person.rb",
+    "lib/jammed/popular_jams.rb",
+    "lib/jammed/random.rb",
+    "lib/jammed/suggested_people.rb",
+    "lib/jammed/user.rb",
+    "lib/jammed/version.rb",
+    "spec/jammed/api_spec.rb",
+    "spec/jammed/base_spec.rb",
+    "spec/jammed/error_spec.rb",
+    "spec/jammed/followers_spec.rb",
+    "spec/jammed/following_spec.rb",
+    "spec/jammed/jams_spec.rb",
+    "spec/jammed/likes_spec.rb",
+    "spec/jammed/people_search_spec.rb",
+    "spec/jammed/person_spec.rb",
+    "spec/jammed/popular_jams_spec.rb",
+    "spec/jammed/random_spec.rb",
+    "spec/jammed/suggested_people_spec.rb",
+    "spec/jammed/user_spec.rb",
+    "spec/sample_responses/bad_request.json",
+    "spec/sample_responses/followers.json",
+    "spec/sample_responses/followers_affinity.json",
+    "spec/sample_responses/followers_date.json",
+    "spec/sample_responses/followers_name.json",
+    "spec/sample_responses/following.json",
+    "spec/sample_responses/following_affinity.json",
+    "spec/sample_responses/following_date.json",
+    "spec/sample_responses/following_name.json",
+    "spec/sample_responses/jams.json",
+    "spec/sample_responses/jams_past.json",
+    "spec/sample_responses/likes.json",
+    "spec/sample_responses/likes_current.json",
+    "spec/sample_responses/likes_past.json",
+    "spec/sample_responses/not_found.json",
+    "spec/sample_responses/person.json",
+    "spec/sample_responses/popular.json",
+    "spec/sample_responses/random.json",
+    "spec/sample_responses/search_artist.json",
+    "spec/sample_responses/search_name.json",
+    "spec/sample_responses/search_track.json",
+    "spec/sample_responses/suggested_people.json",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "https://github.com/seanslerner/Jammed"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "A Ruby wrapper for This Is My Jam's API"
+  s.test_files = ["spec/jammed/api_spec.rb", "spec/jammed/base_spec.rb", "spec/jammed/error_spec.rb", "spec/jammed/followers_spec.rb", "spec/jammed/following_spec.rb", "spec/jammed/jams_spec.rb", "spec/jammed/likes_spec.rb", "spec/jammed/people_search_spec.rb", "spec/jammed/person_spec.rb", "spec/jammed/popular_jams_spec.rb", "spec/jammed/random_spec.rb", "spec/jammed/suggested_people_spec.rb", "spec/jammed/user_spec.rb", "spec/sample_responses/bad_request.json", "spec/sample_responses/followers.json", "spec/sample_responses/followers_affinity.json", "spec/sample_responses/followers_date.json", "spec/sample_responses/followers_name.json", "spec/sample_responses/following.json", "spec/sample_responses/following_affinity.json", "spec/sample_responses/following_date.json", "spec/sample_responses/following_name.json", "spec/sample_responses/jams.json", "spec/sample_responses/jams_past.json", "spec/sample_responses/likes.json", "spec/sample_responses/likes_current.json", "spec/sample_responses/likes_past.json", "spec/sample_responses/not_found.json", "spec/sample_responses/person.json", "spec/sample_responses/popular.json", "spec/sample_responses/random.json", "spec/sample_responses/search_artist.json", "spec/sample_responses/search_name.json", "spec/sample_responses/search_track.json", "spec/sample_responses/suggested_people.json", "spec/spec_helper.rb"]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<httparty>, [">= 0.8.2"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0.8.7"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.8.3"])
+      s.add_development_dependency(%q<rspec>, [">= 2.9.0"])
+      s.add_development_dependency(%q<webmock>, [">= 1.8.6"])
+    else
+      s.add_dependency(%q<httparty>, [">= 0.8.2"])
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0.8.7"])
+      s.add_dependency(%q<jeweler>, [">= 1.8.3"])
+      s.add_dependency(%q<rspec>, [">= 2.9.0"])
+      s.add_dependency(%q<webmock>, [">= 1.8.6"])
+    end
+  else
+    s.add_dependency(%q<httparty>, [">= 0.8.2"])
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0.8.7"])
+    s.add_dependency(%q<jeweler>, [">= 1.8.3"])
+    s.add_dependency(%q<rspec>, [">= 2.9.0"])
+    s.add_dependency(%q<webmock>, [">= 1.8.6"])
+  end
+end
+

data/lib/jammed/api.rb

@@ -0,0 +1,55 @@
+module Jammed
+  # A base class for API calling classes to inherit from which provides a method for making HTTP requests
+  class API
+
+    # Call the API through HTTParty and returns the correct error if error raised
+    #
+    # ==== Attributes
+    #
+    # * +method+ - HTTP method for making hte request (:get, :post, etc.)
+    # * +path+ - Path to API endpoint (/IFTFOM.json)
+    # * +opts+ - Query options (API key!) (:show => :past)
+    #
+    # ==== Examples
+    #
+    #     Jammed::API.request(:get, /IFTFOM/followers.json, :query => {:key => 'api_key', :order => 'affinity'})
+    def self.request(method, path, opts={})
+      base_uri = 'http://api.thisismyjam.com/1'
+
+      params = {}
+      params[:path] = path
+      params[:options] = opts
+      params[:method] = method
+
+      response = HTTParty.send(method, "#{base_uri}#{path}",
+        :query => opts[:query],
+        :body => opts[:body],
+        :format => :plain,
+        :headers => {
+          "Accept" => "application/json",
+          "Content-Type" => "application/json; charset=utf-8",
+          "User-Agent" => "Jammed/#{Jammed::VERSION}"
+        }
+      )
+
+      params[:response] = response.inspect.to_s
+
+      case response.code
+      when 200..201
+        response
+      when 400
+        raise Jammed::BadRequest.new(response, params)
+      when 404
+        raise Jammed::NotFound.new(response, params)
+      when 500
+        raise Jammed::ServerError.new(response, params)
+      when 502
+        raise Jammed::Unavailable.new(response, params)
+      when 503
+        raise Jammed::RateLimited.new(response, params)
+      else
+        raise Jammed::InformJammed.new(response, params)
+      end
+    end
+  end
+end

data/lib/jammed/base.rb

@@ -110,6 +110,16 @@ module Jammed
       Person.profile(username, @api_key)
     end
 
+    # Calls Jammed::RandomJam.jam
+    #
+    # ==== Examples
+    #
+    #     jammed = Jammed.new('08972935872035')
+    #     jammed.random
+    def random
+      RandomJam.jam(@api_key)
+    end
+
     # Calls Jammed::PeopleSearch.search_name
     #
     # ==== Attributes

data/lib/jammed/errors.rb

@@ -0,0 +1,29 @@
+module Jammed
+  class HTTPError < StandardError #:nodoc: 
+    attr_reader :response
+    attr_reader :params
+
+    def initialize(response, params = {})
+      @response = response
+      @params = params
+      super(response)
+    end
+    
+    def to_s
+      "#{self.class.to_s} : #{response.code} #{response.body}"
+    end
+  end
+
+  class RateLimited < HTTPError#:nodoc: 
+  end
+  class NotFound < HTTPError#:nodoc: 
+  end
+  class Unavailable < HTTPError#:nodoc: 
+  end
+  class InformJammed < HTTPError#:nodoc: 
+  end
+  class BadRequest < HTTPError#:nodoc: 
+  end
+  class ServerError < HTTPError#:nodoc: 
+  end
+end

data/lib/jammed/followers.rb

@@ -1,6 +1,6 @@
 module Jammed #:nodoc: 
   # Provides methods for calling API endpoint /follower.json?
-  class Followers
+  class Followers < API
     # Calls API for user specific data concerning followers
     #
     # ==== Attributes
@@ -20,17 +20,21 @@ module Jammed #:nodoc:
     def self.followers(username, api_key, opts={})
       case(opts[:order])
       when nil
-        followers = Search.get "/#{username}/followers.json?key=#{api_key}"
+        response = request(:get, "/#{username}/followers.json", 
+          :query => {:key => api_key})
       when :date
-        followers = Search.get "/#{username}/followers.json?order=followedDate&key=#{api_key}"
+        response = request(:get, "/#{username}/followers.json", 
+          :query => {:order => 'followedDate', :key => api_key})
       when :affinity
-        followers = Search.get "/#{username}/followers.json?order=affinity&key=#{api_key}"
+        response = request(:get, "/#{username}/followers.json", 
+          :query => {:order => 'affinity', :key => api_key})
       when :alpha
-        followers = Search.get "/#{username}/followers.json?order=name&key=#{api_key}"
+        response = request(:get, "/#{username}/followers.json", 
+          :query => {:order => 'name', :key => api_key})
       else
         return "Cannot order Followers by #{opts[:order]}"
       end
-      followers["people"] ? followers["people"] : "404 Not Found" 
+      JSON.parse(response.body)['people']
     end
   end
 end

data/lib/jammed/following.rb

@@ -1,6 +1,6 @@
 module Jammed #:nodoc:
   # Provides methods for calling API endpoint /following.json?
-  class Following
+  class Following < API
     # Calls API for user specific data concerning who the user is following
     #
     # ==== Attributes
@@ -20,17 +20,21 @@ module Jammed #:nodoc:
     def self.following(username, api_key, opts={})
       case(opts[:order])
       when nil
-        followings = Search.get "/#{username}/following.json?key=#{api_key}"
+        response = request(:get, "/#{username}/following.json", 
+          :query => {:key => api_key})
       when :date
-        followings = Search.get "/#{username}/following.json?order=followedDate&key=#{api_key}"
+        response = request(:get, "/#{username}/following.json", 
+          :query => {:order => 'followedDate', :key => api_key})
       when :affinity
-        followings = Search.get "/#{username}/following.json?order=affinity&key=#{api_key}"
+        response = request(:get, "/#{username}/following.json", 
+          :query => {:order => 'affinity', :key => api_key})
       when :alpha
-        followings = Search.get "/#{username}/following.json?order=name&key=#{api_key}"
+        response = request(:get, "/#{username}/following.json", 
+          :query => {:order => 'name', :key => api_key})
       else
         return "Cannot order Followings by #{opts[:order]}"
       end
-      followings["people"] ? followings["people"] : "404 Not Found" 
+      JSON.parse(response.body)['people']
     end
   end
 end

data/lib/jammed/jams.rb

@@ -1,6 +1,6 @@
 module Jammed #:nodoc:
   # Provides methods for calling API endpoint /jams.json?
-  class Jams
+  class Jams < API
     # Calls API for user specific data concerning jams
     #
     # ==== Attributes
@@ -20,14 +20,18 @@ module Jammed #:nodoc:
     def self.jams(username, api_key, opts={})
       case(opts[:show])
       when nil
-        jams = Search.get "/#{username}/jams.json?key=#{api_key}"
-        jams["jams"] ? jams["jams"] : "404: User Not Found"
+        response = request(:get, "/#{username}/jams.json", 
+          :query => {:key => api_key})
+        JSON.parse(response.body)['jams']
       when :past
-        jams = Search.get "/#{username}/jams.json?show=past&key=#{api_key}"
-        jams["jams"] ? jams["jams"] : "404: User Not Found"
+        response = request(:get, "/#{username}/jams.json", 
+          :query => {:show => 'past', :key => api_key})
+        JSON.parse(response.body)['jams']
       when :current
-        jams = Search.get "/#{username}/jams.json?key=#{api_key}"
-        jams["jams"][0]['current'] ? jams["jams"][0] : "No Current Jam"
+        response = request(:get, "/#{username}/jams.json", 
+          :query => {:key => api_key})
+        jams = JSON.parse(response.body)['jams'][0]
+        jams['current'] ? jams : "No Current Jam"
       end
     end
   end

data/lib/jammed/likes.rb

@@ -1,6 +1,6 @@
 module Jammed #:nodoc:
   # Provides methods for calling API endpoint /likes.json?
-  class Likes
+  class Likes < API
     # Calls API for user specific data concerning likes
     #
     # ==== Attributes
@@ -20,13 +20,16 @@ module Jammed #:nodoc:
     def self.likes(username, api_key, opts={})
       case(opts[:show])
       when nil
-        likes = Search.get "/#{username}/likes.json?key=#{api_key}"
+        response = request(:get, "/#{username}/likes.json", 
+          :query => {:key => api_key})
       when :current
-        likes = Search.get "/#{username}/likes.json?show=current&key=#{api_key}"
+        response = request(:get, "/#{username}/likes.json", 
+          :query => {:show => 'current', :key => api_key})
       when :past
-        likes = Search.get "/#{username}/likes.json?show=past&key=#{api_key}"
+        response = request(:get, "/#{username}/likes.json", 
+          :query => {:show => 'past', :key => api_key})
       end
-      likes["jams"] ? likes["jams"] : "404: Not Found"
+      JSON.parse(response.body)['jams']
     end
   end
 end

data/lib/jammed/people_search.rb

@@ -2,7 +2,7 @@ require 'uri'
 
 module Jammed #:nodoc:
   # Provides methods for calling API endpoint /person.json?by=
-  class PeopleSearch
+  class PeopleSearch < API
 
     # Calls API for a search by username
     #
@@ -15,8 +15,9 @@ module Jammed #:nodoc:
     #
     #     Jammed::PeopleSearch.search_name('IFTFOM', '08972935872035')
     def self.search_name(name, api_key)
-      search = Search.get "/search/person.json?by=name&q=#{name.split.join('+')}&key=#{api_key}"
-      search["people"][0] ? search["people"] : "No people found"
+      response = request(:get, "/search/person.json", 
+          :query => {:by => 'name', :q => "#{name.split.join('+')}", :key => api_key})
+      JSON.parse(response.body)['people']
     end
 
     # Calls API for a search by artist
@@ -30,8 +31,9 @@ module Jammed #:nodoc:
     #
     #     Jammed::PeopleSearch.search_artist('beach boys', '08972935872035')
     def self.search_artist(artist, api_key)
-      search = Search.get "/search/person.json?by=artist&q=#{artist.split.join('+')}&key=#{api_key}"
-      search["people"][0] ? search["people"] : "No artists found"
+      response = request(:get, "/search/person.json", 
+          :query => {:by => 'artist', :q => "#{artist.split.join('+')}", :key => api_key})
+      JSON.parse(response.body)['people']
     end
 
     # Calls API for a search by track
@@ -46,9 +48,11 @@ module Jammed #:nodoc:
     #
     #     Jammed::PeopleSearch.search_track('beach boys', 'good vibrations', '08972935872035')
     def self.search_track(artist, track, api_key)
-      uri = URI.escape("/search/person.json?by=track&q=#{artist.split.join('+')}|#{track.split.join('+')}&key=#{api_key}", '|')
-      search = Search.get uri   
-      search["people"][0] ? search["people"] : "No tracks found"  
+      response = request(:get, "/search/person.json",
+          :query => {:by => 'track', 
+                     :q => "#{artist.split.join('+')}|#{track.split.join('+')}",
+                     :key => api_key})
+      JSON.parse(response.body)['people'] 
     end
 
   end

data/lib/jammed/person.rb

@@ -1,14 +1,14 @@
 module Jammed #:nodoc:
   # Provides methods for calling API endpoint /username.json? and accessing user specific data
-  class Person
+  class Person < API
     # Calls API for a specific user's profile
     #
     # ==== Examples
     #
     #     Jammed::Person.profile('IFTFOM', '08972935872035') #returns IFTFOM's profile data
     def self.profile(username, api_key)
-      profile = Search.get "/#{username}.json?key=#{api_key}"
-      profile["person"] ? profile["person"] : "404: User Not Found"
+      response = request(:get, "/#{username}.json", :query => {:key => api_key})
+      JSON.parse(response.body)["person"]
     end
 
     # Calls API for a specific user's name
@@ -26,7 +26,7 @@ module Jammed #:nodoc:
     #
     #     Jammed::Person.joinedDate('IFTFOM', '08972935872035') #returns IFTFOM's joined date
     def self.method_missing(name, *args, &block)
-      self.profile(args[0],args[1]).has_key?(name.to_s) ? self.profile(args[0],args[1])[name.to_s] : super
+      Jammed::Person.profile(args[0],args[1]).has_key?(name.to_s) ? self.profile(args[0],args[1])[name.to_s] : super
     end
   end
 end

data/lib/jammed/popular_jams.rb

@@ -1,14 +1,14 @@
 module Jammed #:nodoc:
   # Provides method for calling API endpoint /popular.json?
-  class PopularJams
+  class PopularJams < API
     # Calls API for popular jams
     #
     # ==== Examples
     #
     #     Jammed::PopularJams.popular_jams('08972935872035') #returns a sample of popular jams
     def self.popular_jams(api_key)
-      search = Search.get "/popular.json?key=#{api_key}"
-      search['jams'] ? search['jams'] : "404 Not Found"
+      response = request(:get, "/popular.json", :query => {:key => api_key})
+      JSON.parse(response.body)['jams']
     end
   end
 end

data/lib/jammed/random.rb

@@ -0,0 +1,14 @@
+module Jammed #:nodoc:
+  # Provides method for calling API endpoint /random.json?
+  class RandomJam < API
+    # Calls API for a random jam
+    #
+    # ==== Examples
+    #
+    #     Jammed::RandomJam.jam('08972935872035') #returns a random jam + the profile of the user
+    def self.jam(api_key)
+      response = request(:get, "/random.json", :query => {:key => api_key})
+      JSON.parse(response.body)
+    end
+  end
+end

data/lib/jammed/suggested_people.rb

@@ -1,14 +1,14 @@
 module Jammed #:nodoc:
   # Provides method for calling API endpoint /suggestedPeople.json?
-  class SuggestedPeople
+  class SuggestedPeople < API
     # Calls API for suggested people
     #
     # ==== Examples
     #
     #     Jammed::SuggestedPeople.people('08972935872035') #returns a list of users with many followers/likes
     def self.people(api_key)
-      response = Search.get "/suggestedPeople.json?key=#{api_key}"
-      response["people"][0] ? response["people"] : "No people found"
+      response = request(:get, "/suggestedPeople.json", :query => {:key => api_key})
+      JSON.parse(response.body)['people']
     end
   end
 end

data/lib/jammed/version.rb

@@ -1,4 +1,4 @@
 module Jammed
   #:nodoc:
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/jammed.rb

@@ -1,15 +1,10 @@
 require 'httparty'
+require 'json'
 Dir[File.dirname(__FILE__) + '/jammed/*.rb'].each do |file|
   require file
 end
 
-module Jammed
-
-  class Search #:nodoc:
-    include HTTParty
-    base_uri 'http://api.thisismyjam.com/1'
-  end
-  
+module Jammed  
   class << self
     #Creates a Jammed::Base object for interacting with the API
     #

data/spec/jammed/api_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+class FakeResponse
+  attr_accessor :code, :body
+  def initialize code, body
+    @code, @body = code, body
+  end
+end
+
+module Jammed
+  describe API do 
+    describe "#request" do 
+      it "sends a request to HTTParty" do
+        HTTParty.should_receive(:get).and_return(FakeResponse.new(200, 'this'))
+        Jammed::API.request(:get, '/path')
+      end
+    end
+  end
+end

data/spec/jammed/base_spec.rb

@@ -52,6 +52,13 @@ module Jammed
       end
     end
 
+    describe "#random" do 
+      it "calls Jammed::RandomJam.jam" do
+        Jammed::RandomJam.should_receive(:jam)
+        jammed.random
+      end
+    end
+
     describe "#search_name" do 
       it "calls Jammed::PeopleSearch.search_name" do
         Jammed::PeopleSearch.should_receive(:search_name)

data/spec/jammed/error_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+module Jammed
+  describe "Errors" do
+    let(:jammed) {Jammed.new('987bcab01b929eb2c07877b224215c92')}
+    describe NotFound do 
+      before do 
+        serve_response("http://api.thisismyjam.com/1/szkjhfkgsufaiuh.json?key=987bcab01b929eb2c07877b224215c92", :not_found, 404)
+      end
+      it "is raised when unknown username is used" do
+        lambda { jammed.profile('szkjhfkgsufaiuh') }.should raise_error NotFound
+      end
+    end
+
+    describe BadRequest do 
+      before do 
+        serve_response('http://api.thisismyjam.com/1/IFTFOM.json?badparam=woo&key=987bcab01b929eb2c07877b224215c92', :bad_request, 400)
+      end
+      it "is raised when bad parameters are used" do
+        lambda { API.request(:get, '/IFTFOM.json', 
+          :query => {:key => '987bcab01b929eb2c07877b224215c92', 
+            :badparam => :woo}) }.should raise_error BadRequest
+      end
+    end
+    
+    describe ServerError do 
+      before do 
+        serve_response("http://api.thisismyjam.com/1/szkjhfkgsufaiuh.json?key=987bcab01b929eb2c07877b224215c92", :not_found, 500)
+      end
+      it "is raised when the server errors" do
+        lambda { jammed.profile('szkjhfkgsufaiuh') }.should raise_error ServerError
+      end
+    end
+  end
+end

data/spec/jammed/people_search_spec.rb

@@ -34,7 +34,8 @@ module Jammed
       let(:search) { Jammed::PeopleSearch.search_artist(query, api_key) }
 
       before do 
-        serve_response("http://api.thisismyjam.com/1/search/person.json?by=artist&q=beach+boys&key=987bcab01b929eb2c07877b224215c92", :search_artist)
+        #serve_response("http://api.thisismyjam.com/1/search/person.json?by=artist&q=beach+boys&key=987bcab01b929eb2c07877b224215c92", :search_artist)
+        serve_response(/by=artist/, :search_artist)
       end
 
       it "returns people from the API" do
@@ -58,7 +59,8 @@ module Jammed
       let(:search) { Jammed::PeopleSearch.search_track(query_artist, query_track, api_key)}
 
       before do 
-        serve_response("http://api.thisismyjam.com/1/search/person.json?by=track&q=Lana+del+Rey|Video+games&key=987bcab01b929eb2c07877b224215c92", :search_track)
+        #serve_response("http://api.thisismyjam.com/1/search/person.json?by=track&q=Lana+del+Rey|Video+games&key=987bcab01b929eb2c07877b224215c92", :search_track)
+        serve_response(/by=track/, :search_track)
       end
 
       it "returns people from the API" do

data/spec/jammed/person_spec.rb

@@ -31,7 +31,7 @@ module Jammed
       end
 
       it "raises method missing if attribute is not present" do
-        lambda { Jammed::Person.foo_attribute('IFTFOM', api_key) }.should raise_error NoMethodError
+        lambda { Jammed::Person.foo_attribute('IFTFOM', api_key) }.should raise_error 
       end
     end
   end

data/spec/jammed/random_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module Jammed
+  describe RandomJam do 
+
+    let(:api_key) {'987bcab01b929eb2c07877b224215c92'}
+
+    describe ".jam" do
+      
+      before do
+        serve_response("http://api.thisismyjam.com/1/random.json?key=987bcab01b929eb2c07877b224215c92", :random)
+      end
+      
+      it "parses the JSON return into a hash" do
+        Jammed::RandomJam.jam(api_key).should be_an_instance_of Hash
+      end
+
+      it "gets popular jams from the api" do
+        Jammed::RandomJam.jam(api_key).should_not be_nil
+      end
+    end
+  end
+end

data/spec/jammed/user_spec.rb

@@ -191,7 +191,7 @@ module Jammed
         end
 
         it "raises method missing if attribute is not present" do
-          lambda { user.foo_attribute }.should raise_error NoMethodError
+          lambda { user.foo_attribute }.should raise_error NameError
         end
       end
 

data/spec/sample_responses/bad_request.json

@@ -0,0 +1,6 @@
+{
+  "error":true,
+  "code":400,
+  "text":"Bad Request",
+  "message":"Invalid value for 'show' parameter: 'them'"
+}

data/spec/sample_responses/not_found.json

@@ -0,0 +1,6 @@
+{
+  "error":true,
+  "code":404,
+  "text":"Not Found",
+  "message":""
+}

data/spec/sample_responses/random.json

@@ -0,0 +1,44 @@
+{
+    "jam": {
+        "artist": "B.W. Stevenson", 
+        "caption": "The Institute needs an AM radio, and soon.", 
+        "creationDate": "Tue, 17 Apr 2012 22:53:03 +0000", 
+        "current": true, 
+        "endDate": "Tue, 24 Apr 2012 22:53:03 +0000", 
+        "from": "IFTFOM", 
+        "id": "18ahqel", 
+        "jamvatarLarge": "http://static01.thisismyjam.com/i/0af5ee0aebf3ed7ddd44e2a91df7f612_395.jpg", 
+        "jamvatarMedium": "http://static02.thisismyjam.com/i/0af5ee0aebf3ed7ddd44e2a91df7f612_185.jpg", 
+        "jamvatarSmall": "http://static01.thisismyjam.com/i/0af5ee0aebf3ed7ddd44e2a91df7f612_80.jpg", 
+        "likes": "http://api.thisismyjam.com/1/jams/18ahqel/likes.json?key=987bcab01b929eb2c07877b224215c92", 
+        "likesCount": 23, 
+        "playCount": 105, 
+        "title": "My Maria", 
+        "via": "youtube", 
+        "viaUrl": "http://www.youtube.com/watch?v=JdBvTvxHy7E"
+    }, 
+    "person": {
+        "apiUrl": "http://api.thisismyjam.com/1/IFTFOM.json?key=987bcab01b929eb2c07877b224215c92", 
+        "avatarNormal": "http://static01.thisismyjam.com/i/avtr_ffb74c754f2e74d43ba3e77aa46c3e1a_128.jpg", 
+        "avatarSmall": "http://static03.thisismyjam.com/i/avtr_ffb74c754f2e74d43ba3e77aa46c3e1a_small.jpg", 
+        "bio": "Between the park and the canal. Improving your music life with science and heart. We like coldwave, yacht rock, the future, and you.", 
+        "followers": "http://api.thisismyjam.com/1/IFTFOM/followers.json?key=987bcab01b929eb2c07877b224215c92", 
+        "followersCount": 1547, 
+        "following": "http://api.thisismyjam.com/1/IFTFOM/following.json?key=987bcab01b929eb2c07877b224215c92", 
+        "followingCount": 718, 
+        "fullname": "Institute for the Future of Music", 
+        "hasCurrentJam": true, 
+        "jamCount": 34, 
+        "joinedDate": "Fri, 26 Aug 2011 16:15:19 +0000", 
+        "lastfmName": "IFTFOM", 
+        "name": "IFTFOM", 
+        "representativeArtists": [
+            "Orchestral Manoeuvres in the Dark", 
+            "Christopher Cross", 
+            "Steely Dan", 
+            "Robert Palmer"
+        ], 
+        "twitterName": "IFTFOM", 
+        "url": "http://www.thisismyjam.com/IFTFOM"
+    }
+}

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'webmock/rspec'
 
 SAMPLE_RESPONSES_DIR = "sample_responses"
 
-def serve_response(path, file_name)
+def serve_response(path, file_name, status=200)
   begin
     response_body = File.binread(
                       File.dirname(__FILE__) +
@@ -13,6 +13,6 @@ def serve_response(path, file_name)
   end
   
   stub_request(:get, path)
-    .to_return(:status => 200, :body => response_body,
+    .to_return(:status => status, :body => response_body,
                                :headers => {:content_type => 'application/json'})
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jammed
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000Z
+date: 2012-05-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70322943151720 !ruby/object:Gem::Requirement
+  requirement: &70115760365280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,21 @@ dependencies:
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *70322943151720
+  version_requirements: *70115760365280
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70115760364640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70115760364640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70322943150020 !ruby/object:Gem::Requirement
+  requirement: &70115760363900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +45,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70322943150020
+  version_requirements: *70115760363900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70322943149140 !ruby/object:Gem::Requirement
+  requirement: &70115760363120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +56,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70322943149140
+  version_requirements: *70115760363120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70322943148160 !ruby/object:Gem::Requirement
+  requirement: &70115760350480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +67,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70322943148160
+  version_requirements: *70115760350480
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70322943147300 !ruby/object:Gem::Requirement
+  requirement: &70115760349000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +78,7 @@ dependencies:
         version: 1.8.6
   type: :development
   prerelease: false
-  version_requirements: *70322943147300
+  version_requirements: *70115760349000
 description: Jammed wraps the This Is My Jam API. More information about the This
   Is My Jam API can be found on their website (http://www.thisismyjam.com/developers).
 email:
@@ -86,8 +97,11 @@ files:
 - README.md
 - Rakefile
 - examples/basics.rb
+- jammed.gemspec
 - lib/jammed.rb
+- lib/jammed/api.rb
 - lib/jammed/base.rb
+- lib/jammed/errors.rb
 - lib/jammed/followers.rb
 - lib/jammed/following.rb
 - lib/jammed/jams.rb
@@ -95,10 +109,13 @@ files:
 - lib/jammed/people_search.rb
 - lib/jammed/person.rb
 - lib/jammed/popular_jams.rb
+- lib/jammed/random.rb
 - lib/jammed/suggested_people.rb
 - lib/jammed/user.rb
 - lib/jammed/version.rb
+- spec/jammed/api_spec.rb
 - spec/jammed/base_spec.rb
+- spec/jammed/error_spec.rb
 - spec/jammed/followers_spec.rb
 - spec/jammed/following_spec.rb
 - spec/jammed/jams_spec.rb
@@ -106,8 +123,10 @@ files:
 - spec/jammed/people_search_spec.rb
 - spec/jammed/person_spec.rb
 - spec/jammed/popular_jams_spec.rb
+- spec/jammed/random_spec.rb
 - spec/jammed/suggested_people_spec.rb
 - spec/jammed/user_spec.rb
+- spec/sample_responses/bad_request.json
 - spec/sample_responses/followers.json
 - spec/sample_responses/followers_affinity.json
 - spec/sample_responses/followers_date.json
@@ -121,8 +140,10 @@ files:
 - spec/sample_responses/likes.json
 - spec/sample_responses/likes_current.json
 - spec/sample_responses/likes_past.json
+- spec/sample_responses/not_found.json
 - spec/sample_responses/person.json
 - spec/sample_responses/popular.json
+- spec/sample_responses/random.json
 - spec/sample_responses/search_artist.json
 - spec/sample_responses/search_name.json
 - spec/sample_responses/search_track.json
@@ -143,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1856835225983972605
+      hash: 756853401178736676
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -157,7 +178,9 @@ signing_key:
 specification_version: 3
 summary: A Ruby wrapper for This Is My Jam's API
 test_files:
+- spec/jammed/api_spec.rb
 - spec/jammed/base_spec.rb
+- spec/jammed/error_spec.rb
 - spec/jammed/followers_spec.rb
 - spec/jammed/following_spec.rb
 - spec/jammed/jams_spec.rb
@@ -165,8 +188,10 @@ test_files:
 - spec/jammed/people_search_spec.rb
 - spec/jammed/person_spec.rb
 - spec/jammed/popular_jams_spec.rb
+- spec/jammed/random_spec.rb
 - spec/jammed/suggested_people_spec.rb
 - spec/jammed/user_spec.rb
+- spec/sample_responses/bad_request.json
 - spec/sample_responses/followers.json
 - spec/sample_responses/followers_affinity.json
 - spec/sample_responses/followers_date.json
@@ -180,8 +205,10 @@ test_files:
 - spec/sample_responses/likes.json
 - spec/sample_responses/likes_current.json
 - spec/sample_responses/likes_past.json
+- spec/sample_responses/not_found.json
 - spec/sample_responses/person.json
 - spec/sample_responses/popular.json
+- spec/sample_responses/random.json
 - spec/sample_responses/search_artist.json
 - spec/sample_responses/search_name.json
 - spec/sample_responses/search_track.json