oddb2xml 1.3.9 → 1.4.0

data/History.txt

@@ -1,3 +1,11 @@
+=== 1.4.0 / 15.02.2013
+
+* Fix cli spec
+* Add report for address xml
+* Update address data as array
+* Fix command option
+* Fix typo
+
 === 1.3.9 / 14.02.2013
 
 * Add address xml output

data/bin/oddb2xml

@@ -22,7 +22,7 @@ Usage:
                          'xml' format includes always ean14 records.
     -t S, --tag-suffix=S XML tag suffix S. Default is none. [A-z0-9]
                          If S is given, it is also used as prefix of filename.
-    -x X, --context      context for address (betrieb and person).
+    -x N, --context=N    context N {product|address}. product is default.
     -h,   --help         Show this help message.
 EOS
 end

data/lib/oddb2xml/builder.rb

@@ -35,8 +35,8 @@ module Oddb2xml
       @orphans    = []
       @fridges    = []
       @ean14      = true
-      @companies  = {}
-      @people     = {}
+      @companies  = []
+      @people     = []
       @tag_suffix = nil
       if block_given?
         yield self
@@ -780,24 +780,24 @@ module Oddb2xml
           'CREATION_DATETIME' => datetime,
           'VALID_DATE'        => datetime,
         ) {
-          @companies.each_pair do |ean, c|
+          @companies.each do |c|
             xml.Betrieb('DT' => '') {
-              xml.GLN_Betrieb        ean unless ean.empty?
-              xml.Betriebsname_1     c[:name_1]  unless c[:name_1].empty?
-              xml.Betriebsname_2     c[:name_2]  unless c[:name_2].empty?
-              xml.Strasse            c[:address] unless c[:address].empty?
-              xml.Nummer             c[:number]  unless c[:number].empty?
-              xml.PLZ                c[:post]    unless c[:post].empty?
-              xml.Ort                c[:place]   unless c[:place].empty?
-              xml.Bewilligungskanton c[:region]  unless c[:region].empty?
-              xml.Land               c[:country] unless c[:country].empty?
-              xml.Betriebstyp        c[:type]    unless c[:type].empty?
+              xml.GLN_Betrieb        c[:gln]           unless c[:gln].empty?
+              xml.Betriebsname_1     c[:name_1]        unless c[:name_1].empty?
+              xml.Betriebsname_2     c[:name_2]        unless c[:name_2].empty?
+              xml.Strasse            c[:address]       unless c[:address].empty?
+              xml.Nummer             c[:number]        unless c[:number].empty?
+              xml.PLZ                c[:post]          unless c[:post].empty?
+              xml.Ort                c[:place]         unless c[:place].empty?
+              xml.Bewilligungskanton c[:region]        unless c[:region].empty?
+              xml.Land               c[:country]       unless c[:country].empty?
+              xml.Betriebstyp        c[:type]          unless c[:type].empty?
               xml.BTM_Berechtigung   c[:authorization] unless c[:authorization].empty?
             }
           end
           xml.RESULT {
             xml.OK_ERROR   'OK'
-            xml.NBR_RECORD @companies.values.length
+            xml.NBR_RECORD @companies.length
             xml.ERROR_CODE ''
             xml.MESSAGE    ''
           }
@@ -816,23 +816,23 @@ module Oddb2xml
           'CREATION_DATETIME' => datetime,
           'VALID_DATE'        => datetime,
         ) {
-          @people.each_pair do |ean, p|
+          @people.each do |p|
             xml.Person('DT' => '') {
-              xml.GLN_Person         ean unless ean.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[:lincense] unless p[:license].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?
             }
           end
           xml.RESULT {
             xml.OK_ERROR   'OK'
-            xml.NBR_RECORD @people.values.length
+            xml.NBR_RECORD @people.length
             xml.ERROR_CODE ''
             xml.MESSAGE    ''
           }

data/lib/oddb2xml/cli.rb

@@ -27,8 +27,8 @@ module Oddb2xml
       @orphans = [] # [addition] Orphaned drugs from Swissmedic xls
       @fridges = [] # [addition] ReFridge drugs from Swissmedic xls
       # addres
-      @companies = {} # betrieb
-      @people    = {} # medizinalperson
+      @companies = [] # betrieb
+      @people    = [] # medizinalperson
       LANGUAGES.each do |lang|
         @index[lang] = {}
       end
@@ -154,7 +154,7 @@ module Oddb2xml
           str = downloader.download
           self.instance_variable_set(
             "@#{var}".intern,
-            MedregbmExtractor.new(str, what).to_hash
+            MedregbmExtractor.new(str, what).to_arry
           )
         end
       when :fachinfo
@@ -284,8 +284,8 @@ module Oddb2xml
       @_prefix ||= (@options[:tag_suffix] || 'oddb').gsub(/^_|_$/, '').downcase
     end
     def report
+      lines = []
       unless @options[:address]
-        lines = []
         LANGUAGES.each do |lang|
           lines << lang
           types.each do |type|
@@ -296,8 +296,16 @@ module Oddb2xml
             end
           end
         end
-        puts lines.join("\n")
+      else
+        {
+          'Betrieb' => :@companies,
+          'Person'  => :@people
+        }.each do |type, var|
+          lines << sprintf(
+            "#{type} addresses: %i", self.instance_variable_get(var).length)
+        end
       end
+      puts lines.join("\n")
     end
     def types # swissindex
       @_types ||=

data/lib/oddb2xml/extractor.rb

@@ -353,44 +353,42 @@ module Oddb2xml
       @io   = StringIO.new(str)
       @type = type
     end
-    def to_hash
-      data = {}
+    def to_arry
+      data = []
       case @type
       when :company
         while line = @io.gets
           row = line.chomp.split("\t")
           next if row[0] =~ /^GLN/
-          gln = row[0].to_s
-          data[gln] = {
-            :gln     => gln,          #=> GLN Betrieb
-            :name_1  => row[1].to_s,  #=> Betriebsname 1
-            :name_2  => row[2].to_s,  #=> Betriebsname 2
-            :address => row[3].to_s,  #=> Strasse
-            :number  => row[4].to_s,  #=> Nummer
-            :post    => row[5].to_s,  #=> PLZ
-            :place   => row[6].to_s,  #=> Ort
-            :region  => row[7].to_s,  #=> Bewilligungskanton
-            :country => row[8].to_s,  #=> Land
-            :type    => row[9].to_s,  #=> Betriebstyp
-            :authorization => row[10].to_s, #=> BTM Berechtigung
+          data << {
+            :gln           => row[0].to_s.gsub(/[^0-9]/, ''), #=> GLN Betrieb
+            :name_1        => row[1].to_s,                    #=> Betriebsname 1
+            :name_2        => row[2].to_s,                    #=> Betriebsname 2
+            :address       => row[3].to_s,                    #=> Strasse
+            :number        => row[4].to_s,                    #=> Nummer
+            :post          => row[5].to_s,                    #=> PLZ
+            :place         => row[6].to_s,                    #=> Ort
+            :region        => row[7].to_s,                    #=> Bewilligungskanton
+            :country       => row[8].to_s,                    #=> Land
+            :type          => row[9].to_s,                    #=> Betriebstyp
+            :authorization => row[10].to_s,                   #=> BTM Berechtigung
           }
         end
       when :person
         while line = @io.gets
           row = line.chomp.split("\t")
           next if row[0] =~ /^GLN/
-          gln = row[0].to_s
-          data[gln] = {
-            :gln           => gln,         #=> GLN Person
-            :last_name     => row[1].to_s, #=> Name
-            :first_name    => row[2].to_s, #=> Vorname
-            :post          => row[3].to_s, #=> PLZ
-            :place         => row[4].to_s, #=> Ort
-            :region        => row[5].to_s, #=> Bewilligungskanton
-            :country       => row[6].to_s, #=> Land
-            :license       => row[7].to_s, #=> Bewilligung Selbstdispensation
-            :certificate   => row[8].to_s, #=> Diplom
-            :authorization => row[9].to_s, #=> BTM Berechtigung
+          data << {
+            :gln           => row[0].to_s.gsub(/[^0-9]/, ''), #=> GLN Person
+            :last_name     => row[1].to_s,                    #=> Name
+            :first_name    => row[2].to_s,                    #=> Vorname
+            :post          => row[3].to_s,                    #=> PLZ
+            :place         => row[4].to_s,                    #=> Ort
+            :region        => row[5].to_s,                    #=> Bewilligungskanton
+            :country       => row[6].to_s,                    #=> Land
+            :license       => row[7].to_s,                    #=> Bewilligung Selbstdispensation
+            :certificate   => row[8].to_s,                    #=> Diplom
+            :authorization => row[9].to_s,                    #=> BTM Berechtigung
           }
         end
       end

data/lib/oddb2xml/version.rb

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

data/spec/cli_spec.rb

@@ -25,7 +25,7 @@ end
 shared_examples_for 'any interface for address' do
   it { cli.should respond_to(:run)  }
   it 'should run successfully' do
-    $stdout.should_not_receive(:puts) # no output
+    $stdout.should_receive(:puts).with(/addresses/)
     cli.run
   end
 end
@@ -247,11 +247,13 @@ describe Oddb2xml::Cli do
       cli.should have_option(:address=> true)
     end
     it 'should not create any compressed file' do
+      $stdout.should_receive(:puts).with(/addresses/)
       cli.run
       Dir.glob('oddb_*.tar.gz').first.should be_nil
       Dir.glob('oddb_*.zip').first.should be_nil
     end
     it 'should create xml files' do
+      $stdout.should_receive(:puts).with(/addresses/)
       cli.run
       expected = [
         'oddb_betrieb.xml',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &19384600 !ruby/object:Gem::Requirement
+  requirement: &18744960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19384600
+  version_requirements: *18744960
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &19384140 !ruby/object:Gem::Requirement
+  requirement: &18743640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19384140
+  version_requirements: *18743640
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &19383700 !ruby/object:Gem::Requirement
+  requirement: &18644340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19383700
+  version_requirements: *18644340
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &19383200 !ruby/object:Gem::Requirement
+  requirement: &18643640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19383200
+  version_requirements: *18643640
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &19382620 !ruby/object:Gem::Requirement
+  requirement: &18642840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19382620
+  version_requirements: *18642840
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &19255580 !ruby/object:Gem::Requirement
+  requirement: &18642040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19255580
+  version_requirements: *18642040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19254720 !ruby/object:Gem::Requirement
+  requirement: &18641340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19254720
+  version_requirements: *18641340
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &19253480 !ruby/object:Gem::Requirement
+  requirement: &18640240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19253480
+  version_requirements: *18640240
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &19252640 !ruby/object:Gem::Requirement
+  requirement: &18639460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19252640
+  version_requirements: *18639460
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &19251860 !ruby/object:Gem::Requirement
+  requirement: &18588900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *19251860
+  version_requirements: *18588900
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &19250720 !ruby/object:Gem::Requirement
+  requirement: &18587540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19250720
+  version_requirements: *18587540
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &19247520 !ruby/object:Gem::Requirement
+  requirement: &18585800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *19247520
+  version_requirements: *18585800
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &19246620 !ruby/object:Gem::Requirement
+  requirement: &18584860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *19246620
+  version_requirements: *18584860
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables: