beerdb 0.7.2 → 0.8.0

data/Manifest.txt

@@ -9,13 +9,16 @@ 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/region.rb
 lib/beerdb/models/tag.rb
+lib/beerdb/models/user.rb
 lib/beerdb/reader.rb
 lib/beerdb/schema.rb
 lib/beerdb/serializers/beer.rb

data/lib/beerdb/cli/main.rb

@@ -56,6 +56,9 @@ end
 command :create do |c|
   c.syntax = 'beerdb create [options]'
   c.description = 'Create DB schema'
+
+  c.option '--extras', 'Extra tables (drinks,bookmarks,users)'
+
   c.action do |args, options|
 
     LogUtils::Logger.root.level = :warn    if options.quiet.present?
@@ -63,10 +66,18 @@ command :create do |c|
 
     myopts.merge_commander_options!( options.__hash__ )
     connect_to_db( myopts )
-    
-    LogDb.create
-    WorldDb.create
-    BeerDb.create
+
+    if options.extras.present?
+      # quick hack: only create extra tables
+      BeerDb::CreateUsers.new.up
+      BeerDb::CreateBookmarks.new.up
+      BeerDb::CreateDrinks.new.up
+    else
+      LogDb.create
+      WorldDb.create
+      BeerDb.create
+    end
+
     puts 'Done.'
   end # action
 end # command create
@@ -175,6 +186,7 @@ command :serve do |c|
     # NB: server (HTTP service) not included in standard default require
     require 'beerdb/server'
 
+    ### fix: add ActiveRecord rack Middleware to close connection!! how?
     BeerDb::Server.run!
     
     puts 'Done.'

data/lib/beerdb/deleter.rb

@@ -9,6 +9,10 @@ module BeerDb
     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?
+      User.delete_all       # db model extension - move to its own addon?
+
       Beer.delete_all
       Brand.delete_all
       Brewery.delete_all

data/lib/beerdb/models/beer.rb

@@ -22,6 +22,15 @@ class Beer < ActiveRecord::Base
 
   validates :key, :format => { :with => /^[a-z][a-z0-9]+$/, :message => 'expected two or more lowercase letters a-z or 0-9 digits' }
 
+########################
+# begin extras/extension drink/bookmar/user
+
+  has_many :drinks ## :class_name => 'Drink'
+  has_many :bookmarks, :as => :bookmarkable
+
+# end extensions
+########
+
 
   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

data/lib/beerdb/models/bookmark.rb

@@ -0,0 +1,25 @@
+# encoding: UTF-8
+
+module BeerDb::Models
+
+class Bookmark < ActiveRecord::Base
+
+  belongs_to :bookmarkable, :polymorphic => true
+  belongs_to :user
+
+
+  ### fix - how to do it with has_many macro? use finder_sql?
+  def drinks
+    ## todo: check/assert bookmarkable_type == BeerDB::Models::Beer
+    Drink.where( user_id: user_id, beer_id: bookmarkable_id )
+  end
+  
+  ## todo: check: how to handle polymorphic best for getting beer for bookmarkable?
+  def beer
+    ## todo: check/assert bookmarkable_type == BeerDB::Models::Beer
+    Beer.find( bookmarkable_id )
+  end
+
+end # class Bookmark
+
+end # module BeerDb::Models

data/lib/beerdb/models/drink.rb

@@ -0,0 +1,12 @@
+# encoding: UTF-8
+
+module BeerDb::Models
+
+class Drink < ActiveRecord::Base
+
+  belongs_to :beer, class_name: 'BeerDb::Models::Beer'
+  belongs_to :user, class_name: 'BeerDb::Models::User'
+
+end # class Drink
+
+end # module BeerDb::Models

data/lib/beerdb/models/forward.rb

@@ -19,6 +19,10 @@ module BeerDb::Models
   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
+
 end
 
 

data/lib/beerdb/models/user.rb

@@ -0,0 +1,25 @@
+# encoding: UTF-8
+
+module BeerDb::Models
+
+class User < ActiveRecord::Base
+
+  has_many :drinks # beers w/ ratings
+  
+  has_many :bookmarks # bookmarked beers
+
+
+  before_save :on_before_save
+  
+  def on_before_save
+    if email.blank?
+      self.key = 'xxx'
+    else
+      # NB: remove whitespace and (.-+_) and downcase
+      self.key = email.gsub( /[\s\.\-+_]/, '' ).downcase
+    end
+  end
+
+end # class User
+
+end # module BeerDb::Models

data/lib/beerdb/reader.rb

@@ -3,50 +3,7 @@
 module BeerDb
 
 
-#
-# rename n split TextUtils::ValueHelper into
-#  WorldDb::Matcher  - match_country, etc.
-#  BeerDb::Matcher   - match_brewery, etc.
-
-
-## todo: move to worlddb for reuse!!! - find a better name?
-
-module FixtureMatcher
-
-  def match_xxx_for_country( name, xxx, blk )  # xxx e.g. beers|breweries
-    if name =~ /(?:^|\/)([a-z]{2})-[^\/]+\/#{xxx}/
-      # new style: e.g. /at-austria/beers or ^at-austria!/beers
-      # auto-add required country code (from folder structure)
-      country_key = $1.dup
-      blk.call( country_key )
-      true # bingo - match found
-    elsif name =~ /\/([a-z]{2})\/#{xxx}/
-      # classic style: e.g. /at/beers (europe/at/beers)
-      # auto-add required country code (from folder structure)
-      country_key = $1.dup
-      blk.call( country_key )
-      true
-    else
-      false # no match found
-    end
-  end
-
-  def match_xxx_for_country_n_region( name, xxx, blk ) # xxx e.g. beers|breweries
-    if name =~ /(?:^|\/)([a-z]{2})-[^\/]+\/([a-z]{1,2})-[^\/]+\/#{xxx}/
-      # new style: e.g.  /at-austria/w-wien/beers or
-      #                  ^at-austria!/w-wien/beers 
-      # nb: country must start name (^) or coming after / e.g. europe/at-austria/...
-      #
-      # auto-add required country n region code (from folder structure)
-      country_key = $1.dup
-      region_key  = $2.dup
-      blk.call( country_key, region_key )
-      true # bingo - match found
-    else
-      false # no match found
-    end
-  end
-
+module Matcher
 
   def match_beers_for_country( name, &blk )
     match_xxx_for_country( name, 'beers', blk )
@@ -64,8 +21,8 @@ module FixtureMatcher
     match_xxx_for_country_n_region( name, 'breweries', blk )
   end
 
+end # module Matcher
 
-end # module FixtureMatcher
 
 class Reader
 
@@ -73,7 +30,8 @@ class Reader
 
   include BeerDb::Models
 
-  include FixtureMatcher # see above
+  include WorldDb::Matcher
+  include BeerDb::Matcher # lets us use match_teams_for_country etc.
 
   attr_reader :include_path
 

data/lib/beerdb/schema.rb

@@ -2,6 +2,79 @@
 
 module BeerDb
 
+
+### some more optional migrations
+#
+#  see beer.db.admin (copied for possible service/api version only)
+
+class CreateDrinks < ActiveRecord::Migration
+
+def up
+  create_table :drinks do |t| # join table (user,beer)
+    t.references :beer, :null => false
+    t.references :user, :null => false
+    t.integer :rating # 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 # class CreateDrinks
+
+class CreateBookmarks < 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 CreateUsers < 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
 
 

data/lib/beerdb/server.rb

@@ -59,6 +59,65 @@ class Server < Sinatra::Base
     erb :index
   end
 
+  get '/drinks/:key' do |key|
+
+    puts "  handle GET /drinks/:key"
+
+    if ['l', 'latest'].include?( key )
+       # get latest drinks (w/ ratings)
+      drinks = Drink.order( 'updated_at DESC' ).limit(10).all
+    elsif ['t', 'top'].include?( key )
+      drinks = Drink.order( 'rating DESC, updated_at DESC' ).limit(10).all
+    else
+      # assume it's a user key
+      user = User.find_by_key!( key )
+      drinks = Drink.order( 'rating DESC, updated_at DESC' ).where( user_id: user.id ).all
+    end
+
+    data = []
+    drinks.each do |drink|
+      data << {
+         beer: { title:  drink.beer.title,
+                 key:    drink.beer.key },
+         rating:      drink.rating,
+         user: { name:   drink.user.name,
+                 key:    drink.user.key },
+         comments:    drink.comments,
+         place:       drink.place,
+         created_at:  drink.created_at,
+         updated_at:  drink.updated_at
+      }
+    end
+    
+    json_or_jsonp( data.to_json )
+  end
+
+
+  get '/drinks' do
+    if params[:method] == 'post'
+      
+      puts "  handle GET /drinks?method=post"
+      
+      user = User.find_by_key!( params[:user] )
+      beer = Beer.find_by_key!( params[:beer] )
+      rating = params[:rating].to_i
+      place  = params[:place]   # assumes for now a string or nil / pass through as is
+
+      attribs = {
+        user_id: user.id,
+        beer_id: beer.id,
+        rating:  rating,
+        place:   place
+      }
+      
+      drink = Drink.new
+      drink.update_attributes!( attribs )
+    end
+
+    json_or_jsonp( { status: 'ok' }.to_json )
+  end
+
+
   get '/d*' do
     erb :debug
   end

data/lib/beerdb/stats.rb

@@ -10,8 +10,12 @@ module BeerDb
       puts " #{'%5d' % Beer.count} beers"
       puts " #{'%5d' % Brand.count} brands"
       puts " #{'%5d' % Brewery.count} breweries"
+      
+      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?
     end
-    
+
     def props
       puts "Props:"
       Prop.order( 'created_at asc' ).all.each do |prop|

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
 module BeerDb
-  VERSION = '0.7.2'
+  VERSION = '0.8.0'
 end

data/lib/beerdb.rb

@@ -33,6 +33,13 @@ require 'beerdb/models/tag'
 require 'beerdb/models/beer'
 require 'beerdb/models/brand'
 require 'beerdb/models/brewery'
+require 'beerdb/models/user'      # db model extensions - move to its own addon gem?
+require 'beerdb/models/drink'     # db model extensions - move to its own addon gem?
+require 'beerdb/models/bookmark'  # db model extensions - move to its own addon gem?
+
+require 'beerdb/serializers/beer'
+require 'beerdb/serializers/brewery'
+
 require 'beerdb/schema'
 require 'beerdb/reader'
 require 'beerdb/deleter'
@@ -56,10 +63,37 @@ module BeerDb
 
   def self.create
     CreateDb.new.up
+
+    ### fix: make optional do NOT auto create here
+    CreateUsers.new.up
+    CreateBookmarks.new.up
+    CreateDrinks.new.up
+
     BeerDb::Models::Prop.create!( key: 'db.schema.beer.version', value: VERSION )
   end
 
 
+
+  module CodeReaderContext
+    #  make models available w/o namespace
+    #  e.g. lets you use Beer instead of BeerDb::Models::Beer
+    include BeerDb::Models
+    ## <evaluated code here>
+  end
+
+  def self.load( name, include_path='.' )  # NB: pass in w/o .rb extension e.g use users etc.
+    path = "#{include_path}/#{name}.rb"
+
+    puts "*** loading seed data '#{name}' (#{path})..."
+
+    ::CodeReader.new( path ).eval( CodeReaderContext )
+    ## nb: will get evaluated in context of passed in module like
+    ## module CodeReaderContext
+    ##  <seed code here>
+    ## end
+  end
+
+
   def self.read( ary, include_path )
     reader = Reader.new( include_path )
     ary.each do |name|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &71631860 !ruby/object:Gem::Requirement
+  requirement: &74333290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *71631860
+  version_requirements: *74333290
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &71631640 !ruby/object:Gem::Requirement
+  requirement: &74333070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *71631640
+  version_requirements: *74333070
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &71631420 !ruby/object:Gem::Requirement
+  requirement: &74332850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *71631420
+  version_requirements: *74332850
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &71631200 !ruby/object:Gem::Requirement
+  requirement: &74332630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *71631200
+  version_requirements: *74332630
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &71630980 !ruby/object:Gem::Requirement
+  requirement: &74332410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *71630980
+  version_requirements: *74332410
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables:
@@ -85,13 +85,16 @@ files:
 - 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/region.rb
 - lib/beerdb/models/tag.rb
+- lib/beerdb/models/user.rb
 - lib/beerdb/reader.rb
 - lib/beerdb/schema.rb
 - lib/beerdb/serializers/beer.rb