oddb2xml 1.7.3 → 1.7.5

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c63629fc30c3dc92cc4ca7bfef2f194d39ae5ee4
-  data.tar.gz: 9a39a16d9eff949f9ec69142be1654052746819b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjdkN2Q1MWNlY2EzMmNmNTZiNWJmYWM3N2Q1ZWM5N2NlNjU5MDhkMw==
+  data.tar.gz: !binary |-
+    OTRiMzM1OTUyN2ZhYjhiNTg2NzQ3Mzg3MzhkMjk5NDgxNzNmZmJmMQ==
 SHA512:
-  metadata.gz: d69ac02e7d81df3f3f0533d7ba85446732342e33cc6fe0ffeda94c5d8e8e5ab180a2a6e72799b53f4c42bf446814253eb3823f1d58a8d1fe30f8ebfd81ed15e6
-  data.tar.gz: 5d6bb6ea7c8d26e0264f7b886ecbe1482dc97e53ba377c2cc3b1ff17471d96462ee70383598aba53013aa1ed50ed96c66882587907ec3f6936b7c7560e81019e
+  metadata.gz: !binary |-
+    ZmU3MzM1ZDY3M2VlZGRiMjJmNDQ3OTBkM2FhNmMwOTZiNDkyODY2ODgzNTEx
+    NDlkNTc1OTc2MzZhZTY2YTc3NzZhZWNlNjMyYzk1Njg4NmI1N2EyZjE2MTkz
+    NWVlMDhkYjBkMDQ3ZmNhNmVkZjViMzhkMDZkYzM2NzUzZmQxM2U=
+  data.tar.gz: !binary |-
+    YTk3ZGY1M2MyZWMyODBmNmYyOGNiNGUyNmU0MWExMDA2ODMyZGNhNzAwYmM2
+    OTRiN2UwOTM3NDU4ZjAzNWZmYjI0MmU4NGM5NzcxNDA2YjQzMjNmMTRkMjc2
+    MTcyM2MzNjcyMGYwYzkxNGQwYzQzMWZhNjFhYWFhZjgzOTFiOWY=

data/.travis.yml

@@ -9,9 +9,15 @@ before_install:
 script: bundle exec rake spec
 
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1
+  - ruby-head
+  
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+
 notifications:
   email:
     recipients:

data/Gemfile

@@ -1,20 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rubyzip', '1.0.0'
-gem 'archive-tar-minitar'
-gem 'mechanize', '~> 2.5.1'
-gem 'nokogiri', '~> 1.5.10'
-gem 'savon', '>= 2.0'
-gem 'spreadsheet'
-gem 'rubyXL', '1.2.10'
-
-group :development do
-  gem 'rspec'
-  gem 'webmock'
-
-  gem 'hoe', '>= 3.4'
-  gem 'rdoc'
-end
+gemspec
 
 group :debugger do
   gem 'pry-debugger'

data/Gemfile.lock

@@ -1,29 +1,39 @@
+PATH
+  remote: .
+  specs:
+    oddb2xml (1.7.4)
+      archive-tar-minitar
+      mechanize (~> 2.5.1)
+      nokogiri (~> 1.5.10)
+      rubyXL (~> 2.5)
+      rubyzip (~> 1.0)
+      savon (~> 2.0)
+      spreadsheet
+
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
-    akami (1.2.0)
+    addressable (2.3.6)
+    akami (1.2.1)
       gyoku (>= 0.4.0)
-      nokogiri (>= 1.4.0)
+      nokogiri
     archive-tar-minitar (0.5.2)
     builder (3.2.2)
     coderay (1.1.0)
     columnize (0.3.6)
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
-    debugger (1.6.5)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    debugger (1.6.6)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.1)
+      debugger-ruby_core_source (~> 1.3.2)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.1)
+    debugger-ruby_core_source (1.3.2)
     diff-lcs (1.2.5)
-    domain_name (0.5.15)
+    domain_name (0.5.18)
       unf (>= 0.0.5, < 1.0.0)
     gyoku (1.1.1)
       builder (>= 2.1.2)
-    hoe (3.7.4)
-      rake (>= 0.8, < 11.0)
     httpi (2.1.0)
       rack
       rubyntlm (~> 0.3.2)
@@ -39,11 +49,11 @@ GEM
     method_source (0.8.2)
     mime-types (1.25.1)
     net-http-digest_auth (1.4)
-    net-http-persistent (2.9)
+    net-http-persistent (2.9.4)
     nokogiri (1.5.11)
     nori (2.3.0)
     ntlm-http (0.1.1)
-    pry (0.9.12.4)
+    pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
@@ -51,23 +61,25 @@ GEM
       debugger (~> 1.3)
       pry (~> 0.9.10)
     rack (1.5.2)
-    rake (10.1.1)
-    rdoc (4.1.0)
+    rake (10.2.2)
+    rdoc (4.1.1)
       json (~> 1.4)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.14.6)
     ruby-ole (1.2.11.7)
-    rubyXL (1.2.10)
+    rubyXL (2.5.0)
+      nokogiri (>= 1.4.4)
+      rubyzip (>= 1.0.0)
     rubyntlm (0.3.4)
-    rubyzip (1.0.0)
-    safe_yaml (0.9.7)
-    savon (2.3.3)
+    rubyzip (1.1.2)
+    safe_yaml (1.0.1)
+    savon (2.4.0)
       akami (~> 1.2.0)
       builder (>= 2.1.2)
       gyoku (~> 1.1.0)
@@ -75,8 +87,8 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 2.3.0)
       wasabi (~> 3.2.2)
-    slop (3.4.7)
-    spreadsheet (0.9.6)
+    slop (3.5.0)
+    spreadsheet (0.9.7)
       ruby-ole (>= 1.0)
     unf (0.1.3)
       unf_ext
@@ -85,7 +97,7 @@ GEM
       httpi (~> 2.0)
       mime-types (< 2.0.0)
       nokogiri (>= 1.4.0)
-    webmock (1.16.1)
+    webmock (1.17.4)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
     webrobots (0.1.1)
@@ -94,15 +106,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  archive-tar-minitar
-  hoe (>= 3.4)
-  mechanize (~> 2.5.1)
-  nokogiri (~> 1.5.10)
+  bundler
+  oddb2xml!
   pry-debugger
+  rake
   rdoc
   rspec
-  rubyXL
-  rubyzip (= 1.0.0)
-  savon (>= 2.0)
-  spreadsheet
   webmock

data/History.txt

@@ -1,29 +1,37 @@
-=== 1.7.3 / 27.02.2013
+=== 1.7.5 / 01.04.2014
+
+* Added option -ae
+
+=== 1.7.4 / 01.04.2014
+
+* Added option --extended
+
+=== 1.7.3 / 27.02.2014
 
 * Added rubyzip 1.0.0 as dependency for RubyXL in Rakefile ;/
 
-=== 1.7.2 / 27.02.2013
+=== 1.7.2 / 27.02.2014
 
 * Added rubyzip 1.0.0 as dependency for RubyXL in Gemfile.lock ;/
 
-=== 1.7.1 / 27.02.2013
+=== 1.7.1 / 27.02.2014
 
 * Added rubyzip 1.0.0 as dependency for RubyXL ;/
 
-=== 1.7.0 / 27.02.2013
+=== 1.7.0 / 27.02.2014
 
 * Added rubyXL 1.2.10 as dependency version
 
-=== 1.6.9 / 07.01.2013
+=== 1.6.9 / 07.01.2014
 
 * Updated Rakefile for rubyzip ~> 0.9.9
 * Remove *.xls/x-Files after extraction
 
-=== 1.6.8 / 07.01.2013
+=== 1.6.8 / 07.01.2014
 
 * Updated Rakefile to include rubyXL
 
-=== 1.6.7 / 07.01.2013
+=== 1.6.7 / 07.01.2014
 
 *  Adapted to swissmedic xlsx files
 

data/Rakefile

@@ -1,36 +1,13 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'oddb2xml/version'
+require "bundler/gem_tasks"
 
-require 'rubygems'
-require 'hoe'
+# dependencies are now declared in oddb2xml.gemspec
 
