oddb2xml 1.7.5 → 1.7.6

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.
Files changed (7) hide show
  1. data/Gemfile.lock +1 -1
  2. data/History.txt +5 -0
  3. data/bin/oddb2xml +5 -9
  4. data/lib/oddb2xml/extractor.rb +6 -3
  5. data/lib/oddb2xml/version.rb +1 -1
  6. metadata +30 -4
  7. checksums.yaml +0 -15
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- oddb2xml (1.7.4)
4
+ oddb2xml (1.7.5)
5
5
  archive-tar-minitar
6
6
  mechanize (~> 2.5.1)
7
7
  nokogiri (~> 1.5.10)
data/History.txt CHANGED
@@ -1,3 +1,8 @@
1
+ === 1.7.6 / 01.04.2014
2
+
3
+ * Write duplicated ean13s to duplicate_ean13_from_zur_rose.txt
4
+ * Removed option -ae
5
+
1
6
  === 1.7.5 / 01.04.2014
2
7
 
3
8
  * Added option -ae
data/bin/oddb2xml CHANGED
@@ -15,10 +15,8 @@ Usage:
15
15
  oddb2xml [option]
16
16
  produced files are found under data
17
17
  -a T, --append=T Additional target. T, only 'nonpharma' is available.
18
- -ae Combine options nonpharma, extended, prices from ZurRose to create a oddb_with_migel.dat file.
19
18
  -c F, --compress=F Compress format F. {tar.gz|zip}
20
- -e --extended Get also all articles (including prices) from zurrose which have an EAN13 code.
21
- (only valid if -p zurrose given)
19
+ -e --extended pharma, non-pharma plus prices and non-pharma from zurrose. Products without EAN-Code will also be listed.
22
20
  -f F, --format=F File format F, default is xml. {xml|dat}
23
21
  If F is given, -o option is ignored.
24
22
  -i I, --include=I Include target option for 'dat' format. only 'ean14' is available.
@@ -51,13 +49,11 @@ opts = {
51
49
  }
52
50
 
53
51
  parser.on('-a v', '--append v', /^nonpharma$/) {|v| opts[:nonpharma] = true }
54
- parser.on('-ae') {|v| opts[:nonpharma] = true;
55
- opts[:extended] = true;
56
- opts[:format] = :dat;
57
- opts[:price] = :zurrose;
58
- }
59
52
  parser.on('-c v', '--compress v', /^tar\.gz|zip$/){|v| opts[:compress_ext] = v }
60
- parser.on('-e', '--extended') {|v| opts[:extended] = true }
53
+ parser.on('-e', '--extended') {|v| opts[:extended] = true
54
+ opts[:nonpharma] = :true
55
+ opts[:price] = :zurrose
56
+ }
61
57
  parser.on('-f v', '--format v', /^xml|dat$/) {|v| opts[:format] = v.intern }
62
58
  parser.on('-o v', '--option v', /^fi$/) {|v| opts[:fi] = true }
63
59
  parser.on('-i v', '--include v', /^ean14$/) {|v| opts[:ean14] = true }
data/lib/oddb2xml/extractor.rb CHANGED
@@ -418,6 +418,7 @@ module Oddb2xml
418
418
  # see http://dev.ywesee.com/Bbmb/TransferDat
419
419
  def initialize(dat, extended = false)
420
420
  @@extended = extended
421
+ @@error_file ||= File.open("duplicate_ean13_from_zur_rose.txt", 'w+')
421
422
  @@items_without_ean13s ||= 0
422
423
  @@duplicated_ean13s ||= 0
423
424
  @@zur_rose_items ||= 0
@@ -439,7 +440,7 @@ module Oddb2xml
439
440
  ean13 = $1.to_s
440
441
  end
441
442
  if data[ean13]
442
- puts "Duplicate ean13 #{ean13} in line \nact: #{line.chomp}\norg: #{data[ean13][:line]}"
443
+ @@error_file.puts "Duplicate ean13 #{ean13} in line \nact: #{line.chomp}\norg: #{data[ean13][:line]}"
443
444
  @@items_without_ean13s -= 1
444
445
  @@duplicated_ean13s += 1
445
446
  next
@@ -461,8 +462,10 @@ module Oddb2xml
461
462
  end
462
463
  at_exit do
463
464
  if defined?(@@extended) and @@extended
464
- puts "Added #{@@items_without_ean13s} via pharmacodes of #{@@zur_rose_items} items when extracting the transfer.dat from \"Zur Rose\""
465
- puts " found #{@@duplicated_ean13s} lines with duplicated ean13" if @@duplicated_ean13s > 0
465
+ msg = "Added #{@@items_without_ean13s} via pharmacodes of #{@@zur_rose_items} items when extracting the transfer.dat from \"Zur Rose\""
466
+ msg += "\n found #{@@duplicated_ean13s} lines with duplicated ean13" if @@duplicated_ean13s > 0
467
+ puts msg
468
+ @@error_file.puts msg
466
469
  end
467
470
  end
468
471
  end
data/lib/oddb2xml/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Oddb2xml
2
- VERSION = "1.7.5"
2
+ VERSION = "1.7.6"
3
3
  end
metadata CHANGED
@@ -1,7 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oddb2xml
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.5
4
+ version: 1.7.6
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Yasuhiro Asaka, Zeno R.R. Davatz
@@ -13,6 +14,7 @@ dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: rubyzip
15
16
  requirement: !ruby/object:Gem::Requirement
17
+ none: false
16
18
  requirements:
17
19
  - - ~>
18
20
  - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
20
22
  type: :runtime
21
23
  prerelease: false
22
24
  version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
23
26
  requirements:
24
27
  - - ~>
25
28
  - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
27
30
  - !ruby/object:Gem::Dependency
28
31
  name: archive-tar-minitar
29
32
  requirement: !ruby/object:Gem::Requirement
33
+ none: false
30
34
  requirements:
31
35
  - - ! '>='
32
36
  - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
34
38
  type: :runtime
35
39
  prerelease: false
36
40
  version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
37
42
  requirements:
38
43
  - - ! '>='
39
44
  - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
41
46
  - !ruby/object:Gem::Dependency
42
47
  name: mechanize
43
48
  requirement: !ruby/object:Gem::Requirement
49
+ none: false
44
50
  requirements:
45
51
  - - ~>
46
52
  - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
48
54
  type: :runtime
49
55
  prerelease: false
50
56
  version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
51
58
  requirements:
52
59
  - - ~>
53
60
  - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
55
62
  - !ruby/object:Gem::Dependency
56
63
  name: nokogiri
57
64
  requirement: !ruby/object:Gem::Requirement
65
+ none: false
58
66
  requirements:
59
67
  - - ~>
60
68
  - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
62
70
  type: :runtime
63
71
  prerelease: false
64
72
  version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
65
74
  requirements:
66
75
  - - ~>
67
76
  - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
69
78
  - !ruby/object:Gem::Dependency
70
79
  name: savon
71
80
  requirement: !ruby/object:Gem::Requirement
81
+ none: false
72
82
  requirements:
73
83
  - - ~>
74
84
  - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
76
86
  type: :runtime
77
87
  prerelease: false
78
88
  version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
79
90
  requirements:
80
91
  - - ~>
81
92
  - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
83
94
  - !ruby/object:Gem::Dependency
84
95
  name: spreadsheet
85
96
  requirement: !ruby/object:Gem::Requirement
97
+ none: false
86
98
  requirements:
87
99
  - - ! '>='
88
100
  - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
90
102
  type: :runtime
91
103
  prerelease: false
92
104
  version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
93
106
  requirements:
94
107
  - - ! '>='
95
108
  - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
97
110
  - !ruby/object:Gem::Dependency
98
111
  name: rubyXL
99
112
  requirement: !ruby/object:Gem::Requirement
113
+ none: false
100
114
  requirements:
101
115
  - - ~>
102
116
  - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
104
118
  type: :runtime
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
121
+ none: false
107
122
  requirements:
108
123
  - - ~>
109
124
  - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
111
126
  - !ruby/object:Gem::Dependency
112
127
  name: bundler
113
128
  requirement: !ruby/object:Gem::Requirement
129
+ none: false
114
130
  requirements:
115
131
  - - ! '>='
116
132
  - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
118
134
  type: :development
119
135
  prerelease: false
120
136
  version_requirements: !ruby/object:Gem::Requirement
137
+ none: false
121
138
  requirements:
122
139
  - - ! '>='
123
140
  - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
125
142
  - !ruby/object:Gem::Dependency
126
143
  name: rake
127
144
  requirement: !ruby/object:Gem::Requirement
