beerdb 0.3.0 → 0.4.0

data/lib/beerdb/cli/main.rb

@@ -157,6 +157,31 @@ command :load do |c|
 end # command load
 
 
+## fix/todo: add server alias (serve/server)
+
+command :serve do |c|
+  ## todo: how to specify many fixutes <>... ??? in syntax
+  c.syntax = 'beerdb serve [options]'
+  c.description = 'Start web service (HTTP JSON API)'
+
+  c.action do |args, options|
+
+    LogUtils::Logger.root.level = :warn    if options.quiet.present?
+    LogUtils::Logger.root.level = :debug   if options.verbose.present?
+
+    myopts.merge_commander_options!( options.__hash__ )
+    connect_to_db( myopts )
+
+    # NB: server (HTTP service) not included in standard default require
+    require 'beerdb/server'
+
+    BeerDb::Server.run!
+    
+    puts 'Done.'
+  end
+end # command load
+
+
 command :stats do |c|
   c.syntax = 'beerdb stats [options]'
   c.description = 'Show stats'

data/lib/beerdb/models/beer.rb

@@ -11,8 +11,26 @@ class Beer < ActiveRecord::Base
   has_many :taggings, :as => :taggable, :class_name => 'WorldDb::Models::Tagging'
   has_many :tags,  :through => :taggings, :class_name => 'WorldDb::Models::Tag'
 
+
+  ### support old names (read-only) for now  (remove later)
+
+  def color
+    srm
+  end
+
+  def plato
+    og
+  end
+
+  def color=(value)
+    self.srm = value
+  end
+
+  def plato=(value)
+    self.og = value
+  end
+
 end # class Beer
 
 
 end # module BeerDb::Models
-

data/lib/beerdb/models/brewery.rb

@@ -13,8 +13,18 @@ class Brewery < ActiveRecord::Base
   has_many :taggings, :as => :taggable, :class_name => 'WorldDb::Models::Tagging'
   has_many :tags,  :through => :taggings, :class_name => 'WorldDb::Models::Tag'
 
+  ### support old names (read-only) for now  (remove later)
+
+  def founded
+    since
+  end
+
+  def founded=(value)
+    self.since = value
+  end
+
+
 end # class Brewery
 
 
 end # module BeerDb::Models
-

data/lib/beerdb/reader.rb

@@ -173,7 +173,7 @@ private
             attribs[ :region_id ] = value_city.region.id
           end
         elsif value =~ /^[0-9]{4}$/   # founded/established year e.g. 1776
-          attribs[ :founded ] = value.to_i
+          attribs[ :since ] = value.to_i
         elsif value =~ /\/{2}/  # if value includes // assume address e.g. 3970 Weitra // Sparkasseplatz 160
           attribs[ :address ] = value
         elsif (values.size==(index+1)) && value =~ /^[a-z0-9\|_ ]+$/   # tags must be last entry
@@ -303,15 +303,15 @@ private
           elsif value_brewery.region.present?
             attribs[ :region_id ] = value_brewery.region.id
           end
-          
+
         elsif value =~ /^<?\s*(\d+(?:\.\d+)?)\s*%$/  ## abv (alcohol by volumee)
           ## nb: allow leading < e.g. <0.5%
           value_abv_str = $1.dup   # convert to decimal? how? use float?
           attribs[ :abv ] = value_abv_str
         elsif value =~ /^(\d+(?:\.\d+)?)°$/  ## plato (stammwuerze/gravity?) e.g. 11.2°
           ## nb: no whitespace allowed between ° and number e.g. 11.2°
-          value_plato_str = $1.dup   # convert to decimal? how? use float?
-          attribs[ :plato ] = value_plato_str
+          value_og_str = $1.dup   # convert to decimal? how? use float?
+          attribs[ :og ] = value_og_str
         elsif value =~ /^(\d+(?:\.\d+)?)\s*kcal(?:\/100ml)?$/  ## kcal
            ## nb: allow 44.4 kcal/100ml or 44.4 kcal or 44.4kcal
           value_kcal_str = $1.dup   # convert to decimal? how? use float?

data/lib/beerdb/schema.rb

@@ -12,6 +12,9 @@ create_table :beers do |t|
   t.string  :title, :null => false
   t.string  :synonyms  # comma separated list of synonyms
 
+  t.string  :web    # optional url link (e.g. )
+  t.integer :since  # optional year (e.g. 1896)
+
   t.boolean  :bottle,  :null => false, :default => false # Flaschenbier
   t.boolean  :draft,   :null => false, :default => false # Fassbier
   ## todo: check seasonal is it proper english?
@@ -24,8 +27,14 @@ create_table :beers do |t|
 
   ## check: why decimal and not float? 
   t.decimal    :abv    # Alcohol by volume (abbreviated as ABV, abv, or alc/vol) e.g. 4.9 %
-  t.decimal    :plato  # stammwuerze / gravity in plato scale (e.g. °P) e.g. 12.6°   - todo: use a different field name e.g. just p or gravity?
-  t.integer    :color  # beer color in Standard Reference Method (SRM)
+  t.decimal    :og
+  t.integer    :srm
+
+  ### fix/todo: add bitterness field
+
+  # renamed - old field names
+  ## t.decimal    :plato  # stammwuerze / gravity in plato scale (e.g. °P) e.g. 12.6°   - todo: use a different field name e.g. just p or gravity?
+  ## t.integer    :color  # beer color in Standard Reference Method (SRM)
 
 # see en.wikipedia.org/wiki/Plato_scale#Colour
 
@@ -60,7 +69,11 @@ create_table :breweries do |t|
   t.string  :title, :null => false
   t.string  :synonyms  # comma separated list of synonyms
   t.string  :address
-  t.integer :founded  # year founded/established
+  t.string  :since
+  ## renamed to founded to since
+  ## t.integer :founded  # year founded/established    - todo/fix: rename to since? 
+
+  t.string  :web   # optional web page (e.g. www.ottakringer.at)
 
   t.references :country,   :null => false
   t.references :region   # optional

data/lib/beerdb/server.rb

@@ -3,7 +3,7 @@
 #
 #  e.g. config.ru:
 #   require './boot'
-#   run LogDb::Server
+#   run BeerDb::Server
 
 
 # 3rd party libs/gems
@@ -68,11 +68,25 @@ class Server < Sinatra::Base
 
     brewery = {}
     if beer.brewery.present?
-      brewery = { key: beer.brewery.key, title: beer.brewery.title }
+      brewery = { key: beer.brewery.key,
+                  title: beer.brewery.title }
     end
 
-    data = { beer: { key: beer.key, title: beer.title, abv: beer.abv, srm: beer.color, og: beer.plato },
-             brewery: brewery }
+    tags = []
+    if beer.tags.present?
+      beer.tags.each { |tag| tags << tag.key }
+    end
+
+    country = {
+      key:   beer.country.key,
+      title: beer.country.title
+    }
+
+    data = { beer: { key: beer.key, title: beer.title, synonyms: beer.synonyms,
+                     abv: beer.abv, srm: beer.srm, og: beer.og,
+                     tags: tags,
+                     brewery: brewery,
+                     country: country }}
 
     json_or_jsonp( data )
   end
@@ -83,10 +97,25 @@ class Server < Sinatra::Base
 
     beers = []
     brewery.beers.each do |b|
-      beers << { key: b.key, title: b.title  }
+      beers << { key: b.key, title: b.title }
+    end
+
+    tags = []
+    if brewery.tags.present?
+      brewery.tags.each { |tag| tags << tag.key }
     end
 
-    data = { brewery: { key: brewery.key, title: brewery.title }, beers: beers }
+    country = {
+      key:   brewery.country.key,
+      title: brewery.country.title
+    }
+
+    data = { brewery: { key: brewery.key, title: brewery.title, synonyms: brewery.synonyms,
+                        since: brewery.since,
+                        address: brewery.address,
+                        tags: tags,
+                        beers: beers,
+                        country: country }}
 
     json_or_jsonp( data )
   end

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
 module BeerDb
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &75206180 !ruby/object:Gem::Requirement
+  requirement: &76799030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *75206180
+  version_requirements: *76799030
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &75205960 !ruby/object:Gem::Requirement
+  requirement: &76798810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *75205960
+  version_requirements: *76798810
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &75205740 !ruby/object:Gem::Requirement
+  requirement: &76798590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *75205740
+  version_requirements: *76798590
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &75205520 !ruby/object:Gem::Requirement
+  requirement: &76798370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *75205520
+  version_requirements: *76798370
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &75205300 !ruby/object:Gem::Requirement
+  requirement: &76798150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *75205300
+  version_requirements: *76798150
 description: beerdb - beer.db command line tool
 email: tobedone@googlegroups.com
 executables: