beerdb 0.9.0 → 0.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/beerdb/reader.rb +9 -5
- data/lib/beerdb/version.rb +2 -1
- metadata +12 -12
data/lib/beerdb/reader.rb
CHANGED
|
@@ -114,14 +114,18 @@ class Reader
|
|
|
114
114
|
def load_beers_for_country_n_region( country_key, region_key, name, more_attribs={} )
|
|
115
115
|
country = Country.find_by_key!( country_key )
|
|
116
116
|
logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
|
|
117
|
+
more_attribs[ :country_id ] = country.id
|
|
117
118
|
|
|
118
119
|
# NB: region lookup requires country id (region key only unique for country)
|
|
119
|
-
region = Region.find_by_key_and_country_id
|
|
120
|
-
|
|
120
|
+
region = Region.find_by_key_and_country_id( region_key, country.id )
|
|
121
|
+
if region.nil?
|
|
122
|
+
# note: allow unknown region keys; issue warning n skip region
|
|
123
|
+
logger.warn "Region w/ key >#{region_key}< not found; skip adding region"
|
|
124
|
+
else
|
|
125
|
+
logger.debug "Region #{region.key} >#{region.title}<"
|
|
126
|
+
more_attribs[ :region_id ] = region.id
|
|
127
|
+
end
|
|
121
128
|
|
|
122
|
-
more_attribs[ :country_id ] = country.id
|
|
123
|
-
more_attribs[ :region_id ] = region.id
|
|
124
|
-
|
|
125
129
|
more_attribs[ :txt ] = name # store source ref
|
|
126
130
|
|
|
127
131
|
load_beers_worker( name, more_attribs )
|
data/lib/beerdb/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: beerdb
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.9.
|
|
4
|
+
version: 0.9.1
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,11 +9,11 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2014-01-
|
|
12
|
+
date: 2014-01-21 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: activerecord
|
|
16
|
-
requirement: &
|
|
16
|
+
requirement: &20992524 !ruby/object:Gem::Requirement
|
|
17
17
|
none: false
|
|
18
18
|
requirements:
|
|
19
19
|
- - ~>
|
|
@@ -21,10 +21,10 @@ dependencies:
|
|
|
21
21
|
version: '3.2'
|
|
22
22
|
type: :runtime
|
|
23
23
|
prerelease: false
|
|
24
|
-
version_requirements: *
|
|
24
|
+
version_requirements: *20992524
|
|
25
25
|
- !ruby/object:Gem::Dependency
|
|
26
26
|
name: worlddb
|
|
27
|
-
requirement: &
|
|
27
|
+
requirement: &20991924 !ruby/object:Gem::Requirement
|
|
28
28
|
none: false
|
|
29
29
|
requirements:
|
|
30
30
|
- - ~>
|
|
@@ -32,10 +32,10 @@ dependencies:
|
|
|
32
32
|
version: '1.8'
|
|
33
33
|
type: :runtime
|
|
34
34
|
prerelease: false
|
|
35
|
-
version_requirements: *
|
|
35
|
+
version_requirements: *20991924
|
|
36
36
|
- !ruby/object:Gem::Dependency
|
|
37
37
|
name: gli
|
|
38
|
-
requirement: &
|
|
38
|
+
requirement: &20991348 !ruby/object:Gem::Requirement
|
|
39
39
|
none: false
|
|
40
40
|
requirements:
|
|
41
41
|
- - ! '>='
|
|
@@ -43,10 +43,10 @@ dependencies:
|
|
|
43
43
|
version: 2.5.6
|
|
44
44
|
type: :runtime
|
|
45
45
|
prerelease: false
|
|
46
|
-
version_requirements: *
|
|
46
|
+
version_requirements: *20991348
|
|
47
47
|
- !ruby/object:Gem::Dependency
|
|
48
48
|
name: rdoc
|
|
49
|
-
requirement: &
|
|
49
|
+
requirement: &20990748 !ruby/object:Gem::Requirement
|
|
50
50
|
none: false
|
|
51
51
|
requirements:
|
|
52
52
|
- - ~>
|
|
@@ -54,10 +54,10 @@ dependencies:
|
|
|
54
54
|
version: '4.0'
|
|
55
55
|
type: :development
|
|
56
56
|
prerelease: false
|
|
57
|
-
version_requirements: *
|
|
57
|
+
version_requirements: *20990748
|
|
58
58
|
- !ruby/object:Gem::Dependency
|
|
59
59
|
name: hoe
|
|
60
|
-
requirement: &
|
|
60
|
+
requirement: &20990208 !ruby/object:Gem::Requirement
|
|
61
61
|
none: false
|
|
62
62
|
requirements:
|
|
63
63
|
- - ~>
|
|
@@ -65,7 +65,7 @@ dependencies:
|
|
|
65
65
|
version: '3.7'
|
|
66
66
|
type: :development
|
|
67
67
|
prerelease: false
|
|
68
|
-
version_requirements: *
|
|
68
|
+
version_requirements: *20990208
|
|
69
69
|
description: beerdb - beer.db command line tool
|
|
70
70
|
email: beerdb@googlegroups.com
|
|
71
71
|
executables:
|