oddb2xml 1.5.4 → 1.5.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. data/History.txt +4 -0
  2. data/bin/oddb2xml +6 -1
  3. data/lib/oddb2xml/cli.rb +1 -1
  4. data/lib/oddb2xml/downloader.rb +6 -1
  5. data/lib/oddb2xml/extractor.rb +1 -1
  6. data/lib/oddb2xml/version.rb +1 -1
  7. metadata +173 -171
data/History.txt CHANGED
@@ -1,3 +1,7 @@
1
+ === 1.5.5 / 08.07.2013
2
+
3
+ * Add local PATH option support for zurrose
4
+
1
5
  === 1.5.4 / 08.07.2013
2
6
 
3
7
  * Update to import VAT from zurrose transfer.dat
data/bin/oddb2xml CHANGED
@@ -47,7 +47,7 @@ parser.on('-o v', '--option v', /^fi$/) {|v| opts[:fi] = true }
47
47
  parser.on('-i v', '--include v', /^ean14$/) {|v| opts[:ean14] = true }
48
48
  parser.on('-t v', '--tag-suffix v', /^[A-z0-9]*$/i) {|v| opts[:tag_suffix] = v.upcase }
49
49
  parser.on('-x v', '--context v', /^addr(ess)*$/i){|v| opts[:address] = true }
50
- parser.on('-p v', '--prices v', /^zurrose$/) {|v| opts[:price] = v.intern }
50
+ parser.on('-p v', '--price v', /^zurrose$/) {|v| opts[:price] = v.intern }
51
51
  #parser.on('--debug') {|v| opts[:debug] = true }
52
52
  parser.on_tail('-h', '--help') { puts help; exit }
53
53
 
@@ -61,6 +61,11 @@ rescue OptionParser::MissingArgument,
61
61
  exit
62
62
  end
63
63
 
64
+ # TEMP
65
+ if path = args.first
66
+ opts[:transfer_dat] = path
67
+ end
68
+
64
69
  ui = Oddb2xml::Cli.new(opts)
65
70
  begin
66
71
  if opts[:format] == :xml
data/lib/oddb2xml/cli.rb CHANGED
@@ -231,7 +231,7 @@ module Oddb2xml
231
231
  end
232
232
  when :zurrose
233
233
  Thread.new do
234
- downloader = ZurroseDownloader.new(@options)
234
+ downloader = ZurroseDownloader.new(@options, @options[:transfer_dat])
235
235
  xml = downloader.download
236
236
  @mutex.synchronize do
237
237
  hsh = ZurroseExtractor.new(xml).to_hash
data/lib/oddb2xml/downloader.rb CHANGED
@@ -115,7 +115,12 @@ module Oddb2xml
115
115
  include DownloadMethod
116
116
  def download
117
117
  @url ||= 'http://zurrose.com/fileadmin/main/lib/download.php?file=/fileadmin/user_upload/downloads/ProduktUpdate/IGM11_mit_MwSt/Vollstamm/transfer.dat'
118
- download_as('oddb2xml_zurrose_transfer.dat', 'r:iso-8859-1:utf-8')
118
+ unless @url =~ /^http/
119
+ io = File.open(@url, 'r:iso-8859-1:utf-8')
120
+ io.read
121
+ else
122
+ download_as('oddb2xml_zurrose_transfer.dat', 'r:iso-8859-1:utf-8')
123
+ end
119
124
  end
120
125
  end
121
126
  class MedregbmDownloader < Downloader
data/lib/oddb2xml/extractor.rb CHANGED
@@ -417,7 +417,7 @@ module Oddb2xml
417
417
  next unless line =~ /(7680\d{9})(\d{1})\r\n$/
418
418
  data[$1.to_s] = {
419
419
  :vat => $2.to_s,
420
- :price => line[60,6].gsub(/(\d{2})$/, "." + $1.to_s).to_f.round(2).to_s
420
+ :price => sprintf("%.2f", line[60,6].gsub(/(\d{2})$/, "." + $1.to_s).to_f)
421
421
  }
422
422
  end
423
423
  data
data/lib/oddb2xml/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Oddb2xml
2
- VERSION = "1.5.4"
2
+ VERSION = "1.5.5"
3
3
  end
metadata CHANGED
@@ -1,206 +1,217 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: oddb2xml
3
- version: !ruby/object:Gem::Version
4
- hash: 11
3
+ version: !ruby/object:Gem::Version
4
+ version: 1.5.5
5
5
  prerelease:
6
- segments:
7
- - 1
8
- - 5
9
- - 4
10
- version: 1.5.4
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Yasuhiro Asaka, Zeno R.R. Davatz
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2013-07-08 00:00:00 Z
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
12
+ date: 2013-07-08 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
21
15
  name: rubyzip
22
- prerelease: false
23
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
24
17
  none: false
25
- requirements:
26
- - - ">="
27
- - !ruby/object:Gem::Version
28
- hash: 3
29
- segments:
30
- - 0
31
- version: "0"
18
+ requirements:
19
+ - - ! '>='
20
+ - !ruby/object:Gem::Version
21
+ version: '0'
32
22
  type: :runtime
33
- version_requirements: *id001
34
- - !ruby/object:Gem::Dependency
35
- name: archive-tar-minitar
36
23
  prerelease: false
37
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: !ruby/object:Gem::Requirement
38
25
  none: false
39
- requirements:
40
- - - ">="
41
- - !ruby/object:Gem::Version
42
- hash: 3
43
- segments:
44
- - 0
45
- version: "0"
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '0'
30
+ - !ruby/object:Gem::Dependency
31
+ name: archive-tar-minitar
32
+ requirement: !ruby/object:Gem::Requirement
33
+ none: false
34
+ requirements:
35
+ - - ! '>='
36
+ - !ruby/object:Gem::Version
37
+ version: '0'
46
38
  type: :runtime
47
- version_requirements: *id002
48
- - !ruby/object:Gem::Dependency
49
- name: mechanize
50
39
  prerelease: false
51
- requirement: &id003 !ruby/object:Gem::Requirement
40
+ version_requirements: !ruby/object:Gem::Requirement
52
41
  none: false
53
- requirements:
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '0'
46
+ - !ruby/object:Gem::Dependency
47
+ name: mechanize
48
+ requirement: !ruby/object:Gem::Requirement
49
+ none: false
50
+ requirements:
54
51
  - - ~>
55
- - !ruby/object:Gem::Version
56
- hash: 25
57
- segments:
58
- - 2
59
- - 5
60
- - 1
52
+ - !ruby/object:Gem::Version
61
53
  version: 2.5.1
62
54
  type: :runtime
63
- version_requirements: *id003
64
- - !ruby/object:Gem::Dependency
65
- name: nokogiri
66
55
  prerelease: false
67
- requirement: &id004 !ruby/object:Gem::Requirement
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ~>
60
+ - !ruby/object:Gem::Version
61
+ version: 2.5.1
62
+ - !ruby/object:Gem::Dependency
63
+ name: nokogiri
64
+ requirement: !ruby/object:Gem::Requirement
68
65
  none: false
69
- requirements:
70
- - - ">="
71
- - !ruby/object:Gem::Version
72
- hash: 3
73
- segments:
74
- - 0
75
- version: "0"
66
+ requirements:
67
+ - - ! '>='
68
+ - !ruby/object:Gem::Version
69
+ version: '0'
76
70
  type: :runtime
77
- version_requirements: *id004
78
- - !ruby/object:Gem::Dependency
79
- name: savon
80
71
  prerelease: false
81
- requirement: &id005 !ruby/object:Gem::Requirement
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ! '>='
76
+ - !ruby/object:Gem::Version
77
+ version: '0'
78
+ - !ruby/object:Gem::Dependency
79
+ name: savon
80
+ requirement: !ruby/object:Gem::Requirement
82
81
  none: false
83
- requirements:
84
- - - ">="
85
- - !ruby/object:Gem::Version
86
- hash: 3
87
- segments:
88
- - 2
89
- - 0
90
- version: "2.0"
82
+ requirements:
83
+ - - ! '>='
84
+ - !ruby/object:Gem::Version
85
+ version: '2.0'
91
86
  type: :runtime
92
- version_requirements: *id005
93
- - !ruby/object:Gem::Dependency
94
- name: spreadsheet
95
87
  prerelease: false
96
- requirement: &id006 !ruby/object:Gem::Requirement
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ! '>='
92
+ - !ruby/object:Gem::Version
93
+ version: '2.0'
94
+ - !ruby/object:Gem::Dependency
95
+ name: spreadsheet
96
+ requirement: !ruby/object:Gem::Requirement
97
97
  none: false
98
- requirements:
99
- - - ">="
100
- - !ruby/object:Gem::Version
101
- hash: 3
102
- segments:
103
- - 0
104
- version: "0"
98
+ requirements:
99
+ - - ! '>='
100
+ - !ruby/object:Gem::Version
101
+ version: '0'
105
102
  type: :runtime
106
- version_requirements: *id006
107
- - !ruby/object:Gem::Dependency
108
- name: rspec
109
103
  prerelease: false
110
- requirement: &id007 !ruby/object:Gem::Requirement
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ! '>='
108
+ - !ruby/object:Gem::Version
109
+ version: '0'
110
+ - !ruby/object:Gem::Dependency
111
+ name: rspec
112
+ requirement: !ruby/object:Gem::Requirement
111
113
  none: false
112
- requirements:
113
- - - ">="
114
- - !ruby/object:Gem::Version
115
- hash: 3
116
- segments:
117
- - 0
118
- version: "0"
114
+ requirements:
115
+ - - ! '>='
116
+ - !ruby/object:Gem::Version
117
+ version: '0'
119
118
  type: :development
120
- version_requirements: *id007
121
- - !ruby/object:Gem::Dependency
122
- name: webmock
123
119
  prerelease: false
124
- requirement: &id008 !ruby/object:Gem::Requirement
120
+ version_requirements: !ruby/object:Gem::Requirement
125
121
  none: false
126
- requirements:
127
- - - ">="
128
- - !ruby/object:Gem::Version
129
- hash: 3
130
- segments:
131
- - 0
132
- version: "0"
122
+ requirements:
123
+ - - ! '>='
124
+ - !ruby/object:Gem::Version
125
+ version: '0'
126
+ - !ruby/object:Gem::Dependency
127
+ name: webmock
128
+ requirement: !ruby/object:Gem::Requirement
129
+ none: false
130
+ requirements:
131
+ - - ! '>='
132
+ - !ruby/object:Gem::Version
133
+ version: '0'
133
134
  type: :development
134
- version_requirements: *id008
135
- - !ruby/object:Gem::Dependency
136
- name: hoe
137
135
  prerelease: false
138
- requirement: &id009 !ruby/object:Gem::Requirement
136
+ version_requirements: !ruby/object:Gem::Requirement
139
137
  none: false
140
- requirements:
141
- - - ">="
142
- - !ruby/object:Gem::Version
143
- hash: 15
144
- segments:
145
- - 3
146
- - 4
147
- version: "3.4"
138
+ requirements:
139
+ - - ! '>='
140
+ - !ruby/object:Gem::Version
141
+ version: '0'
142
+ - !ruby/object:Gem::Dependency
143
+ name: hoe
144
+ requirement: !ruby/object:Gem::Requirement
145
+ none: false
146
+ requirements:
147
+ - - ! '>='
148
+ - !ruby/object:Gem::Version
149
+ version: '3.4'
148
150
  type: :development
149
- version_requirements: *id009
150
- - !ruby/object:Gem::Dependency
151
- name: rdoc
152
151
  prerelease: false
153
- requirement: &id010 !ruby/object:Gem::Requirement
152
+ version_requirements: !ruby/object:Gem::Requirement
154
153
  none: false
155
- requirements:
156
- - - ">="
157
- - !ruby/object:Gem::Version
158
- hash: 3
159
- segments:
160
- - 0
161
- version: "0"
162
- type: :development
163
- version_requirements: *id010
164
- - !ruby/object:Gem::Dependency
154
+ requirements:
155
+ - - ! '>='
156
+ - !ruby/object:Gem::Version
157
+ version: '3.4'
158
+ - !ruby/object:Gem::Dependency
165
159
  name: rdoc
160
+ requirement: !ruby/object:Gem::Requirement
161
+ none: false
162
+ requirements:
163
+ - - ! '>='
164
+ - !ruby/object:Gem::Version
165
+ version: '0'
166
+ type: :development
166
167
  prerelease: false
167
- requirement: &id011 !ruby/object:Gem::Requirement
168
+ version_requirements: !ruby/object:Gem::Requirement
169
+ none: false
170
+ requirements:
171
+ - - ! '>='
172
+ - !ruby/object:Gem::Version
173
+ version: '0'
174
+ - !ruby/object:Gem::Dependency
175
+ name: rdoc
176
+ requirement: !ruby/object:Gem::Requirement
168
177
  none: false
169
- requirements:
178
+ requirements:
170
179
  - - ~>
171
- - !ruby/object:Gem::Version
172
- hash: 19
173
- segments:
174
- - 3
175
- - 10
176
- version: "3.10"
180
+ - !ruby/object:Gem::Version
181
+ version: '3.10'
177
182
  type: :development
178
- version_requirements: *id011
179
- - !ruby/object:Gem::Dependency
180
- name: hoe
181
183
  prerelease: false
182
- requirement: &id012 !ruby/object:Gem::Requirement
184
+ version_requirements: !ruby/object:Gem::Requirement
185
+ none: false
186
+ requirements:
187
+ - - ~>
188
+ - !ruby/object:Gem::Version
189
+ version: '3.10'
190
+ - !ruby/object:Gem::Dependency
191
+ name: hoe
192
+ requirement: !ruby/object:Gem::Requirement
183
193
  none: false
184
- requirements:
194
+ requirements:
185
195
  - - ~>
186
- - !ruby/object:Gem::Version
187
- hash: 25
188
- segments:
189
- - 2
190
- - 13
191
- version: "2.13"
196
+ - !ruby/object:Gem::Version
197
+ version: '2.13'
192
198
  type: :development
193
- version_requirements: *id012
199
+ prerelease: false
200
+ version_requirements: !ruby/object:Gem::Requirement
201
+ none: false
202
+ requirements:
203
+ - - ~>
204
+ - !ruby/object:Gem::Version
205
+ version: '2.13'
194
206
  description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
195
207
  email: yasaka@ywesee.com, zdavatz@ywesee.com
196
- executables:
208
+ executables:
197
209
  - oddb2xml
198
210
  extensions: []
199
-
200
- extra_rdoc_files:
211
+ extra_rdoc_files:
201
212
  - History.txt
202
213
  - Manifest.txt
203
- files:
214
+ files:
204
215
  - .gitignore
205
216
  - .rspec
206
217
  - Gemfile
@@ -257,37 +268,28 @@ files:
257
268
  - .gemtest
258
269
  homepage:
259
270
  licenses: []
260
-
261
271
  post_install_message:
262
- rdoc_options:
272
+ rdoc_options:
263
273
  - --main
264
274
  - README.txt
265
- require_paths:
275
+ require_paths:
266
276
  - lib
267
- required_ruby_version: !ruby/object:Gem::Requirement
277
+ required_ruby_version: !ruby/object:Gem::Requirement
268
278
  none: false
269
- requirements:
270
- - - ">="
271
- - !ruby/object:Gem::Version
272
- hash: 3
273
- segments:
274
- - 0
275
- version: "0"
276
- required_rubygems_version: !ruby/object:Gem::Requirement
279
+ requirements:
280
+ - - ! '>='
281
+ - !ruby/object:Gem::Version
282
+ version: '0'
283
+ required_rubygems_version: !ruby/object:Gem::Requirement
277
284
  none: false
278
- requirements:
279
- - - ">="
280
- - !ruby/object:Gem::Version
281
- hash: 3
282
- segments:
283
- - 0
284
- version: "0"
285
+ requirements:
286
+ - - ! '>='
287
+ - !ruby/object:Gem::Version
288
+ version: '0'
285
289
  requirements: []
286
-
287
290
  rubyforge_project: oddb2xml
288
291
  rubygems_version: 1.8.25
289
292
  signing_key:
290
293
  specification_version: 3
291
294
  summary: oddb2xml creates xml files.
292
295
  test_files: []
293
-