oddb2xml 2.1.9 → 2.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: ce0958ffca26d93466fd9c05bb524d5e305f6de5
-  data.tar.gz: 5cd6b35fbeb42f721eeb47c6b391756b54a8bc53
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjkyNzQ2MmMwZWY1NmM3MTIzNDBjZDA4MDUzMWU2YjllYTk4ZWYwNA==
+  data.tar.gz: !binary |-
+    N2NhOTk0MWY5OTJjMGIwYjExYTUyNjQ4NzBmZTdmYmRmMDE4NGNkNw==
 SHA512:
-  metadata.gz: 0761c887bea19b8bb187327320d18f7386cdf06234a55b4237c21117b3745747c469636694c0fe1ddc0fc29d26f5b8333e5b715881c5544a1d079dc9488e49b0
-  data.tar.gz: 792e6333590c5ba828e1bba3a1506a0ca56304a88fecd4f7474ff3649ff4e7b8f042b296bdf06b24ab186b4bcf8828710f83e5ce53405dad583e20bfa00f0a42
+  metadata.gz: !binary |-
+    YjE0ZGU0MTlhNDhlODQ3MzU2ZGFkNDZmMTc5OTgwNzI3MTY4MDdmMjU1ZTZh
+    NjMyYmU3NmI2ZjQyMThkYjE3YjRkNzZkNWVmZGQ2ZTVlYjljNjY0YzM3NzNh
+    YTdiNmIwMmQzNjE3OWNjMjA1OTY0ZTUyODUxOTlkNzkxYmMzM2Y=
+  data.tar.gz: !binary |-
+    YWQyZTY3ZDU2ZWNhZWZkZjBkNjcyZWM2Yzg0MDViMzFhZTY0OTMyYjQ5MGNk
+    MzVhNTUxMzc0YzZiZjc3MDVmYTIwMWM0ZWY3MTEyNmE1MzhmNDhkOWNlODAx
+    MGY2ZWRkMmQ5M2ZhZjM0NTkwOWVmYTY5M2ZmOTkyNDEyMWVkOTY=

data/Gemfile.lock

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

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.2.0 / 24.06.2015
+
+* Use FixNum instead of String for EAN-keys into hashes
+* Improved speed (oddb2xml -e takes now less than 1 hour here)
+
 === 2.1.9 / 24.06.2015
 
 * Force version of rubyntlm to 0.5.0. Still warning: already initialized constant Net::NTLM::VERSION::MAJOR, but no error

data/lib/oddb2xml/builder.rb

@@ -1,4 +1,4 @@
-  # encoding: utf-8
+# encoding: utf-8
 
 require 'nokogiri'
 require 'oddb2xml/util'
@@ -98,9 +98,9 @@ module Oddb2xml
         end
         # add
         @migel.values.compact.each do |migel|
-          next if migel[:pharmacode].empty?
+          next unless migel[:pharmacode]
           entry = {
-            :ean             => migel[:ean],
+            :ean             => migel[:ean].to_i,
             :pharmacode      => migel[:pharmacode],
             :stat_date       => '',
             :desc_de            => migel[:desc_de],
@@ -120,7 +120,6 @@ module Oddb2xml
           @infos_zur_rose.each{
             |ean13, info|
           nrItems += 1
-          Oddb2xml.log("prepare_articles: nrItems #{nrItems} nrAdded #{nrAdded} prices. Total #{@articles.size}") if nrItems % 100 == 0
           pharmacode = info[:pharmacode]
           if @pharmacode[pharmacode]
             @pharmacode[pharmacode][:price]     = info[:price]
@@ -129,7 +128,8 @@ module Oddb2xml
           end
           obj = {}
           found = false
-          existing = @refdata.values.find{ |x| x[:ean].eql? ean13 }
+          # existing = @refdata.values.find{ |x| x[:ean].eql? ean13 }
+          existing = @refdata[ean13]
           if existing
             found = true
             existing[:price]     = info[:price]
@@ -190,7 +190,7 @@ module Oddb2xml
         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.uniq! { |lim| lim[:id].to_s + lim[:code] + lim[:type] }
         @limitations = limitations.sort_by {|lim| lim[:code] }
         Oddb2xml.log("prepare_limitations done. Total #{@limitations.size} from #{@items.size} items")
       end
@@ -217,9 +217,10 @@ module Oddb2xml
     end
     def prepare_products
       unless @products
-        @products = []
+        @products = {}
         @refdata.each_pair do |ean13, item|
           next if item and item.is_a?(Hash) and item[:atc_code] and /^Q/i.match(item[:atc_code])
+          next if item[:prodno] and @products[item[:prodno]]
           obj = {
             :seq => @items[ean13] ? @items[ean13] : @items[item[:ean]],
             :pac => nil,
@@ -233,13 +234,13 @@ module Oddb2xml
             :comp => '',
           }
           if obj[:ean] # via EAN-Code
-            obj[:no8] = obj[:ean][4..11]
+            obj[:no8] = obj[:ean].to_s[4..11]
           end
           if obj[:no8] and ppac = @packs[obj[:no8].intern] and # Packungen.xls
               !ppac[:is_tier]
             # If RefData does not have EAN
-            if obj[:ean].nil? or obj[:ean].empty?
-              obj[:ean] = ppac[:ean].to_s
+            if obj[:ean].nil?
+              obj[:ean] = ppac[:ean].to_i
             end
             # If RefData dose not have ATC-Code
             if obj[:atc].nil? or obj[:atc].empty?
@@ -251,8 +252,12 @@ module Oddb2xml
             obj[:sub] = ppac[:substance_swissmedic]
             obj[:comp] = ppac[:composition_swissmedic]
           end
-          if obj[:ean][0..3] == '7680'
-            @products << obj
+          if obj[:ean].to_s[0..3] == '7680'
+            if item[:prodno]
+              @products[item[:prodno]] = obj
+            else
+              @products[ean13] = obj
+            end
           end
         end
       end
@@ -416,11 +421,11 @@ module Oddb2xml
       _builder.to_xml
     end
     def add_missing_products_from_swissmedic
-      Oddb2xml.log "build_product add_missing_products_from_swissmedic. Starting"
+      Oddb2xml.log "build_product add_missing_products_from_swissmedic. Starting with #{@products.size} products and #{@packs.size} @packs"
       ean13_to_product = {}
       @products.each{
-        |obj|
-        ean13_to_product[obj[:ean].to_s] = obj
+        |ean13, obj|
+        ean13_to_product[ean13] = obj
       }
       ausgabe = File.open(File.join(WorkDir, 'missing_in_refdata.txt'), 'w+')
       size_old = ean13_to_product.size
@@ -428,12 +433,13 @@ module Oddb2xml
       Oddb2xml.log "build_product add_missing_products_from_swissmedic. Imported #{size_old} ean13_to_product from @products. Checking #{@packs.size} @packs"
       @packs.each_with_index {
         |de_idx, i|
-          next if ean13_to_product[de_idx[1][:ean]]
+          ean = de_idx[1][:ean].to_i
+          next if @refdata[ean]
           list_code = de_idx[1][:list_code]
           next if list_code and /Tierarzneimittel/.match(list_code)
-          ean13_to_product[de_idx[1][:ean].to_s] = de_idx[1]
+          ean13_to_product[ean] = de_idx[1]
           @missing << de_idx[1]
-          ausgabe.puts "#{de_idx[1][:ean]},#{de_idx[1][:sequence_name]}"
+          ausgabe.puts "#{ean},#{de_idx[1][:sequence_name]}"
       }
       corrected_size = ean13_to_product.size
       Oddb2xml.log "build_product add_missing_products_from_swissmedic. Added #{(corrected_size - size_old)} corrected_size #{corrected_size} size_old #{size_old} ean13_to_product."
@@ -449,18 +455,28 @@ module Oddb2xml
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
+        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]) {
-            ean = obj[:ean].to_s
+            ean = obj[:ean].to_i
             xml.GTIN ean
             xml.PRODNO obj[:prodno]                                 if obj[:prodno]
-            xml.DSCRD  obj[:sequence_name]                          if obj[:sequence_name]
-            xml.DSCRF  obj[:sequence_name]                          if obj[:sequence_name]
+            if refdata = @refdata[ean]
+              xml.DSCRD  refdata[:desc_de]
+              xml.DSCRF  refdata[:desc_fr]
+            else
+              xml.DSCRD  obj[:sequence_name]                        if obj[:sequence_name]
+              xml.DSCRF  obj[:sequence_name]                        if obj[:sequence_name]
+            end
             xml.ATC obj[:atc_code]                                  if obj[:atc_code] and !obj[:atc_code].empty?
             xml.IT  obj[:ith_swissmedic]                            if obj[:ith_swissmedic]
             xml.CPT
@@ -470,30 +486,25 @@ module Oddb2xml
             xml.CompositionSwissmedic obj[:composition_swissmedic]  if obj[:composition_swissmedic]
                                }
           end
-          @products.sort! { |a,b| a[:ean] <=> b[:ean] }
-          @products.each do |obj|
+          # @products.sort! { |a,b| a[:ean] <=> b[:ean] }
+          @products.each do |ean13, obj|
             next if /^Q/i.match(obj[:atc])
             seq = obj[:seq]
             length += 1
               xml.PRD('DT' => obj[:last_change]) {
-              ean = obj[:ean].to_s
+              ean = obj[:ean]
               xml.GTIN ean
-              ppac = ((_ppac = @packs[ean[4..11].intern] and !_ppac[:is_tier]) ? _ppac : {})
+              ppac = ((_ppac = @packs[ean.to_s[4..11].intern] and !_ppac[:is_tier]) ? _ppac : {})
               unless ppac
                 ppac = @packs.find{|pac| pac.ean == ean }.first
               end
               xml.PRODNO ppac[:prodno] if ppac[:prodno] and !ppac[:prodno].empty?
-              if seq
-                %w[de fr].each do |l|
-                  name = "name_#{l}".intern
-                  desc = "desc_#{l}".intern
-                  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?
-                    xml.send(elem, [desc])
-                  end
-                end
+              if refdata = @refdata[ean]
+                xml.DSCRD  refdata[:desc_de]
+                xml.DSCRF  refdata[:desc_fr]
+              else
+                xml.DSCRD  obj[:sequence_name]                        if obj[:sequence_name]
+                xml.DSCRF  obj[:sequence_name]                        if obj[:sequence_name]
               end
               #xml.BNAMD
               #xml.BNAMF
@@ -734,7 +745,7 @@ module Oddb2xml
           idx += 1
           Oddb2xml.log "build_article #{idx} of #{@articles.size} articles" if idx % 500 == 0
             item = @items[obj[:ean]]
-            pac,no8 = nil,obj[:ean][4..11] # BAG-XML(SL/LS)
+            pac,no8 = nil,obj[:ean].to_s[4..11] # BAG-XML(SL/LS)
             pack_info = nil
             pack_info = @packs[no8.intern] if no8 # info from Packungen.xlsx from swissmedic_info
             ppac = nil                        # Packungen
@@ -743,7 +754,7 @@ module Oddb2xml
             next if obj[:desc_de] and /ad us vet/i.match(obj[:desc_de])
 
             pharma_code = obj[:pharmacode]
-            ean = nil if ean.match(/^000000/)
+            ean = 0 if sprintf('%013d', ean).match(/^000000/)
             if obj[:seq]
               pac = obj[:seq][:packages][obj[:pharmacode]]
               pac = obj[:seq][:packages][ean] unless pac
@@ -759,7 +770,7 @@ module Oddb2xml
             end
             xml.ART('DT' => obj[:last_change] ? obj[:last_change] : '') {
               xml.REF_DATA (obj[:refdata] || @migel[pharma_code]) ? '1' : '0'
-              xml.PHAR  obj[:pharmacode] unless obj[:pharmacode].empty?
+              xml.PHAR  sprintf('%07d', obj[:pharmacode]) if obj[:pharmacode]
               #xml.GRPCD
               #xml.CDS01
               #xml.CDS02
@@ -767,7 +778,7 @@ module Oddb2xml
                 xml.SMCAT ppac[:swissmedic_category] unless ppac[:swissmedic_category].empty?
               end
               if no8 and !no8.to_s.empty?
-                if ean and ean[0..3] == "7680"
+                if ean and ean.to_s[0..3] == "7680"
                   xml.SMNO no8.to_s
                 end
               end
@@ -793,8 +804,8 @@ module Oddb2xml
                 xml.COOL 1 if @fridges.include?($1.to_s)
               end
               #xml.TEMP
-              if ean and not ean.empty?
-                flag = @flags[ean]
+              if ean
+                flag = @flags[ean.to_s]
                 # as same flag
                 xml.CDBG(flag ? 'Y' : 'N')
                 xml.BG(flag ? 'Y' : 'N')
@@ -852,7 +863,7 @@ module Oddb2xml
               #xml.DEL
               xml.ARTCOMP {
                 # use ean13(gln) as COMPNO
-                xml.COMPNO obj[:company_ean] if obj[:company_ean] and not obj[:company_ean].empty?
+                xml.COMPNO obj[:company_ean] if obj[:company_ean] and obj[:company_ean].to_s.length > 1
                 #xml.ROLE
                 #xml.ARTNO1
                 #xml.ARTNO2
@@ -860,10 +871,10 @@ module Oddb2xml
               }
               xml.ARTBAR {
                 xml.CDTYP  'E13'
-                xml.BC     /^9999/.match(ean) ? 0 : ean
+                xml.BC     /^9999|^0000|^0$/.match(ean.to_s) ? 0 : sprintf('%013d', ean)
                 xml.BCSTAT 'A' # P is alternative
                 #xml.PHAR2
-              } if ean and not ean.empty?
+              } if ean
               #xml.ARTCH {
                 #xml.PHAR2
                 #xml.CHTYPE
@@ -981,7 +992,7 @@ module Oddb2xml
               info_index[info[:monid]] = i
             end
             # prod
-            @products.each do |prod|
+            @products.each do |ean13, prod|
               next unless  prod[:seq] and prod[:seq][:packages]
               seq = prod[:seq]
               prod[:seq][:packages].each {
@@ -1084,7 +1095,7 @@ module Oddb2xml
         # fallback via EAN
         bag_entry_via_ean = @items.values.select do |i|
           next unless i[:packages]
-          i[:packages].values.select {|_pac| _pac[:ean] == de_idx[:ean] }.length != 0
+          i[:packages].values.select {|_pac| _pac[:ean].to_s == de_idx[:ean].to_s }.length != 0
         end.length
         if bag_entry_via_ean > 0
           10
@@ -1229,7 +1240,7 @@ module Oddb2xml
                                           else
                                             ('0' * DAT_LEN[:ITHE])
                                           end.to_i
-          row << "%0#{DAT_LEN[:CEAN]}d" % (ean.match(/^000000/) ? 0 : ean.to_i)
+          row << "%0#{DAT_LEN[:CEAN]}d" % (sprintf('%013d', ean).match(/^000000/) ? 0 : ean.to_i)
           row << "%#{DAT_LEN[:CMWS]}s"  % '2' # pharma
           rows << row
       end

data/lib/oddb2xml/cli.rb

@@ -90,7 +90,6 @@ module Oddb2xml
     private
     def build
       Oddb2xml.log("Start build")
-      puts "#{File.basename(__FILE__)}:#{__LINE__}: @refdata_types.keys #{@refdata_types.keys}"
       begin
         # require 'pry'; binding.pry
         @_files = {"calc"=>"oddb_calc.xml"} if @options[:calc] and not @options[:extended]
@@ -163,19 +162,24 @@ module Oddb2xml
         begin # instead of Thread.new do
           downloader = MedregbmDownloader.new(what)
           str = downloader.download
+          Oddb2xml.log("SwissmedicInfoDownloader #{what} str #{str.size} bytes")
           self.instance_variable_set(
             "@#{var}".intern,
-            MedregbmExtractor.new(str, what).to_arry
+            items = MedregbmExtractor.new(str, what).to_arry
           )
+          Oddb2xml.log("MedregbmExtractor #{what} added #{items.size} fachinfo")
+          items
         end
       when :fachinfo
         begin # instead of Thread.new do
           downloader = SwissmedicInfoDownloader.new
           xml = downloader.download
+          Oddb2xml.log("SwissmedicInfoDownloader #{var} xml #{xml.size} bytes")
           @mutex.synchronize do
             hsh = SwissmedicInfoExtractor.new(xml).to_hash
             @infos = hsh
             Oddb2xml.log("SwissmedicInfoExtractor added #{@infos.size} fachinfo")
+            @infos
           end
         end
       when :orphan, :fridge
@@ -183,34 +187,41 @@ module Oddb2xml
         begin # instead of Thread.new do
           downloader = SwissmedicDownloader.new(what)
           bin = downloader.download
+          Oddb2xml.log("SwissmedicDownloader #{var} bin #{bin.size} bytes")
           self.instance_variable_set(
             "@#{var}".intern,
-            SwissmedicExtractor.new(bin, what).to_arry
+            items = SwissmedicExtractor.new(bin, what).to_arry
           )
-#          Oddb2xml.log("SwissmedicExtractor added #{self.instance_variable_get("@#{var}".intern).size} #{var}. File #{bin} was #{File.size(bin)} bytes")
+          Oddb2xml.log("SwissmedicExtractor added #{items.size} #{var}. File #{bin} was #{File.size(bin)} bytes")
+          items
         end
       when :interaction
         begin # instead of Thread.new do
           downloader = EphaDownloader.new
           str = downloader.download
+          Oddb2xml.log("EphaDownloader str #{str.size} bytes")
           @mutex.synchronize do
             @actions = EphaExtractor.new(str).to_arry
             Oddb2xml.log("EphaExtractor added #{@actions.size} interactions")
+            @actions
           end
         end
       when :migel
         begin # instead of Thread.new do
           downloader = MigelDownloader.new
           bin = downloader.download
+          Oddb2xml.log("MigelDownloader bin #{bin.size} bytes")
           @mutex.synchronize do
             @migel = MigelExtractor.new(bin).to_hash
             Oddb2xml.log("MigelExtractor added #{@migel.size} migel items")
+            @migel
           end
         end
       when :package
         begin # instead of Thread.new do
           downloader = SwissmedicDownloader.new(:package, @options)
           bin = downloader.download
+          Oddb2xml.log("SwissmedicDownloader bin #{bin.size} bytes")
           @mutex.synchronize do
             @packs = SwissmedicExtractor.new(bin, :package).to_hash
             Oddb2xml.log("SwissmedicExtractor added #{@packs.size} packs from #{bin}")
@@ -221,38 +232,44 @@ module Oddb2xml
         begin # instead of Thread.new do
           downloader = BMUpdateDownloader.new
           str = downloader.download
+          Oddb2xml.log("BMUpdateDownloader str #{str.size} bytes")
           @mutex.synchronize do
             @flags = BMUpdateExtractor.new(str).to_hash
             Oddb2xml.log("BMUpdateExtractor added #{@flags.size} flags")
+            @flags
           end
         end
       when :lppv
         begin # instead of Thread.new do
           downloader = LppvDownloader.new
           str = downloader.download
+          Oddb2xml.log("LppvDownloader str #{str.size} bytes")
           @mutex.synchronize do
             @lppvs = LppvExtractor.new(str).to_hash
             Oddb2xml.log("LppvExtractor added #{@lppvs.size} lppvs")
+            @lppvs
           end
         end
       when :bag
         begin # instead of Thread.new do
           downloader = BagXmlDownloader.new(@options)
           xml = downloader.download
+          Oddb2xml.log("BagXmlDownloader xml #{xml.size} bytes")
           @mutex.synchronize do
             hsh = BagXmlExtractor.new(xml).to_hash
             @items = hsh
-            Oddb2xml.log("BagXmlDownloader added #{@items.size} items. #{@items.keys}")
+            Oddb2xml.log("BagXmlExtractor added #{@items.size} items.")
+            @items
           end
         end
       when :zurrose
         begin # instead of Thread.new do
           downloader = ZurroseDownloader.new(@options, @options[:transfer_dat])
           xml = downloader.download
-          Oddb2xml.log("zurrose xml #{xml.size} bytes")
+          Oddb2xml.log("ZurroseDownloader xml #{xml.size} bytes")
           @mutex.synchronize do
             hsh = ZurroseExtractor.new(xml, @options[:extended]).to_hash
-            Oddb2xml.log("zurrose added #{hsh.size} items from xml with #{xml.size} bytes")
+            Oddb2xml.log("ZurroseExtractor added #{hsh.size} items from xml with #{xml.size} bytes")
             @infos_zur_rose = hsh
           end
         end
@@ -261,7 +278,7 @@ module Oddb2xml
           downloader = RefdataDownloader.new(@options, type)
           begin
             xml = downloader.download
-            Oddb2xml.log("refdata #{type} xml #{xml.size} bytes")
+            Oddb2xml.log("RefdataDownloader #{type} xml #{xml.size} bytes")
             xml
           rescue SystemExit
             @mutex.synchronize do
@@ -274,7 +291,8 @@ module Oddb2xml
           @mutex.synchronize do
             hsh = RefdataExtractor.new(xml, type).to_hash
             @refdata_types[type] = hsh
-            Oddb2xml.log("refdata #{type} added #{hsh.size} keys now #{@refdata_types.keys} items from xml with #{xml.size} bytes")
+            Oddb2xml.log("RefdataExtractor #{type} added #{hsh.size} keys now #{@refdata_types.keys} items from xml with #{xml.size} bytes")
+            @refdata_types[type]
           end
         end
       end
@@ -332,7 +350,7 @@ module Oddb2xml
           if @refdata_types[type]
             indices = @refdata_types[type].values.flatten.length
             if type == :nonpharma
-              migel_xls  = @migel.values.compact.select{|m| !m[:pharmacode].empty? }.map{|m| m[:pharmacode] }
+              migel_xls  = @migel.values.compact.select{|m| !m[:pharmacode]}.map{|m| m[:pharmacode] }
               nonpharmas = @refdata_types[type].keys
               indices += (migel_xls - nonpharmas).length # ignore duplicates, null
               lines << sprintf("\tNonPharma products: %i", indices)

data/lib/oddb2xml/downloader.rb

@@ -202,7 +202,7 @@ module Oddb2xml
         end
       end
       content = read_xml_from_zip(/Preparations.xml/, File.join(Downloads, File.basename(file)))
-      FileUtils.rm_f(file, :verbose => false) unless defined?(Rspec)
+      FileUtils.rm_f(file, :verbose => false) unless defined?(RSpec)
       content
     end
   end

data/lib/oddb2xml/extractor.rb

@@ -27,13 +27,6 @@ module Oddb2xml
     def initialize(xml)
       @xml = xml
     end
-    def correct_code(pharmacode, length=7)
-      if pharmacode.length != length # restore zero at the beginnig
-        ("%0#{length}i" % pharmacode.to_i)
-      else
-        pharmacode
-      end
-    end
   end
   class BMUpdateExtractor < Extractor
     include TxtExtractorMethods
@@ -79,11 +72,10 @@ module Oddb2xml
         item[:pharmacodes] = []
         item[:packages]    = {} # pharmacode => package
         seq.Packs.Pack.each do |pac|
-          phar = pac.Pharmacode
-          phar = correct_code(phar.to_s, 7)
-          ean = pac.GTIN
-          binding.pry if pac.GTIN.to_s.eql? '7680324750190'  # lansoyl
-          search_key = phar.to_i != 0 ? phar : ean
+          phar = pac.Pharmacode.to_i
+          ean = pac.GTIN.to_i
+          # search_key = phar.to_i != 0 ? phar : ean
+          search_key = ean != 0 ? ean : phar
           # as common key with RefData Pharma/NonPharma data
           item[:pharmacodes] << phar
           # packages
@@ -141,7 +133,7 @@ module Oddb2xml
             end
             if id.empty? or id == '0'
               key = :pharmacode
-              id  = phar.to_s
+              id  = phar.to_i
             end
             lims.each do |lim|
               limitation = {
@@ -191,16 +183,16 @@ module Oddb2xml
         item = {}
         item[:refdata]         = true
         item[:_type]           = (typ  = pac.ATYPE.downcase.to_sym)  ? typ: ''
-        item[:ean]             = (gtin = pac.GTIN)   ? gtin: ''
-        item[:pharmacode]      = (phar = pac.PHAR)   ? phar: ''
+        item[:ean]             = (gtin = pac.GTIN.to_i)   ? gtin: 0
+        item[:pharmacode]      = (phar = pac.PHAR.to_i)   ? phar: 0
         item[:last_change]     = (date = Time.parse(pac.DT).to_s)  ? date: ''  # Date and time of last data change
         item[:desc_de]         = (dscr = pac.NAME_DE)   ? dscr: ''
         item[:desc_fr]         = (dscr = pac.NAME_FR)   ? dscr: ''
         item[:atc_code]        = (code = pac.ATC)    ? code.to_s : ''
 				item[:company_name] = (nam = pac.AUTH_HOLDER_NAME) ? nam: ''
 				item[:company_ean]  = (gln = pac.AUTH_HOLDER_GLN)  ? gln: ''
-        unless item[:pharmacode].empty?
-          item[:pharmacode] = correct_code(item[:pharmacode].to_s, 7)
+        unless item[:pharmacode]
+          item[:pharmacode] = phar
           unless data[item[:pharmacode]] # pharmacode => GTINs
             data[item[:ean]] = []
           end
@@ -322,18 +314,18 @@ module Oddb2xml
       data = {}
       @sheet.each_with_index do |row, i|
         next if i.zero?
-        phar = correct_code(row[1].to_s.gsub(/[^0-9]/, ''), 7)
-        ean = row[0].to_i.to_s
-        ean = '9999'+phar+'99' unless ean.length == 13
+        phar = row[1].to_i
+        ean = row[0].to_i
+        ean = phar unless ean.to_s.length == 13
         data[ean] = {
           :refdata         => true,
           :ean             => ean,
-          :pharmacode      => phar,
+          :pharmacode      => phar.to_i,
           :desc_de         => row[3],
           :desc_fr         => row[4],
           :quantity        => row[5], # quantity
           :company_name    => row[6],
-          :company_ean     => row[7].to_i.to_s,
+          :company_ean     => row[7].to_i,
         }
       end
       data
@@ -476,12 +468,12 @@ module Oddb2xml
         else
           next unless line =~ /(7680\d{9})(\d{1})$/
         end
-        pharma_code = line[3..9]
+        pharma_code = line[3..9].to_i
         if $1.to_s == '0000000000000'
           @@items_without_ean13s += 1
-          ean13 = '000000' + pharma_code # dummy ean13
+          ean13 = pharma_code # dummy ean13
         else
-          ean13 = $1.to_s
+          ean13 = $1.to_i
         end
         if data[ean13]
           @@error_file.puts "Duplicate ean13 #{ean13} in line \nact: #{line.chomp}\norg: #{data[ean13][:line]}"

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.1.9"
+  VERSION = "2.2.0"
 end

data/oddb2xml.gemspec

@@ -40,5 +40,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rdoc"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "timecop"
+  # spec.add_development_dependency "ruby-prof"
 end
 

data/spec/builder_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require "rexml/document"
 include REXML
-RUN_ALL = false
+RUN_ALL = true
 def checkItemForRefdata(doc, pharmacode, isRefdata)
   article = XPath.match( doc, "//ART[PHAR=#{pharmacode.to_s}]").first
   name =     article.elements['DSCRD'].text
@@ -113,6 +113,7 @@ end
 def checkAndGetProductWithGTIN(doc, gtin)
   products = XPath.match( doc, "//PRD[GTIN=#{gtin.to_s}]")
   gtins    = XPath.match( doc, "//PRD[GTIN=#{gtin.to_s}]/GTIN")
+  binding.pry unless gtins.size == 1
   gtins.size.should eq 1
   gtins.first.text.should eq gtin.to_s
   # return product
@@ -176,8 +177,8 @@ def checkProductXml
   doc = REXML::Document.new IO.read(product_filename)
   desitin = checkAndGetProductWithGTIN(doc, Oddb2xml::LEVETIRACETAM_GTIN)
   desitin.elements['ATC'].text.should == 'N03AX14'
-  desitin.elements['DSCRD'].text.should == "Levetiracetam DESITIN Minipacks mit Mini-Filmtabl 250 mg "
-  desitin.elements['DSCRF'].text.should == 'Levetiracetam DESITIN minipacks avec cpr pell mini 250 mg '
+  desitin.elements['DSCRD'].text.should == "LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk"
+  desitin.elements['DSCRF'].text.should == 'LEVETIRACETAM DESITIN mini cpr pel 250 mg 30 pce'
   desitin.elements['PRODNO'].text.should eq '620691'
   desitin.elements['IT'].text.should eq '01.07.1.'
   desitin.elements['PackGrSwissmedic'].text.should eq '30'
@@ -208,11 +209,9 @@ end
 
 describe Oddb2xml::Builder do
   NrExtendedArticles = 86
-  NrNonPharmaArticles = 66
-  NrPharmaArticles = 8
   NrSubstances = 12
-  NrProdno = 20
-  NrPackages = 21
+  NrProdno = 19
+  NrPackages = 20
   RegExpDesitin = /1125819012LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk/
   include ServerMockHelper
   def common_run_init
@@ -333,7 +332,11 @@ end
       options = Oddb2xml::Options.new
       options.parser.parse!('-e'.split(' '))
       Oddb2xml::Cli.new(options.opts)
-      @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
+      if RUN_ALL
+        @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
+      else
+        Oddb2xml::Cli.new(options.opts).run
+      end
     end
 
     it 'should emit a correct oddb_article.xml' do
@@ -345,9 +348,9 @@ end
     end
 
     it 'should report correct output on stdout' do
-      @res.should match(/NonPharma products/)
-      @res.should match(/NonPharma products: #{NrNonPharmaArticles}/)
-    end
+      @res.should match(/\sPharma products: \d+/)
+      @res.should match(/\sNonPharma products: \d+/)
+    end if RUN_ALL
 
     it 'should contain the correct (normal) prices' do
       checkPrices(false)
@@ -359,7 +362,7 @@ end
       checkItemForRefdata(doc, "1699947", 1) # 3TC Filmtabl 150 mg SMNO 53662013 IKSNR 53‘662, 53‘663
       checkItemForRefdata(doc, "0598003", 0) # SOFRADEX Gtt Auric 8 ml
       checkItemForRefdata(doc, "5366964", 1) # 1-DAY ACUVUE moist jour
-      novopen = checkItemForRefdata(doc, "3036984", 0) # NovoPen 4 Injektionsgerät blue In NonPharma (a MiGel product)
+      novopen = checkItemForRefdata(doc, "3036984", 1) # NovoPen 4 Injektionsgerät blue In NonPharma (a MiGel product)
       expect(novopen.elements['ARTBAR/BC'].text).to eq '0'
     end
 
@@ -388,6 +391,7 @@ end
       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| x.text.match('002771') }.size.should == 0
       XPath.match( doc, "//PRODNO" ).find_all{|x| x.text.match('620691') }.size.should == 1
     end
 

data/spec/cli_spec.rb

@@ -44,6 +44,16 @@ describe Oddb2xml::Cli do
     cleanup_compressor
   end
 
+  context 'when -x address option is given' do
+    before(:all) do
+      cleanup_directories_before_run
+      options = Oddb2xml::Options.new
+      options.parser.parse!('-e --log'.split(' '))
+      @cli = Oddb2xml::Cli.new(options.opts)
+      @cli_output = buildr_capture(:stdout) { @cli.run }
+    end
+  end
+if true
   context 'when -t md option is given' do
     before(:all) do
       cleanup_directories_before_run
@@ -288,3 +298,4 @@ describe Oddb2xml::Cli do
     end
   end
 end
+end

data/spec/downloader_spec.rb

@@ -140,7 +140,6 @@ if true
           puts "#{Time.now}: URI was #{i.request.uri}"
           m = /filename=.([^\d]+)/.match(i.response.headers['Content-Disposition'][0])
           puts "#{Time.now}: SwissmedicDownloader #{m[1]} (#{i.response.body.size} bytes)."
-          # binding.pry
           if m and true
             name = m[1].chomp('_')
             swissmedic_dir = File.join(Oddb2xml::WorkDir, 'swissmedic')

data/spec/extractor_spec.rb

@@ -41,9 +41,10 @@ describe Oddb2xml::MigelExtractor do
   after(:all) { VCR.eject_cassette }
   it "should have at some items" do
     expect(@items.size).not_to eq 0
-    expect(@items.find{|k,v| /3248410/i.match(v[:pharmacode]) }).not_to be_nil
+    expect(@items.find{|k,v| 3248410 == v[:pharmacode] }).not_to be_nil
     expect(@items.find{|k,v| /Novopen/i.match(v[:desc_de]) }).not_to be_nil
-    expect(@items.find{|k,v| /3036984/i.match(v[:pharmacode]) }).not_to be_nil
+    expect(@items.find{|k,v| 3036984 == v[:pharmacode] }).not_to be_nil
+    expect(@items.find{|k,v| /Epimineral/i.match(v[:desc_de]) }).not_to be_nil
   end
 end
 
@@ -59,12 +60,12 @@ describe Oddb2xml::RefdataExtractor do
 
     it "should have correct info for pharmacode 1699947 correctly" do
       @pharma_items = subject.to_hash
-      pharma_code_LEVETIRACETAM = "5819012"
+      pharma_code_LEVETIRACETAM = 5819012
       item_found = @pharma_items.values.find{ |x| x[:pharmacode].eql?(pharma_code_LEVETIRACETAM)}
       expect(item_found).not_to be nil
       expected = { :refdata=>true,
         :_type=>:pharma,
-        :ean=> Oddb2xml::LEVETIRACETAM_GTIN,
+        :ean=> Oddb2xml::LEVETIRACETAM_GTIN.to_i,
         :pharmacode=> pharma_code_LEVETIRACETAM,
         :last_change => "2015-06-04 00:00:00 +0000",
         :desc_de=>"LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk",
@@ -85,12 +86,12 @@ describe Oddb2xml::RefdataExtractor do
 
     it "should have correct info for nonpharma with pharmacode 0058502 correctly" do
       @non_pharma_items = subject.to_hash
-      pharma_code_TUBEGAZE = '0058519'
+      pharma_code_TUBEGAZE = 58519
       item_found = @non_pharma_items.values.find{ |x| x[:pharmacode].eql?(pharma_code_TUBEGAZE)}
       expect(item_found).not_to be nil
       expected = {:refdata=>true,
       :_type=>:nonpharma,
-      :ean=>"7611600441020",
+      :ean=>7611600441020,
       :pharmacode=>pharma_code_TUBEGAZE,
       :last_change => "2015-06-04 00:00:00 +0000",
       :desc_de=>"TUBEGAZE Verband weiss Nr 12 20m Finger gross",
@@ -114,23 +115,24 @@ describe Oddb2xml::BagXmlExtractor do
     end
     it "should handle pub_price for 1699947 correctly" do
       @items = subject.to_hash
-      with_pharma = @items['1699947']
+      with_pharma = @items[Oddb2xml::THREE_TC_GTIN]
       expect(with_pharma).not_to be_nil
+      expect(with_pharma[:name_de]).to eq '3TC'
       expect(with_pharma[:atc_code]).not_to be_nil
-      expect(with_pharma[:pharmacodes]).not_to be_nil
+      expect(with_pharma[:pharmacodes]).to eq [1699947]
       expect(with_pharma[:packages].size).to eq(1)
-      expect(with_pharma[:packages].first[0]).to eq('1699947')
+      expect(with_pharma[:packages].first[0]).to eq(Oddb2xml::THREE_TC_GTIN)
       expect(with_pharma[:packages].first[1][:prices][:pub_price][:price]).to eq('205.3')
       expect(@items.size).to eq(5)
     end
     it "should handle pub_price for 7680620690084 correctly" do
       @items = subject.to_hash
-      no_pharma = @items['7680620690084']
+      no_pharma = @items[7680620690084]
       expect(no_pharma).not_to be_nil
       expect(no_pharma[:atc_code]).not_to be_nil
       expect(no_pharma[:pharmacodes]).not_to be_nil
       expect(no_pharma[:packages].size).to eq(1)
-      expect(no_pharma[:packages].first[0]).to eq('7680620690084')
+      expect(no_pharma[:packages].first[0]).to eq(7680620690084)
       expect(no_pharma[:packages].first[1][:prices][:pub_price][:price]).to eq('27.8')
     end
   end
@@ -253,7 +255,7 @@ describe Oddb2xml::ZurroseExtractor do
       Oddb2xml::ZurroseExtractor.new(dat)
     end
     it { expect(subject.to_hash.keys.length).to eq(1) }
-    it { expect(subject.to_hash.keys.first).to eq("7680316440115") }
+    it { expect(subject.to_hash.keys.first).to eq(7680316440115) }
     it { expect(subject.to_hash.values.first[:price]).to eq("8.95") }
   end
   context 'when Estradiol Creme is given' do
@@ -264,11 +266,11 @@ describe Oddb2xml::ZurroseExtractor do
       Oddb2xml::ZurroseExtractor.new(dat)
     end
     it { expect(subject.to_hash.keys.length).to eq(1) }
-    it { expect(subject.to_hash.keys.first).to eq("7680284070840") }
+    it { expect(subject.to_hash.keys.first).to eq(7680284070840) }
     it { expect(subject.to_hash.values.first[:vat]).to eq("2") }
     it { expect(subject.to_hash.values.first[:price]).to eq("9.40") }
     it { expect(subject.to_hash.values.first[:pub_price]).to eq("16.30") }
-    it { expect(subject.to_hash.values.first[:pharmacode]).to eq("0921929") }
+    it { expect(subject.to_hash.values.first[:pharmacode]).to eq(921929) }
   end
   context 'when SELSUN Shampoo is given' do
     subject do
@@ -278,11 +280,11 @@ describe Oddb2xml::ZurroseExtractor do
       Oddb2xml::ZurroseExtractor.new(dat)
     end
     it { expect(subject.to_hash.keys.length).to eq(1) }
-    it { expect(subject.to_hash.keys.first).to eq("7680172330681") }
+    it { expect(subject.to_hash.keys.first).to eq(7680172330681) }
     it { expect(subject.to_hash.values.first[:vat]).to eq("2") }
     it { expect(subject.to_hash.values.first[:price]).to eq("15.76") }
     it { expect(subject.to_hash.values.first[:pub_price]).to eq("24.30") }
-    it { expect(subject.to_hash.values.first[:pharmacode]).to eq("0020652") }
+    it { expect(subject.to_hash.values.first[:pharmacode]).to eq(20652) }
     it 'should set the correct SALECD cmut code' do expect(subject.to_hash.values.first[:cmut]).to eq("2")  end
   end
   context 'when SOFRADEX is given' do
@@ -303,7 +305,7 @@ describe Oddb2xml::ZurroseExtractor do
       DAT
       Oddb2xml::ZurroseExtractor.new(dat, true)
     end
-    it { expect(subject.to_hash.keys.first).to eq("0000008807890") }
+    it { expect(subject.to_hash.keys.first).to eq(8807890) }
     it "should set the correct SALECD cmut code" do expect(subject.to_hash.values.first[:cmut]).to eq("2") end
     it "should set the correct SALECD description" do expect(subject.to_hash.values.first[:description]).to match(/Ethacridin lactat 1.+ 100ml/) end
   end

data/spec/spec_helper.rb

@@ -65,23 +65,23 @@ module Oddb2xml
                   '7680555580054', # ZYVOXID
                   '7680620690084', # LEVETIRACETAM DESITIN Mini Filmtab 250 mg needed for extractor_spec.rb
                   ] + GTINS_CALC
-    FERRO_GRADUMET_GTIN           = '7680316440115'
-    FIRST_DAY_ACUVUE_GTIN         = '733905577161'
-    HIRUDOID_GTIN                 = '7680161050583'
-    LANSOYL_GTIN                  = '7680324750190'
+    FERRO_GRADUMET_GTIN           = 7680316440115
+    FIRST_DAY_ACUVUE_GTIN         = 733905577161
+    HIRUDOID_GTIN                 = 7680161050583
+    LANSOYL_GTIN                  = 7680324750190
     LANSOYL_PRICE_RESELLER_PUB    = 18.95
     LANSOYL_PRICE_ZURROSE         = 10.54
     LANSOYL_PRICE_ZURROSEPUB      = 16.25
-    LEVETIRACETAM_GTIN            = '7680620690084'
+    LEVETIRACETAM_GTIN            = 7680620690084
     LEVETIRACETAM_PRICE_PPUB      = 27.8
     LEVETIRACETAM_PRICE_ZURROSE   = 13.49
     LEVETIRACETAM_PRICE_RESELLER_PUB = 24.3
-    SOFRADEX_GTIN                 = '7680316950157'
+    SOFRADEX_GTIN                 = 7680316950157
     SOFRADEX_PRICE_RESELLER_PUB   = 12.9
     SOFRADEX_PRICE_ZURROSE        = 7.18
     SOFRADEX_PRICE_ZURROSEPUB     = 15.45
-    THREE_TC_GTIN                 = '7680536620137'
-    ZYVOXID_GTIN                  = '7680555580054'
+    THREE_TC_GTIN                 = 7680536620137
+    ZYVOXID_GTIN                  = 7680555580054
 
   GTINS_MEDREG = [
     7601001380028, # Glarus

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.2.0
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sax-machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -154,126 +154,126 @@ dependencies:
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
@@ -283,9 +283,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -376,17 +376,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: oddb2xml creates xml files.