beerdb 0.6.5 → 0.6.6

data/lib/beerdb/models/beer.rb

@@ -16,21 +16,31 @@ 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' }
 
+
+  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=(value)
+    puts "*** depreceated fn api - use srm="
     self.srm = value
   end
 
   def plato=(value)
+    puts "*** depreceated fn api - use og="
     self.og = value
   end
 

data/lib/beerdb/models/brewery.rb

@@ -18,6 +18,13 @@ class Brewery < ActiveRecord::Base
 
   validates :key, :format => { :with => /^[a-z][a-z0-9]+$/, :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
@@ -201,9 +208,12 @@ class Brewery < ActiveRecord::Base
 
   end # method create_or_update_from_values
 
+
   ### todo/fix:
   # reuse method - put into helper in textutils or somewhere else ??
 
+  ### todo/fix - move to textutils !!!!!  AddressHelper
+
   def self.normalize_address( old_address_line )
     # for now only checks german 5-digit zip code
     #
@@ -225,6 +235,18 @@ class Brewery < ActiveRecord::Base
     new_address_line
   end
 
+  ### todo/fix: move to textutils!!!
+  ## add options for
+  ##  - remove translations e.g. []
+  ##  - remove subtitles   e.g. ()
+  ##  - remove tags/extras e.g. {}
+
+  ##
+  ## fix: make  strip_translations into fn
+  ##      make  strip_subtitles into fn  # better name for () strip_
+  ##      make  strip_desc / tags  (find better name  strip_extras, strip_meta? strip_desc? strip_curly?)
+
+
   def self.title_to_key( title )
 
       ## NB: downcase does NOT work for accented chars (thus, include in alternatives)

data/lib/beerdb/reader.rb

@@ -16,51 +16,17 @@ class Reader
   end
 
 
-  def load_setup( setup )
-    ary = load_fixture_setup( setup )
-
-    ary.each do |name|
-      load( name )
-    end
-  end # method load_setup
-
-
-  ## fix/todo: rename ??
-  def load_fixture_setup( name )
-    
-   ## todo/fix: cleanup quick and dirty code
-    
+  def load_setup( name )
     path = "#{include_path}/#{name}.yml"
 
     logger.info "parsing data '#{name}' (#{path})..."
 
-    text = File.read_utf8( path )
-    
-    hash = YAML.load( text )
-    
-    ### build up array for fixtures from hash
-    
-    ary = []
-    
-    hash.each do |key_wild, value_wild|
-      key   = key_wild.to_s.strip
-      
-      logger.debug "yaml key:#{key_wild.class.name} >>#{key}<<, value:#{value_wild.class.name} >>#{value_wild}<<"
-    
-      if value_wild.kind_of?( String ) # assume single fixture name
-        ary << value_wild
-      elsif value_wild.kind_of?( Array ) # assume array of fixture names as strings
-        ary = ary + value_wild
-      else
-        logger.error "unknow fixture type in setup (yaml key:#{key_wild.class.name} >>#{key}<<, value:#{value_wild.class.name} >>#{value_wild}<<); skipping"
-      end
+    reader = FixtureReader.new( path )
+
+    reader.each do |fixture_name|
+      load( fixture_name )
     end
-    
-    logger.debug "fixture setup:"
-    logger.debug ary.to_json
-    
-    ary
-  end # load_fixture_setup
+  end # method load_setup
 
 
   def load( name )

data/lib/beerdb/schema.rb

@@ -29,6 +29,7 @@ create_table :beers do |t|
   t.decimal    :abv    # Alcohol by volume (abbreviated as ABV, abv, or alc/vol) e.g. 4.9 %
   t.decimal    :og     # malt extract (original gravity) in plato
   t.integer    :srm    # color in srm
+  t.integer    :ibu    # bitterness in ibu
 
   ### fix/todo: add bitterness field
 

data/lib/beerdb/server.rb

@@ -72,8 +72,7 @@ class Server < Sinatra::Base
 
     if ['r', 'rnd', 'rand', 'random'].include?( key )
       # special key for random beer
-      beer_id = rand( Beer.count )+1   # nb: assumes record ids sequence from 1-n
-      beer = Beer.find( beer_id )
+      beer = Beer.rnd
     else
       beer = Beer.find_by_key!( key )
     end
@@ -108,8 +107,7 @@ class Server < Sinatra::Base
 
     if ['r', 'rnd', 'rand', 'random'].include?( key )
       # special key for random brewery
-      brewery_id = rand( Brewery.count )+1   # nb: assumes record ids sequence from 1-n
-      brewery = Brewery.find( brewery_id )
+      brewery = Brewery.rnd
     else
       brewery = Brewery.find_by_key!( key )
     end

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
 module BeerDb
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &75736340 !ruby/object:Gem::Requirement
+  requirement: &71991960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *75736340
+  version_requirements: *71991960
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &75736120 !ruby/object:Gem::Requirement
+  requirement: &71991740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *75736120
+  version_requirements: *71991740
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &75735900 !ruby/object:Gem::Requirement
+  requirement: &71991520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *75735900
+  version_requirements: *71991520
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &75735680 !ruby/object:Gem::Requirement
+  requirement: &71991300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *75735680
+  version_requirements: *71991300
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &75735460 !ruby/object:Gem::Requirement
+  requirement: &71991080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *75735460
+  version_requirements: *71991080
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: