yelp 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56a26261a87144e796fc952682cf9d64a00fafa8
-  data.tar.gz: d6ec8e7c5d4972ae6d7c73ad1e23c3757b2b1e87
+  metadata.gz: 3359fa1baa8262abf574a174c749cfd2b4132d77
+  data.tar.gz: c7f7b07c2af49c4ba54a6e98359f989ffd37b580
 SHA512:
-  metadata.gz: ae8700880ac6d3ac60126062350109257a340afa3e26ba6e60fb9fc43585804c3844d25cbf56b4ac9d506ffdae5831ec58e0980aa24d7c77f34630e0949fe15b
-  data.tar.gz: 9eaee0908609b12531a04de473d6633c79fd788f480b8f3421a78490e47def9a8717bc848e0d7a750a344995da72b61a4b6b1594b09b1d062869dd05b906adb5
+  metadata.gz: c83dc81b6f8f1304832638e887df98c01f9505fcb35ab79205335a9eefdfe35e94181da6a800c0b7185b580943c529af7bdd06e2946c9b69bd1ee0e7f6bab299
+  data.tar.gz: 72b5d04e94f14c9079625b851c9965de12081700989050196f75deab5ee05e5b8e7e5edc461b51f7873daf1188f9bacad3cd484ce60f2d6bcf7d7c8a9cc4d66a

data/README.md

@@ -160,19 +160,10 @@ For specific response values check out the docs for the [Search API](http://www.
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-Our rspec test suite expects environment variables to be populated with your Yelp API Access Tokens. If you use RVM, you could create a `.ruby-env` file in the repo root with contents like:
-
-```
-YELP_CONSUMER_KEY=<YOUR_YELP_CONSUMER_KEY>
-YELP_CONSUMER_SECRET=<YOUR_YELP_CONSUMER_SECRET>
-YELP_TOKEN=<YOUR_YELP_TOKEN>
-YELP_TOKEN_SECRET=<YOUR_YELP_TOKEN_SECRET>
-```
+Our rspec test suite expects environment variables to be populated with your Yelp API Access Tokens.
 
 You can generate and find your Access Tokens at [https://www.yelp.com/developers/manage_api_keys](https://www.yelp.com/developers/manage_api_keys).
 
-(We've included `.ruby-env.example` to get you started. Be careful to remove the `.example`.)
-
 ### Git Workflow
 
 We are using the [git flow](http://nvie.com/posts/a-successful-git-branching-model/)

data/lib/yelp/endpoint/business.rb

@@ -1,3 +1,4 @@
+require 'erb'
 require 'json'
 
 require 'yelp/responses/business'
@@ -37,7 +38,7 @@ module Yelp
       # @param locale [Hash] a hash of supported locale-related parameters
       # @return [Faraday::Response] the raw response back from the connection
       def business_request(id, locale = {})
-        result = @client.connection.get PATH + id, locale
+        result = @client.connection.get PATH + ERB::Util.url_encode(id), locale
         Error.check_for_error(result)
         result
       end

data/lib/yelp/endpoint/search.rb

@@ -17,7 +17,7 @@ module Yelp
       # Take a search_request and return the formatted/structured
       # response from the API
       #
-      # @param location [String] a string location of the neighboorhood,
+      # @param location [String] a string location of the neighborhood,
       #   address, or city
       # @param params [Hash] a hash that corresponds to params on the API:
       #   http://www.yelp.com/developers/documentation/v2/search_api#searchGP

data/lib/yelp/version.rb

@@ -1,3 +1,3 @@
 module Yelp
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 end

data/spec/yelp/client_spec.rb

@@ -16,8 +16,8 @@ describe Yelp::Client do
     subject { client }
 
     context 'with valid configuration' do
-      its(:configuration) { should be_a(Yelp::Configuration) }
-      its(:configuration) { should be_frozen }
+      its(:configuration) { is_expected.to be_a Yelp::Configuration }
+      its(:configuration) { is_expected.to be_frozen }
 
       it 'should not be reconfigurable' do
         expect {
@@ -44,7 +44,7 @@ describe Yelp::Client do
 
       it 'should set the configuration values' do
         valid_api_keys.each do |key, value|
-          expect(client.configuration.send(key)).to eql(value)
+          expect(client.configuration.send(key)).to eq(value)
         end
       end
 
@@ -52,8 +52,8 @@ describe Yelp::Client do
         expect { configure_client_with_api_keys(valid_api_keys) }.to raise_error
       end
 
-      it { should be_a(Yelp::Configuration) }
-      it { should be_frozen }
+      it { is_expected.to be_a Yelp::Configuration }
+      it { is_expected.to be_frozen }
     end
 
     context 'with invalid configuration' do

data/spec/yelp/configuration_spec.rb

@@ -10,35 +10,35 @@ describe Yelp::Configuration do
     subject { configuration }
 
     Yelp::Configuration::AUTH_KEYS.each do |auth_key|
-      its(auth_key) { should eql(api_keys[auth_key]) }
+      its(auth_key) { is_expected.to eq api_keys[auth_key] }
     end
   end
 
   describe '#auth_keys' do
     subject { configuration.auth_keys }
-    it { should eql(api_keys) }
+    it { is_expected.to eq api_keys }
   end
 
-  describe "#valid?" do
+  describe '#valid?' do
     subject { configuration.valid? }
 
-    context "when keys are valid" do
-      it { should be true }
+    context 'when keys are valid' do
+      it { is_expected.to be true }
     end
 
-    context "when keys are not set" do
+    context 'when keys are not set' do
       let(:api_keys) { Hash.new }
-      it { should be false }
+      it { is_expected.to be false }
     end
 
-    context "when a key is an empty string" do
+    context 'when a key is an empty string' do
       let(:api_keys) { valid_api_keys.merge(consumer_key: '') }
-      it { should be false }
+      it { is_expected.to be false }
     end
 
-    context "when a key is nil" do
+    context 'when a key is nil' do
       let(:api_keys) { valid_api_keys.merge(token: nil) }
-      it { should be false }
+      it { is_expected.to be false }
     end
   end
 end

data/spec/yelp/endpoint/business_spec.rb

@@ -6,7 +6,7 @@ describe Yelp::Endpoint::Business do
   let(:api_keys) { real_api_keys }
   let(:business) { 'yelp-san-francisco' }
   let(:client) { Yelp::Client.new(api_keys) }
-  let(:locale) { Hash[lang: 'fr'] }
+  let(:locale) { {lang: 'fr'} }
 
   describe '#business' do
     subject {
@@ -15,21 +15,21 @@ describe Yelp::Endpoint::Business do
       end
     }
 
-    it { should be_a(Yelp::Response::Business) }
-    its('business.name') { should eql('Yelp') }
-    its('business.url') { should include('yelp.com') }
-  end
+    it { is_expected.to be_a(Yelp::Response::Business) }
+    its('business.name') { is_expected.to eq('Yelp') }
+    its('business.url') { is_expected.to include('yelp.com') }
 
-  describe '#business locale' do
-    subject {
-      VCR.use_cassette('business_locale') do
-        client.business(business, locale)
-      end
-    }
+    context 'with locale' do
+      subject {
+        VCR.use_cassette('business_locale') do
+          client.business(business, locale)
+        end
+      }
 
-    it { should be_a(Yelp::Response::Business) }
-    its('business.name') { should eql('Yelp') }
-    its('business.url') { should include('yelp.fr') }
+      it { is_expected.to be_a(Yelp::Response::Business) }
+      its('business.name') { is_expected.to eq('Yelp') }
+      its('business.url') { is_expected.to include('yelp.fr') }
+    end
   end
 
   describe 'errors' do

data/spec/yelp/endpoint/phone_search_spec.rb

@@ -5,7 +5,7 @@ describe Yelp::Endpoint::PhoneSearch do
 
   let(:api_keys) { real_api_keys }
   let(:phone) { '+14159083801' }
-  let(:options) { { code: 'US', category: 'localflavor' } }
+  let(:options) { {code: 'US', category: 'localflavor'} }
   let(:client) { Yelp::Client.new(api_keys) }
 
   describe '#phone_search' do
@@ -15,7 +15,8 @@ describe Yelp::Endpoint::PhoneSearch do
       end
     }
 
-    it { should be_a(Yelp::Response::PhoneSearch) }
+    it { is_expected.to be_a(Yelp::Response::PhoneSearch) }
+
     it 'should get results' do
       expect(results.businesses.size).to be > 0
     end

data/spec/yelp/endpoint/search_spec.rb

@@ -5,8 +5,7 @@ describe Yelp::Endpoint::Search do
 
   let(:api_keys) { real_api_keys }
   let(:location) { 'San Francisco' }
-  let(:params) { Hash[term: 'restaurants',
-                      category_filter: 'discgolf'] }
+  let(:params) { {term: 'restaurants', category_filter: 'discgolf'} }
   let(:client) { Yelp::Client.new(api_keys) }
 
   describe '#search' do
@@ -16,17 +15,22 @@ describe Yelp::Endpoint::Search do
       end
     }
 
-    it { should be_a(Yelp::Response::Search) }
+    it { is_expected.to be_a(Yelp::Response::Search) }
+
     it 'should get results' do
       expect(results.businesses.size).to be > 0
     end
   end
 
-  describe '#search_bounding_box' do
-    let(:bounding_box) { Hash[sw_latitude: 37.7577,
-                              sw_longitude: -122.4376,
-                              ne_latitude: 37.785381,
-                              ne_longitude: -122.391681] }
+  describe '#search_by_bounding_box' do
+    let(:bounding_box) {
+      {
+        sw_latitude: 37.7577,
+        sw_longitude: -122.4376,
+        ne_latitude: 37.785381,
+        ne_longitude: -122.391681,
+      }
+    }
 
     subject(:results) {
       VCR.use_cassette('search_bounding_box') do
@@ -37,11 +41,16 @@ describe Yelp::Endpoint::Search do
     it 'should get results' do
       expect(results.businesses.size).to be > 0
     end
+
+    context 'when params are empty' do
+      subject { -> { client.search_by_bounding_box({}, params) } }
+
+      it { is_expected.to raise_error(Yelp::Error::BoundingBoxNotComplete) }
+    end
   end
 
   describe '#search_by_coordinates' do
-    let(:coordinates) { Hash[latitude: 37.7577,
-                             longitude: -122.4376] }
+    let(:coordinates) { {latitude: 37.7577, longitude: -122.4376} }
 
     subject(:results) {
       VCR.use_cassette('search_by_coordinates') do
@@ -52,19 +61,15 @@ describe Yelp::Endpoint::Search do
     it 'should get results' do
       expect(results.businesses.size).to be > 0
     end
-  end
 
-  describe 'errors' do
-    context 'search' do
-      it 'raises when #search_by_coordinates params are empty' do
-        expect { client.search_by_coordinates({}, params) }.to raise_error(Yelp::Error::MissingLatLng)
-      end
+    context 'when params are empty' do
+      subject { -> { client.search_by_coordinates({}, params) } }
 
-      it 'raises when #search_by_bounding_box params are empty' do
-        expect { client.search_by_bounding_box({}, params) }.to raise_error(Yelp::Error::BoundingBoxNotComplete)
-      end
+      it { is_expected.to raise_error(Yelp::Error::MissingLatLng) }
     end
+  end
 
+  describe 'errors' do
     it_behaves_like 'a request error' do
       let(:request) { client.search(location) }
     end

data/spec/yelp/error_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe Yelp::Error do
-  context '#from_request' do
-    let(:response_body) { "{\"error\": {\"text\": \"error message\", \"id\": \"INTERNAL_ERROR\"}}" }
+  context 'from_request' do
+    let(:response_body) { '{"error": {"text": "error message", "id": "INTERNAL_ERROR"}}' }
     let(:good_response) { double('response', status: 200) }
     let(:bad_response)  { double('response', status: 400, body: response_body) }
 
@@ -20,7 +20,7 @@ describe Yelp::Error do
   end
 
   context 'invalid parameter' do 
-    let(:response_body) { "{\"error\": {\"text\": \"One or more parameters are invalid in request\", \"id\": \"INVALID_PARAMETER\", \"field\": \"oauth_token\"}}" }
+    let(:response_body) { '{"error": {"text": "One or more parameters are invalid in request", "id": "INVALID_PARAMETER", "field": "oauth_token"}}' }
     let(:bad_response)  { double('response', status: 400, body: response_body) }
 
     it 'should raise an invalid response error' do 
@@ -34,9 +34,9 @@ describe Yelp::Error do
         Yelp::Error.check_for_error(bad_response)
       rescue Yelp::Error::InvalidParameter => e 
         # verifies that StandardError message attribute is available
-        expect(e.message).to eq("One or more parameters are invalid in request: oauth_token")
+        expect(e.message).to eq('One or more parameters are invalid in request: oauth_token')
         # verifies that we can get access to the specific field that was invalid
-        expect(e.field).to eq("oauth_token")
+        expect(e.field).to eq('oauth_token')
       end        
     end
 

data/spec/yelp/responses/base_spec.rb

@@ -2,21 +2,25 @@ require 'spec_helper'
 
 describe Yelp::Response::Base do
   describe '#initialize' do
-    let(:json) { Hash['a' => 10, 'b' => 20] }
+    let(:json) { {'a' => 10, 'b' => 20} }
 
-    subject(:base) { base = Yelp::Response::Base.new(json) }
+    subject(:base) { Yelp::Response::Base.new(json) }
 
-    it { should be_a(Yelp::Response::Base) }
+    it { is_expected.to be_a Yelp::Response::Base }
 
     it 'should create variables' do
-      expect(base.instance_variable_get('@a')).to eql 10
-      expect(base.instance_variable_get('@b')).to eql 20
+      expect(base.instance_variable_get(:@a)).to eq 10
+      expect(base.instance_variable_get(:@b)).to eq 20
     end
-  end
 
-  describe '#initialize nil' do
-    subject(:base) { Yelp::Response::Base.new(nil) }
+    context 'when json is nil' do
+      let(:json) { nil }
+
+      it { is_expected.to be_a Yelp::Response::Base }
 
-    it { should be_a(Yelp::Response::Base) }
+      it 'should not have variables' do
+        expect(base.instance_variable_get(:@a)).to be nil
+      end
+    end
   end
 end

data/spec/yelp/yelp_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe Yelp do
-  describe "#client" do
+  describe '::client' do
     subject { Yelp.client }
 
-    it { should be_a(Yelp::Client) }
-    its(:configuration) { should be_nil }
+    it { is_expected.to be_a Yelp::Client }
+    its(:configuration) { is_expected.to be nil }
   end
-end
+end

data/yelp.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 1.9.2'
+  spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake', '~> 10.0', '>= 10.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yelp
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Tomer Elmalem
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -211,7 +211,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-env.example"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
@@ -274,7 +273,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.ruby-env.example

@@ -1,6 +0,0 @@
-# Replace <THESE_VALUES> with yours from
-# https://www.yelp.com/developers/manage_api_keys (don't include <brackets>).
-YELP_CONSUMER_KEY=<YOUR_YELP_CONSUMER_KEY>
-YELP_CONSUMER_SECRET=<YOUR_YELP_CONSUMER_SECRET>
-YELP_TOKEN=<YOUR_YELP_TOKEN>
-YELP_TOKEN_SECRET=<YOUR_YELP_TOKEN_SECRET>