beerdb 0.9.12 → 0.9.13

Sign up to get free protection for your applications and to get access to all the features.
@@ -13,19 +13,50 @@ class Reader < ReaderBase
13
13
  def create_fixture_reader( name )
14
14
  path = "#{@include_path}/#{name}.txt"
15
15
 
16
- logger.info "parsing data '#{name}' (#{path})..."
16
+ logger.info "parsing data (setup) '#{name}' (#{path})..."
17
17
 
18
- FixtureReader.new( path )
18
+ FixtureReader.from_file( path )
19
19
  end
20
20
 
21
21
  def create_beers_reader( name, more_attribs={} )
22
- ValuesReaderV2.new( name, @include_path, more_attribs )
22
+ real_name = name_to_real_name( name )
23
+
24
+ path = "#{@include_path}/#{real_name}.txt"
25
+
26
+ logger.info "parsing data (beers) '#{name}' (#{path})..."
27
+
28
+ ValuesReader.from_file( path, more_attribs )
29
+ ## ValuesReaderV2.new( name, @include_path, more_attribs )
23
30
  end
24
31
 
25
32
  def create_breweries_reader( name, more_attribs={} )
26
- ValuesReaderV2.new( name, @include_path, more_attribs )
33
+ real_name = name_to_real_name( name )
34
+
35
+ path = "#{@include_path}/#{real_name}.txt"
36
+
37
+ logger.info "parsing data (breweries) '#{name}' (#{path})..."
38
+
39
+ ValuesReader.from_file( path, more_attribs )
40
+ ## ValuesReaderV2.new( name, @include_path, more_attribs )
27
41
  end
28
42
 
43
+ private
44
+
45
+ def name_to_real_name( name )
46
+ # map name to real_name path
47
+ # name might include !/ for virtual path (gets cut off)
48
+ # e.g. at-austria!/w-wien/beers becomse w-wien/beers
49
+ pos = name.index( '!/')
50
+ if pos.nil?
51
+ name # not found; real path is the same as name
52
+ else
53
+ # cut off everything until !/ e.g.
54
+ # at-austria!/w-wien/beers becomes
55
+ # w-wien/beers
56
+ name[ (pos+2)..-1 ]
57
+ end
58
+ end
29
59
 
30
60
  end # class Reader
31
61
  end # module BeerDb
62
+
@@ -2,7 +2,7 @@
2
2
  module BeerDb
3
3
  MAJOR = 0 ## todo: namespace inside version or something - why? why not??
4
4
  MINOR = 9
5
- PATCH = 12
5
+ PATCH = 13
6
6
  VERSION = [MAJOR,MINOR,PATCH].join('.')
7
7
 
8
8
  def self.version
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.12
4
+ version: 0.9.13
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-11-06 00:00:00.000000000 Z
12
+ date: 2014-11-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: props
16
- requirement: &74199020 !ruby/object:Gem::Requirement
16
+ requirement: &82424030 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *74199020
24
+ version_requirements: *82424030
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: logutils
27
- requirement: &74198640 !ruby/object:Gem::Requirement
27
+ requirement: &82423660 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *74198640
35
+ version_requirements: *82423660
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: textutils
38
- requirement: &74198220 !ruby/object:Gem::Requirement
38
+ requirement: &82746400 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *74198220
46
+ version_requirements: *82746400
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: worlddb
49
- requirement: &74197590 !ruby/object:Gem::Requirement
49
+ requirement: &82746080 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 2.0.2
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *74197590
57
+ version_requirements: *82746080
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: tagutils
60
- requirement: &74197120 !ruby/object:Gem::Requirement
60
+ requirement: &82745850 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *74197120
68
+ version_requirements: *82745850
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: activerecord-utils
71
- requirement: &74196610 !ruby/object:Gem::Requirement
71
+ requirement: &82745500 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *74196610
79
+ version_requirements: *82745500
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: fetcher
82
- requirement: &74196200 !ruby/object:Gem::Requirement
82
+ requirement: &82745060 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0.3'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *74196200
90
+ version_requirements: *82745060
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: gli
93
- requirement: &74195890 !ruby/object:Gem::Requirement
93
+ requirement: &82744620 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 2.5.6
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *74195890
101
+ version_requirements: *82744620
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rubyzip
104
- requirement: &74195620 !ruby/object:Gem::Requirement
104
+ requirement: &82743920 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *74195620
112
+ version_requirements: *82743920
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: activerecord
115
- requirement: &74193490 !ruby/object:Gem::Requirement
115
+ requirement: &82743610 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *74193490
123
+ version_requirements: *82743610
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: rdoc
126
- requirement: &74193140 !ruby/object:Gem::Requirement
126
+ requirement: &82743270 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,18 +131,18 @@ dependencies:
131
131
  version: '4.0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *74193140
134
+ version_requirements: *82743270
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: hoe
137
- requirement: &74192860 !ruby/object:Gem::Requirement
137
+ requirement: &82742500 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ~>
141
141
  - !ruby/object:Gem::Version
142
- version: '3.12'
142
+ version: '3.13'
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *74192860
145
+ version_requirements: *82742500
146
146
  description: beerdb - beer.db command line tool
147
147
  email: beerdb@googlegroups.com
148
148
  executables: