beerdb 0.6.13 → 0.6.14

data/lib/beerdb/models/brewery.rb

@@ -66,6 +66,57 @@ class Brewery < ActiveRecord::Base
   end
 
 
+  def self.find_grade( text )  # NB: returns ary [grade,text] / two values
+    grade = 4  # defaults to grade 4  e.g  *** => 1, ** => 2, * => 3, -/- => 4
+
+    text = text.sub( /\s+(\*{1,3})\s*$/ ) do |_|  # NB: stars must end field/value
+      if $1 == '***'
+        grade = 1
+      elsif $1 == '**'
+        grade = 2
+      elsif $1 == '*'
+        grade = 3
+      else
+        # unknown grade; not possible, is'it?
+      end
+      ''  # remove * from title if found
+    end
+
+    [grade,text]
+  end
+
+  ## todo/fix: move to helper for reuse in textutils!!! (use for beer model too)
+
+  def self.find_grade_in_titles!( new_attributes )
+
+    # NB: will add a new attributes grade to hash e.g. new_attributes[:grade] = grade
+
+    if new_attributes[:title].present?
+      grade, title = find_grade( new_attributes[:title] )
+      
+      if grade == 1 || grade == 2 || grade == 3  # grade found/present; use stripped title
+        new_attributes[:title] = title
+        new_attributes[:grade] = grade
+        return grade
+      end
+    end  
+      
+    if new_attributes[:synonyms].present?
+      grade, synonyms = find_grade( new_attributes[:synonyms] )
+      
+      if grade == 1 || grade == 2 || grade == 3  # grade found/present; use stripped title
+        new_attributes[:synonyms] = synonyms
+        new_attributes[:grade] = grade
+        return grade
+      end
+    end  
+      
+    grade = 4  # defaults to grade 4  e.g  *** => 1, ** => 2, * => 3, -/- => 4
+    new_attributes[:grade] = grade
+    grade
+  end
+
+
   def self.create_or_update_from_values( new_attributes, values )
 
     ## fix: add/configure logger for ActiveRecord!!!
@@ -74,6 +125,9 @@ class Brewery < ActiveRecord::Base
     value_tag_keys    = []
     value_brands      = ''
 
+    ## check for grades (e.g. ***/**/*) in titles (will add new_attributes[:grade] to hash)
+    find_grade_in_titles!( new_attributes )
+
     ### check for "default" tags - that is, if present new_attributes[:tags] remove from hash
 
     if new_attributes[:tags].present?
@@ -203,11 +257,11 @@ class Brewery < ActiveRecord::Base
           }
 
           if city.present?
-            logger.info "update City #{city.id}-#{city.key}:"
+            logger.debug "update City #{city.id}-#{city.key}:"
             # todo: check - any point in updating city? for now no new attributes
             #   update only for title - title will change?
           else
-            logger.info "create City:"
+            logger.debug "create City:"
             city = City.new
             city_attributes[ :key ] = city_key   # NB: new record; include/update key
           end
@@ -220,7 +274,7 @@ class Brewery < ActiveRecord::Base
           rec.city_id = city.id
           rec.save!
         else
-          logger.warn "auto-add city (#{country_key}) for #{new_attributes[:key]} >>#{new_attributes[:address]}<< failed; no city title found"
+          logger.warn "auto-add city for #{new_attributes[:key]} (#{country_key}) >>#{new_attributes[:address]}<< failed; no city title found"
         end
       end
     end

data/lib/beerdb/reader.rb

@@ -47,7 +47,7 @@ class Reader
        load_brewery_prod( name )
     elsif name =~ /\/([a-z]{2})\.wikipedia/   # e.g. de.wikipedia
        # auto-add required lang e.g. de or en etc.
-       load_brewery_wiki( $1, name )
+       load_brewery_wikipedia( $1, name )
     elsif name =~ /\/([a-z]{2})-[^\/]+\/([a-z]{1,2})-[^\/]+\/breweries/
       # new style: e.g.  /at-austria/w-wien/breweries
       # auto-add required country n region code (from folder structure)
@@ -66,7 +66,7 @@ class Reader
     end
   end
 
-  def load_brewery_wiki( lang_key, name )
+  def load_brewery_wikipedia( lang_key, name )
     path = "#{include_path}/#{name}.yml"
 
     logger.info "parsing data '#{name}' (#{path})..."
@@ -76,9 +76,9 @@ class Reader
     reader.each do |key, value|
       brewery = Brewery.find_by_key!( key )
       
-      wiki = "#{lang_key}.wikipedia.org/wiki/#{value.strip}"
-      logger.debug "  adding #{key} => >#{wiki}<"
-      brewery.wiki = wiki
+      wikipedia = "#{lang_key}.wikipedia.org/wiki/#{value.strip}"
+      logger.debug "  adding #{key} => >#{wikipedia}<"
+      brewery.wikipedia = wikipedia
       brewery.save!
     end
 
@@ -119,6 +119,8 @@ class Reader
 
     more_values[ :country_id ] = country.id
     more_values[ :region_id  ] = region.id
+    
+    more_values[ :txt ] = name  # store source ref
 
     load_beers_worker( name, more_values )
   end
@@ -129,6 +131,8 @@ class Reader
 
     more_values[ :country_id ] = country.id
 
+    more_values[ :txt ] = name  # store source ref
+
     load_beers_worker( name, more_values )
   end
 
@@ -158,6 +162,8 @@ class Reader
     more_values[ :country_id ] = country.id
     more_values[ :region_id  ] = region.id
 
+    more_values[ :txt ] = name  # store source ref
+
     load_breweries_worker( name, more_values )
   end
 
@@ -167,6 +173,8 @@ class Reader
 
     more_values[ :country_id ] = country.id
 
+    more_values[ :txt ] = name  # store source ref
+
     load_breweries_worker( name, more_values )
   end
 

data/lib/beerdb/schema.rb

@@ -15,10 +15,11 @@ create_table :beers do |t|
   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
+  # t.boolean  :bottle,  :null => false, :default => false # Flaschenbier
+  # t.boolean  :draft,   :null => false, :default => false # Fassbier
   ## todo: check seasonal is it proper english?
   t.boolean  :seasonal, :null => false, :default => false # all year or just eg. Festbier/Oktoberfest Special
+  t.boolean  :limited, :null => false, :default => false   # one year or season only
   ## todo: add microbrew/brewpub flag?
   #### t.boolean  :brewpub, :null => false, :default => false
   
@@ -64,7 +65,12 @@ create_table :beers do |t|
   # - B-grade /2nd class/ tier2 / regular, major,   - todo: find better names?
   # - C-grade /3nd class/ tier3/ / speciality, minor ?
 
-  t.integer :grade   # 1/2/3  (A/B/C)
+  # use stars in .txt e.g. # ***/**/*/- => 1/2/3/4
+  t.integer :grade, :null => false, :default => 4
+
+  t.string  :txt            # source ref
+  t.boolean :txt_auto, :null => false, :default => false     # inline? got auto-added?
+
 
   t.references :country,  :null => false
   t.references :region   # optional
@@ -89,7 +95,15 @@ create_table :brands do |t|   # beer families (sharing same name e.g. brand)
   t.boolean :regional,   :null => false, :default => false
   t.boolean :local,      :null => false, :default => false
 
-  t.integer :grade   # 1/2/3/4/5  (global/intern'l/national/regional/local)
+  # t.integer :brand_grade   # 1/2/3/4/5  (global/intern'l/national/regional/local)
+
+  # use stars in .txt e.g. # ***/**/*/- => 1/2/3/4
+  t.integer :grade, :null => false, :default => 4
+  #   -- todo: add plus 1 for brewery w/ *** ??
+
+  t.string  :txt            # source ref
+  t.boolean :txt_auto, :null => false, :default => false     # inline? got auto-added?
+
 
   t.references :brewery   # optional (for now)
 
@@ -113,6 +127,7 @@ create_table :breweries do |t|
 ## todo: add optional parent brewery (owned_by)
 
   t.integer :prod  # (estimated) annual production/capacity in hl (1hl=100l) e.g. megabrewery 2_000_000, microbrewery 1_000 hl; brewbup 500 hl etc.
+  t.integer :prod_grade   # 1/2/3/4/5/6/7/8/9/10/11
 
   # grade - classified using annual production (capacity) in hl
   # <     1_000 hl  => 11
@@ -127,11 +142,16 @@ create_table :breweries do |t|
   # < 2_000_000 hl  => 2
   # > 2_000_000 hl  => 1
 
-  t.integer :grade   # 1/2/3/4/5/6/7/8/9/10/11
 
+  # use stars in .txt e.g. # ***/**/*/- => 1/2/3/4
+  t.integer :grade, :null => false, :default => 4
 
-  t.string  :web   # optional web page (e.g. www.ottakringer.at)
-  t.string  :wiki  # optional wiki(pedia page)
+
+  t.string  :txt            # source ref
+  t.boolean :txt_auto, :null => false, :default => false     # inline? got auto-added?
+
+  t.string  :web        # optional web page (e.g. www.ottakringer.at)
+  t.string  :wikipedia  # optional wiki(pedia page)
 
   t.boolean :indie    # independent brewery (flag)
 

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

@@ -1,5 +1,5 @@
 <div class='version'>
-  <a href="http://groups.google.com/group/opensport">Questions? Comments?</a> |
+  <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>

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

@@ -49,8 +49,8 @@
  <tr>
   <td>
     <code>
-     <a href='<%= url("/beer/dosequisxxamber") %>'>
-        /beer/<span class='params'>dosequisxxamber</span>
+     <a href='<%= url("/beer/dosequisamber") %>'>
+        /beer/<span class='params'>dosequisamber</span>
      </a>
     </code>
   </td>

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
 module BeerDb
-  VERSION = '0.6.13'
+  VERSION = '0.6.14'
 end

data/test/test_values.rb

@@ -73,6 +73,7 @@ class TestValues < MiniTest::Unit::TestCase
     assert( by.since         == 1838 )
     assert( by.web           == 'www.ottakringer.at' )
     assert( by.address       == '1160 Wien // Ottakringer Platz 1' )
+    assert( by.grade         == 4 )
 
     # check auto-created brand
 
@@ -85,6 +86,67 @@ class TestValues < MiniTest::Unit::TestCase
   end
 
 
+  def test_load_brewery_values_w_grade
+
+    # ottakringer, Ottakringer Brauerei, 1838, www.ottakringer.at, WI, city:wien, 1160 Wien // Ottakringer Platz 1
+    #   brands: Ottakringer
+
+    new_attributes = {
+      key: 'ottakringer',
+      title: 'Ottakringer Brauerei **',
+      synonyms: '',
+      country_id: AT.id
+    }
+
+    values = [
+      '1838',
+      'www.ottakringer.at',
+      '1160 Wien // Ottakringer Platz 1',
+      'brands: Ottakringer'
+    ]
+    
+    by = Brewery.create_or_update_from_values( new_attributes, values )
+
+    by2 = Brewery.find_by_key!( new_attributes[:key] )
+    assert( by.id == by2.id )
+
+    assert( by.title         == 'Ottakringer Brauerei' )
+    assert( by.grade         == 2 )
+  end
+
+  def test_load_brewery_values_w_grade_in_synonyms
+
+    ## fix!!!!!!!!: use different brewery! use one w/ synonyms
+    ###
+    
+    # ottakringer, Ottakringer Brauerei, 1838, www.ottakringer.at, WI, city:wien, 1160 Wien // Ottakringer Platz 1
+    #   brands: Ottakringer
+
+    new_attributes = {
+      key: 'ottakringer',
+      title: 'Ottakringer Brauerei',
+      synonyms: 'Otta **',
+      country_id: AT.id
+    }
+
+    values = [
+      '1838',
+      'www.ottakringer.at',
+      '1160 Wien // Ottakringer Platz 1',
+      'brands: Ottakringer'
+    ]
+    
+    by = Brewery.create_or_update_from_values( new_attributes, values )
+
+    by2 = Brewery.find_by_key!( new_attributes[:key] )
+    assert( by.id == by2.id )
+
+    assert( by.title         == 'Ottakringer Brauerei' )
+    assert( by.synonyms      == 'Otta' )
+    assert( by.grade         == 2 )
+  end
+
+
   def test_load_brewery_values_w_city_at
 
     # ottakringer, Ottakringer Brauerei, 1838, www.ottakringer.at, WI, city:wien, 1160 Wien // Ottakringer Platz 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &79691710 !ruby/object:Gem::Requirement
+  requirement: &86079670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *79691710
+  version_requirements: *86079670
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &79691460 !ruby/object:Gem::Requirement
+  requirement: &86079430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *79691460
+  version_requirements: *86079430
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &79691230 !ruby/object:Gem::Requirement
+  requirement: &86079180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *79691230
+  version_requirements: *86079180
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &79691000 !ruby/object:Gem::Requirement
+  requirement: &86078950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *79691000
+  version_requirements: *86078950
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &79690780 !ruby/object:Gem::Requirement
+  requirement: &86078720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *79690780
+  version_requirements: *86078720
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables: