beerdb-admin 0.1.1 → 0.1.2

data/app/helpers/beer_db_admin/routes_helper.rb

@@ -10,6 +10,23 @@ module RoutesHelper
     short_country_worker_path( country.key, opts )
   end
 
+  def short_region_path( region, opts={} )
+    short_region_worker_path( "#{region.country.key}-#{region.key}", opts )
+  end
+
+  def short_city_path( city, opts={} )
+    short_city_worker_path( city.key, opts )
+  end
+
+
+  def short_brewery_path( brewery, opts={} )
+    short_brewery_worker_path( brewery.key, opts )
+  end
+
+  def short_beer_path( beer, opts={} )
+    short_beer_worker_path( beer.key, opts )
+  end
+
 =begin
   def short_tag_path( tag, opts={} )
     ## NB: tag needs slug NOT key (key may contain spaces)

data/app/helpers/beer_db_admin/service_helper.rb

@@ -0,0 +1,69 @@
+# encoding: utf-8
+
+module BeerDbAdmin
+module ServiceHelper
+
+
+###
+#
+# todo/fix: move to its own gem for reuse and sharing ??  - why? why not?
+#  - check alternatives - any?
+#
+#  - use open search xml spec ?? 
+#
+
+
+#####################
+#  browse tags 
+
+  def link_to_flickr_tags( tags, opts={} )   # fix: add alias for link_to_flickr_tag
+    # e.g. use
+    #  ottakringer
+    #  ottakringer+beer    -- use plus for multiple tags
+    link_to tags, "http://www.flickr.com/photos/tags/#{tags}", opts
+  end
+
+#########################
+#  search terms (q)
+
+  def link_to_flickr_search( q, opts={} )
+     # e.g. use
+     #   ottakringer
+     #   ottakringer+beer    -- note: + is url encoded for space e.g. equals ottakringer beer
+    link_to q, "http://www.flickr.com/search/?q=#{q}", opts
+  end
+
+
+  def link_to_google_search( q, opts={} )
+    link_to q, "https://www.google.com/search?q=#{q}", opts
+  end
+
+  def link_to_google_de_search( q, opts={} )
+    link_to q, "https://www.google.de/search?hl=de&q=#{q}", opts
+  end
+
+
+  def link_to_google_search_images( q, opts={} )
+    link_to q, "https://www.google.com/search?tbm=isch&q=#{q}", opts
+  end
+
+  def link_to_bing_search_images( q, opts={} )
+    link_to q, "http://www.bing.com/images/search?q=#{q}", opts
+  end
+
+  def link_to_wikipedia_search( q, opts={} )
+    link_to q, "http://en.wikipedia.org/?search=#{q}", opts
+  end
+
+  def link_to_wikipedia_de_search( q, opts={} )
+    link_to q, "http://de.wikipedia.org/?search=#{q}", opts
+  end
+
+  def link_to_untappd_search( q, opts={} )
+    link_to q, "https://untappd.com/search?q=#{q}", opts
+  end
+
+
+end # module ServiceHelper
+end # moudle BeerDbAdmin
+

data/app/views/beer_db_admin/beers/index.html.erb

@@ -1,19 +1,17 @@
+<% beers = @beers
+ %>
+
 
 <h3><%= Beer.count %> Beers</h3>
 <!-- todo: add display/page count e.g. 25 -->
 
 <table>
-<% @beers.each do |beer| %>
+<% beers.each do |beer| %>
 <tr>
   <td class='beer-key'><%= beer.key %></td>
-  
-<% if signed_in? %>
+
   <td>
-     <%= link_to 'Add', add_beer_to_user_path( beer.id, current_user_id ), class: 'btn' %>
-  </td>
-<% end %>
-  
-  <td><%= link_to beer.title, beer_path( beer.id ) %>
+     <%= link_to_beer( beer ) %>
      <% if beer.synonyms.present? %>
        | <%= beer.synonyms %>
      <% end %>
@@ -30,39 +28,22 @@
      
      //
      <% if beer.brewery.present? %>
-       <%= beer.brewery.title %>
+       <%= link_to_brewery( beer.brewery ) %>
      <% else %>
        -
      <% end %>
-     
+
 <% if beer.tags.count > 0 %>
     <br>
-    <span class='tags'>
-    <% beer.tags.each_with_index do |tag,i| %>
-      <% if i > 0 %>
-         &bull; 
-       <% end %>
-       <%= tag.key %>
-    <% end %>
-    </span>
+    <%= render_tags( beer.tags ) %>
 <% end %>
-     
+
   </td>
   <td>
-    <% if beer.city.present? %>
-      <%= beer.city.title %>
-    <% else %>
-      -
-    <% end %>
-    /
-    <% if beer.region.present? %>
-      <%= beer.region.title %>
-    <% else %>
-      -
-    <% end %>
-    /
-     <%= image_tag_for_country( beer.country ) %>
-     <%= link_to beer.country.title, short_country_path( beer.country ) %>
+    
+    <!-- fix: add option flag: true -->
+    <%= render_world_tree( beer, flag: true ) %>
+    
    </td>
 </tr>
 

data/app/views/beer_db_admin/beers/show.html.erb

@@ -8,23 +8,11 @@
 
 <h3 style='margin-top: 0;'>
   <%= beer.title %>
-  ,
-  <%= beer.bookmarks.where(yes:true).count %>  +1s,
-  <%= beer.drinks.count %> Ratings
-
-  || <%= image_tag_for_country( beer.country ) %>
-     <%= link_to beer.country.title, short_country_path( beer.country ) %>
+  ||
+  <%= link_to_country( beer.country, flag: true ) %>
 </h3>
 
 
-
-<% if signed_in? %>
-<p>
-  <%= link_to "Add", add_beer_to_user_path( beer.id, current_user_id ), class: 'btn' %>
-</p>
-<% end %>
-
-
 <p>
     <!-- todo ? move synonyms up to header ???
      -->
@@ -55,7 +43,7 @@
 
 <% if beer.brewery.present? %>
 <p>
- By  <%= link_to beer.brewery.title, brewery_path( beer.brewery.id ) %> |
+ By  <%= link_to_brewery( beer.brewery ) %> |
      <%= beer.brewery.founded %> ||
      <%= beer.brewery.address %>
 </p>
@@ -64,69 +52,19 @@
 <% end %>
 
 
-
-<h3><%= beer.bookmarks.where(yes:true).count %>  +1s</h3>
-
-<p>
-<% beer.bookmarks.where(yes:true).each_with_index do |bookmark,i| %>
-  <% if i > 0 %>
-    &bull;
-  <% end %>
-  <%= link_to bookmark.user.name, user_path( bookmark.user.id ) %>
-<% end %>
-</p>
-
-<h3><%= beer.drinks.count %> Ratings</h3>
-
-<% beer.drinks.each do |drink| %>
-
-<p>
- <%= link_to drink.user.name, user_path( drink.user.id ) %>
-   -
-  <span class='drink-rating'>
-     <%= drink.rating %>
-   </span>
-
-   <span class='drink-comments'>
-     <%= drink.comments %>
-    </span>
-   /
-   <span class='drink-place'>
-     <%= drink.place %>
-   </span>
-</p>
-
-<% end %>
-
-
-
 <hr>
 <% if beer.brewery.present? %>
 <p>
-  <% beer.brewery.beers.order(:title).each_with_index do |beer,i| %>
+  <% beer.brewery.beers.order(:key).each_with_index do |beer,i| %>
        <% if i > 0 %>
          &bull;
        <% end %>
-       <%= link_to beer.title, beer_path( beer.id ) %>
+       <%= link_to_beer( beer ) %>
   <% end %>
 </p>
 <% end %>
 
 
 <hr>
-<p>
-  <% if beer.city.present? %>
-      <%= beer.city.title %>
-    <% else %>
-      -
-    <% end %>
-    /
-    <% if beer.region.present? %>
-      <%= beer.region.title %>
-    <% else %>
-      -
-    <% end %>
-    /
-     <%= image_tag_for_country( beer.country ) %>
-     <%= link_to beer.country.title, short_country_path( beer.country ) %>
-</p>
+<%= render_world_tree( beer ) %>
+

data/app/views/beer_db_admin/brands/index.html.erb

@@ -1,8 +1,11 @@
+<% brands = @brands
+ %>
+ 
+<h3><%= Brand.count %> Brands</h3>
 
-<h3><%= @brands.count %> Brands</h3>
 
 <table>
-<% @brands.each do |brand| %>
+<% brands.each do |brand| %>
 <tr>
   <td class='beer-key'><%= brand.key %></td>
     
@@ -13,29 +16,19 @@
      
      //
      <% if brand.brewery.present? %>
-       <%= brand.brewery.title %>
+       <%= link_to_brewery( brand.brewery ) %>
      <% else %>
        -
      <% end %>
 
   </td>
   <td>
-    <% if brand.city.present? %>
-      <%= brand.city.title %>
-    <% else %>
-      -
-    <% end %>
-    /
-    <% if brand.region.present? %>
-      <%= brand.region.title %>
-    <% else %>
-      -
-    <% end %>
-    /
-     <%= image_tag_for_country( brand.country ) %>
-     <%= link_to brand.country.title, short_country_path( brand.country ) %>
+    
+    <!-- fix: add option flag: true -->
+    <%= render_world_tree( brand, flag: true ) %>
+
    </td>
 </tr>
 
 <% end %>
-</table>
+</table>

data/app/views/beer_db_admin/breweries/_actions.html.erb

@@ -0,0 +1,53 @@
+
+<div id='actions' style='float: right; border: 1pt solid grey; background-color: silver; padding: 6px; font-size: 80%;'>
+
+Browse Tagged Fotos
+<ul>
+  <li>Flickr:
+     <%= link_to_flickr_tags "#{brewery.key}",       target: 'beerdb' %>,
+     <%= link_to_flickr_tags "#{brewery.key}+beer",  target: 'beerdb' %>,
+     <%= link_to_flickr_tags "#{brewery.key}+bier",  target: 'beerdb' %>
+  </li>
+</ul>
+
+Search Fotos
+<ul>
+  <li>Flickr:
+     <%= link_to_flickr_search "#{brewery.key}",       target: 'beerdb' %>,
+     <%= link_to_flickr_search "#{brewery.key}+beer",  target: 'beerdb' %>,
+     <!-- check: can we select the language e.g. de w/ a query para ?? -->
+     <%= link_to_flickr_search "#{brewery.key}+bier",  target: 'beerdb' %>
+  </li>
+  <li>Google: 
+     <%= link_to_google_search_images "#{brewery.key}",      target: 'beerdb' %>,
+     <%= link_to_google_search_images "#{brewery.key}+beer", target: 'beerdb' %>,
+     <%= link_to_google_search_images "#{brewery.key}+bier", target: 'beerdb' %>
+     <!-- add search w/ title (e.g. Zwettler BRauerei) --> 
+  </li>
+  <li>Bing:
+     <%= link_to_bing_search_images "#{brewery.key}",      target: 'beerdb' %>,
+     <%= link_to_bing_search_images "#{brewery.key}+beer", target: 'beerdb' %>,
+     <!-- check: can we select the language e.g. de w/ a query para ?? -->
+     <%= link_to_bing_search_images "#{brewery.key}+bier", target: 'beerdb' %>
+  </li>
+</ul>
+
+Search
+<ul>
+   <li>Google:
+     <%= link_to_google_search "#{brewery.key}",      target: 'beerdb' %>,
+     <%= link_to_google_search "#{brewery.key}+beer", target: 'beerdb' %>,
+     <%= link_to_google_de_search "#{brewery.key}+bier", target: 'beerdb' %>
+   </li>
+   <li>Wikipedia:
+     <%= link_to_wikipedia_search "#{brewery.key}+beer",  target: 'beerdb' %>
+   </li>
+   <li>Wikipedia (de):
+     <%= link_to_wikipedia_de_search "#{brewery.key}+bier",  target: 'beerdb' %>
+   </li>
+   <li>Untappd:
+     <%= link_to_untappd_search "#{brewery.key}", target: 'beerdb' %>
+   </li>
+</ul>
+
+</div>

data/app/views/beer_db_admin/breweries/index.html.erb

@@ -1,3 +1,5 @@
+<% breweries = @breweries
+ %>
 
 <h3><%= Brewery.count %> Breweries</h3>
 <!-- todo: add display/page count e.g. 25 -->
@@ -12,18 +14,13 @@
 
 
 <table>
-<% @breweries.each do |brewery| %>
+<% breweries.each do |brewery| %>
 <tr>
   <td class='brewery-key'><%= brewery.key %></td>
 
-<% if signed_in? %>
-  <td>
-     <%= link_to 'Add', add_brewery_to_user_path( brewery.id, current_user_id ), class: 'btn' %>
-  </td>
-<% end %>
 
   <td>
-    <%= link_to brewery.title, brewery_path( brewery.id ) %>
+    <%= link_to_brewery( brewery ) %>
     <% if brewery.synonyms.present? %>
        | <%= brewery.synonyms %>
     <% end %>
@@ -32,20 +29,10 @@
 
   </td>
   <td>
-    <% if brewery.city.present? %>
-      <%= brewery.city.title %>
-    <% else %>
-      -
-    <% end %>
-     /
-    <% if brewery.region.present? %>
-      <%= brewery.region.title %>
-    <% else %>
-      -
-    <% end %>
-     /
-     <%= image_tag_for_country( brewery.country ) %>
-     <%= link_to brewery.country.title, short_country_path( brewery.country ) %>
+    
+    <!-- fix: add option flag: true -->
+    <%= render_world_tree( brewery, flag: true ) %>
+    
    </td>
 </tr>
 

data/app/views/beer_db_admin/breweries/show.html.erb

@@ -17,9 +17,9 @@
   <% end %>
   
   ||
-  <%= image_tag_for_country( brewery.country ) %>
-  <%= link_to brewery.country.title, short_country_path( brewery.country ) %>
-  
+  <%= link_to_country( brewery.country, flag: true ) %>
+
+  - <%= brewery.beers.count %> Beers
 
 <% if brewery.tags.count > 0 %>
   <span class='tags tag-list'>
@@ -29,6 +29,12 @@
 
 </h3>
 
+<!-- add some quick search services for convenience
+   fix: move to shared ?? use render_brewery_actions() ???
+-->
+<%= render partial: 'actions', locals: { brewery: brewery } %>
+
+
 <p>
   <%= brewery.address %>
 </p>
@@ -41,46 +47,23 @@
 
 
 <!-- add all beers -->
-
 <hr>
 <ul>
   <% brewery.beers.each do |beer| %>
     <li>
-       <%= link_to beer.title, beer_path( beer.id ) %>
-
-     <% if beer.synonyms.present? %>
-       &bull; <%= beer.synonyms %>
-     <% end %>
-     /
-     <% if beer.abv.present? %>
-       <%= beer.abv %>
-     <% else %>
-       -
-     <% end %>
-      %
-     <% if beer.plato.present? %>
-      / <%= beer.plato %>°
-     <% end %>
-
-<% if beer.tags.count > 0 %>
-     /
-    <span class='tags'>
-    <% beer.tags.each_with_index do |tag,i| %>
-      <% if i > 0 %>
-         &bull; 
-      <% end %>
-      <%= tag.key %>
-    <% end %>
-    </span>
-<% end %>
-
-
-       
+      <%= render_beer( beer ) %>
     </li>
   <% end %>
 </ul>
 
 
+<hr>
+<% if brewery.city.present? %>
+  <!-- check number of breweries !!! only if more than one!!! -->
+  <%= render_breweries_for_city( brewery.city ) %>
+<% end %>
+
+
 <hr>
 
 <% if brewery.region.present? %>
@@ -90,22 +73,7 @@
 <% end %><!-- if brewery.region.present? -->
 
 
-
 <hr>
 
-<p>
-  <% if brewery.city.present? %>
-      <%= brewery.city.title %>
-  <% else %>
-      -
-  <% end %>
-    /
-    <% if brewery.region.present? %>
-      <%= brewery.region.title %>
-    <% else %>
-      -
-    <% end %>
-    /
-  <%= image_tag_for_country( brewery.country ) %>
-  <%= link_to brewery.country.title, short_country_path( brewery.country ) %>
-</p>
+<%= render_world_tree( brewery ) %>
+