beerdb 0.9.4 → 0.9.5

data/Manifest.txt

@@ -9,28 +9,17 @@ lib/beerdb/cli/opts.rb
 lib/beerdb/console.rb
 lib/beerdb/deleter.rb
 lib/beerdb/models/beer.rb
-lib/beerdb/models/bookmark.rb
 lib/beerdb/models/brand.rb
 lib/beerdb/models/brewery.rb
-lib/beerdb/models/city.rb
-lib/beerdb/models/country.rb
-lib/beerdb/models/drink.rb
 lib/beerdb/models/forward.rb
-lib/beerdb/models/note.rb
-lib/beerdb/models/region.rb
 lib/beerdb/models/tag.rb
-lib/beerdb/models/user.rb
+lib/beerdb/models/world/city.rb
+lib/beerdb/models/world/country.rb
+lib/beerdb/models/world/region.rb
 lib/beerdb/reader.rb
 lib/beerdb/schema.rb
 lib/beerdb/serializers/beer.rb
 lib/beerdb/serializers/brewery.rb
-lib/beerdb/server.rb
-lib/beerdb/server/public/style.css
-lib/beerdb/server/views/_debug.erb
-lib/beerdb/server/views/_version.erb
-lib/beerdb/server/views/debug.erb
-lib/beerdb/server/views/index.erb
-lib/beerdb/server/views/layout.erb
 lib/beerdb/stats.rb
 lib/beerdb/version.rb
 test/helper.rb

data/README.md

@@ -2,8 +2,8 @@
 
 beer.db Command Line Tool in Ruby
 
-* home  :: [github.com/geraldb/beer.db.ruby](https://github.com/geraldb/beer.db.ruby)
-* bugs  :: [github.com/geraldb/beer.db.ruby/issues](https://github.com/geraldb/beer.db.ruby/issues)
+* home  :: [github.com/beerkit/beer.db.ruby](https://github.com/beerkit/beer.db.ruby)
+* bugs  :: [github.com/beerkit/beer.db.ruby/issues](https://github.com/beerkit/beer.db.ruby/issues)
 * gem   :: [rubygems.org/gems/beerdb](https://rubygems.org/gems/beerdb)
 * rdoc  :: [rubydoc.info/gems/beerdb](http://rubydoc.info/gems/beerdb)
 * forum :: [groups.google.com/group/beerdb](https://groups.google.com/group/beerdb)

data/lib/beerdb/cli/main.rb

@@ -79,6 +79,8 @@ command [:create] do |c|
       BeerDb::CreateDbExtrasDrinks.new.up
     else
       LogDb.create
+      ConfDb.create
+      TagDb.create
       WorldDb.create
       BeerDb.create
     end
@@ -108,9 +110,11 @@ command [:setup,:s] do |c|
     setup = args[0] || 'all'
     
     LogDb.create
+    ConfDb.create
+    TagDb.create
     WorldDb.create
     BeerDb.create
-    
+
     WorldDb.read_all( opts.world_data_path )
     BeerDb.read_setup( "setups/#{setup}", opts.data_path )
     puts 'Done.'
@@ -182,7 +186,7 @@ command [:serve,:server] do |c|
     connect_to_db( opts )
 
     # NB: server (HTTP service) not included in standard default require
-    require 'beerdb/server'
+    require 'beerdb/service'
 
 # make sure connections get closed after every request e.g.
 #
@@ -192,18 +196,18 @@ command [:serve,:server] do |c|
 #
 
     puts 'before add middleware ConnectionManagement'
-    BeerDb::Server.use ActiveRecord::ConnectionAdapters::ConnectionManagement
+    BeerDb::Service.use ActiveRecord::ConnectionAdapters::ConnectionManagement
     puts 'after add middleware ConnectionManagement'
     ## todo: check if we can check on/dump middleware stack
 
     ## rack middleware might not work with multi-threaded thin web server; close it ourselfs
-    BeerDb::Server.after do
+    BeerDb::Service.after do
       puts "  #{Thread.current.object_id} -- make sure db connections gets closed after request"
       # todo: check if connection is open - how? 
       ActiveRecord::Base.connection.close
     end    
 
-    BeerDb::Server.run!
+    BeerDb::Service.run!
 
     puts 'Done.'
   end
@@ -229,12 +233,14 @@ command :props do |c|
 
     connect_to_db( opts )
     
-    BeerDb.props
+    ### fix: use ConfDb.props or similar !!!
+    ### BeerDb.props
     
     puts 'Done.'
   end
 end
 
+
 desc 'Show logs'
 command :logs do |c|
   c.action do |g,o,args|

data/lib/beerdb/deleter.rb

@@ -4,15 +4,18 @@ module BeerDb
 
   class Deleter
     
-    include BeerDb::Models
+    include Models
 
     def run
       # for now delete all tables
 
-      Bookmark.delete_all   # db model extension - move to its own addon?
-      Drink.delete_all      # db model extension - move to its own addon?
-      Note.delete_all       # db model extension - move to its own addon?
-      User.delete_all       # db model extension - move to its own addon?
+      ### fix: use if defined? BeerDbNote or similar or/and check if table exist ??
+      ###      or move to beerdb-note ??
+
+      ## Bookmark.delete_all   # db model extension - move to its own addon?
+      ## Drink.delete_all      # db model extension - move to its own addon?
+      ## Note.delete_all       # db model extension - move to its own addon?
+      ## User.delete_all       # db model extension - move to its own addon?
 
       Beer.delete_all
       Brand.delete_all

data/lib/beerdb/models/beer.rb

@@ -19,9 +19,6 @@ class Beer < ActiveRecord::Base
   belongs_to :brewery, :class_name => 'BeerDb::Model::Brewery',  :foreign_key => 'brewery_id'
 
 
-  ## has_many :taggings, :as => :taggable, :class_name => 'WorldDb::Model::Tagging'
-  ## has_many :tags,  :through => :taggings, :class_name => 'WorldDb::Model::Tag'
-
   has_many :taggings, class_name: 'TagDb::Model::Tagging', :as      => :taggable
   has_many :tags,     class_name: 'TagDb::Model::Tag',     :through => :taggings
 
@@ -41,22 +38,10 @@ class Beer < ActiveRecord::Base
 ########
 
 
-  def self.rnd  # find random beer  - fix: use "generic" activerecord helper and include/extend class
-    rnd_offset = rand( Beer.count )   ## NB: call "global" std lib rand
-    Beer.offset( rnd_offset ).limit( 1 )
-  end
-
   ### support old names (read-only) for now  (remove later)
 
-  def color
-    puts "*** depreceated fn api - use srm"
-    srm
-  end
-
-  def plato
-    puts "*** depreceated fn api - use og"
-    og
-  end
+  def color()  puts "*** depreceated fn api - use srm"; srm;  end
+  def plato()  puts "*** depreceated fn api - use og";  og;   end
 
   def color=(value)
     puts "*** depreceated fn api - use srm="
@@ -67,7 +52,8 @@ class Beer < ActiveRecord::Base
     puts "*** depreceated fn api - use og="
     self.og = value
   end
-  
+
+
   def as_json_v2( opts={} )
     # NB: do NOT overwrite "default" / builtin as_json, thus, lets use as_json_v2
     BeerSerializer.new( self ).as_json

data/lib/beerdb/models/brewery.rb

@@ -21,9 +21,6 @@ class Brewery < ActiveRecord::Base
   has_many   :beers,   :class_name => 'BeerDb::Model::Beer',     :foreign_key => 'brewery_id'
   has_many   :brands,  :class_name => 'BeerDb::Model::Brand',    :foreign_key => 'brand_id'
 
-  ## has_many :taggings, :as => :taggable, :class_name => 'WorldDb::Model::Tagging'
-  ## has_many :tags,  :through => :taggings, :class_name => 'WorldDb::Model::Tag'
-
   has_many :taggings, class_name: 'TagDb::Model::Tagging', :as      => :taggable
   has_many :tags,     class_name: 'TagDb::Model::Tag',     :through => :taggings
 
@@ -31,21 +28,21 @@ class Brewery < ActiveRecord::Base
   validates :key, :format => { :with => /\A[a-z][a-z0-9]+\z/, :message => 'expected two or more lowercase letters a-z or 0-9 digits' }
 
 
-  def self.rnd  # find random beer  - fix: use "generic" activerecord helper and include/extend class
-    rnd_offset = rand( Brewery.count )   ## NB: call "global" std lib rand
-    Brewery.offset( rnd_offset ).limit( 1 )
-  end
+  ### support old names (read-only) for now  (remove later ??)
 
+  def founded()        since;  end
+  def founded=(value)  self.since = value; end
 
-  ### support old names (read-only) for now  (remove later)
+  def opened()        since;  end
+  def openend=(value)  self.since = value; end
+
+  def m?()  prod_m == true;  end
+  def l?()  prod_l == true;  end
+  
+  ## TODO: activerecord supplies brewpub? already? same as attrib; check w/ test case (and remove here)
+  def brewpub?()  brewpub == true;  end   
 
-  def founded
-    since
-  end
 
-  def founded=(value)
-    self.since = value
-  end
 
   def as_json_v2( opts={} )
     # NB: do NOT overwrite "default" / builtin as_json, thus, lets use as_json_v2

data/lib/beerdb/models/forward.rb

@@ -24,15 +24,16 @@ module BeerDb
   class Brand < ActiveRecord::Base ; end
   class Brewery < ActiveRecord::Base ; end
 
-  class User < ActiveRecord::Base ; end
-  class Bookmark < ActiveRecord::Base ; end
-  class Drink < ActiveRecord::Base ; end
-  class Note < ActiveRecord::Base ; end
-
   end # module Model
+
+  ## convenience alias (for better english ;-) )
+  ##   lets you use =>  include Models  (instead of include Model)
+  Models = Model
+  
 end # module BeerDb
 
 
+
 module WorldDb
   module Model
 

data/lib/beerdb/models/world/city.rb

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+module WorldDb
+  module Model
+
+class City
+  has_many :beers,     :class_name => 'BeerDb::Model::Beer',    :foreign_key => 'city_id'
+  has_many :brands,    :class_name => 'BeerDb::Model::Brand',   :foreign_key => 'city_id'
+  has_many :breweries, :class_name => 'BeerDb::Model::Brewery', :foreign_key => 'city_id'
+end # class Country
+
+  end # module Model
+end # module WorldDb
+

data/lib/beerdb/models/world/region.rb

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+module WorldDb
+  module Model
+
+class Region
+  has_many :beers,     :class_name => 'BeerDb::Model::Beer',    :foreign_key => 'region_id'
+  has_many :brands,    :class_name => 'BeerDb::Model::Brand',   :foreign_key => 'region_id'
+  has_many :breweries, :class_name => 'BeerDb::Model::Brewery', :foreign_key => 'region_id'
+end # class Region
+
+  end # module Model
+end # module WorldDb
+

data/lib/beerdb/reader.rb

@@ -21,7 +21,6 @@ module Matcher
     match_xxx_for_country_n_region( name, 'breweries', &blk )
   end
 
-  ## todo: autoadd  brewpub flag!! use more_attribs??
   def match_brewpubs_for_country( name, &blk )
     match_xxx_for_country( name, 'brewpubs', &blk )
   end
@@ -80,12 +79,10 @@ class Reader
             load_breweries_for_country( country_key, name )
           end
     elsif match_brewpubs_for_country_n_region( name ) do |country_key, region_key|
-            ## todo: autoadd  brewpub flag!! use more_attribs??
-            load_breweries_for_country_n_region( country_key, region_key, name )
+            load_breweries_for_country_n_region( country_key, region_key, name, brewpub: true )
           end
     elsif match_brewpubs_for_country( name ) do |country_key|
-            ## todo: autoadd  brewpub flag!! use more_attribs??
-            load_breweries_for_country( country_key, name )
+            load_breweries_for_country( country_key, name, brewpub: true )
           end
     else
       logger.error "unknown beer.db fixture type >#{name}<"
@@ -202,6 +199,15 @@ class Reader
   end
 
   def load_breweries_worker( name, more_attribs={} )
+    
+    if name =~ /\(m\)/     # check for (m) mid-size/medium marker -todo- use $?? must be last?
+       more_attribs[ :prod_m ] = true
+    elsif name =~ /\(l\)/  # check for (l) large marker - todo - use $?? must be last?
+       more_attribs[ :prod_l ] = true
+    else
+      ## no marker; do nothing
+    end
+
     reader = ValuesReaderV2.new( name, include_path, more_attribs )
 
     reader.each_line do |new_attributes, values|

data/lib/beerdb/schema.rb

@@ -3,110 +3,8 @@
 module BeerDb
 
 
-### some more optional migrations
-#
-#  see beer.db.admin (copied for possible service/api version only)
-
-
-####
-# tasting notes (w/ ratings)
-class CreateDbExtrasNotes < ActiveRecord::Migration
-
-def up
-  create_table :notes do |t| # join table (user,beer)
-    t.references :beer, :null => false
-    t.references :user, :null => false
-    t.integer :rating,  :null => false  # 1-10 scala (10 is best)
-
-    t.text :comments
-    t.string :place # location (place) where tasted/drunken
-      
-    ## todo: add flag for bottle, can, draft
-      
-    t.timestamps
-  end
-end # method up
-
-def down
-  raise ActiveRecord::IrreversibleMigration
-end
-
-end
-
-
-#################
-# +1 - beer drink log; track beers
-class CreateDbExtrasDrinks < ActiveRecord::Migration
-
-def up
-  create_table :drinks do |t| # join table (user,beer)
-    t.references :beer, :null => false
-    t.references :user, :null => false
-    t.datetime   :drunk_at  ## , :null => false  # todo: pre-set if nil to created_at?
-
-    t.string     :place # location (place) where tasted/drunken
-
-    ## todo: add flag for bottle, can, draft
-      
-    t.timestamps
-  end
-end # method up
-
-def down
-  raise ActiveRecord::IrreversibleMigration
-end
-
-end # class CreateDrinks
-
-class CreateDbExtrasBookmarks < ActiveRecord::Migration
-
-def up
-  create_table :bookmarks do |t| # join table (user,beer/brewery)
-    t.references :bookmarkable, :polymorphic => true # todo: check add :null => false is possible/needed?
-    t.references :user, :null => false
-    t.boolean :yes,  :null => false, :default => false # like/favorite/top
-    t.boolean :no,   :null => false, :default => false # dislike/flop/blacklisted
-    t.boolean :wish, :null => false, :default => false # e.g wish == false == drunk / wishlist (beer not yet drunken/tasted)
-
-    t.timestamps
-  end
-end # method up
-
-def down
-  raise ActiveRecord::IrreversibleMigration
-end
-
-end # class CreateBookmarks
-
-
-class CreateDbExtrasUsers < ActiveRecord::Migration
-
-def up
-  create_table :users do |t|
-    t.string :key, :null => false # import/export key
-    t.string :name, :null => false
-    t.string :email, :null => false
-    t.boolean :admin, :null => false, :default => false
-    t.boolean :guest, :null => false, :default => false
-    t.boolean :active, :null => false, :default => true
-
-    t.timestamps
-  end
-end # method up
-
-def down
-  raise ActiveRecord::IrreversibleMigration
-end
-
-end # class CreateUsers
-
-
-#####################
-# main migration
-
 class CreateDb < ActiveRecord::Migration
 
-
 def up
 
 create_table :beers do |t|
@@ -222,11 +120,20 @@ create_table :breweries do |t|
   t.string  :synonyms  # comma separated list of synonyms
   t.string  :address
   t.integer :since
+  ### fix: rename back to founded or use opened/closed
+  ## fix: add flag for  ca./about  boolean opened_guess / opened_est / opened_??
+  ##   ca. / about  1010  marker   e.g  t.boolean : opened_est (for estimate) or similar!!!
   ## renamed to founded to since
   ## t.integer :founded  # year founded/established    - todo/fix: rename to since? 
   t.integer :closed  # optional;  year brewery closed
 
-## todo: add optional parent brewery (owned_by)
+## todo: add optional parent brewery (owned_by)  ???
+
+  t.boolean  :brewpub, :null => false, :default => false
+  t.boolean  :prod_m,  :null => false, :default => false   # prod medium  (mid-size/regional brewery)
+                       #   e.g. > 15_000 barrels (us)
+  t.boolean  :prod_l,  :null => false, :default => false   # prod large
+                       #   e.g. > 500_000 hl (at), > 6_000_000 barrels (us)
 
   t.integer :prod  # (estimated) annual production/capacity in hl (1hl=100l) e.g. megabrewery 2_000_000, microbrewery 1_000 hl; brewbup 500 hl etc.
   t.integer :prod_grade   # 1/2/3/4/5/6/7/8/9/10/11
@@ -285,4 +192,4 @@ end
 
 end # class CreateDb
 
-end # module BeerDb
+end # module BeerDb

data/lib/beerdb/stats.rb

@@ -3,7 +3,7 @@
 module BeerDb
 
   class Stats
-    include BeerDb::Models
+    include Models
 
     def tables
       puts "Stats:"
@@ -11,18 +11,17 @@ module BeerDb
       puts " #{'%5d' % Brand.count} brands"
       puts " #{'%5d' % Brewery.count} breweries"
       puts
-      puts " #{'%5d' % User.count} users"         # db model extension - move to its own addon?
-      puts " #{'%5d' % Bookmark.count} bookmarks" # db model extension - move to its own addon?
-      puts " #{'%5d' % Drink.count} drinks"       # db model extension - move to its own addon?
-      puts " #{'%5d' % Note.count} notes"         # db model extension - move to its own addon?
-    end
 
-    def props
-      puts "Props:"
-      Prop.order( 'created_at asc' ).all.each do |prop|
-        puts "  #{prop.key} / #{prop.value} || #{prop.created_at}"
-      end
+      ### fix: use if defined? BeerDbNote or similar or/and check if table exist ??
+      ###      or move to beerdb-note ??
+      
+      # puts " #{'%5d' % User.count} users"         # db model extension - move to its own addon?
+      # puts " #{'%5d' % Bookmark.count} bookmarks" # db model extension - move to its own addon?
+      # puts " #{'%5d' % Drink.count} drinks"       # db model extension - move to its own addon?
+      # puts " #{'%5d' % Note.count} notes"         # db model extension - move to its own addon?
     end
+
   end # class Stats
 
-end # module BeerDb
+end # module BeerDb
+

data/lib/beerdb/version.rb

@@ -1,7 +1,20 @@
 
 module BeerDb
-  VERSION = '0.9.4'
-end
+  MAJOR = 0 ## todo: namespace inside version or something - why? why not??
+  MINOR = 9
+  PATCH = 5
+  VERSION = [MAJOR,MINOR,PATCH].join('.')
 
+  def self.version
+    VERSION
+  end
 
+  def self.banner
+    "beerdb/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  end
+
+  def self.root
+    "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
+  end
+end  # module BeerDb