oddb2xml 1.0.10 → 1.1.0

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.0 / 27.12.2012
+
+* Add new additional file limitation.xml
+
 === 1.0.10 / 25.12.2012
 
 * Add ORPH and COOL from swissmedic xls

data/README.md

@@ -1,6 +1,6 @@
 # oddb2xml
 
-oddb2xml, creates xml files using swissINDEX and BAG-XML.
+oddb2xml, creates xml files using swissINDEX, BAG-XML and Swissmedic.
 
 
 ## usage

data/lib/oddb2xml/builder.rb

@@ -38,15 +38,32 @@ module Oddb2xml
       end
     end
     private
-    def build_substance
-      @substances = []
-      @items.values.uniq.each do |seq|
-        seq[:substances].each do |sub|
-          @substances << sub[:name]
+    def prepare_substances
+      unless @substances
+        @substances = []
+        @items.values.uniq.each do |seq|
+          seq[:substances].each do |sub|
+            @substances << sub[:name]
+          end
+        end
+        @substances.uniq!
+        @substances.sort!
+      end
+    end
+    def prepare_limitations
+      unless @limitations
+        @limitations = []
+        @items.values.uniq.each do |seq|
+          seq[:packages].each_value do |pac|
+            @limitations += pac[:limitations]
+          end
         end
+        @limitations.uniq!
+        @limitations.sort_by!{|lim| lim[:code] }
       end
-      @substances.uniq!
-      @substances.sort!
+    end
+    def build_substance
+      prepare_substances
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T.%7N%z')
@@ -77,7 +94,45 @@ module Oddb2xml
       end
       _builder.to_xml
     end
+    def build_limitation
+      prepare_limitations
+      _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
+        xml.doc.tag_suffix = @tag_suffix
+        datetime = Time.new.strftime('%FT%T.%7N%z')
+        xml.LIMITATION(
+          'xmlns:xsd'         => 'http://www.w3.org/2001/XMLSchema',
+          'xmlns:xsi'         => 'http://www.w3.org/2001/XMLSchema-instance',
+          'xmlns'             => 'http://wiki.oddb.org/wiki.php?pagename=Swissmedic.Datendeklaration',
+          'CREATION_DATETIME' => datetime,
+          'PROD_DATE'         => datetime,
+          'VALID_DATE'        => datetime,
+        ) {
+          @limitations.each do |lim|
+            xml.LIM('DT' => '') {
+              xml.LIMCD  lim[:code]
+              xml.IT     lim[:it]
+              xml.LIMTYP lim[:type]
+              xml.LIMVAL lim[:value]
+              xml.DSCRD  lim[:desc_de]
+              xml.DSCRF  lim[:desc_fr]
+              xml.VDAT   lim[:vdate]
+              if lim[:del]
+                xml.DEL 3
+              end
+            }
+          end
+          xml.RESULT {
+            xml.OK_ERROR   'OK'
+            xml.NBR_RECORD @limitations.length.to_s
+            xml.ERROR_CODE ''
+            xml.MESSAGE    ''
+          }
+        }
+      end
+      _builder.to_xml
+    end
     def build_product
+      prepare_substances
       # merge company info from swissINDEX
       objects = []
       objects = @items.values.uniq.map do |seq|
@@ -218,6 +273,7 @@ module Oddb2xml
       _builder.to_xml
     end
     def build_article
+      prepare_limitations
       objects = [] # base is 'DE'
       @index['DE'].each_pair do |pharmacode, index|
         object = {

data/lib/oddb2xml/cli.rb

@@ -9,6 +9,7 @@ require 'oddb2xml/compressor'
 module Oddb2xml
   class Cli
     SUBJECTS  = %w[product article]
+    ADDITIONS = %w[substance limitation]
     LANGUAGES = %w[DE FR] # EN does not exist
     def initialize(args)
       @options = args
@@ -35,7 +36,10 @@ module Oddb2xml
       threads << Thread.new do
         downloader = BagXmlDownloader.new
         xml = downloader.download
-        @items = BagXmlExtractor.new(xml).to_hash
+        @mutex.synchronize do
+          hsh = BagXmlExtractor.new(xml).to_hash
+          @items = hsh
+        end
       end
       LANGUAGES.each do |lang|
         # swissindex
@@ -52,13 +56,11 @@ module Oddb2xml
       end
       threads.map(&:join)
       build
+      compress if @options[:compress_ext]
       report
     end
     private
     def build
-      files = {}
-      prefix = (@options[:tag_suffix] || 'oddb').gsub(/^_|_$/, '').downcase
-      SUBJECTS.each{ |sbj| files[sbj] = "#{prefix}_#{sbj}.xml" }
       begin
         files.each_pair do |sbj, file|
           builder = Builder.new do |builder|
@@ -76,23 +78,9 @@ module Oddb2xml
             builder.fridges    = @fridges
             builder.tag_suffix = @options[:tag_suffix]
           end
-          if file =~ /(product)/
-            xml = builder.to_xml('substance')
-            File.open(file.gsub($1, 'substance'), 'w:utf-8'){ |fh| fh << xml }
-          end
           xml = builder.to_xml
           File.open(file, 'w:utf-8'){ |fh| fh << xml }
         end
-        if @options[:compress_ext]
-          compressor = Compressor.new(prefix, @options[:compress_ext])
-          files.values.each do |file|
-            if file =~ /(product)/
-              compressor.contents << file.gsub($1, 'substance')
-            end
-            compressor.contents << file
-          end
-          compressor.finalize!
-        end
       rescue Interrupt
         files.values.each do |file|
           if File.exist? file
@@ -102,6 +90,27 @@ module Oddb2xml
         raise Interrupt
       end
     end
+    def compress
+      compressor = Compressor.new(prefix, @options[:compress_ext])
+      files.values.each do |file|
+        if File.exists?(file)
+          compressor.contents << file
+        end
+      end
+      compressor.finalize!
+    end
+    def files
+      unless @_files
+        @_files = {}
+        (ADDITIONS + SUBJECTS).each do|sbj|
+          @_files[sbj] = "#{prefix}_#{sbj.to_s}.xml"
+        end
+      end
+      @_files
+    end
+    def prefix
+      @_prefix ||= (@options[:tag_suffix] || 'oddb').gsub(/^_|_$/, '').downcase
+    end
     def report
       lines = []
       LANGUAGES.each do |lang|
@@ -114,11 +123,12 @@ module Oddb2xml
       puts lines.join("\n")
     end
     def types # swissindex
-      if @options[:nonpharma]
-        [:pharma, :nonpharma]
-      else
-        [:pharma]
-      end
+      @_types ||= 
+        if @options[:nonpharma]
+          [:pharma, :nonpharma]
+        else
+          [:pharma]
+        end
     end
   end
 end

data/lib/oddb2xml/compressor.rb

@@ -14,7 +14,7 @@ module Oddb2xml
       super()
     end
     def finalize!
-      unless @contents.select{ |file| File.exists?(file) }.length == 3
+      if @contents.empty?
         return false
       end
       begin
@@ -35,8 +35,7 @@ module Oddb2xml
             File.unlink file
           end
         end
-      rescue => error
-        puts error
+      rescue Errno::ENOENT, StandardError
         if File.exists? @compress_file
           File.unlink @compress_file
         end

data/lib/oddb2xml/extractor.rb

@@ -23,7 +23,7 @@ module Oddb2xml
         item[:name_fr]      = (name = seq.at_xpath('.//NameFr'))        ? name.text : ''
         item[:org_gen_code] = (orgc = seq.at_xpath('.//OrgGenCode'))    ? orgc.text : ''
         item[:deductible]   = (ddbl = seq.at_xpath('.//FlagSB20'))      ? ddbl.text : ''
-        item[:atc_code]     = (orgc = seq.at_xpath('.//AtcCode'))       ? orgc.text : ''
+        item[:atc_code]     = (atcc = seq.at_xpath('.//AtcCode'))       ? atcc.text : ''
         item[:comment_de]   = (info = seq.at_xpath('.//CommentDe'))     ? info.text : ''
         item[:comment_fr]   = (info = seq.at_xpath('.//CommentFr'))     ? info.text : ''
         item[:it_code]      = ''
@@ -71,10 +71,25 @@ module Oddb2xml
             # limitation
             item[:packages][phar][:limitations] = []
             pac.xpath('.//Limitation').each do |lim|
-              item[:packages][phar][:limitations] << {
-                :code => (lic = lim.at_xpath('.//LimitationCode')) ? lic.text : '',
-                :type => (lit = lim.at_xpath('.//LimitationType')) ? lit.text : '',
+              limitation = {
+                :it      => item[:it_code],
+                :code    => (lic = lim.at_xpath('.//LimitationCode'))  ? lic.text : '',
+                :type    => (lit = lim.at_xpath('.//LimitationType'))  ? lit.text : '',
+                :value   => (liv = lim.at_xpath('.//LimitationValue')) ? liv.text : '',
+                :desc_de => (dsc = lim.at_xpath('.//DescriptionDe'))   ? dsc.text : '',
+                :desc_fr => (dsc = lim.at_xpath('.//DescriptionDe'))   ? dsc.text : '',
+                :vdate   => (dat = lim.at_xpath('.//ValidFromDate'))   ? dat.text : '',
               }
+              deleted = false
+              if upto = ((thr = lim.at_xpath('.//ValidThruDate')) ? thr.text : nil) and
+                 upto =~ /\d{2}\.\d{2}\.\d{2}/
+                begin
+                  deleted = true if Date.strptime(upto, '%d.%m.%y') >= Date.today
+                rescue ArgumentError
+                end
+              end
+              limitation[:del] = deleted
+              item[:packages][phar][:limitations] << limitation
             end
             # limitation points
             pts = pac.at_xpath('.//PointLimitations/PointLimitation/Points') # only first points

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.0.10"
+  VERSION = "1.1.0"
 end

data/spec/compressor_spec.rb

@@ -7,6 +7,8 @@ shared_examples_for 'any compressor' do
     File.stub(:unlink).and_return(false)
     @compressor.contents << File.expand_path('../data/oddb_article.xml', __FILE__)
     @compressor.contents << File.expand_path('../data/oddb_product.xml', __FILE__)
+    @compressor.contents << File.expand_path('../data/oddb_substance.xml', __FILE__)
+    @compressor.contents << File.expand_path('../data/oddb_limitation.xml', __FILE__)
     @compressor.finalize!.should == true
     compress_file = @compressor.instance_variable_get(:@compress_file)
     File.exists?(compress_file).should == true

data/spec/downloader_spec.rb

@@ -84,4 +84,35 @@ describe Oddb2xml::SwissIndexDownloader do
     end
   end
 
+describe Oddb2xml::SwissmedicDownloader do
+  include ServerMockHelper
+  before(:each) do
+    setup_swissmedic_server_mock
+    @downloader = Oddb2xml::SwissmedicDownloader.new()
+  end
+  it_behaves_like 'any downloader'
+  context 'download_by for orphans xls' do
+    let(:io) { @downloader.download_by(:orphans) }
+    it 'should return valid IO' do
+      io.should be_a IO
+      io.bytes.should_not nil
+    end
+    it 'should clean up current directory' do
+      io.should_not raise_error(Timeout::Error)
+      File.exist?('oddb_orphans.xls').should be(false)
+    end
+  end
+  context 'download_by for fridges xls' do
+    let(:io) { @downloader.download_by(:fridges) }
+    it 'should return valid IO' do
+      io.should be_a IO
+      io.bytes.should_not nil
+    end
+    it 'should clean up current directory' do
+      io.should_not raise_error(Timeout::Error)
+      File.exist?('oddb_fridges.xls').should be(false)
+    end
+  end
+end
+
 end

data/spec/spec_helper.rb

@@ -19,12 +19,13 @@ module ServerMockHelper
   def setup_server_mocks
     setup_bag_xml_server_mock
     setup_swiss_index_server_mock
+    setup_swissmedic_server_mock
   end
   def setup_bag_xml_server_mock
     # zip
-    stub_wsdl_url = 'http://bag.e-mediat.net/SL2007.Web.External/File.axd?file=XMLPublications.zip'
+    stub_zip_url = 'http://bag.e-mediat.net/SL2007.Web.External/File.axd?file=XMLPublications.zip'
     stub_response = File.read(File.expand_path('../data/XMLPublications.zip', __FILE__))
-    stub_request(:get, stub_wsdl_url).
+    stub_request(:get, stub_zip_url).
       with(:headers => {
         'Accept'          => '*/*',
         'Accept-Encoding' => 'gzip,deflate,identity',
@@ -61,6 +62,39 @@ module ServerMockHelper
           :body    => stub_response)
     end
   end
+  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'}
+    }.each_pair do |type, urls|
+      # html (dummy)
+      stub_html_url = "http://#{host}" + urls[:html]
+      stub_response = File.read(File.expand_path("../data/swissmedic_#{type.to_s}.html", __FILE__))
+      stub_request(:get, stub_html_url).
+        with(:headers => {
+          'Accept' => '*/*',
+          'Host'   => host,
+        }).
+        to_return(
+          :status  => 200,
+          :headers => {'Content-Type' => 'text/html; charset=utf-8'},
+          :body    => stub_response)
+      # xls
+      stub_xls_url  = "http://#{host}" + urls[:xls] + "/swissmedic_#{type.to_s}.xls"
+      stub_response = File.read(File.expand_path("../data/swissmedic_#{type.to_s}.xls", __FILE__))
+      stub_request(:get, stub_xls_url).
+        with(:headers => {
+          'Accept'          => '*/*',
+          'Accept-Encoding' => 'gzip,deflate,identity',
+          'Host'            => host,
+        }).
+        to_return(
+          :status  => 200,
+          :headers => {'Content-Type' => 'application/octet-stream; charset=utf-8'},
+          :body    => stub_response)
+    end
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,63 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oddb2xml
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 10
-  version: 1.0.10
 platform: ruby
-authors: 
+authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &11850420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *11850420
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &11849560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 2
-        - 13
-        version: "2.13"
+      - !ruby/object:Gem::Version
+        version: '2.13'
   type: :development
-  version_requirements: *id002
-description: ""
-email: 
+  prerelease: false
+  version_requirements: *11849560
+description: ''
+email:
 - yasaka@ywesee.com,  zdavatz@ywesee.com
-executables: 
+executables:
 - oddb2xml
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -89,37 +74,28 @@ files:
 - .gemtest
 homepage: 
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: oddb2xml
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: ""
+summary: ''
 test_files: []
-