beerdb 0.6.4 → 0.6.5

data/lib/beerdb/server/views/index.erb

@@ -3,6 +3,20 @@
 
 <h2>Examples</h2>
 
+<h3>Get random beer <code>/beer/rand</code></h3>
+
+<table>
+ <tr>
+  <td>
+    <code>
+     <a href='<%= url("/beer/rand") %>'>
+        /beer/<span class='params'>rand</span>
+     </a>
+    </code>
+  </td>
+ </tr>
+</table>
+
 <h3>Get beer by key <code>/beer/<span class='params'>:key</span></code></h3>
 
 <table>
@@ -69,6 +83,20 @@
 </table>
 
 
+<h3>Get random brewery <code>/brewery/rand</code></h3>
+
+<table>
+ <tr>
+  <td>
+    <code>
+     <a href='<%= url("/brewery/rand") %>'>
+        /brewery/<span class='params'>rand</span>
+     </a>
+    </code>
+  </td>
+ </tr>
+</table>
+
 <h3>Get brewery by key <code>/brewery/<span class='params'>:key</span></code></h3>
 
 <table>

data/lib/beerdb/server.rb

@@ -63,8 +63,20 @@ class Server < Sinatra::Base
     erb :debug
   end
 
+  ## todo: add support for beer of the day, of the week, of the month, of the year?
+  ##  /beer/day|d  | /beer/month|m  | beer/year|y ??
+  ##
+  ## add table daily_beer, weekly_beer, etc. ??
+
   get '/beer/:key' do |key|
-    beer = Beer.find_by_key!( key )
+
+    if ['r', 'rnd', 'rand', 'random'].include?( key )
+      # special key for random beer
+      beer_id = rand( Beer.count )+1   # nb: assumes record ids sequence from 1-n
+      beer = Beer.find( beer_id )
+    else
+      beer = Beer.find_by_key!( key )
+    end
 
     brewery = {}
     if beer.brewery.present?
@@ -82,18 +94,26 @@ class Server < Sinatra::Base
       title: beer.country.title
     }
 
-    data = { beer: { key: beer.key, title: beer.title, synonyms: beer.synonyms,
+    data = { key: beer.key, title: beer.title, synonyms: beer.synonyms,
                      abv: beer.abv, srm: beer.srm, og: beer.og,
                      tags: tags,
                      brewery: brewery,
-                     country: country }}
+                     country: country }
 
     json_or_jsonp( data )
   end
 
 
   get '/brewery/:key' do |key|
-    brewery = Brewery.find_by_key!( key )
+
+    if ['r', 'rnd', 'rand', 'random'].include?( key )
+      # special key for random brewery
+      brewery_id = rand( Brewery.count )+1   # nb: assumes record ids sequence from 1-n
+      brewery = Brewery.find( brewery_id )
+    else
+      brewery = Brewery.find_by_key!( key )
+    end
+
 
     beers = []
     brewery.beers.each do |b|
@@ -110,16 +130,16 @@ class Server < Sinatra::Base
       title: brewery.country.title
     }
 
-    data = { brewery: { key: brewery.key,
-                        title: brewery.title,
-                        synonyms: brewery.synonyms,
-                        since: brewery.since,
-                        address: brewery.address,
-                        web: brewery.web,
-                        prod: brewery.prod,  # (estimated) annual production in hl e.g. 2_000 hl
-                        tags: tags,
-                        beers: beers,
-                        country: country }}
+    data = {  key: brewery.key,
+              title: brewery.title,
+              synonyms: brewery.synonyms,
+              since: brewery.since,
+              address: brewery.address,
+              web: brewery.web,
+              prod: brewery.prod,  # (estimated) annual production in hl e.g. 2_000 hl
+              tags: tags,
+              beers: beers,
+              country: country }
 
     json_or_jsonp( data )
   end

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
 module BeerDb
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &83421770 !ruby/object:Gem::Requirement
+  requirement: &75736340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *83421770
+  version_requirements: *75736340
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &83421550 !ruby/object:Gem::Requirement
+  requirement: &75736120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *83421550
+  version_requirements: *75736120
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &83421330 !ruby/object:Gem::Requirement
+  requirement: &75735900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *83421330
+  version_requirements: *75735900
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &83421110 !ruby/object:Gem::Requirement
+  requirement: &75735680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *83421110
+  version_requirements: *75735680
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &83420890 !ruby/object:Gem::Requirement
+  requirement: &75735460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *83420890
+  version_requirements: *75735460
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: