beerdb 0.9.4 → 0.9.5

data/lib/beerdb.rb

@@ -14,6 +14,8 @@ require 'logger'
 require 'optparse'
 require 'fileutils'
 require 'erb'
+require 'uri'
+
 
 # 3rd party gems / libs
 
@@ -24,183 +26,19 @@ require 'erb'
 
 require 'worlddb'
 
-######################
-# fix begin:
-
-
-################
-# todo: move module to textutils!!!
-
-### fix: move to textutils??
-
-
-## todo: rename to  TitleHelpers? TitleMatcher? TitleMapper? TitleMapping? TitleMappings? TitleFinder? TitleHelpers?
-#   or rename to KeyMapping?, KeyMapper?, KeyTable? etc.
-
-
-module TextUtils::TitleTable
-
-
-def build_title_table_for( records )
-    ## build known tracks table w/ synonyms e.g.
-    #
-    # [[ 'wolfsbrug', [ 'VfL Wolfsburg' ]],
-    #  [ 'augsburg',  [ 'FC Augsburg', 'Augi2', 'Augi3' ]],
-    #  [ 'stuttgart', [ 'VfB Stuttgart' ]] ]
-
-    known_titles = []
-
-    records.each_with_index do |rec,index|
-
-      title_candidates = []
-      title_candidates << rec.title
-
-      title_candidates += rec.synonyms.split('|') if rec.synonyms.present?
-
-
-      ## check if title includes subtitle e.g. Grand Prix Japan (Suzuka Circuit)
-      #  make subtitle optional by adding title w/o subtitle e.g. Grand Prix Japan
-
-      titles = []
-      title_candidates.each do |t|
-        titles << t
-        if t =~ /\(.+\)/
-          extra_title = t.gsub( /\(.+\)/, '' ) # remove/delete subtitles
-          extra_title.strip!   # strip leading n trailing withspaces too!
-          titles << extra_title
-        end
-      end
-
-
-      ## NB: sort here by length (largest goes first - best match)
-      #  exclude code and key (key should always go last)
-      titles = titles.sort { |left,right| right.length <=> left.length }
-      
-      ## escape for regex plus allow subs for special chars/accents
-      titles = titles.map { |title| TextUtils.title_esc_regex( title )  }
-
-      ## NB: only include code field - if defined
-      titles << rec.code          if rec.respond_to?(:code) && rec.code.present?
-
-      known_titles << [ rec.key, titles ]
-
-      ### fix: use plain logger
-      LogUtils::Logger.root.debug "  #{rec.class.name}[#{index+1}] #{rec.key} >#{titles.join('|')}<"
-    end
-
-    known_titles
-end
-
-
-
-def find_key_for!( name, line )
-  regex = /@@oo([^@]+?)oo@@/     # e.g. everything in @@ .... @@ (use non-greedy +? plus all chars but not @, that is [^@])
-
-  upcase_name   = name.upcase
-  downcase_name = name.downcase
-
-  if line =~ regex
-    value = "#{$1}"
-    ### fix: use plain logger
-    LogUtils::Logger.root.debug "   #{downcase_name}: >#{value}<"
-      
-    line.sub!( regex, "[#{upcase_name}]" )
-
-    return $1
-  else
-    return nil
-  end
-end
-
-
-def find_keys_for!( name, line )  # NB: keys (plural!) - will return array
-  counter = 1
-  keys = []
-
-  downcase_name = name.downcase
-
-  key = find_key_for!( "#{downcase_name}#{counter}", line )
-  while key.present?
-    keys << key
-    counter += 1
-    key = find_key_for!( "#{downcase_name}#{counter}", line )
-  end
-
-  keys
-end
-
-
-def map_titles_for!( name, line, title_table )
-  title_table.each do |rec|
-    key    = rec[0]
-    values = rec[1]
-    map_title_worker_for!( name, line, key, values )
-  end
-end
-
-
-def map_title_worker_for!( name, line, key, values )
-
-  downcase_name = name.downcase
-
-  values.each do |value|
-    ## nb: \b does NOT include space or newline for word boundry (only alphanums e.g. a-z0-9)
-    ## (thus add it, allows match for Benfica Lis.  for example - note . at the end)
-
-    ## check add $ e.g. (\b| |\t|$) does this work? - check w/ Benfica Lis.$
-    regex = /\b#{value}(\b| |\t|$)/   # wrap with world boundry (e.g. match only whole words e.g. not wac in wacker) 
-    if line =~ regex
-      ### fix: use plain logger
-      LogUtils::Logger.root.debug "     match for #{downcase_name}  >#{key}< >#{value}<"
-      # make sure @@oo{key}oo@@ doesn't match itself with other key e.g. wacker, wac, etc.
-      line.sub!( regex, "@@oo#{key}oo@@ " )    # NB: add one space char at end
-      return true    # break out after first match (do NOT continue)
-    end
-  end
-  return false
-end
-
-
-
-end # module TextUtils::TitleTable
-
-
-
-## auto-include methods
-
-module TextUtils
-  # make helpers available as class methods e.g. TextUtils.convert_unicode_dashes_to_plain_ascii
-  extend TitleTable  # lets us use TextUtils.build_title_table_for etc.
-end
-
-# quich fix end:
-########################
-
-
 
 # our own code
 
 require 'beerdb/version'   ## version always goes first
 
 require 'beerdb/models/forward'
-require 'beerdb/models/country'
-require 'beerdb/models/region'
-require 'beerdb/models/city'
+require 'beerdb/models/world/country'
+require 'beerdb/models/world/region'
+require 'beerdb/models/world/city'
 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/models/note'      # db model extensions - move to its own addon gem?
-
-
-## add backwards compatible namespace
-##  todo: move to forward -- check sportdb/worlddb convention ??
-module BeerDb
-  Models = Model
-end
 
 
 require 'beerdb/serializers/beer'
@@ -214,14 +52,6 @@ require 'beerdb/stats'
 
 module BeerDb
 
-  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__)) )}"
-  end
-
   def self.main
     require 'beerdb/cli/main'
     # Runner.new.run(ARGV) old code
@@ -231,10 +61,13 @@ module BeerDb
     CreateDb.new.up
 
     ### fix: make optional do NOT auto create here
-    CreateDbExtrasUsers.new.up
-    CreateDbExtrasBookmarks.new.up
-    CreateDbExtrasDrinks.new.up
-    CreateDbExtrasNotes.new.up
+    ### fix: use if defined? BeerDbNote or similar or/and check if table exist ??
+    ###      or move to beerdb-note ??
+
+    # CreateDbExtrasUsers.new.up
+    # CreateDbExtrasBookmarks.new.up
+    # CreateDbExtrasDrinks.new.up
+    # CreateDbExtrasNotes.new.up
 
     ConfDb::Model::Prop.create!( key: 'db.schema.beer.version', value: VERSION )
   end
@@ -267,11 +100,6 @@ module BeerDb
     Stats.new.tables
   end
 
-  ###
-  # fix: (re)use ConfDb.props
-  def self.props
-    Stats.new.props
-  end
 
 end  # module BeerDb
 

data/test/helper.rb

@@ -9,20 +9,11 @@ require 'minitest/autorun'
 # include MiniTest::Unit  # lets us use TestCase instead of MiniTest::Unit::TestCase
 
 
-# ruby stdlibs
-
-require 'json'
-require 'uri'
-require 'pp'
-
-# ruby gems
-
-require 'active_record'
-
 # our own code
 
 require 'beerdb'
-require 'logutils/db'   # NB: explict require required for LogDb (not automatic) 
+require 'logutils/db'   # NOTE: explict require required for LogDb (not automatic) 
+
 
 Country = WorldDb::Model::Country
 Region  = WorldDb::Model::Region

data/test/test_fixture_matchers.rb

@@ -3,7 +3,6 @@
 
 require 'helper'
 
-### todo/fix: move to worlddb along with fixture matcher module!!
 
 class TestFixtureMatchers < MiniTest::Unit::TestCase
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-12 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &77761980 !ruby/object:Gem::Requirement
+  requirement: &82209140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77761980
+  version_requirements: *82209140
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &77761760 !ruby/object:Gem::Requirement
+  requirement: &82208590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77761760
+  version_requirements: *82208590
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &77761510 !ruby/object:Gem::Requirement
+  requirement: &82208120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77761510
+  version_requirements: *82208120
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &77761150 !ruby/object:Gem::Requirement
+  requirement: &82207380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *77761150
+  version_requirements: *82207380
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &77760800 !ruby/object:Gem::Requirement
+  requirement: &82206750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77760800
+  version_requirements: *82206750
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: &77760460 !ruby/object:Gem::Requirement
+  requirement: &82205990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77760460
+  version_requirements: *82205990
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &77760170 !ruby/object:Gem::Requirement
+  requirement: &82204150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *77760170
+  version_requirements: *82204150
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &77759820 !ruby/object:Gem::Requirement
+  requirement: &82203870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *77759820
+  version_requirements: *82203870
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &77759280 !ruby/object:Gem::Requirement
+  requirement: &82203620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77759280
+  version_requirements: *82203620
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77758880 !ruby/object:Gem::Requirement
+  requirement: &82203360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *77758880
+  version_requirements: *82203360
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &77758470 !ruby/object:Gem::Requirement
+  requirement: &82203110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *77758470
+  version_requirements: *82203110
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables:
@@ -153,28 +153,17 @@ 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/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/lib/beerdb/models/bookmark.rb

@@ -1,33 +0,0 @@
-# encoding: UTF-8
-
-module BeerDb
-  module Model
-
-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::Model::Beer
-    Drink.where( user_id: user_id, beer_id: bookmarkable_id )
-  end
-
-  def notes
-    ## todo: check/assert bookmarkable_type == BeerDB::Model::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::Model::Beer
-    Beer.find( bookmarkable_id )
-  end
-
-end # class Bookmark
-
-  end # module Model
-end # module BeerDb

data/lib/beerdb/models/city.rb

@@ -1,14 +0,0 @@
-# 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/drink.rb

@@ -1,25 +0,0 @@
-# encoding: UTF-8
-
-module BeerDb
-  module Model
-
-class Drink < ActiveRecord::Base
-
-  belongs_to :beer, class_name: 'BeerDb::Model::Beer'
-  belongs_to :user, class_name: 'BeerDb::Model::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 Model
-end # module BeerDb
-

data/lib/beerdb/models/note.rb

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

data/lib/beerdb/models/region.rb

@@ -1,14 +0,0 @@
-# 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/models/user.rb

@@ -1,29 +0,0 @@
-# encoding: UTF-8
-
-module BeerDb
-  module Model
-
-class User < ActiveRecord::Base
-
-  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'
-    else
-      # NB: remove whitespace and (.-+_) and downcase
-      self.key = email.gsub( /[\s\.\-+_]/, '' ).downcase
-    end
-  end
-
-end # class User
-
-  end # module Model
-end # module BeerDb
-

data/lib/beerdb/server/public/style.css

@@ -1,36 +0,0 @@
-body {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; }
-
-a {
-  color: black;
-  text-decoration: none; }
-  a:hover {
-    color: black;
-    background-color: aqua;
-    text-decoration: underline; }
-  a:visited {
-    color: black; }
-
-.params {
-  color: green;
-  font-style: italic;
-  font-weight: bold; }
-
-pre {
-  background-color: #F3F3F3;
-  border-bottom: 1px solid #BBBBBB;
-  border-top: 1px solid #BBBBBB;
-  padding: 4px; }
-
-
-/**********
- * version / powered by
- */
-
-.version {
-  text-align: center;
-  margin-top: 10px;
-  color: grey; }
-  .version a, .version span {
-    font-size: 12px;
-    color: grey; }

data/lib/beerdb/server/views/_debug.erb

@@ -1,17 +0,0 @@
-
-<h3>Debug</h3>
-
-<pre>
-  request.scheme          <%= request.scheme %>
-  request.script_name     <%= request.script_name %>
-  request.path_info       <%= request.path_info %>
-  request.port            <%= request.port %>
-  request.request_method  <%= request.request_method %>
-  request.query_string    <%= request.query_string %>
-  request.host            <%= request.host %>
-  request.referrer        <%= request.referrer %>
-  request.user_agent      <%= request.user_agent %>
-  request.url             <%= request.url %>
-  request.path            <%= request.path %>
-  request.ip              <%= request.ip %>
-</pre>

data/lib/beerdb/server/views/_version.erb

@@ -1,7 +0,0 @@
-<div class='version'>
-  <a href="http://groups.google.com/group/beerdb">Questions? Comments?</a> |
-  <a href="https://github.com/geraldb/world.db">world.db/<%= WorldDb::VERSION %></a>,
-  <a href="https://github.com/geraldb/beer.db">beer.db/<%= BeerDb::VERSION %></a> -
-  <span>Ruby/<%= "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE}/#{RUBY_PLATFORM})" %> on</span>
-  <span>Sinatra/<%= Sinatra::VERSION %> (<%= ENV['RACK_ENV'] %>)</span>
-</div>

data/lib/beerdb/server/views/debug.erb

@@ -1,3 +0,0 @@
-
-<%= erb :'_debug' %>
-