foursquare2 1.1.2 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/foursquare2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{foursquare2}
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Mueller", "Marco Moura"]
-  s.date = %q{2011-10-07}
+  s.date = %q{2011-10-20}
   s.description = %q{Gives access to all endpoints in version 2 of foursquare's API with syntax that will be familiar to those who used the original foursquare gem by Jeremy Welch.}
   s.email = ["muellermr@gmail.com", "email@marcomoura.com"]
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "foursquare2.gemspec",
     "lib/foursquare2.rb",
+    "lib/foursquare2/api_error.rb",
     "lib/foursquare2/checkins.rb",
     "lib/foursquare2/client.rb",
     "lib/foursquare2/hash.rb",
@@ -36,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/foursquare2/venues.rb",
     "test/config.rb",
     "test/fixtures/checkin.json",
+    "test/fixtures/error.json",
     "test/fixtures/explore_venues.json",
     "test/fixtures/friend_checkins.json",
     "test/fixtures/no_venues_by_tip.json",

data/lib/foursquare2/api_error.rb

@@ -0,0 +1,19 @@
+module Foursquare2
+  class APIError < StandardError
+
+    attr_reader :code
+    attr_reader :detail
+    attr_reader :type
+
+    def initialize(error)
+      @code   = error.code
+      @detail = error.errorDetail
+      @type   = error.errorType
+    end
+
+    def message
+      "#{@type}: #{@detail} (#{@code})"
+    end
+
+  end
+end

data/lib/foursquare2/client.rb

@@ -60,7 +60,11 @@ module Foursquare2
     # Added just for convenience to avoid having to traverse farther down the response just to get to returned data.
 
     def return_error_or_body(response, response_body)
-      response.body.meta.code == 200 ? response_body : response.body
+      if response.body.meta.code == 200 
+        response_body
+      else
+        raise Foursquare2::APIError.new(response.body.meta) 
+      end
     end
       
     private

data/lib/foursquare2.rb

@@ -27,6 +27,7 @@ module Foursquare2
   require 'foursquare2/venues'
   require 'foursquare2/client'
   require 'foursquare2/hash'
+  require 'foursquare2/api_error'
 
 end
 

data/test/fixtures/error.json

@@ -0,0 +1,2 @@
+{ "meta": { "code": 500, "errorType": "error", "errorDetail": "An error occured" } }
+

data/test/helper.rb

@@ -11,6 +11,7 @@ require 'test/unit'
 require 'shoulda'
 require 'matchy'
 require 'fakeweb'
+require 'json'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -27,10 +28,17 @@ def foursquare_url(url)
   url =~ /^http/ ? url : "http://api.foursquare.com/v2#{url}"
 end
 
-def fixture_file(filename)
+def fixture_file(filename, options={})
   return '' if filename == ''
   file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/' + filename)
-  File.read(file_path)
+  fixture   = File.read(file_path)
+  
+  case File.extname(file_path)
+  when '.json'
+    options[:parse] ? JSON.parse(fixture) : fixture
+  else
+    fixture
+  end
 end
 
 def stub_get(url, filename, options={})

data/test/test_client.rb

@@ -29,4 +29,26 @@ class TestClient < Test::Unit::TestCase
       @client.ssl[:ca_file].should == 'path_to_ca_file'
     end
   end
+
+  context "When returning a successful response" do
+    should "return the response body as a Hash." do
+      response = Faraday::Response.new(:body => fixture_file('search_venues.json', :parse => true))
+      client   = Foursquare2::Client.new
+
+      subject = client.return_error_or_body(response, response.body.response)
+      subject.should eql(response.body.response)
+    end
+  end
+
+  context "When returning a unsucessful response(error)" do
+    should "raise Foursquare2::Error." do
+      response = Faraday::Response.new(:body => fixture_file('error.json', :parse => true))
+      client   = Foursquare2::Client.new
+  
+      assert_raises(Foursquare2::APIError) do
+        client.return_error_or_body(response, response.body)
+      end
+    end
+  end
+
 end

metadata

@@ -1,221 +1,158 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: foursquare2
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 2
-  version: 1.1.2
 platform: ruby
-authors: 
+authors:
 - Matt Mueller
 - Marco Moura
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-07 00:00:00 -05:00
+date: 2011-10-20 00:00:00.000000000 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: &10737380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
-  name: faraday
-  version_requirements: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *10737380
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: &10695760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
-  name: faraday_middleware
-  version_requirements: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *10695760
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: &10691680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  name: hashie
-  version_requirements: *id003
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *10691680
+- !ruby/object:Gem::Dependency
   name: shoulda
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: &10689700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *10689700
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &10654920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  name: bundler
-  version_requirements: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *10654920
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &10651560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
-  name: jeweler
-  version_requirements: *id006
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rcov
-  version_requirements: *id007
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: *10651560
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &10634900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *10634900
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &10632100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  name: fakeweb
-  version_requirements: *id008
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *10632100
+- !ruby/object:Gem::Dependency
+  name: jnunemaker-matchy
+  requirement: &10630160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
-  name: jnunemaker-matchy
-  version_requirements: *id009
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *10630160
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: &10623100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
-  name: json_pure
-  version_requirements: *id010
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *10623100
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &10621360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.0.0
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 0
-        - 5
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.5
-  name: multi_json
-  version_requirements: *id011
+  type: :development
   prerelease: false
-description: Gives access to all endpoints in version 2 of foursquare's API with syntax that will be familiar to those who used the original foursquare gem by Jeremy Welch.
-email: 
+  version_requirements: *10621360
+description: Gives access to all endpoints in version 2 of foursquare's API with syntax
+  that will be familiar to those who used the original foursquare gem by Jeremy Welch.
+email:
 - muellermr@gmail.com
 - email@marcomoura.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -225,6 +162,7 @@ files:
 - VERSION
 - foursquare2.gemspec
 - lib/foursquare2.rb
+- lib/foursquare2/api_error.rb
 - lib/foursquare2/checkins.rb
 - lib/foursquare2/client.rb
 - lib/foursquare2/hash.rb
@@ -236,6 +174,7 @@ files:
 - lib/foursquare2/venues.rb
 - test/config.rb
 - test/fixtures/checkin.json
+- test/fixtures/error.json
 - test/fixtures/explore_venues.json
 - test/fixtures/friend_checkins.json
 - test/fixtures/no_venues_by_tip.json
@@ -262,37 +201,31 @@ files:
 - test/test_venues.rb
 has_rdoc: true
 homepage: http://github.com/mattmueller/foursquare2
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 273972918968587298
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Foursquare API v2 gem in the spirit of the original foursquare gem
 test_files: []
-