tankard 0.1.0 → 0.2.0

data/spec/spec_helper.rb

@@ -17,5 +17,5 @@ require 'shared_examples_for_find'
 WebMock.disable_net_connect!(allow: 'coveralls.io')
 
 def stub_get(path)
-  stub_request(:get, "http://api.brewerydb.com/v2/" + path)
-end
+  stub_request(:get, 'http://api.brewerydb.com/v2/' + path)
+end

data/spec/tankard/api/beer_spec.rb

@@ -5,204 +5,231 @@ describe Tankard::Api::Beer do
   let(:beer) { Tankard::Api::Beer.new(@request) }
 
   before do
-    @request = mock("request")
+    @request = double('request')
   end
 
-  describe "#find" do
+  describe '#find' do
 
     before do
-      @request.stub(:get).with("beer/valid1", {}).and_return({ "data" => "valid1_found"})
-      @request.stub(:get).with("beer/valid2", {}).and_return({ "data" => "valid2_found"})
-      @request.stub(:get).with("beer/invalid1", {}).and_raise(Tankard::Error::HttpError)
-      @request.stub(:get).with("beer/invalid2", {}).and_raise(Tankard::Error::HttpError)
+      @request.stub(:get).with('beer/valid1', {}).and_return('data' => 'valid1_found')
+      @request.stub(:get).with('beer/valid2', {}).and_return('data' => 'valid2_found')
+      @request.stub(:get).with('beer/invalid1', {}).and_raise(Tankard::Error::HttpError)
+      @request.stub(:get).with('beer/invalid2', {}).and_raise(Tankard::Error::HttpError)
     end
 
-    it_should_behave_like "the find method" do
+    it_should_behave_like 'the find method' do
       let(:context) { beer }
-      let(:valid_items) { ["valid1", "valid2"] }
-      let(:valid_responses) { ["valid1_found", "valid2_found"] }
-      let(:invalid_items) { ["invalid1", "invalid2"] }
+      let(:valid_items) { %w(valid1 valid2) }
+      let(:valid_responses) { %w(valid1_found valid2_found) }
+      let(:invalid_items) { %w(invalid1 invalid2) }
       let(:valid_invalid_items) { valid_items + invalid_items }
     end
   end
 
-  describe "#id" do
+  describe '#id' do
 
-    it "sets the options[:id] to the beer id passed in" do
-      beer.id("port")
-      beer_options = beer.instance_variable_get(:"@options")
-      expect(beer_options[:id]).to eql("port")
+    it 'sets the options[:id] to the beer id passed in' do
+      beer.id('port')
+      beer_options = beer.instance_variable_get(:"@http_request_parameters")
+      expect(beer_options[:id]).to eql('port')
     end
 
-    it "returns itself" do
-      expect(beer.object_id).to eql(beer.id("port").object_id)
+    it 'returns itself' do
+      expect(beer.object_id).to eql(beer.id('port').object_id)
     end
   end
 
-  describe "#breweries" do
+  describe '#breweries' do
 
-    it "sets the options[:endpoint] to breweries" do
+    it 'sets the options[:endpoint] to breweries' do
       beer.breweries
-      beer_options = beer.instance_variable_get(:"@options")
-      expect(beer_options[:endpoint]).to eql("breweries")
+      beer_options = beer.instance_variable_get(:"@http_request_parameters")
+      expect(beer_options[:endpoint]).to eql('breweries')
     end
 
-    it "returns itself" do
+    it 'returns itself' do
       expect(beer.object_id).to eql(beer.breweries.object_id)
     end
   end
 
-  describe "#events" do
+  describe '#events' do
 
-    it "sets the options[:endpoint] to events" do
+    it 'sets the options[:endpoint] to events' do
       beer.events
-      beer_options = beer.instance_variable_get(:"@options")
-      expect(beer_options[:endpoint]).to eql("events")
+      beer_options = beer.instance_variable_get(:"@http_request_parameters")
+      expect(beer_options[:endpoint]).to eql('events')
     end
 
-    it "returns itself" do
+    it 'returns itself' do
       expect(beer.object_id).to eql(beer.events.object_id)
     end
   end
 
-  describe "#ingredients" do
+  describe '#ingredients' do
 
-    it "sets the options[:endpoint] to ingredients" do
+    it 'sets the options[:endpoint] to ingredients' do
       beer.ingredients
-      beer_options = beer.instance_variable_get(:"@options")
-      expect(beer_options[:endpoint]).to eql("ingredients")
+      beer_options = beer.instance_variable_get(:"@http_request_parameters")
+      expect(beer_options[:endpoint]).to eql('ingredients')
     end
 
-    it "returns itself" do
+    it 'returns itself' do
       expect(beer.object_id).to eql(beer.ingredients.object_id)
     end
   end
 
-  describe "#social_accounts" do
+  describe '#social_accounts' do
 
-    it "sets the options[:endpoint] to socialaccounts" do
+    it 'sets the options[:endpoint] to socialaccounts' do
       beer.social_accounts
-      beer_options = beer.instance_variable_get(:"@options")
-      expect(beer_options[:endpoint]).to eql("socialaccounts")
+      beer_options = beer.instance_variable_get(:"@http_request_parameters")
+      expect(beer_options[:endpoint]).to eql('socialaccounts')
     end
 
-    it "returns itself" do
+    it 'returns itself' do
       expect(beer.object_id).to eql(beer.social_accounts.object_id)
     end
   end
 
-  describe "#variations" do
+  describe '#variations' do
 
-    it "sets the options[:endpoint] to variations" do
+    it 'sets the options[:endpoint] to variations' do
       beer.variations
-      beer_options = beer.instance_variable_get(:"@options")
-      expect(beer_options[:endpoint]).to eql("variations")
+      beer_options = beer.instance_variable_get(:"@http_request_parameters")
+      expect(beer_options[:endpoint]).to eql('variations')
     end
 
-    it "returns itself" do
+    it 'returns itself' do
       expect(beer.object_id).to eql(beer.variations.object_id)
     end
   end
 
-  describe "#params" do
+  describe '#params' do
 
-    it "sets parameters" do
-      beer.params(withSocialAccounts: "y", withGuilds: "n")
-      beer_options = beer.instance_variable_get(:"@options")
-      expect(beer_options[:withSocialAccounts]).to eql("y")
-      expect(beer_options[:withGuilds]).to eql("n")
+    it 'sets parameters' do
+      beer.params(withSocialAccounts: 'y', withGuilds: 'n')
+      beer_options = beer.instance_variable_get(:"@http_request_parameters")
+      expect(beer_options[:withSocialAccounts]).to eql('y')
+      expect(beer_options[:withGuilds]).to eql('n')
     end
 
-    it "merges data when called multiple times" do
-      beer.params(test: "n")
-      beer.params(test: "y")
-      beer_options = beer.instance_variable_get(:"@options")
-      expect(beer_options[:test]).to eql("y")
+    it 'merges data when called multiple times' do
+      beer.params(test: 'n')
+      beer.params(test: 'y')
+      beer_options = beer.instance_variable_get(:"@http_request_parameters")
+      expect(beer_options[:test]).to eql('y')
     end
 
-    it "returns itself" do
+    it 'returns itself' do
       expect(beer.object_id).to eql(beer.params.object_id)
     end
   end
 
-  describe "private methods" do
+  describe 'private methods' do
 
-    describe "#raise_if_no_id_in_options" do
+    describe '#raise_if_no_id_in_options' do
 
-      context "when an ID is not set" do
+      context 'when an ID is not set' do
 
-        it "raises Tankard::Error::MissingParameter" do
-          expect { beer.send(:raise_if_no_id_in_options) }.to raise_error(Tankard::Error::MissingParameter, "No Beer ID is set")
+        it 'raises Tankard::Error::MissingParameter' do
+          expect { beer.send(:raise_if_no_id_in_options) }.to raise_error(Tankard::Error::MissingParameter, 'No Beer ID is set')
         end
       end
 
-      context "when an ID is set" do
+      context 'when an ID is set' do
 
         before do
-          beer.instance_variable_get(:"@options")[:id] = "test"
+          beer.instance_variable_get(:"@http_request_parameters")[:id] = 'test'
         end
 
-        it "returns the id from options" do
-          expect(beer.send(:raise_if_no_id_in_options)).to eql("test")
+        it 'returns the id from options' do
+          expect(beer.send(:raise_if_no_id_in_options)).to eql('test')
         end
 
-        it "removes the id from options" do
+        it 'removes the id from options' do
           beer.send(:raise_if_no_id_in_options)
-          expect(beer.instance_variable_get(:"@options")[:id]).to be_nil
+          expect(beer.instance_variable_get(:"@http_request_parameters")[:id]).to be_nil
+        end
+
+        it 'can be called multiple times and not raise error' do
+          beer.send(:raise_if_no_id_in_options)
+          expect { beer.send(:raise_if_no_id_in_options) }.not_to raise_error
+        end
+
+        it 'caches the ID for future method calls' do
+          beer.send(:raise_if_no_id_in_options)
+          expect(beer.send(:raise_if_no_id_in_options)).to eql('test')
+        end
+
+        it 'updates the cache value if the user sets a new ID' do
+          beer.send(:raise_if_no_id_in_options)
+          beer.instance_variable_get(:"@http_request_parameters")[:id] = 'test1'
+          expect(beer.send(:raise_if_no_id_in_options)).to eql('test1')
         end
       end
     end
 
-    describe "#route" do
+    describe '#route' do
 
-      it "returns the route for the api request" do
-        expect(beer.send(:route)).to eql("beer")
+      it 'returns the route for the api request' do
+        expect(beer.send(:route)).to eql('beer')
       end
     end
 
-    describe "#http_request_uri" do
+    describe '#http_request_uri' do
 
       before do
-        beer.stub!(:route).and_return("beer")
-        beer.stub!(:raise_if_no_id_in_options).and_return("123")
+        beer.stub(:route).and_return('beer')
+        beer.stub(:raise_if_no_id_in_options).and_return('123')
       end
 
-      context "no endpoint is set" do
+      context 'no endpoint is set' do
 
-        it "returns the route with the id" do
-          expect(beer.send(:http_request_uri)).to eql("beer/123")
+        it 'returns the route with the id' do
+          expect(beer.send(:http_request_uri)).to eql('beer/123')
         end
       end
 
-      context "endpoint is set" do
+      context 'endpoint is set' do
 
         before do
-          beer.instance_variable_get(:"@options")[:endpoint] = "events"
+          beer.instance_variable_get(:"@http_request_parameters")[:endpoint] = 'events'
+        end
+
+        it 'returns the route with the id and endpoint' do
+          expect(beer.send(:http_request_uri)).to eql('beer/123/events')
         end
 
-        it "returns the route with the id and endpoint" do
-          expect(beer.send(:http_request_uri)).to eql("beer/123/events")
+        it 'removes the endpoint from options' do
+          beer.send(:http_request_uri)
+          expect(beer.instance_variable_get(:"@http_request_parameters")[:endpoint]).to be_nil
+        end
+
+        it 'caches the endpoint for future method calls' do
+          beer.send(:http_request_uri)
+          expect(beer.send(:http_request_uri)).to eql('beer/123/events')
         end
 
-        it "removes the endpoint from options" do
+        it 'updates the cached endpoint if the user sets a new one' do
           beer.send(:http_request_uri)
-          expect(beer.instance_variable_get(:"@options")[:endpoint]).to be_nil
+          beer.instance_variable_get(:"@http_request_parameters")[:endpoint] = 'breweries'
+          expect(beer.send(:http_request_uri)).to eql('beer/123/breweries')
         end
       end
     end
 
-    describe "#http_client" do
+    describe '#http_client' do
 
-      it "returns the request variable that is passed when the class is created" do
+      it 'returns the request variable that is passed when the class is created' do
         expect(beer.send(:http_client).object_id).to eql(@request.object_id)
       end
     end
 
-    describe "#http_request_parameters" do
+    describe '#http_request_parameters' do
 
-      it "returns the options for the request" do
-        expect(beer.send(:http_request_parameters).object_id).to eql(beer.instance_variable_get(:"@options").object_id)
+      it 'returns the options for the request' do
+        expect(beer.send(:http_request_parameters).object_id).to eql(beer.instance_variable_get(:"@http_request_parameters").object_id)
       end
     end
   end
-end
+end

data/spec/tankard/api/beers_spec.rb

@@ -4,77 +4,77 @@ describe Tankard::Api::Beers do
   let(:beers) { Tankard::Api::Beers.new(@request) }
 
   before do
-    @request = mock("request")
+    @request = double('request')
   end
 
-  describe "#name" do
+  describe '#name' do
 
-    it "sets the options[:name] of a beer" do
-      beers.name("stone")
-      beers_options = beers.instance_variable_get(:"@options")
-      expect(beers_options[:name]).to eql("stone")
+    it 'sets the http_request_parameters[:name] of a beer' do
+      beers.name('stone')
+      beers_options = beers.instance_variable_get(:"@http_request_parameters")
+      expect(beers_options[:name]).to eql('stone')
     end
 
-    it "returns self" do
-      expect(beers.object_id).to eql(beers.name("stone").object_id)
+    it 'returns self' do
+      expect(beers.object_id).to eql(beers.name('stone').object_id)
     end
   end
 
-  describe "#page" do
+  describe '#page' do
 
-    it "sets the options[:p] for the page number" do
+    it 'sets the http_request_parameters[:p] for the page number' do
       beers.page(1)
-      beers_options = beers.instance_variable_get(:"@options")
+      beers_options = beers.instance_variable_get(:"@http_request_parameters")
       expect(beers_options[:p]).to eql(1)
     end
 
-    it "returns self" do
+    it 'returns self' do
       expect(beers.object_id).to eql(beers.page(1).object_id)
     end
   end
 
-  describe "#params" do
+  describe '#params' do
 
-    it "sets parameters" do
-      beers.params(withSocialAccounts: "y", withGuilds: "n")
-      beers_options = beers.instance_variable_get(:"@options")
-      expect(beers_options[:withSocialAccounts]).to eql("y")
-      expect(beers_options[:withGuilds]).to eql("n")
+    it 'sets parameters' do
+      beers.params(withSocialAccounts: 'y', withGuilds: 'n')
+      beers_options = beers.instance_variable_get(:"@http_request_parameters")
+      expect(beers_options[:withSocialAccounts]).to eql('y')
+      expect(beers_options[:withGuilds]).to eql('n')
     end
 
-    it "merges params when called multiple times" do
-      beers.params(test: "n")
-      beers.params(test: "y")
-      beers_options = beers.instance_variable_get(:"@options")
-      expect(beers_options[:test]).to eql("y")
+    it 'merges params when called multiple times' do
+      beers.params(test: 'n')
+      beers.params(test: 'y')
+      beers_options = beers.instance_variable_get(:"@http_request_parameters")
+      expect(beers_options[:test]).to eql('y')
     end
 
-    it "returns itself" do
+    it 'returns itself' do
       expect(beers.object_id).to eql(beers.params.object_id)
     end
   end
 
-  describe "private methods" do
+  describe 'private methods' do
 
-    describe "#http_request_uri" do
+    describe '#http_request_uri' do
 
-      it "returns the string beers" do
-        expect(beers.send(:http_request_uri)).to eql("beers")
+      it 'returns the string beers' do
+        expect(beers.send(:http_request_uri)).to eql('beers')
       end
     end
 
-    describe "#http_client" do
+    describe '#http_client' do
 
-      it "returns the request variable that is passed in when the class is initialized" do
+      it 'returns the request variable that is passed in when the class is initialized' do
         expect(beers.send(:http_client).object_id).to eql(@request.object_id)
       end
     end
 
-    describe "#http_request_parameters" do
+    describe '#http_request_parameters' do
 
-      it "returns the options for the request" do
-        expect(beers.send(:http_request_parameters).object_id).to eql(beers.instance_variable_get(:"@options").object_id)
+      it 'returns the http_request_parameters for the request' do
+        expect(beers.send(:http_request_parameters).object_id).to eql(beers.instance_variable_get(:"@http_request_parameters").object_id)
       end
     end
   end
-end
+end

data/spec/tankard/api/search_spec.rb

@@ -5,123 +5,123 @@ describe Tankard::Api::Search do
   let(:search) { Tankard::Api::Search.new(@request) }
 
   before do
-    @request = mock("request")
+    @request = double('request')
   end
 
-  describe "#query" do
+  describe '#query' do
 
-    it "sets options[:q] with the query the user wants to run" do
-      search.query("test")
-      search_options = search.instance_variable_get(:"@options")
-      expect(search_options[:q]).to eql("test")
+    it 'sets http_request_parameters[:q] with the query the user wants to run' do
+      search.query('test')
+      search_options = search.instance_variable_get(:"@http_request_parameters")
+      expect(search_options[:q]).to eql('test')
     end
 
-    it "returns itself" do
-      expect(search.object_id).to eql(search.query("test").object_id)
+    it 'returns itself' do
+      expect(search.object_id).to eql(search.query('test').object_id)
     end
 
   end
 
-  describe "#params" do
+  describe '#params' do
 
-    it "sets parameters" do
-      search.params(withSocialAccounts: "y", withGuilds: "n")
-      search_options = search.instance_variable_get(:"@options")
-      expect(search_options[:withSocialAccounts]).to eql("y")
-      expect(search_options[:withGuilds]).to eql("n")
+    it 'sets parameters' do
+      search.params(withSocialAccounts: 'y', withGuilds: 'n')
+      search_options = search.instance_variable_get(:"@http_request_parameters")
+      expect(search_options[:withSocialAccounts]).to eql('y')
+      expect(search_options[:withGuilds]).to eql('n')
     end
 
-    it "merges params when called multiple times" do
-      search.params(test: "n")
-      search.params(test: "y")
-      search_options = search.instance_variable_get(:"@options")
-      expect(search_options[:test]).to eql("y")
+    it 'merges params when called multiple times' do
+      search.params(test: 'n')
+      search.params(test: 'y')
+      search_options = search.instance_variable_get(:"@http_request_parameters")
+      expect(search_options[:test]).to eql('y')
     end
 
-    it "returns itself" do
+    it 'returns itself' do
       expect(search.object_id).to eql(search.params.object_id)
     end
   end
 
-  describe "#type" do
+  describe '#type' do
 
-    it "sets options[:type] with the type to search for" do
-      search.type("beer")
-      search_options = search.instance_variable_get(:"@options")
-      expect(search_options[:type]).to eql("beer")
+    it 'sets http_request_parameters[:type] with the type to search for' do
+      search.type('beer')
+      search_options = search.instance_variable_get(:"@http_request_parameters")
+      expect(search_options[:type]).to eql('beer')
     end
 
-    it "returns itself" do
-      expect(search.object_id).to eql (search.type("test").object_id)
+    it 'returns itself' do
+      expect(search.object_id).to eql(search.type('test').object_id)
     end
   end
 
-  describe "#page" do
+  describe '#page' do
 
-    it "sets options[:p] with the page number to load" do
+    it 'sets http_request_parameters[:p] with the page number to load' do
       search.page(1)
-      search_options = search.instance_variable_get(:"@options")
+      search_options = search.instance_variable_get(:"@http_request_parameters")
       expect(search_options[:p]).to eql(1)
     end
 
-    it "returns itself" do
+    it 'returns itself' do
       expect(search.object_id).to eql(search.page(1).object_id)
     end
   end
 
-  describe "#upc" do
+  describe '#upc' do
 
     before do
-      search.upc("123")
-      @search_options = search.instance_variable_get(:"@options")
+      search.upc('123')
+      @search_options = search.instance_variable_get(:"@http_request_parameters")
     end
 
-    it "sets options[:endpoint] with the search endpoint to use" do
-      expect(@search_options[:endpoint]).to eql("upc")
+    it 'sets http_request_parameters[:endpoint] with the search endpoint to use' do
+      expect(@search_options[:endpoint]).to eql('upc')
     end
 
-    it "sets options[:code] with the upc code" do
-      expect(@search_options[:code]).to eql("123")
+    it 'sets http_request_parameters[:code] with the upc code' do
+      expect(@search_options[:code]).to eql('123')
     end
 
-    it "returns itself" do
-      expect(search.object_id).to eql(search.upc("123").object_id)
+    it 'returns itself' do
+      expect(search.object_id).to eql(search.upc('123').object_id)
     end
   end
 
-  describe "#geo_point" do
+  describe '#geo_point' do
 
     before do
       search.geo_point(1.23, 4.56)
-      @search_options = search.instance_variable_get(:"@options")
+      @search_options = search.instance_variable_get(:"@http_request_parameters")
     end
 
-    it "sets options[:endpoint] with the correct search endpoint to use" do
-      expect(@search_options[:endpoint]).to eql("geo/point")
+    it 'sets http_request_parameters[:endpoint] with the correct search endpoint to use' do
+      expect(@search_options[:endpoint]).to eql('geo/point')
     end
 
-    it "sets options[:lat] with the latitude" do
+    it 'sets http_request_parameters[:lat] with the latitude' do
       expect(@search_options[:lat]).to eql(1.23)
     end
 
-    it "sets options[:lng] with the longitude" do
+    it 'sets http_request_parameters[:lng] with the longitude' do
       expect(@search_options[:lng]).to eql(4.56)
     end
 
-    it "returns itself" do
+    it 'returns itself' do
       expect(search.object_id).to eql(search.geo_point(1.3, 4.5).object_id)
     end
   end
 
-  describe "#each" do
+  describe '#each' do
 
-    it "should call raise_if_required_options_not_set" do
+    it 'should call raise_if_required_options_not_set' do
       search.stub(:find_on_single_or_all_pages).and_return(nil)
       search.should_receive(:raise_if_required_options_not_set)
       search.each
     end
 
-    it "calls the super object with the block" do
+    it 'calls the super object with the block' do
       block = -> x { x }
       search.stub(:raise_if_required_options_not_set).and_return(nil)
       search.should_receive(:find_on_single_or_all_pages)
@@ -129,104 +129,115 @@ describe Tankard::Api::Search do
     end
   end
 
-  describe "private methods" do
+  describe 'private methods' do
 
-    describe "#raise_if_required_options_not_set" do
+    describe '#raise_if_required_options_not_set' do
 
-      context "the endpoint is not set" do
+      context 'the endpoint is not set' do
 
-        it "raises Tankard::Error::NoSearchQuery when the query is not set" do
-          expect { search.send(:raise_if_required_options_not_set) }.to raise_error(Tankard::Error::MissingParameter, "No search query set")
+        it 'raises Tankard::Error::NoSearchQuery when the query is not set' do
+          expect { search.send(:raise_if_required_options_not_set) }.to raise_error(Tankard::Error::MissingParameter, 'No search query set')
         end
 
-        it "does not raise Tankard::Error::NoSearchQuery when the query is set" do
-          search.instance_variable_get(:"@options")[:q] = "findme"
-          expect { search.send(:raise_if_required_options_not_set) }.not_to raise_error(Tankard::Error::MissingParameter, "No search query set")
+        it 'does not raise Tankard::Error::NoSearchQuery when the query is set' do
+          search.instance_variable_get(:"@http_request_parameters")[:q] = 'findme'
+          expect { search.send(:raise_if_required_options_not_set) }.not_to raise_error
         end
       end
 
-      context "the endpoint is set to upc" do
+      context 'the endpoint is set to upc' do
 
         before do
-          search.instance_variable_get(:"@options")[:endpoint] = "upc"
+          search.instance_variable_get(:"@http_request_parameters")[:endpoint] = 'upc'
         end
 
-        it "raises Tankard::Error::MissingParameter when code is not set" do
-          expect { search.send(:raise_if_required_options_not_set) }.to raise_error(Tankard::Error::MissingParameter, "missing parameter: code")
+        it 'raises Tankard::Error::MissingParameter when code is not set' do
+          expect { search.send(:raise_if_required_options_not_set) }.to raise_error(Tankard::Error::MissingParameter, 'missing parameter: code')
         end
 
-        it "does not raise Tankard::Error::MissingParameter when code is set" do
-          search.instance_variable_get(:"@options")[:code] = "1234"
-          expect { search.send(:raise_if_required_options_not_set) }.not_to raise_error(Tankard::Error::MissingParameter)
+        it 'does not raise Tankard::Error::MissingParameter when code is set' do
+          search.instance_variable_get(:"@http_request_parameters")[:code] = '1234'
+          expect { search.send(:raise_if_required_options_not_set) }.not_to raise_error
         end
       end
 
-      context "the endpoint is set to geo/point" do
+      context 'the endpoint is set to geo/point' do
 
         before do
-          search.instance_variable_get(:"@options")[:endpoint] = "geo/point"
+          search.instance_variable_get(:"@http_request_parameters")[:endpoint] = 'geo/point'
         end
 
-        it "raises Tankard::Error::MissingParameter when latitude is not set" do
-          search.instance_variable_get(:"@options")[:lng] = 123
-          expect { search.send(:raise_if_required_options_not_set) }.to raise_error(Tankard::Error::MissingParameter, "missing Parameters: lat, lng")
+        it 'raises Tankard::Error::MissingParameter when latitude is not set' do
+          search.instance_variable_get(:"@http_request_parameters")[:lng] = 123
+          expect { search.send(:raise_if_required_options_not_set) }.to raise_error(Tankard::Error::MissingParameter, 'missing Parameters: lat, lng')
         end
 
-        it "raises Tankard::Error::MissingParameter when longitude is not set" do
-          search.instance_variable_get(:"@options")[:lat] = 123
-          expect { search.send(:raise_if_required_options_not_set) }.to raise_error(Tankard::Error::MissingParameter, "missing Parameters: lat, lng")
+        it 'raises Tankard::Error::MissingParameter when longitude is not set' do
+          search.instance_variable_get(:"@http_request_parameters")[:lat] = 123
+          expect { search.send(:raise_if_required_options_not_set) }.to raise_error(Tankard::Error::MissingParameter, 'missing Parameters: lat, lng')
         end
 
-        it "raises Tankard::Error::MissingParameter when latitude and longitude are not set" do
-          expect { search.send(:raise_if_required_options_not_set) }.to raise_error(Tankard::Error::MissingParameter, "missing Parameters: lat, lng")
+        it 'raises Tankard::Error::MissingParameter when latitude and longitude are not set' do
+          expect { search.send(:raise_if_required_options_not_set) }.to raise_error(Tankard::Error::MissingParameter, 'missing Parameters: lat, lng')
         end
 
-        it "does not raise Tankard::Error::MissingParameter when latitude and longitude are set" do
-          search.instance_variable_get(:"@options")[:lat] = 123
-          search.instance_variable_get(:"@options")[:lng] = 123
-          expect { search.send(:raise_if_required_options_not_set) }.not_to raise_error(Tankard::Error::MissingParameter)
+        it 'does not raise Tankard::Error::MissingParameter when latitude and longitude are set' do
+          search.instance_variable_get(:"@http_request_parameters")[:lat] = 123
+          search.instance_variable_get(:"@http_request_parameters")[:lng] = 123
+          expect { search.send(:raise_if_required_options_not_set) }.not_to raise_error
         end
       end
     end
 
-    describe "#http_request_uri" do
+    describe '#http_request_uri' do
 
-      context "no endpoint is set" do
+      context 'no endpoint is set' do
 
-        it "returns search" do
-          expect(search.send(:http_request_uri)).to eql("search")
+        it 'returns search' do
+          expect(search.send(:http_request_uri)).to eql('search')
         end
       end
 
-      context "an endpoint is set" do
+      context 'an endpoint is set' do
 
         before do
-          search.instance_variable_get(:"@options")[:endpoint] = "upc"
+          search.instance_variable_get(:"@http_request_parameters")[:endpoint] = 'upc'
         end
 
-        it "adds the endpoint to the uri" do
-          expect(search.send(:http_request_uri)).to eql("search/upc")
+        it 'adds the endpoint to the uri' do
+          expect(search.send(:http_request_uri)).to eql('search/upc')
         end
 
-        it "removes the endpoint from options" do
+        it 'removes the endpoint from http_request_parameters' do
           search.send(:http_request_uri)
-          expect(search.instance_variable_get(:"@options")[:endpoint]).to eql(nil)
+          expect(search.instance_variable_get(:"@http_request_parameters")[:endpoint]).to eql(nil)
+        end
+
+        it 'caches the endpoint for future method calls' do
+          search.send(:http_request_uri)
+          expect(search.send(:http_request_uri)).to eql('search/upc')
+        end
+
+        it 'updates the cached endpoint if the user sets a new one' do
+          search.send(:http_request_uri)
+          search.instance_variable_get(:"@http_request_parameters")[:endpoint] = 'geo/point'
+          expect(search.send(:http_request_uri)).to eql('search/geo/point')
         end
       end
     end
 
-    describe "#http_client" do
+    describe '#http_client' do
 
-      it "returns the request variable that is passed when the class is created" do
+      it 'returns the request variable that is passed when the class is created' do
         expect(search.send(:http_client).object_id).to eql(@request.object_id)
       end
     end
 
-    describe "#http_request_parameters" do
+    describe '#http_request_parameters' do
 
-      it "returns the options for the request" do
-        expect(search.send(:http_request_parameters).object_id).to eql(search.instance_variable_get(:"@options").object_id)
+      it 'returns the http_request_parameters for the request' do
+        expect(search.send(:http_request_parameters).object_id).to eql(search.instance_variable_get(:"@http_request_parameters").object_id)
       end
     end
   end
-end
+end