145
+ none: false
128
146
  requirements:
129
147
  - - ! '>='
130
148
  - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
132
150
  type: :development
133
151
  prerelease: false
134
152
  version_requirements: !ruby/object:Gem::Requirement
153
+ none: false
135
154
  requirements:
136
155
  - - ! '>='
137
156
  - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
139
158
  - !ruby/object:Gem::Dependency
140
159
  name: rspec
141
160
  requirement: !ruby/object:Gem::Requirement
161
+ none: false
142
162
  requirements:
143
163
  - - ! '>='
144
164
  - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
146
166
  type: :development
147
167
  prerelease: false
148
168
  version_requirements: !ruby/object:Gem::Requirement
169
+ none: false
149
170
  requirements:
150
171
  - - ! '>='
151
172
  - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
153
174
  - !ruby/object:Gem::Dependency
154
175
  name: webmock
155
176
  requirement: !ruby/object:Gem::Requirement
177
+ none: false
156
178
  requirements:
157
179
  - - ! '>='
158
180
  - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
160
182
  type: :development
161
183
  prerelease: false
162
184
  version_requirements: !ruby/object:Gem::Requirement
185
+ none: false
163
186
  requirements:
164
187
  - - ! '>='
165
188
  - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
167
190
  - !ruby/object:Gem::Dependency
168
191
  name: rdoc
169
192
  requirement: !ruby/object:Gem::Requirement
193
+ none: false
170
194
  requirements:
171
195
  - - ! '>='
172
196
  - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
174
198
  type: :development
175
199
  prerelease: false
176
200
  version_requirements: !ruby/object:Gem::Requirement
201
+ none: false
177
202
  requirements:
178
203
  - - ! '>='
179
204
  - !ruby/object:Gem::Version
@@ -257,26 +282,27 @@ files:
257
282
  homepage: https://github.com/zdavatz/oddb2xml
258
283
  licenses:
259
284
  - GPL-v2
260
- metadata: {}
261
285
  post_install_message:
262
286
  rdoc_options: []
263
287
  require_paths:
264
288
  - lib
265
289
  required_ruby_version: !ruby/object:Gem::Requirement
290
+ none: false
266
291
  requirements:
267
292
  - - ! '>='
268
293
  - !ruby/object:Gem::Version
269
294
  version: '0'
270
295
  required_rubygems_version: !ruby/object:Gem::Requirement
296
+ none: false
271
297
  requirements:
272
298
  - - ! '>='
273
299
  - !ruby/object:Gem::Version
274
300
  version: '0'
275
301
  requirements: []
276
302
  rubyforge_project:
277
- rubygems_version: 2.2.1
303
+ rubygems_version: 1.8.25
278
304
  signing_key:
279
- specification_version: 4
305
+ specification_version: 3
280
306
  summary: oddb2xml creates xml files.
281
307
  test_files:
282
308
  - spec/builder_spec.rb
checksums.yaml DELETED
@@ -1,15 +0,0 @@
1
- ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- NjdkN2Q1MWNlY2EzMmNmNTZiNWJmYWM3N2Q1ZWM5N2NlNjU5MDhkMw==
5
- data.tar.gz: !binary |-
6
- OTRiMzM1OTUyN2ZhYjhiNTg2NzQ3Mzg3MzhkMjk5NDgxNzNmZmJmMQ==
7
- SHA512:
8
- metadata.gz: !binary |-
9
- ZmU3MzM1ZDY3M2VlZGRiMjJmNDQ3OTBkM2FhNmMwOTZiNDkyODY2ODgzNTEx
10
- NDlkNTc1OTc2MzZhZTY2YTc3NzZhZWNlNjMyYzk1Njg4NmI1N2EyZjE2MTkz
11
- NWVlMDhkYjBkMDQ3ZmNhNmVkZjViMzhkMDZkYzM2NzUzZmQxM2U=
12
- data.tar.gz: !binary |-
13
- YTk3ZGY1M2MyZWMyODBmNmYyOGNiNGUyNmU0MWExMDA2ODMyZGNhNzAwYmM2
14
- OTRiN2UwOTM3NDU4ZjAzNWZmYjI0MmU4NGM5NzcxNDA2YjQzMjNmMTRkMjc2
15
- MTcyM2MzNjcyMGYwYzkxNGQwYzQzMWZhNjFhYWFhZjgzOTFiOWY=