yelpster 1.1.3 → 1.1.4

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+== YELPSTER_20130629_1_1_4
+* [naveed] Convert Yelp to a module
+
+* [naveed] Make lib ruby v1.8 compatible
+
+* [naveed] Add rdoc task
+
+* [naveed] Add Travis CI
+
 == YELPSTER_20130608_1_1_3
 * [naveed] Combine address components with ',' rather than space
 

data/README.md

@@ -1,5 +1,7 @@
 ## Yelpster
 
+[![Build Status](https://travis-ci.org/nvd/yelpster.png?branch=develop)](https://travis-ci.org/nvd/yelpster)
+
 A Ruby object-oriented interface to the local business content available
 on Yelp at http://www.yelp.com.  Functionality is provided to perform
 all searches available via the developer API including:
@@ -46,7 +48,7 @@ or
 
 ## Usage
 
-Instantiate a Yelp::Client and use its +search+ method to make requests of
+Instantiate a Yelp::Client and use its ```search``` method to make requests of
 the Yelp server.
 
 The available search request types are:
@@ -62,10 +64,13 @@ The available search request types are:
 * Yelp::V2::Search::Request::GeoPoint
 * Yelp::V2::Search::Request::Location
 
+You can ```include``` the overlying module to cut back on typing
+or in case of conflicts between classes, use the fully qualified search request class name.
+
 By default, response content is formatted as a Ruby hash converted from Yelp's
 source JSON response content. Alternate response formats (including the
 original pure JSON) can be specified on request record construction via the
-Yelp::[V1/V2]::Request +response_format+ parameter, available in all request record
+Yelp::[V1/V2]::Request ```response_format``` parameter, available in all request record
 types.
 
 A few examples:
@@ -74,8 +79,9 @@ A few examples:
  # construct a client instance
  client = Yelp::Client.new
 
+ include Yelp::V1::Review::Request
  # perform an address/location-based search for cream puffs nearby
- request = Yelp::V1::Review::Request::Location.new(
+ request = Location.new(
              :address => '650 Mission St',
              :city => 'San Francisco',
              :state => 'CA',
@@ -85,79 +91,88 @@ A few examples:
  response = client.search(request)
 
  # perform a location-based category search for either ice cream or donut shops in SF
- request = Yelp::V1::Review::Request::Location.new(
+ request = Location.new(
              :city => 'San Francisco',
              :state => 'CA',
-             :category => [ 'donuts', 'icecream' ],
+             :category => ['donuts', 'icecream'],
              :yws_id => 'YOUR_YWSID_HERE')
  response = client.search(request)
 
  # perform a neighborhood name lookup for a specific geo-location point
- request = Yelp::V1::Neighborhood::Request::GeoPoint.new(
+ request = GeoPoint.new(
              :latitude => 37.782093,
              :longitude => -122.483230,
              :yws_id => 'YOUR_YWSID_HERE')
  response = client.search(request)
 
+ # -------------------------------------------------------
+
+ include Yelp::V1::Phone::Request
  # perform a business review search based on a business phone number
- request = Yelp::V1::Phone::Request::Number.new(
+ request = Number.new(
              :phone_number => '4155551212',
              :yws_id => 'YOUR_YWSID_HERE')
  response = client.search(request)
 
+ # -------------------------------------------------------
+
+ include Yelp::V2::Business::Request
  # retrieve details of business vi yelp business id
- request = Yelp::V2::Business::Request::Id.new(
-			:yelp_business_id => "pjb2WMwa0AfK3L-dWimO8w",
-			:consumer_key => 'YOUR_CONSUMER_KEY',
-			:consumer_secret => 'YOUR_CONSUMER_SECRET',
-			:token => 'YOUR_TOKEN',
-			:token_secret => 'YOUR_TOKEN_SECRET')
+ request = Id.new(
+             :yelp_business_id => "pjb2WMwa0AfK3L-dWimO8w",
+             :consumer_key => 'YOUR_CONSUMER_KEY',
+             :consumer_secret => 'YOUR_CONSUMER_SECRET',
+             :token => 'YOUR_TOKEN',
+             :token_secret => 'YOUR_TOKEN_SECRET')
  response = client.search(request)
 
+ # -------------------------------------------------------
+
+ include Yelp::V2::Search::Request
  # search for businesses via bounding box geo coords'
- request = Yelp::V2::Search::Request::BoundingBox.new(
-			:term => "cream puffs",
-			:sw_latitude => 37.900000,
-			:sw_longitude => -122.500000,
-			:ne_latitude => 37.788022,
-			:ne_longitude => -122.399797,
-			:limit => 3,
-			:consumer_key => 'YOUR_CONSUMER_KEY',
-			:consumer_secret => 'YOUR_CONSUMER_SECRET',
-			:token => 'YOUR_TOKEN',
-			:token_secret => 'YOUR_TOKEN_SECRET')
+ request = BoundingBox.new(
+             :term => "cream puffs",
+             :sw_latitude => 37.900000,
+             :sw_longitude => -122.500000,
+             :ne_latitude => 37.788022,
+             :ne_longitude => -122.399797,
+             :limit => 3,
+             :consumer_key => 'YOUR_CONSUMER_KEY',
+             :consumer_secret => 'YOUR_CONSUMER_SECRET',
+             :token => 'YOUR_TOKEN',
+             :token_secret => 'YOUR_TOKEN_SECRET')
  response = client.search(request)
 
  # search for businesses via lat/long geo point'
- request = Yelp::V2::Search::Request::GeoPoint.new(
-			:term => "cream puffs",
-			:latitude => 37.788022,
-			:longitude => -122.399797,
-			:consumer_key => 'YOUR_CONSUMER_KEY',
-			:consumer_secret => 'YOUR_CONSUMER_SECRET',
-			:token => 'YOUR_TOKEN',
-			:token_secret => 'YOUR_TOKEN_SECRET')
+ request = GeoPoint.new(
+             :term => "cream puffs",
+             :latitude => 37.788022,
+             :longitude => -122.399797,
+             :consumer_key => 'YOUR_CONSUMER_KEY',
+             :consumer_secret => 'YOUR_CONSUMER_SECRET',
+             :token => 'YOUR_TOKEN',
+             :token_secret => 'YOUR_TOKEN_SECRET')
  response = client.search(request)
 
  # search for businesses via location (address, neighbourhood, city, state, zip, country, latitude, longitude)'
- request = Yelp::V2::Search::Request::Location.new(
-			:term => "cream puffs",
-			:city => "San Francisco",
-			:consumer_key => 'YOUR_CONSUMER_KEY',
-			:consumer_secret => 'YOUR_CONSUMER_SECRET',
-			:token => 'YOUR_TOKEN',
-			:token_secret => 'YOUR_TOKEN_SECRET')
+ request = Location.new(
+             :term => "cream puffs",
+             :city => "San Francisco",
+             :consumer_key => 'YOUR_CONSUMER_KEY',
+             :consumer_secret => 'YOUR_CONSUMER_SECRET',
+             :token => 'YOUR_TOKEN',
+             :token_secret => 'YOUR_TOKEN_SECRET')
  response = client.search(request)
 
- request = Yelp::V2::Search::Request::Location.new(
-			:term => "german food",
-			:address => "Hayes",
-			:latitude => 37.77493,
-			:longitude => -122.419415,
-			:consumer_key => 'YOUR_CONSUMER_KEY',
-			:consumer_secret => 'YOUR_CONSUMER_SECRET',
-			:token => 'YOUR_TOKEN',
-			:token_secret => 'YOUR_TOKEN_SECRET')
+ request = Location.new(
+             :term => "german food",
+             :address => "Hayes",
+             :latitude => 37.77493,
+             :longitude => -122.419415,
+             :consumer_key => 'YOUR_CONSUMER_KEY',
+             :consumer_secret => 'YOUR_CONSUMER_SECRET',
+             :token => 'YOUR_TOKEN',
+             :token_secret => 'YOUR_TOKEN_SECRET')
  response = client.search(request)
 ```
 

data/lib/yelpster.rb

@@ -18,7 +18,3 @@ require 'yelpster/v2/search/request/base'
 require 'yelpster/v2/search/request/geo_point'
 require 'yelpster/v2/search/request/bounding_box'
 require 'yelpster/v2/search/request/location'
-
-class Yelp
-  VERSION = '1.1.3'
-end

data/lib/yelpster/client.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'json'
 require 'yaml'
 
-class Yelp
+module Yelp
   # Provides access to the Yelp search facilities as documented at:
   #
   # http://www.yelp.com/developers/documentation
@@ -64,6 +64,7 @@ class Yelp
       # http_request_params not used in v2 as OAuth (implemented in v2) only takes response params
       http_params = { 'User-Agent' => @agent }
       http_params['Accept-Encoding'] = 'gzip,deflate' if request.compress_response?
+      http_params[:proxy] = nil
       content = request.pull_results(url, http_params)
 
       # read the response content
@@ -90,10 +91,10 @@ class Yelp
     end
 
     def to_query_string(params)
-      params.delete_if { |_, v| v.nil? }
-            .to_a
-            .map { |key, value| "#{escape(key)}=#{escape(value)}" }
-            .join('&')
+      params.delete_if { |_, v| v.nil? }.
+             to_a.
+             map { |key, value| "#{escape(key)}=#{escape(value)}" }.
+             join('&')
     end
 
     def escape(object)

data/lib/yelpster/record.rb

@@ -1,4 +1,4 @@
-class Yelp
+module Yelp
   # General-purpose record that allows passing a hash with parameters
   # to populate object attributes defined via methods like
   # +attr_reader+ or +attr_accessor+.

data/lib/yelpster/response_format.rb

@@ -1,6 +1,6 @@
 require 'yelpster/record'
 
-class Yelp
+module Yelp
   # Describes the available response formats when querying the Yelp web
   # service for results.
   #

data/lib/yelpster/v1/neighborhood/request/base.rb

@@ -1,6 +1,6 @@
 require 'yelpster/v1/request'
 
-class Yelp
+module Yelp
   module V1
     module Neighborhood
       module Request

data/lib/yelpster/v1/neighborhood/request/geo_point.rb

@@ -1,6 +1,6 @@
 require 'yelpster/v1/neighborhood/request/base'
 
-class Yelp
+module Yelp
   module V1
     module Neighborhood
       module Request

data/lib/yelpster/v1/neighborhood/request/location.rb

@@ -1,6 +1,6 @@
 require 'yelpster/v1/neighborhood/request/base'
 
-class Yelp
+module Yelp
   module V1
     module Neighborhood
       module Request

data/lib/yelpster/v1/phone/request/number.rb

@@ -1,6 +1,6 @@
 require 'yelpster/v1/request'
 
-class Yelp
+module Yelp
   module V1
     module Phone
       module Request

data/lib/yelpster/v1/request.rb

@@ -2,7 +2,7 @@ require 'yelpster/record'
 require 'open-uri'
 require 'zlib'
 
-class Yelp
+module Yelp
   module V1
     class Request < Yelp::Record
       # specifies whether the response content should be transmitted

data/lib/yelpster/v1/review/request/base.rb

@@ -1,6 +1,6 @@
 require 'yelpster/v1/request'
 
-class Yelp
+module Yelp
   module V1
     module Review
       module Request

data/lib/yelpster/v1/review/request/bounding_box.rb

@@ -1,6 +1,6 @@
 require 'yelpster/v1/review/request/base'
 
-class Yelp
+module Yelp
   module V1
     module Review
       module Request

data/lib/yelpster/v1/review/request/geo_point.rb

@@ -1,6 +1,6 @@
 require 'yelpster/v1/review/request/base'
 
-class Yelp
+module Yelp
   module V1
     module Review
       module Request

data/lib/yelpster/v1/review/request/location.rb

@@ -1,6 +1,6 @@
 require 'yelpster/v1/review/request/base'
 
-class Yelp
+module Yelp
   module V1
     module Review
       module Request

data/lib/yelpster/v2/business/request/id.rb

@@ -1,6 +1,6 @@
 require 'yelpster/v2/request'
 
-class Yelp
+module Yelp
   module V2
     module Business
       module Request

data/lib/yelpster/v2/request.rb

@@ -1,7 +1,7 @@
 require 'yelpster/record'
 require 'oauth'
 
-class Yelp
+module Yelp
   module V2
     class Request < Yelp::Record
       # specifies whether the response content should be transmitted

data/lib/yelpster/v2/search/request/base.rb

@@ -1,6 +1,6 @@
 require 'yelpster/v2/request'
 
-class Yelp
+module Yelp
   module V2
     module Search
       module Request

data/lib/yelpster/v2/search/request/bounding_box.rb

@@ -1,6 +1,6 @@
 require 'yelpster/v2/search/request/base'
 
-class Yelp
+module Yelp
   module V2
     module Search
       module Request

data/lib/yelpster/v2/search/request/geo_point.rb

@@ -1,6 +1,6 @@
 require 'yelpster/v2/search/request/base'
 
-class Yelp
+module Yelp
   module V2
     module Search
       module Request

data/lib/yelpster/v2/search/request/location.rb

@@ -1,6 +1,6 @@
 require 'yelpster/v2/search/request/base'
 
-class Yelp
+module Yelp
   module V2
 	  module Search
     		module Request

data/lib/yelpster/version.rb

@@ -0,0 +1,3 @@
+module Yelp
+  VERSION = '1.1.4'.freeze
+end

data/spec/business_retrieve_spec.rb

@@ -1,22 +1,24 @@
 require 'spec_helper'
 
-describe 'Find Business by Id' do
-  let!(:client) { create_client(AdditionalSpecHelpers::API_V2) }
+module Yelp::V2::Business::Request
+  describe Id do
+    let!(:client) { create_client(AdditionalSpecHelpers::API_V2) }
 
-  subject do
-    client.search(Yelp::V2::Business::Request::Id.new(
-                    :yelp_business_id => 'pjb2WMwa0AfK3L-dWimO8w',
-                    :consumer_key => @consumer_key,
-                    :consumer_secret => @consumer_secret,
-                    :token => @token,
-                    :token_secret => @token_secret))
-  end
+    subject do
+      client.search(Id.new(
+        :yelp_business_id => 'pjb2WMwa0AfK3L-dWimO8w',
+        :consumer_key => @consumer_key,
+        :consumer_secret => @consumer_secret,
+        :token => @token,
+        :token_secret => @token_secret))
+    end
 
-  it 'returns a valid business hash' do
-    subject.should be_valid_business_hash
-  end
+    it 'returns a valid business hash' do
+      subject.should be_valid_business_hash
+    end
 
-  it 'returns the correct business' do
-    expect(subject['id']).to eq('chocolate-san-francisco')
+    it 'returns the correct business' do
+      expect(subject['id']).to eq('chocolate-san-francisco')
+    end
   end
 end

data/spec/business_search_spec.rb

@@ -1,65 +1,67 @@
 require 'spec_helper'
 
-describe 'Business Search' do
-  let!(:client)   { create_client(AdditionalSpecHelpers::API_V2) }
-  let(:latitude)  { 37.782303 }
-  let(:longitude) { -122.484101 }
-  let(:location)  { {
-    'cross_streets'   => '24th Ave & 25th Ave',
-    'city'            => 'San Francisco', 
-    'display_address' => ['2308 Clement St', '(b/t 24th Ave & 25th Ave)', 'Outer Richmond', 'San Francisco, CA 94121'], 
-    'geo_accuracy'    => 8,
-    'neighborhoods'   => ['Outer Richmond'], 
-    'postal_code'     => '94121', 
-    'country_code'    => 'US', 
-    'address'         => ['2308 Clement St'], 
-    'coordinate'      => {'latitude' => latitude, 'longitude' => longitude},
-    'state_code'      => 'CA'
-  } }
+module Yelp::V2::Search::Request
+  describe 'Business Search' do
+    let!(:client)   { create_client(AdditionalSpecHelpers::API_V2) }
+    let(:latitude)  { 37.782303 }
+    let(:longitude) { -122.484101 }
+    let(:location)  { {
+      'cross_streets'   => '24th Ave & 25th Ave',
+      'city'            => 'San Francisco', 
+      'display_address' => ['2308 Clement St', '(b/t 24th Ave & 25th Ave)', 'Outer Richmond', 'San Francisco, CA 94121'], 
+      'geo_accuracy'    => 8,
+      'neighborhoods'   => ['Outer Richmond'], 
+      'postal_code'     => '94121', 
+      'country_code'    => 'US', 
+      'address'         => ['2308 Clement St'], 
+      'coordinate'      => {'latitude' => latitude, 'longitude' => longitude},
+      'state_code'      => 'CA'
+    } }
 
-  describe 'by Bounding Box' do
-    it 'returns businesses within a bounding box' do
-      request = Yelp::V2::Search::Request::BoundingBox.new(
-        sw_latitude:  37.9,
-        sw_longitude: -122.5,
-        ne_latitude:  37.788022,
-        ne_longitude: -122.399797,
-        term:         'yelp',
-        consumer_key: @consumer_key,
-        consumer_secret: @consumer_secret,
-        token: @token,
-        token_secret: @token_secret)
-      expect(client.search(request)).to be_valid_response_hash
+    describe 'by Bounding Box' do
+      it 'returns businesses within a bounding box' do
+        request = BoundingBox.new(
+          :sw_latitude     => 37.9,
+          :sw_longitude    => -122.5,
+          :ne_latitude     =>  37.788022,
+          :ne_longitude    => -122.399797,
+          :term            => 'yelp',
+          :consumer_key    => @consumer_key,
+          :consumer_secret => @consumer_secret,
+          :token           => @token,
+          :token_secret    => @token_secret)
+        expect(client.search(request)).to be_valid_response_hash
+      end
     end
-  end
 
-  describe 'by GeoPoint' do
-    it 'returns business at geo point' do
-      request = Yelp::V2::Search::Request::GeoPoint.new(latitude:        latitude,
-                                                        longitude:       longitude,
-                                                        consumer_key:    @consumer_key,
-                                                        consumer_secret: @consumer_secret,
-                                                        token:           @token,
-                                                        token_secret:    @token_secret)
-      response = client.search(request)
-      expect(response).to be_valid_response_hash
-      expect(response['businesses'].first['location']).to eq(location)
+    describe 'by GeoPoint' do
+      it 'returns business at geo point' do
+        request = GeoPoint.new(:latitude        => latitude,
+                               :longitude       => longitude,
+                               :consumer_key    => @consumer_key,
+                               :consumer_secret => @consumer_secret,
+                               :token           => @token,
+                               :token_secret    => @token_secret)
+        response = client.search(request)
+        expect(response).to be_valid_response_hash
+        expect(response['businesses'].first['location']).to eq(location)
+      end
     end
-  end
 
-  describe 'by Location' do
-    it 'by Location' do
-      request = Yelp::V2::Search::Request::Location.new(address:        '2308 Clement St',
-                                                        city:           'San Francisco',
-                                                        state:          'CA',
-                                                        zipcode:         94121,
-                                                        consumer_key:    @consumer_key,
-                                                        consumer_secret: @consumer_secret,
-                                                        token:           @token,
-                                                        token_secret:    @token_secret)
-      response = client.search(request)
-      expect(response).to be_valid_response_hash
-      expect(response['businesses'].first['location']['postal_code']).to eq('94121')
+    describe 'by Location' do
+      it 'by Location' do
+        request = Location.new(:address         => '2308 Clement St',
+                               :city            => 'San Francisco',
+                               :state           => 'CA',
+                               :zipcode         => 94121,
+                               :consumer_key    => @consumer_key,
+                               :consumer_secret => @consumer_secret,
+                               :token           => @token,
+                               :token_secret    => @token_secret)
+        response = client.search(request)
+        expect(response).to be_valid_response_hash
+        expect(response['businesses'].first['location']['postal_code']).to eq('94121')
+      end
     end
   end
 end

data/spec/neighborhood_search_spec.rb

@@ -1,29 +1,31 @@
 require 'spec_helper'
 
-describe 'Neighborhood Search' do
-  let!(:client) { create_client(AdditionalSpecHelpers::API_V1) }
+module Yelp::V1::Neighborhood::Request
+  describe 'Neighborhood Search' do
+    let!(:client) { create_client(AdditionalSpecHelpers::API_V1) }
 
-  describe 'by GeoPoint' do
-    it 'returns neighbourhoods at point' do
-      request = Yelp::V1::Neighborhood::Request::GeoPoint.new(:latitude => 37.782093,
-                                                              :longitude => -122.483230,
-                                                              :yws_id => @yws_id)
-      response = client.search(request)
-      expect(response).to be_valid_response_hash
-      expect(response['neighborhoods'].first['name']).to eq('Outer Richmond')
+    describe 'by GeoPoint' do
+      it 'returns neighbourhoods at point' do
+        request = GeoPoint.new(:latitude => 37.782093,
+                               :longitude => -122.483230,
+                               :yws_id => @yws_id)
+        response = client.search(request)
+        expect(response).to be_valid_response_hash
+        expect(response['neighborhoods'].first['name']).to eq('Outer Richmond')
+      end
     end
-  end
 
-  describe 'by Location' do
-    it 'returns neighbourhoods at location' do
-      request = Yelp::V1::Neighborhood::Request::Location.new(:address => '2252 Clement Street',
-                                                              :city => 'San Francisco',
-                                                              :state => 'CA',
-                                                              :zipcode => 94121,
-                                                              :yws_id => @yws_id)
-      response = client.search(request)
-      expect(response).to be_valid_response_hash
-      expect(response['neighborhoods'].first['name']).to eq('Outer Richmond')
+    describe 'by Location' do
+      it 'returns neighbourhoods at location' do
+        request = Location.new(:address => '2252 Clement Street',
+                               :city => 'San Francisco',
+                               :state => 'CA',
+                               :zipcode => 94121,
+                               :yws_id => @yws_id)
+        response = client.search(request)
+        expect(response).to be_valid_response_hash
+        expect(response['neighborhoods'].first['name']).to eq('Outer Richmond')
+      end
     end
   end
 end

data/spec/phone_search_spec.rb

@@ -1,10 +1,12 @@
 require 'spec_helper'
 
-describe 'Search by phone number' do
-  let!(:client) { create_client(AdditionalSpecHelpers::API_V1) }
+module Yelp::V1::Phone::Request
+  describe 'Search by phone number' do
+    let!(:client) { create_client(AdditionalSpecHelpers::API_V1) }
 
-  it 'returns business with specified phone number' do
-    request = Yelp::V1::Phone::Request::Number.new(phone_number: '4155666011', yws_id: @yws_id)
-    expect(client.search(request)).to be_valid_response_hash
+    it 'returns business with specified phone number' do
+      request = Number.new(:phone_number => '4155666011', :yws_id => @yws_id)
+      expect(client.search(request)).to be_valid_response_hash
+    end
   end
 end

data/spec/review_search_spec.rb

@@ -1,145 +1,147 @@
 require 'spec_helper'
 
-describe 'Review Search' do
-  let!(:client) { create_client(AdditionalSpecHelpers::API_V1) }
-
-  describe 'by Bounding Box' do
-    it 'returns reviews in box' do
-      request = Yelp::V1::Review::Request::BoundingBox.new(
-        :bottom_right_latitude => 37.788022,
-        :bottom_right_longitude => -122.399797,
-        :top_left_latitude => 37.9,
-        :top_left_longitude => -122.5,
-        :term => 'yelp',
-        :yws_id => @yws_id)
-      expect(client.search(request)).to be_valid_response_hash
+module Yelp::V1::Review::Request
+  describe 'Review Search' do
+    let!(:client) { create_client(AdditionalSpecHelpers::API_V1) }
+
+    describe 'by Bounding Box' do
+      it 'returns reviews in box' do
+        request = BoundingBox.new(
+          :bottom_right_latitude => 37.788022,
+          :bottom_right_longitude => -122.399797,
+          :top_left_latitude => 37.9,
+          :top_left_longitude => -122.5,
+          :term => 'yelp',
+          :yws_id => @yws_id)
+        expect(client.search(request)).to be_valid_response_hash
+      end
     end
-  end
 
-  describe 'by GeoPoint' do
-    it 'returns reviews at point' do
-      request = Yelp::V1::Review::Request::GeoPoint.new(
-        :latitude => 37.78022,
-        :longitude => -122.399797,
-        :radius => 2,
-        :term => 'yelp',
-        :yws_id => @yws_id)
-      expect(client.search(request)).to be_valid_response_hash
+    describe 'by GeoPoint' do
+      it 'returns reviews at point' do
+        request = GeoPoint.new(
+          :latitude => 37.78022,
+          :longitude => -122.399797,
+          :radius => 2,
+          :term => 'yelp',
+          :yws_id => @yws_id)
+        expect(client.search(request)).to be_valid_response_hash
+      end
     end
-  end
 
-  describe 'by Location' do
-    it 'returns reviews at location' do
-      request = Yelp::V1::Review::Request::Location.new(
-        :address => '650 Mission St',
-        :city => 'San Francisco',
-        :state => 'CA',
-        :radius => 2,
-        :term => 'cream puffs',
-        :yws_id => @yws_id)
+    describe 'by Location' do
+      it 'returns reviews at location' do
+        request = Location.new(
+          :address => '650 Mission St',
+          :city => 'San Francisco',
+          :state => 'CA',
+          :radius => 2,
+          :term => 'cream puffs',
+          :yws_id => @yws_id)
+        expect(client.search(request)).to be_valid_response_hash
+      end
+    end
+
+    context 'when filtered with category' do
+      it 'returns less results than unfiltered search' do
+        # perform a basic search of businesses near SOMA
+        request = GeoPoint.new(
+          :latitude => 37.78022,
+          :longitude => -122.399797,
+          :radius => 5,
+          :term => 'yelp',
+          :yws_id => @yws_id)
+        response = client.search(request)
+
+        # perform the same search focusing only on playgrounds
+        narrowed_request = GeoPoint.new(
+          :latitude => 37.78022,
+          :longitude => -122.399797,
+          :radius => 5,
+          :term => 'yelp',
+          :category => 'playgrounds',
+          :yws_id => @yws_id)
+        narrowed_response = client.search(narrowed_request)
+
+        # make sure we got less for the second
+        expect(response['businesses'].length).to be > narrowed_response['businesses'].length
+      end
+    end
+
+    it 'returns valid json' do
+      request = basic_request(:response_format => Yelp::ResponseFormat::JSON)
+      expect(client.search(request)).to be_valid_json
+    end
+
+    it 'returns valid ruby hash' do
+      request = basic_request(:response_format => Yelp::ResponseFormat::JSON_TO_RUBY)
       expect(client.search(request)).to be_valid_response_hash
     end
-  end
 
-  context 'when filtered with category' do
-    it 'returns less results than unfiltered search' do
-      # perform a basic search of businesses near SOMA
-      request = Yelp::V1::Review::Request::GeoPoint.new(
-        :latitude => 37.78022,
-        :longitude => -122.399797,
-        :radius => 5,
-        :term => 'yelp',
-        :yws_id => @yws_id)
+    pending 'returns valid pickle' do
+      request = basic_request(:response_format => Yelp::ResponseFormat::PICKLE)
       response = client.search(request)
+      # TODO: validation
+    end
 
-      # perform the same search focusing only on playgrounds
-      narrowed_request = Yelp::V1::Review::Request::GeoPoint.new(
-        :latitude => 37.78022,
-        :longitude => -122.399797,
-        :radius => 5,
-        :term => 'yelp',
-        :category => 'playgrounds',
-        :yws_id => @yws_id)
-      narrowed_response = client.search(narrowed_request)
-
-      # make sure we got less for the second
-      expect(response['businesses'].length).to be > narrowed_response['businesses'].length
+    pending 'returns valid php' do
+      request = basic_request(:response_format => Yelp::ResponseFormat::PHP)
+      response = client.search(request)
+      # TODO: validation
     end
-  end
 
-  it 'returns valid json' do
-    request = basic_request(:response_format => Yelp::ResponseFormat::JSON)
-    expect(client.search(request)).to be_valid_json
-  end
+    it 'returns multiple categories' do
+      # fetch results for only one category
+      params = {
+        :city => 'San Francisco',
+        :state => 'CA',
+        :yws_id => @yws_id,
+        :category => 'donuts'
+      }
+      request = Location.new(params)
+      response = client.search(request)
 
-  it 'returns valid ruby hash' do
-    request = basic_request(:response_format => Yelp::ResponseFormat::JSON_TO_RUBY)
-    expect(client.search(request)).to be_valid_response_hash
-  end
+      expect(response).to be_valid_response_hash
 
-  pending 'returns valid pickle' do
-    request = basic_request(:response_format => Yelp::ResponseFormat::PICKLE)
-    response = client.search(request)
-    # TODO: validation
-  end
+      # make sure all businesses returned have at least the specified category
+      response['businesses'].each do |b|
+        cat_exists = b['categories'].find { |c| c['category_filter'] == 'donuts' }
+        expect(cat_exists).to_not be_nil
+      end
 
-  pending 'returns valid php' do
-    request = basic_request(:response_format => Yelp::ResponseFormat::PHP)
-    response = client.search(request)
-    # TODO: validation
-  end
-  
-  it 'returns multiple categories' do
-    # fetch results for only one category
-    params = {
-      :city => 'San Francisco',
-      :state => 'CA',
-      :yws_id => @yws_id,
-      :category => 'donuts'
-    }
-    request = Yelp::V1::Review::Request::Location.new(params)
-    response = client.search(request)
-
-    expect(response).to be_valid_response_hash
-
-    # make sure all businesses returned have at least the specified category
-    response['businesses'].each do |b|
-      cat_exists = b['categories'].find { |c| c['category_filter'] == 'donuts' }
-      expect(cat_exists).to_not be_nil
-    end
+      # now fetch for businesses with two categories
+      params[:category] = [ 'donuts', 'icecream' ]
+      request = Location.new(params)
+      response = client.search(request)
 
-    # now fetch for businesses with two categories
-    params[:category] = [ 'donuts', 'icecream' ]
-    request = Yelp::V1::Review::Request::Location.new(params)
-    response = client.search(request)
+      expect(response).to be_valid_response_hash
 
-    expect(response).to be_valid_response_hash
+      # make sure we have at least one of each specified category, and
+      # that each business has at least one
+      donut_count = 0
+      icecream_count = 0
+      response['businesses'].each do |b|
+        has_donut = b['categories'].find { |c| c['category_filter'] == 'donuts' }
+        has_icecream = b['categories'].find { |c| c['category_filter'] == 'icecream' }
 
-    # make sure we have at least one of each specified category, and
-    # that each business has at least one
-    donut_count = 0
-    icecream_count = 0
-    response['businesses'].each do |b|
-      has_donut = b['categories'].find { |c| c['category_filter'] == 'donuts' }
-      has_icecream = b['categories'].find { |c| c['category_filter'] == 'icecream' }
+        donut_count += 1 if has_donut
+        icecream_count += 1 if has_icecream
 
-      donut_count += 1 if has_donut
-      icecream_count += 1 if has_icecream
+        expect(has_donut || has_icecream).to_not be_nil
+      end
 
-      expect(has_donut || has_icecream).to_not be_nil
+      expect((donut_count > 0) && (icecream_count > 0)).to be_true
     end
 
-    expect((donut_count > 0) && (icecream_count > 0)).to be_true
-  end
-
-  private
-  def basic_request(options = {})
-    default_params = {
-      :city => 'San Francisco',
-      :state => 'CA',
-      :term => 'gordo',
-      :yws_id => @yws_id
-    }
-    Yelp::V1::Review::Request::Location.new(default_params.merge(options))
+    private
+    def basic_request(options = {})
+      default_params = {
+        :city => 'San Francisco',
+        :state => 'CA',
+        :term => 'gordo',
+        :yws_id => @yws_id
+      }
+      Location.new(default_params.merge(options))
+    end
   end
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: yelpster
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
+  prerelease: 
 platform: ruby
 authors:
 - Naveed Siddiqui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2013-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -65,6 +70,7 @@ files:
 - lib/yelpster/v2/search/request/bounding_box.rb
 - lib/yelpster/v2/search/request/geo_point.rb
 - lib/yelpster/v2/search/request/location.rb
+- lib/yelpster/version.rb
 - lib/yelpster.rb
 - spec/business_retrieve_spec.rb
 - spec/business_search_spec.rb
@@ -76,26 +82,33 @@ files:
 homepage: https://github.com/nvd/yelpster
 licenses:
 - LGPL
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1283160560018612419
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1283160560018612419
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Wrapper for Yelp Developer API
 test_files:
 - spec/business_retrieve_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDhiOTVjZGU2NWRiMTI1ZjU4OGJjMWVmOWI5MWMxNTZhMGVmODA5Yg==
-  data.tar.gz: !binary |-
-    MmUyZjBmNmUzZTJkMjE1M2QyMzUzNjNkZTA1Y2VkMmVhMTJhMTFjNQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OTc2MzAyOTdhN2I4NWFmMTA1OTUyYzI3MDc0ZDdiNGRkMWNmNjg5NDA0ODI1
-    Zjc5OWZlOTQxYzNlZWNjNmQ4NmJhOWJhOGMyOTliZjY0ZjRmMzdkNDExNWQ0
-    MWIxMmE1MDdiZDk1MjE4ZjIzNDc5NzA5ODQxYWRiOGNhYzQ1ZTQ=
-  data.tar.gz: !binary |-
-    YTg4Mzc5MGIwYWRjMzNjMDEyYzhjODdkODZkYzU1ZGNjYzQ3NGQzMjAyMzNl
-    NzU3ZGU0ZTRlZGQyODIwNmY1MGEzODc5ZjY1NmJhYWI3MmNjOTJlZTdjNzYz
-    M2QzYjU5OWVmOGFiNzM3ODcwNjVjM2ZhODY4N2IwMWE5MTI0MjU=