beerdb 0.8.0 → 0.8.1

data/Manifest.txt

@@ -16,6 +16,7 @@ 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

data/lib/beerdb.rb

@@ -36,6 +36,7 @@ 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/models/note'      # db model extensions - move to its own addon gem?
 
 require 'beerdb/serializers/beer'
 require 'beerdb/serializers/brewery'
@@ -65,9 +66,10 @@ module BeerDb
     CreateDb.new.up
 
     ### fix: make optional do NOT auto create here
-    CreateUsers.new.up
-    CreateBookmarks.new.up
-    CreateDrinks.new.up
+    CreateDbExtrasUsers.new.up
+    CreateDbExtrasBookmarks.new.up
+    CreateDbExtrasDrinks.new.up
+    CreateDbExtrasNotes.new.up
 
     BeerDb::Models::Prop.create!( key: 'db.schema.beer.version', value: VERSION )
   end

data/lib/beerdb/cli/main.rb

@@ -69,9 +69,10 @@ command :create do |c|
 
     if options.extras.present?
       # quick hack: only create extra tables
-      BeerDb::CreateUsers.new.up
-      BeerDb::CreateBookmarks.new.up
-      BeerDb::CreateDrinks.new.up
+      BeerDb::CreateDbExtrasUsers.new.up
+      BeerDb::CreateDbExtrasBookmarks.new.up
+      BeerDb::CreateDbExtrasNotes.new.up
+      BeerDb::CreateDbExtrasDrinks.new.up
     else
       LogDb.create
       WorldDb.create

data/lib/beerdb/deleter.rb

@@ -11,6 +11,7 @@ module BeerDb
 
       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

data/lib/beerdb/models/beer.rb

@@ -26,6 +26,7 @@ class Beer < ActiveRecord::Base
 # begin extras/extension drink/bookmar/user
 
   has_many :drinks ## :class_name => 'Drink'
+  has_many :notes  ## :class_name => 'Note'
   has_many :bookmarks, :as => :bookmarkable
 
 # end extensions

data/lib/beerdb/models/bookmark.rb

@@ -13,7 +13,13 @@ class Bookmark < ActiveRecord::Base
     ## todo: check/assert bookmarkable_type == BeerDB::Models::Beer
     Drink.where( user_id: user_id, beer_id: bookmarkable_id )
   end
-  
+
+  def notes
+    ## todo: check/assert bookmarkable_type == BeerDB::Models::Beer
+    Note.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

data/lib/beerdb/models/drink.rb

@@ -7,6 +7,16 @@ class Drink < ActiveRecord::Base
   belongs_to :beer, class_name: 'BeerDb::Models::Beer'
   belongs_to :user, class_name: 'BeerDb::Models::User'
 
+  before_save :on_before_save
+
+  def on_before_save
+    # todo/check: can we use blank? for datetime too or just array,strings,etc.
+    #  check - can we use/access created_at? already set for new records?
+
+    self.drunk_at = Time.now   if drunk_at.blank?
+  end
+
+
 end # class Drink
 
 end # module BeerDb::Models

data/lib/beerdb/models/forward.rb

@@ -22,6 +22,7 @@ module BeerDb::Models
   class User < ActiveRecord::Base ; end
   class Bookmark < ActiveRecord::Base ; end
   class Drink < ActiveRecord::Base ; end
+  class Note < ActiveRecord::Base ; end
 
 end
 

data/lib/beerdb/models/note.rb

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

data/lib/beerdb/models/user.rb

@@ -4,13 +4,14 @@ module BeerDb::Models
 
 class User < ActiveRecord::Base
 
-  has_many :drinks # beers w/ ratings
-  
+  has_many :notes # beers w/ ratings
+  has_many :drinks
+
   has_many :bookmarks # bookmarked beers
 
 
   before_save :on_before_save
-  
+
   def on_before_save
     if email.blank?
       self.key = 'xxx'

data/lib/beerdb/schema.rb

@@ -7,13 +7,17 @@ module BeerDb
 #
 #  see beer.db.admin (copied for possible service/api version only)
 
-class CreateDrinks < ActiveRecord::Migration
+
+####
+# tasting notes (w/ ratings)
+class CreateDbExtrasNotes < ActiveRecord::Migration
 
 def up
-  create_table :drinks do |t| # join table (user,beer)
+  create_table :notes 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.integer :rating,  :null => false  # 1-10 scala (10 is best)
+
     t.text :comments
     t.string :place # location (place) where tasted/drunken
       
@@ -27,18 +31,43 @@ 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 CreateBookmarks < ActiveRecord::Migration
+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 :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
@@ -50,7 +79,7 @@ end
 end # class CreateBookmarks
 
 
-class CreateUsers < ActiveRecord::Migration
+class CreateDbExtrasUsers < ActiveRecord::Migration
 
 def up
   create_table :users do |t|

data/lib/beerdb/server.rb

@@ -59,19 +59,85 @@ class Server < Sinatra::Base
     erb :index
   end
 
+  get '/notes/:key' do |key|
+
+    puts "  handle GET /notes/:key"
+
+    if ['l', 'latest'].include?( key )
+       # get latest tasting notes (w/ ratings)
+      notes = Note.order( 'updated_at DESC' ).limit(10).all
+    elsif ['h', 'hot'].include?( key )
+       # get latest tasting notes (w/ ratings)
+       # fix: use log algo for "hotness" - for now same as latest
+      notes = Note.order( 'updated_at DESC' ).limit(10).all
+    elsif ['t', 'top'].include?( key )
+      notes = Note.order( 'rating DESC, updated_at DESC' ).limit(10).all
+    else
+      ### todo: move to /u/:key/notes ??
+      
+      # assume it's a user key
+      user = User.find_by_key!( key )
+      notes = Note.order( 'rating DESC, updated_at DESC' ).where( user_id: user.id ).all
+    end
+
+    data = []
+    notes.each do |note|
+      data << {
+         beer: { title:  note.beer.title,
+                 key:    note.beer.key },
+         user: { name:   note.user.name,
+                 key:    note.user.key },
+         rating:      note.rating,
+         comments:    note.comments,
+         place:       note.place,
+         created_at:  note.created_at,
+         updated_at:  note.updated_at
+      }
+    end
+
+    json_or_jsonp( data.to_json )
+  end
+
+
+  get '/notes' do
+    if params[:method] == 'post'
+      
+      puts "  handle GET /notes?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
+      }
+      
+      note = Note.new
+      note.update_attributes!( attribs )
+    end
+
+    json_or_jsonp( { status: 'ok' }.to_json )
+  end
+
+
   get '/drinks/:key' do |key|
 
     puts "  handle GET /drinks/:key"
 
     if ['l', 'latest'].include?( key )
-       # get latest drinks (w/ ratings)
+       # get latest +1 drinks
+       ## todo: order by drunk_at??
       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
+      ### todo: move to /u/:key/drinks ??
+
       # 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
+      drinks = Drink.order( 'updated_at DESC' ).where( user_id: user.id ).all
     end
 
     data = []
@@ -79,16 +145,15 @@ class Server < Sinatra::Base
       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,
+         drunk_at:    drink.drunk_at,
          created_at:  drink.created_at,
          updated_at:  drink.updated_at
       }
     end
-    
+
     json_or_jsonp( data.to_json )
   end
 
@@ -100,13 +165,11 @@ class Server < Sinatra::Base
       
       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
       }
       

data/lib/beerdb/stats.rb

@@ -10,10 +10,11 @@ module BeerDb
       puts " #{'%5d' % Beer.count} beers"
       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

data/lib/beerdb/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &74333290 !ruby/object:Gem::Requirement
+  requirement: &77241100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *74333290
+  version_requirements: *77241100
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &74333070 !ruby/object:Gem::Requirement
+  requirement: &77240880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *74333070
+  version_requirements: *77240880
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &74332850 !ruby/object:Gem::Requirement
+  requirement: &77240660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *74332850
+  version_requirements: *77240660
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &74332630 !ruby/object:Gem::Requirement
+  requirement: &77240440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *74332630
+  version_requirements: *77240440
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &74332410 !ruby/object:Gem::Requirement
+  requirement: &77240220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *74332410
+  version_requirements: *77240220
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables:
@@ -92,6 +92,7 @@ files:
 - 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