intown 0.1.2 → 0.1.3

data/lib/intown/artist.rb

@@ -3,7 +3,7 @@ module Intown
     class << self
       def fetch(params)
         identifier = artist_identifier(params)
-        response = get("/artists/#{URI.encode(identifier)}", options)
+        response = get("/artists/#{identifier}", options)
         process_response(response)
       end
     end

data/lib/intown/client.rb

@@ -22,6 +22,7 @@ module Intown
         case response.code
         when 500 then raise Intown::InvalidRequestError, response.body
         when 404 then process_not_found(response)
+        when 406 then process_not_acceptable(response)
         else
           json_response = JSON.parse(response.body)
 
@@ -34,6 +35,10 @@ module Intown
           end
         end
       end
+      
+      def process_not_acceptable(response)
+        raise Intown::InvalidRequestError, "Bandsintown rejected your request.  Please check your input parameters."
+      end
 
       def process_not_found(response)
         json = JSON.parse(response.body)
@@ -46,9 +51,14 @@ module Intown
       def artist_identifier(params)
         return musicbrainz_identifier(params[:mbid]) if params[:mbid]
         return facebook_identifier(params[:fbid]) if params[:fbid]
-        return params[:name] if params[:name]
+        return encode_name(params[:name]) if params[:name]
         raise ArgumentError, "params must contain one of mbid, fbid, or name"
       end
+      
+      def encode_name(name)
+        # periods & slashes cause the API to blow up
+        URI.encode(name).gsub(/\./, "%2E").gsub(/\//, "%2F")
+      end
 
       def musicbrainz_identifier(mbid)
         "mbid_#{mbid}"

data/lib/intown/event.rb

@@ -4,7 +4,7 @@ module Intown
       def list(params)
         identifier = artist_identifier(params)
         event_params = options.merge(date_options(params))
-        url = "/artists/#{URI.encode(identifier)}/events"
+        url = "/artists/#{identifier}/events"
         response = get(url, event_params)
         process_response(response)
       end

data/lib/intown/version.rb

@@ -1,3 +1,3 @@
 module Intown
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/intown/artist_spec.rb

@@ -1,44 +1,79 @@
 require 'spec_helper'
 
 describe Intown::Artist do
-  let(:response) {
-    stub(:code => 200,
-         :body => '{
-                    "upcoming_events_count":0,
-                    "thumb_url":"http:\/\/www.bandsintown.com\/Nirvana\/photo\/small.jpg",
-                    "name": "Nirvana",
-                    "image_url":"http:\/\/www.bandsintown.com\/Nirvana\/photo\/medium.jpg",
-                    "mbid":"ea5883b7-68ce-48b3-b115-61746ea53b8c",
-                    "facebook_tour_dates_url":"http:\/\/bnds.in\/zTPiUu"
-                  }'
-        )
-  }
+  describe "valid response" do
+    let(:response) {
+      stub(:code => 200,
+           :body => '{
+                      "upcoming_events_count":0,
+                      "thumb_url":"http:\/\/www.bandsintown.com\/Nirvana\/photo\/small.jpg",
+                      "name": "Nirvana",
+                      "image_url":"http:\/\/www.bandsintown.com\/Nirvana\/photo\/medium.jpg",
+                      "mbid":"ea5883b7-68ce-48b3-b115-61746ea53b8c",
+                      "facebook_tour_dates_url":"http:\/\/bnds.in\/zTPiUu"
+                    }'
+          )
+    }
 
-  context "searching by name" do
-    it "should put the name in the artist url" do
-      Intown::Artist.should_receive(:get).with(/\/artists\/Nirvana/, anything).and_return(response)
-      Intown::Artist.fetch(:name => "Nirvana")
+    context "searching by name" do
+      it "should put the name in the artist url" do
+        Intown::Artist.should_receive(:get).with(/\/artists\/Nirvana/, anything).and_return(response)
+        Intown::Artist.fetch(:name => "Nirvana")
+      end
     end
-  end
 
-  context "searching by name with spaces" do
-    it "should url encode the spaces" do
-      Intown::Artist.should_receive(:get).with(/\/artists\/Foo%20Fighters/, anything).and_return(response)
-      Intown::Artist.fetch(:name => "Foo Fighters")
+    context "searching by name with spaces" do
+      it "should url encode the spaces" do
+        Intown::Artist.should_receive(:get).with(/\/artists\/Foo%20Fighters/, anything).and_return(response)
+        Intown::Artist.fetch(:name => "Foo Fighters")
+      end
+    end
+    
+    context "searching by name with periods in the name" do
+      it "should URL encode the period" do
+        Intown::Artist.should_receive(:get).with(/\/artists\/Jr%2E%20Doc/, anything).and_return(response)
+        Intown::Artist.fetch(:name => "Jr. Doc")        
+      end
+    end
+    
+    context "searching by name with a /" do
+      it "should encode the slash" do
+        Intown::Artist.should_receive(:get).with(/\/artists\/Is%2FIs/, anything).and_return(response)
+        Intown::Artist.fetch(:name => "Is/Is")
+      end
     end
-  end
 
-  context "searching by musicbrainz id" do
-    it "should format the musicbrainz id in the url" do
-      Intown::Artist.should_receive(:get).with(/\/artists\/mbid_1234567890abcd/, anything).and_return(response)
-      Intown::Artist.fetch(:mbid => "1234567890abcd")
+    context "searching by musicbrainz id" do
+      it "should format the musicbrainz id in the url" do
+        Intown::Artist.should_receive(:get).with(/\/artists\/mbid_1234567890abcd/, anything).and_return(response)
+        Intown::Artist.fetch(:mbid => "1234567890abcd")
+      end
     end
-  end
 
-  context "searching with invalid params" do
-    it "should raise an argument error" do
-      expect { Intown::Artist.fetch(:foo_bar => "baz") }.to raise_error ArgumentError
+    context "searching with invalid params" do
+      it "should raise an argument error" do
+        expect { Intown::Artist.fetch(:foo_bar => "baz") }.to raise_error ArgumentError
+      end
+    end
+  end
+  
+  describe "invalid response" do
+    let(:status_code) { nil }
+    let(:response_body) { nil }
+    let(:response) {
+      stub(:body => response_body, 
+           :code => status_code)
+    }
+    before do
+      Intown::Artist.should_receive(:get).and_return(response)
+    end
+    context "406 Not Acceptable" do
+      let(:status_code) { 406 }
+      it "should raise an invalid request error" do
+        expect { Intown::Artist.fetch(:name => "Jr. Doc") }.to raise_error Intown::InvalidRequestError
+      end
     end
+    
   end
 
 end

metadata

@@ -2,14 +2,14 @@
 name: intown
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ben Scheirman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -138,7 +138,7 @@ files:
 - spec/intown/artist_spec.rb
 - spec/intown/configuration_spec.rb
 - spec/intown/event_spec.rb
-- spec/intown/tourbus_spec.rb
+- spec/intown/intown_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/subdigital/intown
 licenses: []
@@ -175,6 +175,6 @@ test_files:
 - spec/intown/artist_spec.rb
 - spec/intown/configuration_spec.rb
 - spec/intown/event_spec.rb
-- spec/intown/tourbus_spec.rb
+- spec/intown/intown_spec.rb
 - spec/spec_helper.rb
 has_rdoc: