oddb2xml 1.4.0 → 1.4.1

data/.gitignore

@@ -1,9 +1,9 @@
 *.gem
 *.rbc
-.bundle
+.bundle*
 .config
 .yardoc
-Gemfile.lock
+Gemfile.lock*
 InstalledFiles
 _yardoc
 coverage
@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version

data/Gemfile

@@ -10,7 +10,6 @@ gem 'spreadsheet'
 group :development do
   gem 'rspec'
   gem 'webmock'
-  gem 'ZenTest'
 
   gem 'hoe', '>= 3.4'
   gem 'rdoc'

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.4.1 / 15.02.2013
+
+* Add Ruby 1.8.7 support
+
 === 1.4.0 / 15.02.2013
 
 * Fix cli spec

data/Rakefile

@@ -29,7 +29,6 @@ Hoe.spec 'oddb2xml' do
   # gem.add_development_dependency
   self.extra_dev_deps << ['rspec']
   self.extra_dev_deps << ['webmock']
-  self.extra_dev_deps << ['ZenTest']
 
   self.extra_dev_deps << ['hoe', '>= 3.4']
   self.extra_dev_deps << ['rdoc']

data/lib/oddb2xml/builder.rb

@@ -112,16 +112,16 @@ module Oddb2xml
     end
     def prepare_limitations
       unless @limitations
-        @limitations = []
+        limitations = []
         @items.values.uniq.each do |seq|
           seq[:packages].each_value do |pac|
-            @limitations += pac[:limitations]
+            limitations += pac[:limitations]
           end
         end
         # ID is no longer fixed TAG (swissmedicNo8, swissmedicNo5, pharmacode)
         # limitation.xml needs all duplicate entries by this keys.
-        @limitations.uniq! {|lim| lim[:id] + lim[:code] + lim[:type] }
-        @limitations.sort_by!{|lim| lim[:code] }
+        limitations.uniq! {|lim| lim[:id] + lim[:code] + lim[:type] }
+        @limitations = limitations.sort_by {|lim| lim[:code] }
       end
     end
     def prepare_interactions
@@ -194,18 +194,18 @@ module Oddb2xml
       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')
+        datetime = Time.new.strftime('%FT%T%z')
         xml.SUBSTANCE(
           '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,
+          'VALID_DATE'        => datetime
         ) {
           @substances.each_with_index do |sub_name, i|
             xml.SB('DT' => '') {
-              xml.SUBNO (i + 1).to_i
+              xml.SUBNO((i + 1).to_i)
               #xml.NAMD
               #xml.ANAMD
               #xml.NAMF
@@ -226,14 +226,14 @@ module Oddb2xml
       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')
+        datetime = Time.new.strftime('%FT%T%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,
+          'VALID_DATE'        => datetime
         ) {
           @limitations.each do |lim|
             xml.LIM('DT' => '') {
@@ -243,7 +243,7 @@ module Oddb2xml
               when :swissmedic_number5
                 xml.SwissmedicNo5 lim[:id]
               when :pharmacode
-                xml.Pharmacode lim[:id]
+                xml.Pharmacode    lim[:id]
               end
               xml.IT         lim[:it]
               xml.LIMTYP     lim[:type]
@@ -273,14 +273,14 @@ module Oddb2xml
       prepare_codes
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
-        datetime = Time.new.strftime('%FT%T.%7N%z')
+        datetime = Time.new.strftime('%FT%T%z')
         xml.INTERACTION(
           '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,
+          'VALID_DATE'        => datetime
         ) {
           @interactions.sort_by{|ix| ix[:ixno] }.each do |ix|
             xml.IX('DT' => '') {
@@ -334,14 +334,14 @@ module Oddb2xml
       prepare_codes
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
-        datetime = Time.new.strftime('%FT%T.%7N%z')
+        datetime = Time.new.strftime('%FT%T%z')
         xml.CODE(
           '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,
+          'VALID_DATE'        => datetime
         ) {
           @codes.each_pair do |val, definition|
             xml.CD('DT' => '') {
@@ -353,7 +353,7 @@ module Oddb2xml
               #xml.DSCRMF
               #xml.DSCRD
               #xml.DSCRF
-              xml.DEL false
+              xml.DEL     false
             }
           end
           xml.RESULT {
@@ -373,14 +373,14 @@ module Oddb2xml
       prepare_codes
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
-        datetime = Time.new.strftime('%FT%T.%7N%z')
+        datetime = Time.new.strftime('%FT%T%z')
         xml.PRODUCT(
           '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,
+          'VALID_DATE'        => datetime
         ) {
           list = []
           length = 0
@@ -393,7 +393,7 @@ module Oddb2xml
                 %w[de fr].each do |l|
                   name = "name_#{l}".intern
                   desc = "desc_#{l}".intern
-                  elem = "DSCR" + l[0].upcase
+                  elem = "DSCR" + l[0].chr.upcase
                   if !seq[name].empty? and !seq[desc].empty?
                     xml.send(elem, seq[name] + ' ' + seq[desc])
                   elsif !seq[desc].empty?
@@ -471,7 +471,7 @@ module Oddb2xml
                   seq[:substances].each do |sub|
                     xml.CPTCMP {
                       xml.LINE  sub[:index]    unless sub[:index].empty?
-                      xml.SUBNO @substances.index(sub[:name]) + 1 if @substances.include?(sub[:name])
+                      xml.SUBNO(@substances.index(sub[:name]) + 1) if @substances.include?(sub[:name])
                       xml.QTY   sub[:quantity] unless sub[:quantity].empty?
                       xml.QTYU  sub[:unit]     unless sub[:unit].empty?
                       #xml.WHK
@@ -519,14 +519,14 @@ module Oddb2xml
       prepare_articles
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
-        datetime = Time.new.strftime('%FT%T.%7N%z')
+        datetime = Time.new.strftime('%FT%T%z')
         xml.ARTICLE(
           '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,
+          'VALID_DATE'        => datetime
         ) {
           @articles.each do |obj|
             obj[:de].each_with_index do |de_idx, i|
@@ -556,7 +556,7 @@ module Oddb2xml
                 #xml.ARTTYP
                 #xml.VAT
                 if de_idx
-                  xml.SALECD de_idx[:status].empty? ? 'N' : de_idx[:status]
+                  xml.SALECD(de_idx[:status].empty? ? 'N' : de_idx[:status])
                 end
                 if pac
                   #xml.INSLIM
@@ -571,8 +571,8 @@ module Oddb2xml
                 unless de_idx[:ean].empty?
                   flag = @flags[de_idx[:ean]]
                   # as same flag
-                  xml.CDBG (flag ? 'Y' : 'N')
-                  xml.BG   (flag ? 'Y' : 'N')
+                  xml.CDBG(flag ? 'Y' : 'N')
+                  xml.BG(flag ? 'Y' : 'N')
                 end
                 #xml.EXP
                 xml.QTY   de_idx[:additional_desc] unless de_idx[:additional_desc].empty?
@@ -686,14 +686,14 @@ module Oddb2xml
     def build_fi
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
-        datetime = Time.new.strftime('%FT%T.%7N%z')
+        datetime = Time.new.strftime('%FT%T%z')
         xml.KOMPENDIUM(
           '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,
+          'VALID_DATE'        => datetime
         ) {
           length = 0
           %w[de fr].each do |lang|
@@ -702,16 +702,16 @@ module Oddb2xml
               xml.KMP(
                 'MONTYPE' => 'fi', # only
                 'LANG'    => lang.upcase,
-                'DT'      => '',
+                'DT'      => ''
               ) {
                 unless info[:name].empty?
-                  xml.name { xml.p info[:name] }
+                  xml.name  { xml.p(info[:name]) }
                 end
                 unless info[:owner].empty?
-                  xml.owner { xml.p info[:owner] }
+                  xml.owner { xml.p(info[:owner]) }
                 end
-                xml.monid info[:monid] unless info[:monid].empty?
-                xml.paragraph { xml.cdata info[:paragraph] unless info[:paragraph].empty? }
+                xml.monid     info[:monid]                    unless info[:monid].empty?
+                xml.paragraph { xml.cdata(info[:paragraph]) } unless info[:paragraph].empty?
               }
             end
           end
@@ -729,14 +729,14 @@ module Oddb2xml
       prepare_products
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
-        datetime = Time.new.strftime('%FT%T.%7N%z')
+        datetime = Time.new.strftime('%FT%T%z')
         xml.KOMPENDIUM_PRODUCT(
           '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,
+          'VALID_DATE'        => datetime
         ) {
           length = 0
           info_index = {}
@@ -755,7 +755,7 @@ module Oddb2xml
                   length += 1
                 end
                 # as orphans ?
-                xml.DEL @orphans.include?(monid) ? true : false
+                xml.DEL(@orphans.include?(monid) ? true : false)
               }
             end
           end
@@ -772,13 +772,13 @@ module Oddb2xml
     def build_company
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
-        datetime = Time.new.strftime('%FT%T.%7N%z')
+        datetime = Time.new.strftime('%FT%T%z')
         xml.Betriebe(
           '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,
-          'VALID_DATE'        => datetime,
+          'VALID_DATE'        => datetime
         ) {
           @companies.each do |c|
             xml.Betrieb('DT' => '') {
@@ -808,23 +808,23 @@ module Oddb2xml
     def build_person
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
-        datetime = Time.new.strftime('%FT%T.%7N%z')
+        datetime = Time.new.strftime('%FT%T%z')
         xml.Personen(
           '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,
-          'VALID_DATE'        => datetime,
+          'VALID_DATE'        => datetime
         ) {
           @people.each do |p|
             xml.Person('DT' => '') {
-              xml.GLN_Person         p[:gln]           unless p[:gln].empty?
-              xml.Name               p[:last_name]     unless p[:last_name].empty?
-              xml.Vorname            p[:first_name]    unless p[:first_name].empty?
-              xml.PLZ                p[:post]          unless p[:post].empty?
-              xml.Ort                p[:place]         unless p[:place].empty?
-              xml.Bewilligungskanton p[:region]        unless p[:region].empty?
-              xml.Land               p[:country]       unless p[:country].empty?
+              xml.GLN_Person         p[:gln]         unless p[:gln].empty?
+              xml.Name               p[:last_name]   unless p[:last_name].empty?
+              xml.Vorname            p[:first_name]  unless p[:first_name].empty?
+              xml.PLZ                p[:post]        unless p[:post].empty?
+              xml.Ort                p[:place]       unless p[:place].empty?
+              xml.Bewilligungskanton p[:region]      unless p[:region].empty?
+              xml.Land               p[:country]     unless p[:country].empty?
               xml.Bewilligung_Selbstdispensation p[:license] unless p[:license].empty?
               xml.Diplom             p[:certificate]   unless p[:certificate].empty?
               xml.BTM_Berechtigung   p[:authorization] unless p[:authorization].empty?
@@ -846,12 +846,12 @@ module Oddb2xml
       price = price_str.split('.')
       pre = ''
       las = ''
-      pre = "%0#{int_len}d" % (price[0] ? price[0] : '0')
+      pre = "%0#{int_len}d" % (price[0] ? price[0].chr : '0')
       las = if price[1]
-              if price[1].size < frac_len
-                price[1] + "0"*(frac_len-price[2].to_s.size)
+              if price[1].chr.size < frac_len
+                price[1].chr + "0"*(frac_len-price[2].to_s.size)
               else
-                price[1][0,frac_len]
+                price[1].chr[0,frac_len]
               end
             else
               '0'*frac_len

data/lib/oddb2xml/downloader.rb

@@ -38,6 +38,12 @@ module Oddb2xml
       @agent.redirect_ok         = true
       @agent.redirection_limit   = 5
       @agent.follow_meta_refresh = true
+      if RUBY_PLATFORM =~ /mswin|mingw|bccwin|cygwin/i and
+         ENV['SSL_CERT_FILE'].nil?
+        cert_store = OpenSSL::X509::Store.new
+        cert_store.add_file(File.expand_path('../../../tools/cacert.pem', __FILE__))
+        @agent.cert_store = cert_store
+      end
     end
     protected
     def retrievable?

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &18744960 !ruby/object:Gem::Requirement
+  requirement: &16948820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18744960
+  version_requirements: *16948820
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &18743640 !ruby/object:Gem::Requirement
+  requirement: &16947060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18743640
+  version_requirements: *16947060
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &18644340 !ruby/object:Gem::Requirement
+  requirement: &16990140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18644340
+  version_requirements: *16990140
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &18643640 !ruby/object:Gem::Requirement
+  requirement: &16874220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18643640
+  version_requirements: *16874220
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &18642840 !ruby/object:Gem::Requirement
+  requirement: &17290420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *18642840
+  version_requirements: *17290420
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &18642040 !ruby/object:Gem::Requirement
+  requirement: &17280100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18642040
+  version_requirements: *17280100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18641340 !ruby/object:Gem::Requirement
+  requirement: &17275540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18641340
+  version_requirements: *17275540
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &18640240 !ruby/object:Gem::Requirement
+  requirement: &17268300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,21 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18640240
-- !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: &18639460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *18639460
+  version_requirements: *17268300
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &18588900 !ruby/object:Gem::Requirement
+  requirement: &17266380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +109,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *18588900
+  version_requirements: *17266380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &18587540 !ruby/object:Gem::Requirement
+  requirement: &17265540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18587540
+  version_requirements: *17265540
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &18585800 !ruby/object:Gem::Requirement
+  requirement: &17264500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +131,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *18585800
+  version_requirements: *17264500
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &18584860 !ruby/object:Gem::Requirement
+  requirement: &17263040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +142,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *18584860
+  version_requirements: *17263040
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables: