oddb2xml 1.3.2 → 1.3.3

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.3.3 / 05.02.2013
+
+* Add spec example for downloading of Packungen.xls
+* Chaneg ID tag of limitation.xml
+* update to group GTINs of fi_product.xml by MONID
+
 === 1.3.2 / 04.02.2013
 
 * Fix Swissmedic-Number extract from swissmedicinfo

data/Manifest.txt

@@ -40,6 +40,8 @@ spec/data/swissmedic_info.zip
 spec/data/swissmedic_info_2.html
 spec/data/swissmedic_orphans.html
 spec/data/swissmedic_orphans.xls
+spec/data/swissmedic_packages.html
+spec/data/swissmedic_packages.xls
 spec/data/wsdl.xml
 spec/data/wsdl_nonpharma.xml
 spec/data/wsdl_pharma.xml

data/lib/oddb2xml/builder.rb

@@ -115,7 +115,9 @@ module Oddb2xml
             @limitations += pac[:limitations]
           end
         end
-        @limitations.uniq! {|lim| lim[:code] + lim[:type] }
+        # ID is no longer fixed TAG (swissmedicNo8, swissmedicNo5, pharmacode)
+        # limitation.xml needs all duplicate entries for this keys.
+        #@limitations.uniq! {|lim| lim[:] lim[:code] + lim[:type] }
         @limitations.sort_by!{|lim| lim[:code] }
       end
     end
@@ -222,15 +224,22 @@ module Oddb2xml
         ) {
           @limitations.each do |lim|
             xml.LIM('DT' => '') {
-              xml.LIMCD  lim[:key] # swissmedic_number8, swissmedic_number5 or pharmacode
-              xml.IT     lim[:it]
-              xml.LIMTYP lim[:type]
-              xml.LIMVAL lim[:value]
+              case lim[:key]
+              when :swissmedic_number8
+                xml.SwissmedicNo8 lim[:id]
+              when :swissmedic_number5
+                xml.SwissmedicNo5 lim[:id]
+              when :pharmacode
+                xml.Pharmacode lim[:id]
+              end
+              xml.IT         lim[:it]
+              xml.LIMTYP     lim[:type]
+              xml.LIMVAL     lim[:value]
               xml.LIMNAMEBAG lim[:code] # original LIMCD
-              xml.LIMNIV lim[:niv]
-              xml.DSCRD  lim[:desc_de]
-              xml.DSCRF  lim[:desc_fr]
-              xml.VDAT   lim[:vdate]
+              xml.LIMNIV     lim[:niv]
+              xml.DSCRD      lim[:desc_de]
+              xml.DSCRF      lim[:desc_fr]
+              xml.VDAT       lim[:vdate]
               if lim[:del]
                 xml.DEL 3
               end
@@ -670,7 +679,7 @@ module Oddb2xml
           length = 0
           %w[de fr].each do |lang|
             length += @infos[lang].length
-            @infos[lang].each_with_index do |info, i|
+            @infos[lang].each do |info|
               xml.KMP(
                 'MONTYPE' => 'fi', # only
                 'LANG'    => lang.upcase,
@@ -711,29 +720,28 @@ module Oddb2xml
           'VALID_DATE'        => datetime,
         ) {
           length = 0
+          info_index = {}
           %w[de fr].each do |lang|
-            info_index = {}
             @infos[lang].each_with_index do |info, i|
               info_index[info[:monid]] = i
             end
-            # prod
-            @products.each do |seq|
-              seq[:packages].values.each do |pac|
-                if pac[:swissmedic_number8] =~ /(\d{5})(\d{3})/
-                  number = $1.to_s
-                  if ((i = info_index[number]) and
-                      (pac[:ean] and pac[:ean][0..3] == '7680'))
-                    length += 1
-                    xml.KP('DT' => '') {
-                      xml.MONID @infos[lang][i][:monid]
-                      xml.GTIN  pac[:ean]
-                      xml.LANG  lang
-                      # as orphans ?
-                      xml.DEL   @orphans.include?(number) ? true : false
-                    }
+          end
+          @products.group_by{|seq| seq[:swissmedic_number5] }.
+            each_pair do |monid, products|
+            if info_index[monid]
+              xml.KP('DT' => '') {
+                xml.MONID monid
+                products.each do |seq|
+                  seq[:packages].values.each do |pac|
+                    if (pac[:ean] and pac[:ean][0..3] == '7680')
+                      length += 1
+                      xml.GTIN pac[:ean]
+                    end
                   end
                 end
-              end
+                # as orphans ?
+                xml.DEL @orphans.include?(monid) ? true : false
+              }
             end
           end
           xml.RESULT {

data/lib/oddb2xml/extractor.rb

@@ -79,20 +79,29 @@ module Oddb2xml
             limitations[:itc] = (lims = seq.xpath('.//ItCodes/ItCode/Limitations/Limitation')) ? lims.to_a : nil
             # in pac
             limitations[:pac] = (lims = pac.xpath('.//Limitations/Limitation')) ? lims.to_a : nil
-            limitations.each_pair do |key, lims|
-              key = case key
-                    when :pac
-                      item[:packages][phar][:swissmedic_number8]
-                    when :seq
-                      item[:swissmedic_number5]
-                    when :itc
-                      phar
-                    end
-              key = phar if (key.empty? or key == '0')
+            limitations.each_pair do |lim_key, lims|
+              key = ''
+              id  = ''
+              case lim_key
+              when :pac
+                key = :swissmedic_number8
+                id  = item[:packages][phar][key].to_s
+              when :seq
+                key = :swissmedic_number5
+                id  = item[key].to_s
+              when :itc
+                key = :pharmacode
+                id  = phar
+              end
+              if id.empty? or id == '0'
+                key = :pharmacode
+                id  = phar .to_s
+              end
               lims.each do |lim|
                 limitation = {
                   :it      => item[:it_code],
                   :key     => key,
+                  :id      => id,
                   :code    => (lic = lim.at_xpath('.//LimitationCode'))   ? lic.text : '',
                   :type    => (lit = lim.at_xpath('.//LimitationType'))   ? lit.text : '',
                   :value   => (liv = lim.at_xpath('.//LimitationValue'))  ? liv.text : '',

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/spec/data/swissmedic_packages.html

@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html lang="utf-8">
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body>
+  <div id="sprungmarke0_7">
+    <a title="Excel-Version Zugelassene Verpackungen*" href="/download/swissmedic_packages.xls"></a>
+  </div>
+</body>
+</html>

data/spec/downloader_spec.rb

@@ -122,6 +122,23 @@ describe Oddb2xml::SwissmedicDownloader do
       end
     end
   end
+  context 'packages' do
+    before(:each) do
+      setup_swissmedic_server_mock
+      @downloader = Oddb2xml::SwissmedicDownloader.new(:packages)
+    end
+    context 'download_by for packages xls' do
+      let(:bin) { @downloader.download }
+      it 'should return valid Binary-String' do
+        bin.should be_a String
+        bin.bytes.should_not nil
+      end
+      it 'should clean up current directory' do
+        bin.should_not raise_error(Timeout::Error)
+        File.exist?('oddb_packages.xls').should be(false)
+      end
+    end
+  end
 end
 
 describe Oddb2xml::SwissmedicInfoDownloader do

data/spec/spec_helper.rb

@@ -70,8 +70,9 @@ module ServerMockHelper
   def setup_swissmedic_server_mock
     host = 'www.swissmedic.ch'
     {
-      :orphans => {:html => '/daten/00081/index.html?lang=de',       :xls => '/download'},
-      :fridges => {:html => '/daten/00080/00254/index.html?lang=de', :xls => '/download'}
+      :orphans  => {:html => '/daten/00081/index.html?lang=de',       :xls => '/download'},
+      :fridges  => {:html => '/daten/00080/00254/index.html?lang=de', :xls => '/download'},
+      :packages => {:html => '/daten/00080/00251/index.html?lang=de', :xls => '/download'},
     }.each_pair do |type, urls|
       # html (dummy)
       stub_html_url = "http://#{host}" + urls[:html]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &20030020 !ruby/object:Gem::Requirement
+  requirement: &7463900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20030020
+  version_requirements: *7463900
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &20028900 !ruby/object:Gem::Requirement
+  requirement: &7463260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20028900
+  version_requirements: *7463260
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &20028240 !ruby/object:Gem::Requirement
+  requirement: &7462720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20028240
+  version_requirements: *7462720
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &20027320 !ruby/object:Gem::Requirement
+  requirement: &7461920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20027320
+  version_requirements: *7461920
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &20026360 !ruby/object:Gem::Requirement
+  requirement: &7461240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *20026360
+  version_requirements: *7461240
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &20025440 !ruby/object:Gem::Requirement
+  requirement: &7460680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20025440
+  version_requirements: *7460680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20024560 !ruby/object:Gem::Requirement
+  requirement: &7459980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20024560
+  version_requirements: *7459980
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &20024020 !ruby/object:Gem::Requirement
+  requirement: &7459340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20024020
+  version_requirements: *7459340
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &20023360 !ruby/object:Gem::Requirement
+  requirement: &7458660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20023360
+  version_requirements: *7458660
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &20022720 !ruby/object:Gem::Requirement
+  requirement: &7457740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *20022720
+  version_requirements: *7457740
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20022140 !ruby/object:Gem::Requirement
+  requirement: &7456780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20022140
+  version_requirements: *7456780
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20021360 !ruby/object:Gem::Requirement
+  requirement: &7456080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *20021360
+  version_requirements: *7456080
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &20020720 !ruby/object:Gem::Requirement
+  requirement: &7455140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *20020720
+  version_requirements: *7455140
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables:
@@ -203,6 +203,8 @@ files:
 - spec/data/swissmedic_info_2.html
 - spec/data/swissmedic_orphans.html
 - spec/data/swissmedic_orphans.xls
+- spec/data/swissmedic_packages.html
+- spec/data/swissmedic_packages.xls
 - spec/data/wsdl.xml
 - spec/data/wsdl_nonpharma.xml
 - spec/data/wsdl_pharma.xml