-# Hoe.plugin :compiler
-# Hoe.plugin :gem_prelude_sucks
-# Hoe.plugin :inline
-# Hoe.plugin :minitest
-# Hoe.plugin :racc
-# Hoe.plugin :rubyforge
-
-Hoe.spec 'oddb2xml' do
-  self.author      = "Yasuhiro Asaka, Zeno R.R. Davatz" # gem.authors
-  self.email       = "yasaka@ywesee.com, zdavatz@ywesee.com"
-  self.description = "oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic."
-  self.summary     = "oddb2xml creates xml files."
-  self.urls        = ["https://github.com/zdavatz/oddb2xml"] # gem.homepage
-
-  # gem.add_runtime_dependency
-  self.extra_deps << ['rubyzip', '~> 1.0.0']
-  self.extra_deps << ['archive-tar-minitar']
-  self.extra_deps << ['mechanize', '~> 2.5.1']
-  self.extra_deps << ['nokogiri']
-  self.extra_deps << ['savon', '>= 2.0']
-  self.extra_deps << ['spreadsheet']
-  self.extra_deps << ['rubyXL', '~> 1.2.10']
-
-  # gem.add_development_dependency
-  self.extra_dev_deps << ['rspec']
-  self.extra_dev_deps << ['webmock']
-
-  self.extra_dev_deps << ['hoe', '>= 3.4']
-  self.extra_dev_deps << ['rdoc']
-end
+desc 'Offer a gem task like hoe'
+task :gem => :build do
+  Rake::Task[:build].invoke
+end

data/bin/oddb2xml

@@ -15,7 +15,10 @@ Usage:
   oddb2xml [option]
     produced files are found under data
     -a T, --append=T     Additional target. T, only 'nonpharma' is available.
+    -ae                  Combine options nonpharma, extended, prices from ZurRose to create a oddb_with_migel.dat file.
     -c F, --compress=F   Compress format F. {tar.gz|zip}
+    -e    --extended     Get also all articles (including prices) from zurrose which have an EAN13 code.
+                         (only valid if -p zurrose given)
     -f F, --format=F     File format F, default is xml. {xml|dat}
                          If F is given, -o option is ignored.
     -i I, --include=I    Include target option for 'dat' format. only 'ean14' is available.
@@ -38,6 +41,7 @@ opts = {
   :fi           => false,
   :adr          => false,
   :nonpharma    => false,
+  :extended      => false,
   :compress_ext => nil,
   :format       => :xml,
   :tag_suffix   => nil,
@@ -47,7 +51,13 @@ opts = {
 }
 
 parser.on('-a v', '--append v',     /^nonpharma$/)  {|v| opts[:nonpharma] = true }
+parser.on('-ae')                                    {|v| opts[:nonpharma] = true;
+                                                     opts[:extended] = true;
+                                                    opts[:format] = :dat;
+                                                    opts[:price] = :zurrose;
+                                                    }
 parser.on('-c v', '--compress v',   /^tar\.gz|zip$/){|v| opts[:compress_ext] = v }
+parser.on('-e',   '--extended')                     {|v| opts[:extended] = true }
 parser.on('-f v', '--format v',     /^xml|dat$/)    {|v| opts[:format] = v.intern }
 parser.on('-o v', '--option v',     /^fi$/)         {|v| opts[:fi] = true }
 parser.on('-i v', '--include v',    /^ean14$/)      {|v| opts[:ean14] = true }

data/lib/oddb2xml/builder.rb

@@ -99,12 +99,37 @@ module Oddb2xml
           end
           @articles << obj
         end
+        if @options[:extended]
+          nrAdded = 0
+          @prices.each{
+            |ean13, info|
+            obj = {}
+          %w[de fr].each do |lang|
+          next if @index[lang] and @index[lang][ean13]
+            entry = {
+                     :desc            => info[:description],
+                     :status          => 'I', # or it will not be emitted in the dat
+                     :atc_code        => '',
+                     :ean             => ean13,
+                     :lang            => lang.capitalize,
+                     :pharmacode      => info[:pharmacode],
+                     :price           => info[:price],
+                     :pub_price       => info[:pub_price],
+                     :type            => info[:type],
+                     }
+            obj[lang.intern] = [entry]
+          end
+          nrAdded += 1
+          @articles << obj
+          }
+        end
       end
     end
     def prepare_substances
       unless @substances
         @substances = []
         @items.values.uniq.each do |seq|
+          next unless seq[:substances]
           seq[:substances].each do |sub|
             @substances << sub[:name]
           end
@@ -117,6 +142,7 @@ module Oddb2xml
       unless @limitations
         limitations = []
         @items.values.uniq.each do |seq|
+          next unless seq[:packages]
           seq[:packages].each_value do |pac|
             limitations += pac[:limitations]
           end
@@ -539,7 +565,7 @@ module Oddb2xml
         ) {
           @articles.each do |obj|
             obj[:de].each_with_index do |de_idx, i|
-              fr_idx = obj[:fr][i]              # swissindex FR
+        fr_idx = obj[:fr][i]              # swissindex FR
               pac,no8 = nil,de_idx[:ean][4..11] # BAG-XML(SL/LS)
               ppac = nil                        # Packungen
               ean = de_idx[:ean]
@@ -547,7 +573,7 @@ module Oddb2xml
                 pac = obj[:seq][:packages][de_idx[:pharmacode]]
                 pac = obj[:seq][:packages][ean] unless pac
               else
-                pac = @items[ean][:packages][ean] if @items and @items[ean]
+                pac = @items[ean][:packages][ean] if @items and @items[ean] and @items[ean][:packages]
               end
               if no8
                 ppac = ((_ppac = @packs[no8.intern] and !_ppac[:is_tier]) ? _ppac : nil)
@@ -599,11 +625,11 @@ module Oddb2xml
                   xml.BG(flag ? 'Y' : 'N')
                 end
                 #xml.EXP
-                xml.QTY   de_idx[:additional_desc] unless de_idx[:additional_desc].empty?
-                xml.DSCRD de_idx[:desc]            unless de_idx[:desc].empty?
-                xml.DSCRF fr_idx[:desc]            unless fr_idx[:desc].empty?
-                xml.SORTD de_idx[:desc].upcase     unless de_idx[:desc].empty?
-                xml.SORTF fr_idx[:desc].upcase     unless fr_idx[:desc].empty?
+                xml.QTY   de_idx[:additional_desc] if de_idx[:additional_desc] and not de_idx[:additional_desc].empty?
+                xml.DSCRD de_idx[:desc]            if de_idx[:desc] and not de_idx[:desc].empty?
+                xml.DSCRF fr_idx[:desc]            if fr_idx[:desc] and not fr_idx[:desc].empty?
+                xml.SORTD de_idx[:desc].upcase     if de_idx[:desc] and not de_idx[:desc].empty?
+                xml.SORTF fr_idx[:desc].upcase     if fr_idx[:desc] and not fr_idx[:desc].empty?
                 #xml.QTYUD
                 #xml.QTYUF
                 #xml.IMG
@@ -630,8 +656,8 @@ module Oddb2xml
                 #xml.BAGSL
                 #xml.BAGSLC
                 #xml.LOACD
-                if de_idx[:status] == "I"
-                  xml.OUTSAL de_idx[:stat_date] unless de_idx[:stat_date].empty?
+                if de_idx[:status] == 'I'
+                  xml.OUTSAL de_idx[:stat_date] if de_idx[:stat_date] and not de_idx[:stat_date].empty?
                 end
                 #xml.STTOX
                 #xml.NOTI
@@ -647,7 +673,7 @@ module Oddb2xml
                 #xml.DEL
                 xml.ARTCOMP {
                   # use ean13(gln) as COMPNO
-                  xml.COMPNO de_idx[:company_ean] unless de_idx[:company_ean].empty?
+                  xml.COMPNO de_idx[:company_ean] if de_idx[:company_ean] and not de_idx[:company_ean].empty?
                   #xml.ROLE
                   #xml.ARTNO1
                   #xml.ARTNO2
@@ -889,6 +915,7 @@ module Oddb2xml
       else
         # 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
         end.length
         if bag_entry_via_ean > 0
@@ -960,15 +987,16 @@ module Oddb2xml
         obj[:de].each_with_index do |idx, i|
           ean = idx[:ean]
           next if ((ean.to_s.length != 13) and !ean14)
+          next if idx[:type] == :nonpharma
           row = ''
           # Oddb2tdat.parse
           if idx[:status] =~ /A|I/
             pac,no8 = nil,nil
-            if obj[:seq]
+            if obj[:seq] and obj[:seq][:packages]
               pac = obj[:seq][:packages][idx[:pharmacode]]
               pac = obj[:seq][:packages][ean] unless pac
             else
-              pac = @items[ean][:packages][ean] if @items and @items[ean]
+              pac = @items[ean][:packages][ean] if @items and @items[ean] and @items[ean][:packages]
             end
              # :swissmedic_numbers
             if pac
@@ -980,7 +1008,7 @@ module Oddb2xml
             end
             row << "%#{DAT_LEN[:RECA]}s"  % '11'
             row << "%#{DAT_LEN[:CMUT]}s"  % if (phar = idx[:pharmacode] and phar.size > 3) # does not check expiration_date
-                                              idx[:status] == "I" ? '3' : '1'
+                                              idx[:status] == 'I' ? '3' : '1'
                                             else
                                               '3'
                                             end
@@ -988,7 +1016,7 @@ module Oddb2xml
             abez = ( # de name
               idx[:desc].to_s + " " +
               (pac ? pac[:name_de].to_s : '') +
-              idx[:additional_desc]
+              (idx[:additional_desc] ? idx[:additional_desc] : '')
             ).gsub(/"/, '')
             row << format_name(abez)
             row << "%#{DAT_LEN[:PRMO]}s"  % (pac ? format_price(pac[:prices][:exf_price][:price].to_s) : ('0' * DAT_LEN[:PRMO]))
@@ -1048,7 +1076,7 @@ module Oddb2xml
           row << "%0#{DAT_LEN[:PHAR]}d" % idx[:pharmacode].to_i
           abez = ( # de name
             idx[:desc].to_s + " " +
-            idx[:additional_desc]
+          (idx[:additional_desc] ? idx[:additional_desc] : '')
           ).gsub(/"/, '')
           row << format_name(abez)
           row << "%#{DAT_LEN[:PRMO]}s"  % ('0' * DAT_LEN[:PRMO])

data/lib/oddb2xml/cli.rb

@@ -237,7 +237,8 @@ module Oddb2xml
           downloader = ZurroseDownloader.new(@options, @options[:transfer_dat])
           xml = downloader.download
           @mutex.synchronize do
-            hsh = ZurroseExtractor.new(xml).to_hash
+            hsh = ZurroseExtractor.new(xml, @options[:extended]).to_hash
+            @items = hsh if  @options[:extended]
             @prices = hsh
           end
         end

data/lib/oddb2xml/compressor.rb

@@ -2,7 +2,7 @@
 
 require 'zlib'
 require 'archive/tar/minitar'
-require 'zip/zip'
+require 'zip'
 
 module Oddb2xml
  class Compressor
@@ -27,7 +27,7 @@ module Oddb2xml
           tgz = Zlib::GzipWriter.new(File.open(@compress_file, 'wb'))
           Minitar.pack(@contents, tgz)
         when /\.zip$/
-          Zip::ZipFile.open(@compress_file, Zip::ZipFile::CREATE) do |zip|
+          Zip::File.open(@compress_file, Zip::File::CREATE) do |zip|
             @contents.each do |file|
               filename = File.basename(file)
               zip.add(filename, file)

data/lib/oddb2xml/downloader.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 require 'mechanize'
-require 'zip/zip'
+require 'zip'
 require 'savon'
 
 module Oddb2xml
@@ -64,7 +64,7 @@ module Oddb2xml
     def read_xml_form_zip(target, zipfile)
       xml = ''
       if RUBY_PLATFORM =~ /mswin|mingw|bccwin|cygwin/i
-        Zip::ZipFile.open(zipfile) do |zipFile|
+        Zip::File.open(zipfile) do |zipFile|
           zipFile.each do |entry|
             if entry.name =~ target
               io = entry.get_input_stream
@@ -78,7 +78,7 @@ module Oddb2xml
           end
         end
       else
-        Zip::ZipFile.foreach(zipfile) do |entry|
+        Zip::File.foreach(zipfile) do |entry|
           if entry.name =~ target
             entry.get_input_stream { |io| xml = io.read }
           end

data/lib/oddb2xml/extractor.rb

@@ -415,20 +415,55 @@ module Oddb2xml
     end
   end
   class ZurroseExtractor < Extractor
-    def initialize(dat)
+    # see http://dev.ywesee.com/Bbmb/TransferDat
+    def initialize(dat, extended = false)
+      @@extended = extended
+      @@items_without_ean13s ||= 0
+      @@duplicated_ean13s ||= 0
+      @@zur_rose_items ||= 0
       @io = StringIO.new(dat) if dat
     end
     def to_hash
       data = {}
       while line = @io.gets
-        next unless line =~ /(7680\d{9})(\d{1})\r\n$/
-        data[$1.to_s] = {
-         :vat   => $2.to_s,
-         :price => sprintf("%.2f", line[60,6].gsub(/(\d{2})$/, '.\1').to_f),
-         :pub_price => sprintf("%.2f", line[66,6].gsub(/(\d{2})$/, '.\1').to_f),
+        if @@extended
+          next unless line =~ /(\d{13})(\d{1})\r\n$/
+        else
+          next unless line =~ /(7680\d{9})(\d{1})\r\n$/
+        end
+        pharma_code = line[3..9]
+        if $1.to_s == '0000000000000'
+          @@items_without_ean13s += 1
+          ean13 = '000000' + pharma_code # dummy ean13
+        else
+          ean13 = $1.to_s
+        end
+        if data[ean13]
+          puts "Duplicate ean13 #{ean13} in line \nact: #{line.chomp}\norg: #{data[ean13][:line]}"
+          @@items_without_ean13s -= 1
+          @@duplicated_ean13s += 1
+          next
+        end
+        data[ean13] = {
+          :line   => line.chomp,
+          :ean   => ean13,
+          :vat   => $2.to_s,
+          :description => line[10..59], # .sub(/\s+$/, ''),
+          :additional_desc => '',
+          :pharmacode => pharma_code,
+          :price => sprintf("%.2f", line[60,6].gsub(/(\d{2})$/, '.\1').to_f),
+          :pub_price => sprintf("%.2f", line[66,6].gsub(/(\d{2})$/, '.\1').to_f),
+          :type => :nonpharma,
         }
+        @@zur_rose_items += 1
       end if @io
       data
     end
+    at_exit do
+      if defined?(@@extended) and @@extended
+        puts "Added #{@@items_without_ean13s} via pharmacodes of #{@@zur_rose_items} items when extracting the transfer.dat from \"Zur Rose\"" 
+        puts "  found #{@@duplicated_ean13s} lines with duplicated ean13" if @@duplicated_ean13s > 0
+      end
+    end
   end
 end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.7.3"
+  VERSION = "1.7.5"
 end

data/oddb2xml.gemspec

@@ -0,0 +1,35 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'oddb2xml/version'
+
+Gem::Specification.new do |spec|
+  spec.name        = "oddb2xml"
+  spec.version     = Oddb2xml::VERSION
+  spec.author      = "Yasuhiro Asaka, Zeno R.R. Davatz"
+  spec.email       = "yasaka@ywesee.com, zdavatz@ywesee.com"
+  spec.description = "oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic."
+  spec.summary     = "oddb2xml creates xml files."
+  spec.homepage    = "https://github.com/zdavatz/oddb2xml"
+  spec.license       = "GPL-v2"
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'rubyzip', '~> 1.0'
+  spec.add_dependency 'archive-tar-minitar'
+  spec.add_dependency 'mechanize', '~> 2.5.1'
+  spec.add_dependency 'nokogiri', '~> 1.5.10'
+  spec.add_dependency 'savon', '~> 2.0'
+  spec.add_dependency 'spreadsheet'
+  spec.add_dependency 'rubyXL', '~> 2.5'
+  
+  
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "rdoc"
+end
+

data/spec/extractor_spec.rb

@@ -133,27 +133,54 @@ describe Oddb2xml::ZurroseExtractor do
     end
     it { expect(subject.to_hash).to be_empty }
   end
-  context 'when only 1 record have a valid EAN code' do
+  context 'when expected line is given' do
     subject do
       dat = <<-DAT
-1120020209ERYTRHOCIN I.V. Trockensub Fl 1g                  001518002010300B080160000000000000002\r\n
 1120020244FERRO-GRADUMET Depottabl 30 Stk                   000895001090300C060710076803164401152\r\n
       DAT
       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.values.first[:vat]).to eq("2") }
+    it { expect(subject.to_hash.values.first[:price]).to eq("8.95") }
   end
-  context 'when expected line is given' do
+  context 'when Estradiol Creme is given' do
     subject do
       dat = <<-DAT
-1120020244FERRO-GRADUMET Depottabl 30 Stk                   000895001090300C060710076803164401152\r\n
+1130921929OESTRADIOL Inj L�s 5 mg 10 Amp 1 ml               000940001630300B070820076802840708402\r\n
       DAT
       Oddb2xml::ZurroseExtractor.new(dat)
     end
+    #it { expect(pp subject.to_hash) }
     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("7680284070840") }
     it { expect(subject.to_hash.values.first[:vat]).to eq("2") }
-    it { expect(subject.to_hash.values.first[:price]).to eq("8.95") }
+    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") }
+  end
+  context 'when SELSUN Shampoo is given' do
+    subject do
+      dat = <<-DAT
+1120020652SELSUN Shampoo Susp 120 ml                        001576002430300D100400076801723306812\r\n
+      DAT
+      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.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") }
+    
   end
+  
+  x =%(
+  Record-Art 1 Länge 97
+    :vat   => $2.to_s,
+    :price => sprintf("%.2f", line[60,6].gsub(/(\d{2})$/, '.\1').to_f),
+    :pub_price => sprintf("%.2f", line[66,6].gsub(/(\d{2})$/, '.\1').to_f),
+    =
+    )
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.5
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -16,26 +16,26 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.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
@@ -56,42 +56,42 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.10
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.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
@@ -100,80 +100,90 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.10
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.10
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        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: '4.0'
+        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: hoe
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables:
 - oddb2xml
 extensions: []
-extra_rdoc_files:
-- History.txt
-- Manifest.txt
-- QA.md
-- README.md
+extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
@@ -195,6 +205,7 @@ files:
 - lib/oddb2xml/extractor.rb
 - lib/oddb2xml/util.rb
 - lib/oddb2xml/version.rb
+- oddb2xml.gemspec
 - spec/builder_spec.rb
 - spec/cli_spec.rb
 - spec/compressor_spec.rb
@@ -243,30 +254,73 @@ files:
 - tools/cacert.pem
 - tools/set.bat
 - tools/win_fetch_cacerts.rb
-- .gemtest
 homepage: https://github.com/zdavatz/oddb2xml
-licenses: []
+licenses:
+- GPL-v2
 metadata: {}
 post_install_message: 
-rdoc_options:
-- --main
-- README.md
+rdoc_options: []
 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: oddb2xml
-rubygems_version: 2.0.3
+rubyforge_project: 
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: oddb2xml creates xml files.
-test_files: []
+test_files:
+- spec/builder_spec.rb
+- spec/cli_spec.rb
+- spec/compressor_spec.rb
+- spec/data/GL_Diff_SB.xml
+- spec/data/Gestrichene_Packungen_Emballages_radies.xls
+- spec/data/ItCodes.xml
+- spec/data/PR121001.txt
+- spec/data/PR121002.txt
+- spec/data/Preparation.xml
+- spec/data/Preparations.xml
+- spec/data/Publications.xls
+- spec/data/XMLPublications.zip
+- spec/data/epha_interactions.csv
+- spec/data/medregbm_betrieb.txt
+- spec/data/medregbm_person.txt
+- spec/data/oddb2xml_files_bm_update.txt
+- spec/data/oddb2xml_files_lppv.txt
+- spec/data/oddb2xml_files_nonpharma.xls
+- spec/data/oddb_article.xml
+- spec/data/oddb_fi.xml
+- spec/data/oddb_fi_product.xml
+- spec/data/oddb_limitation.xml
+- spec/data/oddb_product.xml
+- spec/data/oddb_substance.xml
+- spec/data/swissindex.xml
+- spec/data/swissindex_nonpharma.xml
+- spec/data/swissindex_pharma.xml
+- spec/data/swissmedic_fridges.html
+- spec/data/swissmedic_fridges.xls
+- spec/data/swissmedic_fridges.xlsx
+- spec/data/swissmedic_info.html
+- 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/swissmedic_packages.xlsx
+- spec/data/wsdl.xml
+- spec/data/wsdl_nonpharma.xml
+- spec/data/wsdl_pharma.xml
+- spec/data/zurrose_transfer.dat
+- spec/downloader_spec.rb
+- spec/extractor_spec.rb
+- spec/spec_helper.rb