beerdb-admin 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5370891f4c9c6156823865911deaa0209da52691
+  data.tar.gz: aa6b615bf25bed25fe87e2edb822c2ef4a7b9a1f
+SHA512:
+  metadata.gz: 2c102e57877ad8d999ec3cdb753366783a56a4b3296d6edf47fa6d9dc19a9fa67e45740dbef9bf92de6bf984aad3bc352212d85b00d7e3d723fbff25ad7f77b5
+  data.tar.gz: 416ba2a94255890baf0210b6003bb9c1b582a28edec43ac9e6d51f6c3c23d70c4f61a3e6931bd5c5a01412809e16c10e4ed83863f9f5a1fe5edccbe3e9363ab1

data/Manifest.txt

@@ -1,60 +1,57 @@
-History.md
-Manifest.txt
-README.md
-Rakefile
-app/assets/javascripts/beer_db_admin/application.js
-app/assets/stylesheets/beer_db_admin/application.css.scss
-app/assets/stylesheets/beer_db_admin/button.css.scss
-app/assets/stylesheets/beer_db_admin/flash.css.scss
-app/assets/stylesheets/beer_db_admin/navbar.css.scss
-app/assets/stylesheets/beer_db_admin/settings.css.scss
-app/controllers/beer_db_admin/beer_db_admin_controller.rb
-app/controllers/beer_db_admin/beers_controller.rb
-app/controllers/beer_db_admin/bookmarks_controller.rb
-app/controllers/beer_db_admin/brands_controller.rb
-app/controllers/beer_db_admin/breweries_controller.rb
-app/controllers/beer_db_admin/countries_controller.rb
-app/controllers/beer_db_admin/drinks_controller.rb
-app/controllers/beer_db_admin/frontpage_controller.rb
-app/controllers/beer_db_admin/pages_controller.rb
-app/controllers/beer_db_admin/regions_controller.rb
-app/controllers/beer_db_admin/sessions_controller.rb
-app/controllers/beer_db_admin/tags_controller.rb
-app/controllers/beer_db_admin/time_controller.rb
-app/controllers/beer_db_admin/users_controller.rb
-app/helpers/beer_db_admin/application_helper.rb
-app/helpers/beer_db_admin/part_helper.rb
-app/helpers/beer_db_admin/routes_helper.rb
-app/views/beer_db_admin/beers/index.html.erb
-app/views/beer_db_admin/beers/show.html.erb
-app/views/beer_db_admin/brands/index.html.erb
-app/views/beer_db_admin/breweries/index.html.erb
-app/views/beer_db_admin/breweries/show.html.erb
-app/views/beer_db_admin/countries/index.html.erb
-app/views/beer_db_admin/countries/show.html.erb
-app/views/beer_db_admin/countries/show_pocket.html.erb
-app/views/beer_db_admin/drinks/_form.html.erb
-app/views/beer_db_admin/drinks/edit.html.erb
-app/views/beer_db_admin/drinks/new.html.erb
-app/views/beer_db_admin/pages/about.html.erb
-app/views/beer_db_admin/pages/index.html.erb
-app/views/beer_db_admin/regions/index.html.erb
-app/views/beer_db_admin/sessions/new.html.erb
-app/views/beer_db_admin/shared/_beers.html.erb
-app/views/beer_db_admin/shared/_bookmarks.html.erb
-app/views/beer_db_admin/shared/_breweries_for_country.html.erb
-app/views/beer_db_admin/shared/_breweries_for_region.html.erb
-app/views/beer_db_admin/shared/_brewery_tags.html.erb
-app/views/beer_db_admin/shared/_countries.html.erb
-app/views/beer_db_admin/shared/_tags.html.erb
-app/views/beer_db_admin/tags/index.html.erb
-app/views/beer_db_admin/time/index.html.erb
-app/views/beer_db_admin/users/edit.html.erb
-app/views/beer_db_admin/users/show.html.erb
-app/views/layouts/beer_db_admin/_flash.html.erb
-app/views/layouts/beer_db_admin/_header.html.erb
-app/views/layouts/beer_db_admin/beer_db_admin.html.erb
-config/routes.rb
-lib/beerdb/admin.rb
-lib/beerdb/admin/engine.rb
-lib/beerdb/admin/version.rb
+History.md
+Manifest.txt
+README.md
+Rakefile
+app/assets/javascripts/beer_db_admin/application.js
+app/assets/stylesheets/beer_db_admin/application.css.scss
+app/assets/stylesheets/beer_db_admin/button.css.scss
+app/assets/stylesheets/beer_db_admin/flash.css.scss
+app/assets/stylesheets/beer_db_admin/navbar.css.scss
+app/assets/stylesheets/beer_db_admin/settings.css.scss
+app/controllers/beer_db_admin/beer_db_admin_controller.rb
+app/controllers/beer_db_admin/beers_controller.rb
+app/controllers/beer_db_admin/brands_controller.rb
+app/controllers/beer_db_admin/breweries_controller.rb
+app/controllers/beer_db_admin/cities_controller.rb
+app/controllers/beer_db_admin/countries_controller.rb
+app/controllers/beer_db_admin/pages_controller.rb
+app/controllers/beer_db_admin/regions_controller.rb
+app/controllers/beer_db_admin/tags_controller.rb
+app/helpers/beer_db_admin/application_helper.rb
+app/helpers/beer_db_admin/link_helper.rb
+app/helpers/beer_db_admin/part_helper.rb
+app/helpers/beer_db_admin/routes_helper.rb
+app/helpers/beer_db_admin/service_helper.rb
+app/views/beer_db_admin/beers/index.html.erb
+app/views/beer_db_admin/beers/show.html.erb
+app/views/beer_db_admin/brands/index.html.erb
+app/views/beer_db_admin/breweries/_actions.html.erb
+app/views/beer_db_admin/breweries/index.html.erb
+app/views/beer_db_admin/breweries/show.html.erb
+app/views/beer_db_admin/cities/show.html.erb
+app/views/beer_db_admin/countries/index.html.erb
+app/views/beer_db_admin/countries/show.html.erb
+app/views/beer_db_admin/countries/show_pocket.html.erb
+app/views/beer_db_admin/pages/about.html.erb
+app/views/beer_db_admin/pages/index.html.erb
+app/views/beer_db_admin/regions/index.html.erb
+app/views/beer_db_admin/regions/show.html.erb
+app/views/beer_db_admin/shared/_beer.html.erb
+app/views/beer_db_admin/shared/_beers.html.erb
+app/views/beer_db_admin/shared/_breweries_for_city.html
+app/views/beer_db_admin/shared/_breweries_for_country.html.erb
+app/views/beer_db_admin/shared/_breweries_for_region.html.erb
+app/views/beer_db_admin/shared/_breweries_table_rows.html.erb
+app/views/beer_db_admin/shared/_breweries_table_rows_for_region.html.erb
+app/views/beer_db_admin/shared/_brewery_tags.html.erb
+app/views/beer_db_admin/shared/_countries.html.erb
+app/views/beer_db_admin/shared/_tags.html.erb
+app/views/beer_db_admin/shared/_world_tree.html.erb
+app/views/beer_db_admin/tags/index.html.erb
+app/views/layouts/beer_db_admin/_flash.html.erb
+app/views/layouts/beer_db_admin/_header.html.erb
+app/views/layouts/beer_db_admin/beer_db_admin.html.erb
+config/routes.rb
+lib/beerdb/admin.rb
+lib/beerdb/admin/engine.rb
+lib/beerdb/admin/version.rb

data/README.md

@@ -2,12 +2,13 @@
 
 Open beer web admin addon / rails engine
 
-* home  :: [github.com/geraldb/beer.db.admin](https://github.com/geraldb/beer.db.admin)
-* bugs  :: [github.com/geraldb/beer.db.admin/issues](https://github.com/geraldb/beer.db.admin/issues)
+* home  :: [github.com/beerkit/beer.db.admin](https://github.com/beerkit/beer.db.admin)
+* bugs  :: [github.com/beerkit/beer.db.admin/issues](https://github.com/beerkit/beer.db.admin/issues)
 * gem   :: [rubygems.org/gems/beerdb-admin](https://rubygems.org/gems/beerdb-admin)
 * rdoc  :: [rubydoc.info/gems/beerdb-admin](http://rubydoc.info/gems/beerdb-admin)
 * forum :: [groups.google.com/group/beerdb](https://groups.google.com/group/beerdb)
 
+
 ## Demo
 
 Try the `beer.db` web admin demo running
@@ -20,7 +21,7 @@ on Heroku [`prost.herokuapp.com`](http://prost.herokuapp.com).
 
 In your routes (`config/routes.rb`) mount the beer.db.admin app; add the line:
 
-    mount BeerDbAdmin::Server, :at => '/db'
+    mount BeerDbAdmin::Engine, :at => '/db'
 
 
 ## License

data/Rakefile

@@ -9,7 +9,7 @@ Hoe.spec 'beerdb-admin' do
   self.summary = 'beerdb admin addon - rails engine'
   self.description = summary
 
-  self.urls    = ['https://github.com/geraldb/beer.db.admin']
+  self.urls    = ['https://github.com/beerkit/beer.db.admin']
 
   self.author  = 'Gerald Bauer'
   self.email   = 'beerdb@googlegroups.com'

data/app/assets/stylesheets/beer_db_admin/application.css.scss

@@ -24,6 +24,10 @@ body
 }
 
 
+ul {
+  list-style-type: square;
+}
+
 
 a {
   color: black;
@@ -39,7 +43,6 @@ a {
 }
 
 
-.team-count,
 .city-count,
 .beer-count,
 .country-key,
@@ -64,16 +67,6 @@ table {
   }
 }
 
-.drink-rating {
-    font-size: 40px;
-}
-
-.drink-comments,
-.drink-place {
-    color: $dark-gray;
-    font-size: 12px;   // ~80%
-}
-
 
 /////////////////////////
 // version / powered_by

data/app/assets/stylesheets/beer_db_admin/navbar.css.scss

@@ -22,12 +22,7 @@ navy);
        text-decoration: underline;
        color: $navbar-text;
      }
-     
-     .signin, .signin *,
-     .signout, .signout * {
-       font-size: $base-font-size*0.80;
-     }
-     
+
      .logo {
         a,a:visited,a:hover {
            text-decoration: none;
@@ -63,12 +58,7 @@ navy);
        text-decoration: underline;
        color: $admin-navbar-text;
      }
-     
-     .signin, .signin *,
-     .signout, .signout * {
-       font-size: $base-font-size*0.80;
-     }
-     
+
      .logo {
         a,a:visited,a:hover {
            text-decoration: none;
@@ -104,12 +94,7 @@ navy);
        text-decoration: underline;
        color: $db-navbar-text;
      }
-     
-     .signin, .signin *,
-     .signout, .signout * {
-       font-size: $base-font-size*0.80;
-     }
-     
+
      .logo {
         a,a:visited,a:hover {
            text-decoration: none;

data/app/controllers/beer_db_admin/beers_controller.rb

@@ -6,7 +6,7 @@ class BeersController < BeerDbAdminController
   
   def index
     # note: show 25 per page for now
-    @beers = Beer.limit( 25 )
+    @beers = Beer.limit( 25 ).where( 'brewery_id is not null' )
   end
   
   # GET /beers/:id e.g. /beers/1
@@ -14,6 +14,12 @@ class BeersController < BeerDbAdminController
     @beer = Beer.find( params[:id] )
   end
 
+  # GET /beer/:key  e.g  /beer/guiness /beer/ottakringerhelles
+  def shortcut
+    @beer = Beer.find_by_key!( params[:key] )
+    render :show
+  end
+
 end # class BeersController
 
 end # module BeerDbAdmin

data/app/controllers/beer_db_admin/breweries_controller.rb

@@ -25,6 +25,12 @@ class BreweriesController < BeerDbAdminController
     @brewery = Brewery.find( params[:id] )
   end
 
+  # GET /by/:key  e.g  /by/guiness /by/ottakringer
+  def shortcut
+    @brewery = Brewery.find_by_key!( params[:key] )
+    render :show
+  end
+
 
 end # class BreweriesController
 

data/app/controllers/beer_db_admin/cities_controller.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+module BeerDbAdmin
+
+class CitiesController < BeerDbAdminController
+
+  def index
+    @cities = City.all
+  end
+
+  def show
+    @city = City.find( params[:id] )
+  end
+
+
+  def shortcut
+    # todo/fix: check if city key is unique ? or needs country or region??
+  
+    @city = City.find_by_key!( params[:key] )
+
+    render :show
+  end
+end # class CitiesController
+
+end # module BeerDbAdmin

data/app/controllers/beer_db_admin/regions_controller.rb

@@ -7,7 +7,23 @@ class RegionsController < BeerDbAdminController
   def index
     @regions = Region.all
   end
+  
+  def show
+    @region = Region.find( params[:id] )
+  end
 
+  def shortcut
+    
+    # todo/fix: check case if no key match; no country; no region etc.
+    
+    # split key into country key and region key
+    if params[:key] =~ /([a-z]{2,3})[\-+.]([a-z]{1,3})/
+      @country = Country.find_by_key( $1 )
+      @region  = Region.find_by_country_id_and_key( @country.id, $2 )
+    end
+
+    render :show
+  end
 end # class RegionsController
 
 end # module BeerDbAdmin

data/app/helpers/beer_db_admin/application_helper.rb

@@ -10,30 +10,12 @@ module ApplicationHelper
     end
   end
 
-  def signed_in?
-    session[:user_id].nil? == false
-  end
-  
-  def current_user
-    User.find( session[:user_id] )
-  end
-  
-  def current_user_id
-    session[:user_id]
-  end
-  
-  def current_user?( user )
-    session[:user_id] == user.id
-  end
-
-
-
   def powered_by
     content_tag :div do
       link_to( 'Questions? Comments?', 'http://groups.google.com/group/beerdb' ) + " | " +
-      link_to( "world.db/#{WorldDb::VERSION}", 'https://github.com/geraldb/world.db.ruby' )  + ', ' +
-      link_to( "beer.db/#{BeerDb::VERSION}", 'https://github.com/geraldb/beer.db.ruby' ) + ', ' +
-      link_to( "beer.db.admin/#{BeerDbAdmin::VERSION}", 'https://github.com/geraldb/beer.db.admin' ) + ' - ' +
+      link_to( "world.db/#{WorldDb::VERSION}", 'https://github.com/worlddb/world.db.ruby' )  + ', ' +
+      link_to( "beer.db/#{BeerDb::VERSION}", 'https://github.com/beerkit/beer.db.ruby' ) + ', ' +
+      link_to( "beer.db.admin/#{BeerDbAdmin::VERSION}", 'https://github.com/beerkit/beer.db.admin' ) + ' - ' +
       content_tag( :span, "Ruby/#{RUBY_VERSION} (#{RUBY_RELEASE_DATE}/#{RUBY_PLATFORM}) on") + ' ' +
       content_tag( :span, "Rails/#{Rails.version} (#{Rails.env})" ) + " | " + 
       link_to( 'Icon Drawer Flags', 'http://www.icondrawer.com' )

data/app/helpers/beer_db_admin/link_helper.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+module BeerDbAdmin
+module LinkHelper
+
+
+  def link_to_brewery( brewery, opts={} )
+    link_to brewery.title, short_brewery_path( brewery )
+  end
+
+  def link_to_beer( beer, opts={} )
+    link_to beer.title, short_beer_path( beer )
+  end
+
+  def link_to_city( city, opts={} )
+    link_to city.title, short_city_path( city )
+  end
+
+  def link_to_region( region, opts={} )
+    link_to region.title, short_region_path( region )
+  end
+
+  def link_to_country( country, opts={} )
+
+    pp opts
+
+    buf = ""
+
+    ## add flag (image tag) if flag opt present e.g. flag:true
+    if opts[:flag].present?
+      puts "add flag (image tag) for country #{country.title}"
+      buf << image_tag_for_country( country )
+      buf << ' '
+    end
+
+    buf << link_to( country.title, short_country_path( country ))
+    buf.html_safe   # note: make sure html will NOT get escaped
+  end
+
+
+end # module LinkHelper
+end # moudle BeerDbAdmin

data/app/helpers/beer_db_admin/part_helper.rb

@@ -3,18 +3,19 @@
 module BeerDbAdmin
 module PartHelper
 
+  def render_world_tree( o, opts={} )
+    render partial: 'beer_db_admin/shared/world_tree',
+           locals: { country: o.country,
+                     region:  o.region,
+                     city:    o.city,
+                     show_flag: (opts[:flag].present? ? true : false) }
+  end
+
   def render_countries( countries, opts={} )
     render partial: 'beer_db_admin/shared/countries',
            locals: { countries: countries }
   end
 
-  def render_bookmarks( bookmarks, opts={} )
-
-    render partial: 'beer_db_admin/shared/bookmarks',
-           locals: { bookmarks: bookmarks,
-                     allow_edits: (opts[:edit].present? ? true : false) }
-  end
-
   def render_tags( tags )
     render partial: 'beer_db_admin/shared/tags', locals: { tags: tags }
   end
@@ -24,11 +25,30 @@ module PartHelper
     render partial: 'beer_db_admin/shared/brewery_tags', locals: { brewery: brewery }
   end
 
+  def render_beer( beer )
+    render partial: 'beer_db_admin/shared/beer', locals: { beer: beer }
+  end
+
   def render_beers( beers )
     render partial: 'beer_db_admin/shared/beers', locals: { beers: beers }
   end
 
 
+  def render_breweries_table_rows( breweries )
+    render partial: 'beer_db_admin/shared/breweries_table_rows',
+      locals: { breweries: breweries }
+  end
+  
+  def render_breweries_table_rows_for_region( region )
+    render partial: 'beer_db_admin/shared/breweries_table_rows_for_region',
+      locals: { region: region }
+  end
+
+
+  def render_breweries_for_city( city )
+    render partial: 'beer_db_admin/shared/breweries_for_city', locals: { city: city }
+  end
+
   def render_breweries_for_region( region )
     render partial: 'beer_db_admin/shared/breweries_for_region', locals: { region: region }
   end