brewery_db 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTU4MDdlZjViYWVmOTBkZjM0YjQ4ZmQzYTBlZDkxZTc5MjYzMWI2YQ==
-  data.tar.gz: !binary |-
-    ODZjMTA2OWFiNDQyMzM0MmE4ZGY0Y2UyZDNhNWRhMWQ2ZjQ0NTkzOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NmFlZGVkYWYzYTZmZmZiZWUzZGEzZjczMmQyNzlmNDk4YTU4Yjc2YzU3NDEy
-    OWE0MWNmZDFlNDFhMjU3MzNmNDgzYzI4OTU0N2RlZmE1MGFmNjA0MmIxZTgz
-    Njc3NjhkNWM2NDE5NTg0NTg1YjE4NDY4NjJiMjljNmZmM2ZiNjg=
-  data.tar.gz: !binary |-
-    YTAzNjljZDFjNTY5NTlhNTRiYzExYjI0NDI1NjZkM2EzYjMzOWQxODUxMmFk
-    YTZjYTBlY2NhYzUxOGNhMWQwODVjMWQ4ZTc0MjQ0MGVkOTM2MTI5Y2JiZTdi
-    ZmExYTc0ZjNiMjhlYmNiMzVkOWU4MDUyNGQxYjljMTViNzQ2MzI=
+SHA1:
+  metadata.gz: fa53de9a4ce4552fc997f30b90d47ef2a5f461b3
+  data.tar.gz: 8b40c3072e60c656d3d96d2f4e3f8badb9b61925
+SHA512:
+  metadata.gz: d4d3b86c757e186a5908852a0031d273392877acfedbe6096c2ffc4ae331b00fd22c66e7147ef5410ed878cdcdac65fce329ddbc2243fc10f32569fae2b48e5b
+  data.tar.gz: 752492a08c1214df0894d3868e6517ef71e8aac9c524408d51ee9e16a1c8faa806258959f23a16c9740a98cc9509f34f8e6e7345de81fbc3a72588820a624a4b

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 0.2.1 (2013-08-02)
+
+  * Add support for `hops`, `hops/:id`, `fermentables`, `fermentables/:id`,
+    `yeasts`, and `yeasts:id` endpoints ([Jésus Lopes][jtadeulopes])
+
 ## 0.2.0 (2013-06-26)
 
   * Add support for `locations` and `locations/:id` endpoints ([dbc-apprentice][dbc-apprentice])
@@ -20,5 +25,6 @@
   * Initial release ([Tyler Hunt][tylerhunt])
 
 [dbc-apprentice]: https://github.com/dbc-apprentice
+[jtadeulopes]: https://github.com/jtadeulopes
 [stevenharman]: http://github.com/stevenharman
 [tylerhunt]: http://github.com/tylerhunt

data/README.md

@@ -70,9 +70,15 @@ brewery_db.brewery('d1zSa7').beers
 brewery_db.categories.all
 brewery_db.categories.find(1)
 
+brewery_db.fermentables.all(country: 'Brazil')
+brewery_db.fermentables.find(1924)
+
 brewery_db.glassware.all
 brewery_db.glassware.find(1)
 
+brewery_db.hops.all
+brewery_db.hops.find(1)
+
 brewery_db.search.all(q: 'IPA')
 brewery_db.search.beers(q: 'IPA')
 brewery_db.search.breweries(q: 'IPA')
@@ -84,6 +90,9 @@ brewery_db.styles.find(1)
 
 brewery_db.locations.all(locality: 'San Francisco')
 
+brewery_db.yeasts.all
+brewery_db.yeasts.find(1836)
+
 ```
 
 ### WebHooks

data/brewery_db.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday_middleware', '~> 0.8'
   gem.add_dependency 'hashie', '>= 1.1', '< 3'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'rspec', '~> 2.11'
+  gem.add_development_dependency 'rspec', '~> 2.14'
   gem.add_development_dependency 'vcr', '~> 2.0'
 
   gem.files = `git ls-files`.split($\)

data/lib/brewery_db.rb

@@ -25,9 +25,12 @@ module BreweryDB
     autoload :Breweries, 'brewery_db/resources/breweries'
     autoload :Brewery, 'brewery_db/resources/brewery'
     autoload :Categories, 'brewery_db/resources/categories'
+    autoload :Fermentables, 'brewery_db/resources/fermentables'
     autoload :Glassware, 'brewery_db/resources/glassware'
+    autoload :Hops, 'brewery_db/resources/hops'
     autoload :Locations, 'brewery_db/resources/locations'
     autoload :Search, 'brewery_db/resources/search'
     autoload :Styles, 'brewery_db/resources/styles'
+    autoload :Yeasts, 'brewery_db/resources/yeasts'
   end
 end

data/lib/brewery_db/client.rb

@@ -33,10 +33,18 @@ module BreweryDB
       @categories ||= Resources::Categories.new(config)
     end
 
+    def fermentables
+      @fermentables ||= Resources::Fermentables.new(config)
+    end
+
     def glassware
       @glassware ||= Resources::Glassware.new(config)
     end
 
+    def hops
+      @hops ||= Resources::Hops.new(config)
+    end
+
     def locations
       @locations ||= Resources::Locations.new(config)
     end
@@ -48,5 +56,9 @@ module BreweryDB
     def styles
       @styles ||= Resources::Styles.new(config)
     end
+
+    def yeasts
+      @yeasts ||= Resources::Yeasts.new(config)
+    end
   end
 end

data/lib/brewery_db/resources/fermentables.rb

@@ -0,0 +1,13 @@
+module BreweryDB
+  module Resources
+    class Fermentables < Resource
+      def all(params={})
+        get('fermentables', params).data
+      end
+
+      def find(id, params={})
+        get('fermentable/%s' % id, params).data
+      end
+    end
+  end
+end

data/lib/brewery_db/resources/hops.rb

@@ -0,0 +1,13 @@
+module BreweryDB
+  module Resources
+    class Hops < Resource
+      def all(params={})
+        get('hops', params).data
+      end
+
+      def find(id, params={})
+        get('hop/%s' % id, params).data
+      end
+    end
+  end
+end

data/lib/brewery_db/resources/yeasts.rb

@@ -0,0 +1,13 @@
+module BreweryDB
+  module Resources
+    class Yeasts < Resource
+      def all(params={})
+        get('yeasts', params).data
+      end
+
+      def find(id, params={})
+        get('yeast/%s' % id, params).data
+      end
+    end
+  end
+end

data/lib/brewery_db/version.rb

@@ -1,3 +1,3 @@
 module BreweryDB
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/brewery_db/client_spec.rb

@@ -1,56 +1,61 @@
 require 'spec_helper'
 
 describe BreweryDB::Client do
+  subject(:client) { described_class.new }
+
   context '#config' do
     it 'returns a configuration instance' do
-      subject.config.should be_a(BreweryDB::Config)
+      expect(client.config).to be_a(BreweryDB::Config)
     end
 
     it 'memoizes the return value' do
-      BreweryDB::Config.should_receive(:new).once.and_return(stub)
-      2.times { subject.config }
+      expect(BreweryDB::Config).to receive(:new).once.and_return(double)
+      2.times { client.config }
     end
   end
 
   context '#configure' do
     it 'can set the adapter' do
       expect {
-        subject.configure { |config| config.adapter = :typhoeus }
-      }.to change(subject.config, :adapter).to(:typhoeus)
+        client.configure { |config| config.adapter = :typhoeus }
+      }.to change(client.config, :adapter).to(:typhoeus)
     end
 
     it 'can set the API key' do
       expect {
-        subject.configure { |config| config.api_key = 'secret' }
-      }.to change(subject.config, :api_key).to('secret')
+        client.configure { |config| config.api_key = 'secret' }
+      }.to change(client.config, :api_key).to('secret')
     end
 
     it 'can set the base URI' do
       expect {
-        subject.configure { |config| config.base_uri = 'http://example.com' }
-      }.to change(subject.config, :base_uri).to('http://example.com')
+        client.configure { |config| config.base_uri = 'http://example.com' }
+      }.to change(client.config, :base_uri).to('http://example.com')
     end
 
     it 'can set the timeout' do
       expect {
-        subject.configure { |config| config.timeout = 42 }
-      }.to change(subject.config, :timeout).to(42)
+        client.configure { |config| config.timeout = 42 }
+      }.to change(client.config, :timeout).to(42)
     end
 
     it 'can set the user agent' do
       expect {
-        subject.configure { |config| config.user_agent = 'Brewdega' }
-      }.to change(subject.config, :user_agent).to('Brewdega')
+        client.configure { |config| config.user_agent = 'Brewdega' }
+      }.to change(client.config, :user_agent).to('Brewdega')
     end
   end
 
   its(:beers) { should be_a(BreweryDB::Resources::Beers) }
   its(:breweries) { should be_a(BreweryDB::Resources::Breweries) }
   its(:categories) { should be_a(BreweryDB::Resources::Categories) }
+  its(:fermentables) { should be_a(BreweryDB::Resources::Fermentables) }
   its(:glassware) { should be_a(BreweryDB::Resources::Glassware) }
+  its(:hops) { should be_a(BreweryDB::Resources::Hops) }
   its(:locations) { should be_a(BreweryDB::Resources::Locations) }
   its(:search) { should be_a(BreweryDB::Resources::Search) }
   its(:styles) { should be_a(BreweryDB::Resources::Styles) }
+  its(:yeasts) { should be_a(BreweryDB::Resources::Yeasts) }
 
-  it { subject.brewery('KlSsWY').should be_a(BreweryDB::Resources::Brewery) }
+  it { expect(client.brewery('KlSsWY')).to be_a(BreweryDB::Resources::Brewery) }
 end

data/spec/brewery_db/config_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe BreweryDB::Config do
+  subject(:config) { described_class.new }
+
   context 'defaults' do
     its(:adapter) { should eq Faraday.default_adapter }
     its(:api_key) { should be_nil }
@@ -12,40 +14,40 @@ describe BreweryDB::Config do
   context '#adapter=' do
     it do
       expect {
-        subject.adapter = :typhoeus
-      }.to change(subject, :adapter).to(:typhoeus)
+        config.adapter = :typhoeus
+      }.to change(config, :adapter).to(:typhoeus)
     end
   end
 
   context '#api_key=' do
     it do
       expect {
-        subject.api_key = 'secret'
-      }.to change(subject, :api_key).to('secret')
+        config.api_key = 'secret'
+      }.to change(config, :api_key).to('secret')
     end
   end
 
   context '#base_uri=' do
     it do
       expect {
-        subject.base_uri = 'http://example.com'
-      }.to change(subject, :base_uri).to('http://example.com')
+        config.base_uri = 'http://example.com'
+      }.to change(config, :base_uri).to('http://example.com')
     end
   end
 
   context 'timeout=' do
     it do
       expect {
-        subject.timeout = 42
-      }.to change(subject, :timeout).to(42)
+        config.timeout = 42
+      }.to change(config, :timeout).to(42)
     end
   end
 
   context 'user_agent=' do
     it do
       expect {
-        subject.user_agent = 'Brewdega'
-      }.to change(subject, :user_agent).to('Brewdega')
+        config.user_agent = 'Brewdega'
+      }.to change(config, :user_agent).to('Brewdega')
     end
   end
 end

data/spec/brewery_db/mash_spec.rb

@@ -6,14 +6,14 @@ describe BreweryDB::Mash do
   context '#convert_key' do
     it 'underscores camelcased keys' do
       response = described_class.new(currentPage: 1)
-      response.current_page.should == 1
+      expect(response.current_page).to eq(1)
     end
   end
 
   context '#convert_value' do
     it 'converts CR+LF to LF' do
       response = described_class.new(description: "This.\r\nThat.")
-      response.description.should == "This.\nThat."
+      expect(response.description).to eq("This.\nThat.")
     end
   end
 end

data/spec/brewery_db/middleware/error_handler_spec.rb

@@ -4,7 +4,7 @@ describe BreweryDB::Middleware::ErrorHandler do
   subject(:handler) { described_class.new }
 
   describe '#on_complete' do
-    let(:error_body) { stub(error_message: error_message, status: 'failure') }
+    let(:error_body) { double(error_message: error_message, status: 'failure') }
     let(:error_message) { 'error' }
     let(:over_ratelimit) { { 'x-ratelimit-remaining' => '0' } }
 

data/spec/brewery_db/resource_spec.rb

@@ -20,15 +20,16 @@ describe BreweryDB::Resource, :resource do
       }.new(config)
     end
 
-    context 'an OK request' do
-      subject { resource.ok.first }
 
-      its(:name) { should == 'Rogue Ales' }
+    context 'an OK request' do
+      it 'returns the data' do
+        expect(resource.ok.first.name).to eq('Rogue Ales')
+      end
     end
 
     context 'a list of resources' do
       it 'can be enumerated' do
-        resource.list.inject(0) { |tally, r| tally + 1 }.should eq 55
+        expect(resource.list.inject(0) { |tally, r| tally + 1 }).to eq(66)
       end
     end
 
@@ -37,9 +38,14 @@ describe BreweryDB::Resource, :resource do
         expect { resource.not_found }.to raise_error(BreweryDB::NotFound)
       end
 
-      it 'sets the exception message to the error message in the response' do
+      it 'includes the response message in the error message' do
+        exception = resource.not_found rescue $!
+        expect(exception.message).to match(/could not be found/)
+      end
+
+      it 'includes the response status in the error message' do
         exception = resource.not_found rescue $!
-        exception.message.should match /not\s+found/
+        expect(exception.message).to match(/404/)
       end
     end
   end

data/spec/brewery_db/resources/beers_spec.rb

@@ -7,7 +7,7 @@ describe BreweryDB::Resources::Beers, :resource do
     let(:response) { described_class.new(config).all(abv: '5.5') }
 
     it 'fetches all of the beers at once' do
-      response.count.should eq 495
+      expect(response.count).to eq(807)
     end
   end
 
@@ -15,7 +15,7 @@ describe BreweryDB::Resources::Beers, :resource do
     let(:response) { described_class.new(config).find('99Uj1n') }
 
     it 'fetches only the beer asked for' do
-      response.id.should == '99Uj1n'
+      expect(response.id).to eq('99Uj1n')
     end
   end
 end

data/spec/brewery_db/resources/breweries_spec.rb

@@ -7,7 +7,7 @@ describe BreweryDB::Resources::Breweries, :resource do
     let(:response) { described_class.new(config).all(established: 2006) }
 
     it 'fetches all of the breweries at once' do
-      response.count.should eq 55
+      expect(response.count).to eq(66)
     end
   end
 
@@ -15,7 +15,7 @@ describe BreweryDB::Resources::Breweries, :resource do
     let(:response) { described_class.new(config).find('Idm5Y5') }
 
     it 'fetches only the brewery asked for' do
-      response.id.should == 'Idm5Y5'
+      expect(response.id).to eq('Idm5Y5')
     end
   end
 end

data/spec/brewery_db/resources/brewery_spec.rb

@@ -2,25 +2,25 @@ require 'spec_helper'
 
 describe BreweryDB::Resources::Brewery do
   context '#beers' do
-    let(:config) { stub }
+    let(:config) { double }
     let(:id) { 'KlSsWY' }
-    let(:response) { stub(data: nil) }
+    let(:response) { double(data: :some_beers) }
 
-    subject { described_class.new(config, id: id) }
+    subject(:brewery) { described_class.new(config, id: id) }
 
     context 'without params' do
       it 'returns the beers for a brewery' do
-        subject.should_receive(:get).with('brewery/KlSsWY/beers', {}) { response }
-        subject.beers
+        brewery.stub(:get).with('brewery/KlSsWY/beers', {}) { response }
+        expect(brewery.beers).to eq(:some_beers)
       end
     end
 
     context 'with params' do
-      let(:params) { stub }
+      let(:params) { double }
 
       it 'returns the beers for a brewery with params' do
-        subject.should_receive(:get).with('brewery/KlSsWY/beers', params) { response }
-        subject.beers(params)
+        brewery.stub(:get).with('brewery/KlSsWY/beers', params) { response }
+        expect(brewery.beers(params)).to eq(:some_beers)
       end
     end
   end