oddb2xml 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69751ba3c076df58a220d7228e9cb095be71469d3bbd3b724dc3caa794b08a47
-  data.tar.gz: d365c3755b21c38ebfb42d35b6c8104085d73020e3337a759af1406e1fe468de
+  metadata.gz: 7cc43d372c64564821c3594e837a93058f4b9aeb51bef7dd76036e694fed737a
+  data.tar.gz: 44e66c7136db33e6cbb656f070522cffe920f736a1a15ddfa2fa8363a79b3ca4
 SHA512:
-  metadata.gz: d3cca5c33e5693ce85f6caec848e8513feead69d095834de0801dbffd55bcc25b5fbd29873acc8c1501f1d209e6c614167bf2c01f241143a25c1d885b9ae4c13
-  data.tar.gz: f75d3211d0405487509db615fc97092017db6d24bb1cf6dc95efd2a2170b97bce6adff9958d4bbdd4e1ef4002ef7a50c8ee3995a67d2b734d879389186d0ca9b
+  metadata.gz: 94d01ca34a3d6d535f14f873d377c5a46ae99a28c63330fe5fe14f886f416218d75df5ab3201fd05da9c607110de05666d6297fdfb9941a3b2f61a1a87517560
+  data.tar.gz: 6313c7015702732aa1be35b404b2b87a4230adc0b20bc8600bfa55d4c7e93ce8f16bab9cc13b6748927ce4ba13d0d97862ceabed64d81ae9baed397c436fd0ac

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.8.0)
+    oddb2xml (2.8.1)
       htmlentities
       httpi
       mechanize
@@ -177,7 +177,7 @@ GEM
       webrick (~> 1.7.0)
 
 PLATFORMS
-  x86_64-linux
+  ruby
 
 DEPENDENCIES
   bundler

data/lib/oddb2xml/builder.rb

@@ -172,15 +172,19 @@ module Oddb2xml
           end
         end
         @firstbase.each do |ean13, obj|
-          entry = {
-            ean13: obj[:gtin],
-            desc_de: obj[:trade_item_description_de],
-            desc_fr: obj[:trade_item_description_fr],
-            atc_code: "",
-            company_ean: obj[:gln],
-            firstbase: true
-          }
-          if @refdata[obj[:gtin]].nil?
+          description = obj[:trade_item_description_de]
+          if description.empty?
+            description = obj[:trade_item_description_en]
+          end
+          if (!description.empty? || !obj[:trade_item_description_fr].empty?) && @refdata[obj[:gtin]].nil?
+            entry = {
+              ean13: obj[:gtin],
+              desc_de: description,
+              desc_fr: obj[:trade_item_description_fr],
+              atc_code: "",
+              company_ean: obj[:gln],
+              firstbase: true
+            }
             @articles << entry
           end
         end
@@ -595,12 +599,18 @@ module Oddb2xml
             }
           end
           @firstbase.each do |ean13, obj|
-            xml.PRD("DT" => "") {
-              xml.GTIN obj[:gtin]
-              xml.CPT
-              xml.DSCRD obj[:trade_item_description_de]
-              xml.DSCRF obj[:trade_item_description_fr]
-            }
+            description = obj[:trade_item_description_de]
+            if description.empty?
+              description = obj[:trade_item_description_en]
+            end
+            if !description.empty? || !obj[:trade_item_description_fr].empty?
+              xml.PRD("DT" => "") {
+                xml.GTIN obj[:gtin]
+                xml.CPT
+                xml.DSCRD description
+                xml.DSCRF obj[:trade_item_description_fr]
+              }
+            end
           end
           @products.sort.to_h.each do |ean13, obj|
             next if /^Q/i.match?(obj[:atc])

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.8.0"
+  VERSION = "2.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-24 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip