beerdb 0.6.8 → 0.6.9

data/lib/beerdb/models/beer.rb

@@ -185,6 +185,8 @@ class Beer < ActiveRecord::Base
           rec.tags << tag
         end
     end
+    
+    rec # NB: return created or updated obj
 
   end # method create_or_update_from_values
 

data/lib/beerdb/models/brewery.rb

@@ -210,6 +210,8 @@ class Brewery < ActiveRecord::Base
       end
     end
 
+    rec # NB: return created or updated obj
+
   end # method create_or_update_from_values
 
 

data/lib/beerdb/reader.rb

@@ -32,18 +32,33 @@ class Reader
   def load( name )
 
     if name =~ /\/([a-z]{2})\/beers/
-      ## auto-add required country code (from folder structure)
-      load_beers( $1, name )
+      # classic style: e.g. /at/beers
+      # auto-add required country code (from folder structure)
+      load_beers_for_country( $1, name )
+    elsif name =~ /\/([a-z]{2})-[^\/]+\/([a-z]{1,2})-[^\/]+\/beers/
+      # new style: e.g.  /at-austria/w-wien/beers
+      # auto-add required country n region code (from folder structure)
+      load_beers_for_country_n_region( $1, $2, name )
+    elsif name =~ /\/([a-z]{2})-[^\/]+\/beers/
+      # new style: e.g. /at-austria/beers
+      # auto-add required country code (from folder structure)
+      load_beers_for_country( $1, name )
     elsif name =~ /\.hl$/   # e.g. breweries.hl   # NB: must end w/ .hl
        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 )
-    elsif name =~ /\/([a-z]{2})\/breweries_([a-z]{1,2})(?:_|$)/  # NB: region key must end name or be followed by underscore (_)
-      ## auto-add required country code (from folder structure) plus region
+    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)
       load_breweries_for_country_n_region( $1, $2, name )
+    elsif name =~ /\/([a-z]{2})-[^\/]+\/breweries/
+      # new style: e.g.  /at-austria/breweries
+      # auto-add required country (from folder structure)
+      load_breweries_for_country( $1, name )
     elsif name =~ /\/([a-z]{2})\/breweries/
-      ## auto-add required country code (from folder structure)
+      # classic style: e.g. /at/breweries
+      # auto-add required country code (from folder structure)
       load_breweries_for_country( $1, name )
     else
       logger.error "unknown beer.db fixture type >#{name}<"
@@ -94,12 +109,30 @@ class Reader
     Prop.create_from_fixture!( name, path )
   end
 
-  def load_beers( country_key, name, more_values={} )
+  def load_beers_for_country_n_region( country_key, region_key, name, more_values={} )
     country = Country.find_by_key!( country_key )
     logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
 
+    # NB: region lookup requires country id (region key only unique for country)
+    region  = Region.find_by_key_and_country_id!( region_key, country.id )
+    logger.debug "Region #{region.key} >#{region.title}<"
+
     more_values[ :country_id ] = country.id
+    more_values[ :region_id  ] = region.id
+
+    load_beers_worker( name, more_values )
+  end
 
+  def load_beers_for_country( country_key, name, more_values={} )
+    country = Country.find_by_key!( country_key )
+    logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
+
+    more_values[ :country_id ] = country.id
+
+    load_beers_worker( name, more_values )
+  end
+
+  def load_beers( name, more_values={} )
     path = "#{include_path}/#{name}.txt"
 
     logger.info "parsing data '#{name}' (#{path})..."
@@ -128,7 +161,6 @@ class Reader
     load_breweries_worker( name, more_values )
   end
 
-
   def load_breweries_for_country( country_key, name, more_values={} )
     country = Country.find_by_key!( country_key )
     logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
@@ -138,7 +170,6 @@ class Reader
     load_breweries_worker( name, more_values )
   end
 
-
   def load_breweries_worker( name, more_values={} )
     path = "#{include_path}/#{name}.txt"
 

data/lib/beerdb/server.rb

@@ -72,7 +72,7 @@ class Server < Sinatra::Base
 
     if ['r', 'rnd', 'rand', 'random'].include?( key )
       # special key for random beer
-      beer = Beer.rnd
+      beer = Beer.rnd.first
     else
       beer = Beer.find_by_key!( key )
     end
@@ -107,7 +107,7 @@ class Server < Sinatra::Base
 
     if ['r', 'rnd', 'rand', 'random'].include?( key )
       # special key for random brewery
-      brewery = Brewery.rnd
+      brewery = Brewery.rnd.first
     else
       brewery = Brewery.find_by_key!( key )
     end

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

@@ -3,20 +3,6 @@
 
 <h2>Examples</h2>
 
-<h3>Get random beer <code>/beer/rand</code></h3>
-
-<table>
- <tr>
-  <td>
-    <code>
-     <a href='<%= url("/beer/rand") %>'>
-        /beer/<span class='params'>rand</span>
-     </a>
-    </code>
-  </td>
- </tr>
-</table>
-
 <h3>Get beer by key <code>/beer/<span class='params'>:key</span></code></h3>
 
 <table>
@@ -82,21 +68,21 @@
 
 </table>
 
-
-<h3>Get random brewery <code>/brewery/rand</code></h3>
+<h3>Get random beer <code>/beer/<span class='params'>rand</span></code></h3>
 
 <table>
  <tr>
   <td>
     <code>
-     <a href='<%= url("/brewery/rand") %>'>
-        /brewery/<span class='params'>rand</span>
+     <a href='<%= url("/beer/rand") %>'>
+        /beer/<span class='params'>rand</span>
      </a>
     </code>
   </td>
  </tr>
 </table>
 
+
 <h3>Get brewery by key <code>/brewery/<span class='params'>:key</span></code></h3>
 
 <table>
@@ -113,7 +99,7 @@
  <tr>
   <td>
     <code>
-     <a href='<%= url("/brewery/fullers") %>'>
+     <a href='<%= url("/brewery/fuller") %>'>
         /brewery/<span class='params'>fullers</span>
      </a>
     </code>
@@ -152,5 +138,19 @@
 
 </table>
 
+<h3>Get random brewery <code>/brewery/<span class='params'>rand</span></code></h3>
+
+<table>
+ <tr>
+  <td>
+    <code>
+     <a href='<%= url("/brewery/rand") %>'>
+        /brewery/<span class='params'>rand</span>
+     </a>
+    </code>
+  </td>
+ </tr>
+</table>
+
 
 <%= erb :'_debug' %>

data/lib/beerdb/version.rb

@@ -1,4 +1,4 @@
 
 module BeerDb
-  VERSION = '0.6.8'
+  VERSION = '0.6.9'
 end

data/test/test_values.rb

@@ -0,0 +1,88 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_helper.rb
+#  or better
+#     rake test
+
+require 'helper'
+
+class TestValues < MiniTest::Unit::TestCase
+
+  def setup
+    #  delete all beers, brands, breweries in in-memory only db
+    BeerDb.delete!
+  end
+
+  def test_load_beer_values
+    
+    new_attributes = {
+      key: 'ottakringerpur',
+      title: 'Ottakringer (Gold Fassl) Pur {Bio}',
+      synonyms: '',
+      country_id: AT.id
+    }
+
+    values = [
+      '5.2 %',
+      '11.8°',
+      'bio'
+    ]
+    
+    beer = Beer.create_or_update_from_values( new_attributes, values )
+    
+    beer2 = Beer.find_by_key!( new_attributes[:key] )
+    assert( beer.id == beer2.id )
+
+    assert( beer.title         == new_attributes[:title] )
+    assert( beer.country_id    == AT.id )
+    assert( beer.country.title == AT.title )
+    assert( beer.abv           == 5.2 )
+    assert( beer.og            == 11.8 )
+    assert( beer.srm           == nil )
+  end
+
+  def test_load_brewery_values
+
+    # 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         == new_attributes[:title] )
+    assert( by.country_id    == AT.id )
+    assert( by.country.title == AT.title )
+    assert( by.since         == 1838 )
+    assert( by.web           == 'www.ottakringer.at' )
+    assert( by.address       == '1160 Wien // Ottakringer Platz 1' )
+
+    # check auto-created brand
+
+    br = Brand.find_by_key!( 'ottakringer')
+
+    assert( br.title         == 'Ottakringer' )
+    assert( br.brewery_id    == by.id )
+    assert( br.brewery.title == by.title )
+    assert( br.country_id    == by.country_id )
+  end
+
+
+end # class TestValues

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beerdb
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &83579610 !ruby/object:Gem::Requirement
+  requirement: &84206950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *83579610
+  version_requirements: *84206950
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &83579390 !ruby/object:Gem::Requirement
+  requirement: &84206730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *83579390
+  version_requirements: *84206730
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &83579170 !ruby/object:Gem::Requirement
+  requirement: &84206510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *83579170
+  version_requirements: *84206510
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &83578950 !ruby/object:Gem::Requirement
+  requirement: &84206290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *83578950
+  version_requirements: *84206290
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &83578730 !ruby/object:Gem::Requirement
+  requirement: &84206070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *83578730
+  version_requirements: *84206070
 description: beerdb - beer.db command line tool
 email: beerdb@googlegroups.com
 executables:
@@ -103,6 +103,8 @@ files:
 - lib/beerdb/server/views/layout.erb
 - lib/beerdb/stats.rb
 - lib/beerdb/version.rb
+- test/test_values.rb
+- .gemtest
 homepage: https://github.com/geraldb/beer.db.ruby
 licenses:
 - Public Domain
@@ -130,4 +132,5 @@ rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: beerdb - beer.db command line tool
-test_files: []
+test_files:
+- test/test_values.rb