oddb2xml 1.8.3 → 1.8.4

data/spec/builder_spec.rb

@@ -18,6 +18,18 @@ module Kernel
   end
 end
 
+def check_validation_via_xsd
+  @oddb2xml_xsd = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb2xml.xsd'))
+  File.exists?(@oddb2xml_xsd).should be_true
+  files = Dir.glob('*.xml')
+  xsd = Nokogiri::XML::Schema(File.read(@oddb2xml_xsd))                                        
+  files.each{
+    |file|
+    doc = Nokogiri::XML(File.read(@article_xml))
+    xsd.validate(doc).each do |error|  error.message.should be_nil  end
+  }
+end
+
 describe Oddb2xml::Builder do
   NrExtendedArticles = 71
   NrPharmaAndNonPharmaArticles = 61
@@ -34,6 +46,23 @@ describe Oddb2xml::Builder do
     Dir.chdir @savedDir if @savedDir and File.directory?(@savedDir)
   end
 
+  context 'XSD-generation: ' do
+    let(:cli) do
+        opts = {}
+        @oddb2xml_xsd = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb2xml.xsd'))
+        @article_xml  = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
+        @product_xml  = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_product.xml'))
+        Oddb2xml::Cli.new(opts)
+    end
+
+    it 'should return true when validating oddb_article.xml against oddb_article.xsd' do
+      res = buildr_capture(:stdout){ cli.run }
+      File.exists?(@article_xml).should be_true
+      File.exists?(@product_xml).should be_true
+      check_validation_via_xsd
+    end
+  end
+  
   context 'should handle BAG-articles with and without pharmacode' do
     it {
       dat = File.read(File.expand_path('../data/Preparations.xml', __FILE__))
@@ -50,12 +79,16 @@ describe Oddb2xml::Builder do
       Oddb2xml::Cli.new(opts)
     end
 
+    it 'should pass validating via oddb2xml.xsd' do
+      check_validation_via_xsd
+    end
+    
     it 'should generate a valid oddb_product.xml' do
       res = buildr_capture(:stdout){ cli.run }
       res.should match(/products/)
-      article_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
-      File.exists?(article_filename).should be_true
-      article_xml = IO.read(article_filename)
+      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
+      File.exists?(@article_xml).should be_true
+      article_xml = IO.read(@article_xml)
       product_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_product.xml'))
       File.exists?(product_filename).should be_true
       unless /1\.8\.7/.match(RUBY_VERSION)
@@ -94,7 +127,8 @@ describe Oddb2xml::Builder do
         :format       => :dat,
       }
       Oddb2xml::Cli.new(opts)
-    end    
+    end
+
     it 'should generate a valid oddb_with_migel.dat' do
       res = buildr_capture(:stdout){ cli.run }
       res.should match(/products/)
@@ -106,6 +140,7 @@ describe Oddb2xml::Builder do
     end
     it "pending should match EAN of Desitin. returns 0 at the moment" 
   end
+
   context 'when option -e is given' do
     let(:cli) do
       opts = {
@@ -118,18 +153,35 @@ describe Oddb2xml::Builder do
       Oddb2xml::Cli.new(opts)
     end
 
+    it 'should pass validating via oddb2xml.xsd' do
+      check_validation_via_xsd
+    end
+    
+    it 'should not contain veterinary iksnr 47066 CANIPHEDRIN'  do
+      res = buildr_capture(:stdout){ cli.run }
+      res.should match(/NonPharma/i)
+      res.should match(/NonPharma products: #{NrPharmaAndNonPharmaArticles}/)
+      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
+      File.exists?(@article_xml).should be_true
+      article_xml = IO.read(@article_xml)
+      doc = REXML::Document.new File.new(@article_xml)
+      dscrds = XPath.match( doc, "//ART" )
+      XPath.match( doc, "//BC" ).find_all{|x| x.text.match('47066') }.size.should == 0
+      XPath.match( doc, "//DSCRD" ).find_all{|x| x.text.match(/CANIPHEDRIN/) }.size.should == 0
+    end
+
     it 'should handle not duplicate pharmacode 5366964'  do
       res = buildr_capture(:stdout){ cli.run }
       res.should match(/NonPharma/i)
       res.should match(/NonPharma products: #{NrPharmaAndNonPharmaArticles}/)
-      article_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
-      File.exists?(article_filename).should be_true
-      article_xml = IO.read(article_filename)
-      doc = REXML::Document.new File.new(article_filename)
+      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
+      File.exists?(@article_xml).should be_true
+      article_xml = IO.read(@article_xml)
+      doc = REXML::Document.new File.new(@article_xml)
       dscrds = XPath.match( doc, "//ART" )
       XPath.match( doc, "//PHAR" ).find_all{|x| x.text.match('5366964') }.size.should == 1
       dscrds.size.should == NrExtendedArticles
-      XPath.match( doc, "//PRODNO" ).find_all{|x| true}.size.should == 1
+      XPath.match( doc, "//PRODNO" ).find_all{|x| true}.size.should >= 1
       XPath.match( doc, "//PRODNO" ).find_all{|x| x.text.match('620691') }.size.should == 1
     end
 
@@ -137,10 +189,10 @@ describe Oddb2xml::Builder do
       res = buildr_capture(:stdout){ cli.run }
       res.should match(/NonPharma/i)
       res.should match(/NonPharma products: #{NrPharmaAndNonPharmaArticles}/)
-      article_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
-      File.exists?(article_filename).should be_true 
-      article_xml = IO.read(article_filename)
-      doc = REXML::Document.new File.new(article_filename)
+      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
+      File.exists?(@article_xml).should be_true
+      article_xml = IO.read(@article_xml)
+      doc = REXML::Document.new File.new(@article_xml)
       dscrds = XPath.match( doc, "//ART" )
       dscrds.size.should == NrExtendedArticles
       XPath.match( doc, "//PHAR" ).find_all{|x| x.text.match('1699947') }.size.should == 1 # swissmedic_packages Cardio-Pulmo-Rénal Sérocytol, suppositoire
@@ -166,10 +218,10 @@ describe Oddb2xml::Builder do
 
     it 'should emit a correct oddb_article.xml' do
       res = buildr_capture(:stdout){ cli.run }
-      article_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
-      File.exists?(article_filename).should be_true
-      article_xml = IO.read(article_filename)
-      doc = REXML::Document.new File.new(article_filename)
+      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
+      File.exists?(@article_xml).should be_true
+      article_xml = IO.read(@article_xml)
+      doc = REXML::Document.new File.new(@article_xml)
       unless /1\.8\.7/.match(RUBY_VERSION)
         # check articles
         article_xml.should match(/3TC/)
@@ -195,7 +247,7 @@ describe Oddb2xml::Builder do
         article_xml.should match(/7680555580054/) # ZYVOXID
         article_xml.should match(/ZYVOXID/i)
         
-        doc = REXML::Document.new File.new article_filename
+        doc = REXML::Document.new File.new @article_xml
         dscrds = XPath.match( doc, "//DSCRD" )
         dscrds.find_all{|x| x.text.match('ZYVOXID Filmtabl 600 mg') }.size.should == 1
         

data/spec/data/zurrose_transfer.dat

@@ -10,3 +10,7 @@
 1130027447ARTHROSENEX2519120 Salbe 100 g                    0012930024300000000000000000000000002
 1130028470COMPLAMIN RETARD Tabl 500 mg 60 Stk               001817003110300C020430000000000000002
 11353669641-DAY ACUVUE Moist Tag -2.00dpt BC 8.5 30 Stk     0021170037501000000000000000000000001
+1122871437CANIPHEDRIN Tabl 20 mg ad us vet. 100 Stk         001266001550400C000000076804706601832
+1122871443CANIPHEDRIN Tabl 20 mg ad us vet. 500 Stk         004872006910400C000000000000000000002
+1122871466CANIPHEDRIN Tabl 50 mg ad us vet. 100 Stk         001424001750400C000000076804706604282
+1122871472CANIPHEDRIN Tabl 50 mg ad us vet. 500 Stk         005443007580400C000000000000000000002

data/spec/extractor_spec.rb

@@ -67,7 +67,7 @@ describe Oddb2xml::SwissmedicInfoExtractor do
     it {
         filename = File.join(Oddb2xml::SpecData, 'swissmedic_package.xlsx')
         @packs = Oddb2xml::SwissmedicExtractor.new(filename, :package).to_hash
-        expect(@packs.size).to eq(14)
+        expect(@packs.size).to eq(16)
         serocytol = nil
         @packs.each{|pack|
                     serocytol = pack[1] if pack[0].to_s == '00274001'

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
+  prerelease: 
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sax-machine
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -181,6 +206,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -188,6 +214,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -221,6 +248,7 @@ files:
 - lib/oddb2xml/version.rb
 - lib/oddb2xml/xml_definitions.rb
 - oddb2xml.gemspec
+- oddb2xml.xsd
 - spec/builder_spec.rb
 - spec/cli_spec.rb
 - spec/compressor_spec.rb
@@ -272,26 +300,27 @@ files:
 homepage: https://github.com/zdavatz/oddb2xml
 licenses:
 - GPL-v2
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: oddb2xml creates xml files.
 test_files:
 - spec/builder_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDAzMTE2OWI2MWMzYzE5OTkxMjAzMmJiMzU2OWQyMmI5N2JlMGM1Nw==
-  data.tar.gz: !binary |-
-    ZWEyOWE5M2Y0ZDE3OTJlN2NlYmU5Mjg1NDcxZGEwMWQxNzk3NTljYw==
-SHA512:
-  metadata.gz: !binary |-
-    MDUzZGY0MTIzZWIxYjdmODVlYmYzZGQ2NmVlZmU0YTRjZjM4YjczM2U1MmRm
-    OWZkMDI4OWQ1YzI4MDNmZWY4NDk5ZDEwNzhjN2VhZGQxM2UxYmM5NWM2MmQy
-    NDIxNDM5MzRmMWU0NjQzZjcxOWYxYTJmNjU1MGYzY2NmODJlYWQ=
-  data.tar.gz: !binary |-
-    ZGQyZWRhMmFmZDM2ZDMyZTFjYzk1MDcyNTM2ZGJjYjMzNTY1ZjExNWJhN2Q1
-    M2I2N2RhOGQzMGZiM2ZjZDRmZDkyMmM3YjhlNTE2ZWU2ZTdkYzE1OTY2OTc1
-    OTRlNmE1ZGYwNDcyMGE3OTFjYjAxMTQ2ZTBhYTg5OTMwZGQxMmU=