oddb2xml 2.3.6 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b279006b7a02bc2158a4c4648cf8085558ba461c
-  data.tar.gz: 05670f47dd650124d5b09eae09189dfcb664c155
+  metadata.gz: f372d02cc0e7829efac3ae2dfda2f85f031d78f6
+  data.tar.gz: a5ef791e8e1e3afc811c823b2d407bdcbf3a8e26
 SHA512:
-  metadata.gz: 0e4335f32a05b00def36dcbba9816e69f518a9e5d15af88610eff955b651ae154ada3e046ec0d3c8dd0073993b729607305869928e5e23b55d1c45bedfe33542
-  data.tar.gz: 21b5c2dfaa6b45eec587d86ced6499f67b6404d6f7c4a42dec5e264dcbb56a37a81541b56eeac6e74c9cd0346463295d2e9c3c295e3d932d184c1eb3ad1432a9
+  metadata.gz: a443f4fce853675f60aeddad4044a862e341597be1d3d1554f5f7dccb73ada07ed15aff04261e0adda1f86ab6154c580efd270e816d852dc1bb4173331b96678
+  data.tar.gz: bb8c5bebdb782b2f62aa976e57bc6880f1fbda0c58cea16b274fb5b634c100e25facc3a88169e2ef3138abbd383956d1073b3ca215964623c53318b432af5995

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.3.6)
+    oddb2xml (2.3.7)
       archive-tar-minitar
       httpi (>= 2.4.1)
       mechanize

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.3.7 /4.04.2016
+
+* Emit version of oddb2xml which generated the XML-file
+* Fix NBR_RECORD in generated oddb_product.xml
+* Remove unused variables length in builder.rb
+
 === 2.3.6 /16.03.2016
 
 * Generate always a PRODNO with 7 digits (5 from ISKNR, 2 from SEQNR)

data/lib/oddb2xml/builder.rb

@@ -32,6 +32,7 @@ module Oddb2xml
   'CREATION_DATETIME' => Time.new.strftime('%FT%T%z'),
   'PROD_DATE'         => Time.new.strftime('%FT%T%z'),
   'VALID_DATE'        => Time.new.strftime('%FT%T%z'),
+  'GENERATED_BY'      => "oddb2xml #{VERSION}"
   }
   class Builder
     attr_accessor :subject, :refdata, :items, :flags, :lppvs,
@@ -458,7 +459,7 @@ module Oddb2xml
       prepare_interactions
       prepare_codes
       add_missing_products_from_swissmedic
-      nbr_records = 0
+      nbr_products = 0
       Oddb2xml.log "build_product #{@products.size+@missing.size} products"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
@@ -466,15 +467,14 @@ module Oddb2xml
         emitted = []
         xml.PRODUCT(XML_OPTIONS) {
           list = []
-          length = 0
           @missing.each do |obj|
             next if /^Q/i.match(obj[:atc])
             if obj[:prodno]
               next if emitted.index(obj[:prodno])
               emitted << obj[:prodno]
             end
-            length += 1
             xml.PRD('DT' => obj[:last_change]) {
+            nbr_products += 1
             ean = obj[:ean].to_i
             xml.GTIN ean
             xml.PRODNO obj[:prodno]                                 if obj[:prodno]
@@ -498,8 +498,8 @@ module Oddb2xml
           @products.each do |ean13, obj|
             next if /^Q/i.match(obj[:atc])
             seq = obj[:seq]
-            length += 1
               xml.PRD('DT' => obj[:last_change]) do
+              nbr_products += 1
               ean = obj[:ean]
               xml.GTIN ean
               ppac = ((_ppac = @packs[ean.to_s[4..11].intern] and !_ppac[:is_tier]) ? _ppac : {})
@@ -616,12 +616,11 @@ module Oddb2xml
               xml.EinheitSwissmedic   obj[:eht] unless obj[:eht].empty?
               xml.SubstanceSwissmedic obj[:sub] unless obj[:sub].empty?
               xml.CompositionSwissmedic obj[:comp] unless obj[:comp].empty?
-              nbr_records += 1
             end
           end
           xml.RESULT {
             xml.OK_ERROR   'OK'
-            xml.NBR_RECORD nbr_records
+            xml.NBR_RECORD nbr_products
             xml.ERROR_CODE ''
             xml.MESSAGE    ''
           }
@@ -956,10 +955,8 @@ module Oddb2xml
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
         xml.KOMPENDIUM(XML_OPTIONS) {
-          length = 0
           %w[de fr].each do |lang|
             infos = @infos[lang].uniq {|i| i[:monid] }
-            length += infos.length
             infos.each do |info|
               xml.KMP(
                 'MONTYPE' => 'fi', # only
@@ -996,7 +993,6 @@ module Oddb2xml
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
         xml.KOMPENDIUM_PRODUCT(XML_OPTIONS) {
-          length = 0
           info_index = {}
           %w[de fr].each do |lang|
             @infos[lang].each_with_index do |info, i|
@@ -1112,8 +1108,8 @@ module Oddb2xml
         bag_entry_via_ean = @items.values.select do |i|
           next unless i[:packages]
           i[:packages].values.select {|_pac| _pac[:ean].to_s == de_idx[:ean].to_s }.length != 0
-        end.length
-        if bag_entry_via_ean > 0
+        end
+        if bag_entry_via_ean.length > 0
           10
         else
           nil

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.3.6"
+  VERSION = "2.3.7"
 end

data/oddb2xml.xsd

@@ -102,6 +102,7 @@
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="PROD_DATE" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="required"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="ART">
@@ -451,6 +452,7 @@
       </xs:sequence>
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="Betrieb">
@@ -507,6 +509,7 @@
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="PROD_DATE" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="CD">
@@ -530,6 +533,7 @@
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="PROD_DATE" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="CDMD">
@@ -554,6 +558,7 @@
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="PROD_DATE" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="IX">
@@ -614,6 +619,7 @@
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="PROD_DATE" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="IXMD">
@@ -674,6 +680,7 @@
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="PROD_DATE" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="LIM">
@@ -731,6 +738,7 @@
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="PROD_DATE" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="LIMMD">
@@ -802,6 +810,7 @@
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="PROD_DATE" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="PRD">
@@ -876,6 +885,7 @@
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="PROD_DATE" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="PRDMD">
@@ -938,6 +948,7 @@
       </xs:sequence>
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="Person">
@@ -986,6 +997,7 @@
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="PROD_DATE" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="SB">
@@ -1008,6 +1020,7 @@
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="PROD_DATE" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="SBMD">
@@ -1160,6 +1173,7 @@
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="PROD_DATE" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="optional"/>
     </xs:complexType>
   </xs:element>
 
@@ -1186,6 +1200,7 @@
       <xs:attribute name="CREATION_DATETIME" use="required"/>
       <xs:attribute name="PROD_DATE" use="required"/>
       <xs:attribute name="VALID_DATE" use="required"/>
+      <xs:attribute name="GENERATED_BY" use="optional"/>
     </xs:complexType>
   </xs:element>
 </xs:schema>

data/oddb_calc.xsd

@@ -136,6 +136,7 @@
       <xs:attribute type="xs:string" name="CREATION_DATETIME" />
       <xs:attribute type="xs:string" name="PROD_DATE" />
       <xs:attribute type="xs:string" name="VALID_DATE" />
+      <xs:attribute name="GENERATED_BY" use="required"/>
     </xs:complexType>
   </xs:element>
 </xs:schema>

data/spec/builder_spec.rb

@@ -413,8 +413,10 @@ def checkProductXml(nbr_record = -1)
   expect(File.exists?(product_filename)).to eq true
 
   # check products
-  doc = REXML::Document.new IO.read(product_filename)
+  content = IO.read(product_filename)
+  doc = REXML::Document.new content
   check_result(doc, nbr_record)
+  expect(nbr_record).to eq  content.scan(/<PRD/).size if nbr_record != -1
 
   desitin = checkAndGetProductWithGTIN(doc, Oddb2xml::LEVETIRACETAM_GTIN)
   expect(desitin.elements['ATC'].text).to eq('N03AX14')
@@ -592,7 +594,7 @@ if RUN_ALL
 
     it 'should generate a valid oddb_product.xml' do
       expect(@res).to match(/products/) if @res
-      checkProductXml(NrProducts)
+      checkProductXml(NrPackages)
     end
 
   end
@@ -671,7 +673,7 @@ if RUN_ALL
 
     it 'should generate a valid oddb_product.xml' do
       expect(@res).to match(/products/) if @res != nil
-      checkProductXml(NrProducts)
+      checkProductXml(NrPackages)
     end
 
     it 'should contain the correct (increased) prices' do
@@ -734,7 +736,7 @@ if RUN_ALL
     end
 
     it 'should produce a correct oddb_product.xml' do
-      checkProductXml(NrProducts)
+      checkProductXml(NrPackages)
     end
 
     it 'should report correct output on stdout' do
@@ -870,7 +872,7 @@ if RUN_ALL
     it 'should add 80 percent to zur_rose pubbprice' do
       expect(File.exists?(oddb_article_xml)).to eq true
       FileUtils.cp(oddb_article_xml, File.join(Oddb2xml::WorkDir, 'tst-e80.xml'))
-      checkProductXml(NrProducts)
+      checkProductXml(NrPackages)
       checkArticleXml
       checkPrices(true)
     end
@@ -883,7 +885,7 @@ if RUN_ALL
     end
 
     it 'should generate a correct oddb_product.xml' do
-      checkProductXml(NrProducts)
+      checkProductXml(NrPackages)
     end
 
     it 'should generate an article with the COOL (fridge) attribute' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.7
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip