medreg 0.1 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f55cbd956da4f88e6ba28632b08daa57a98aeb6e
+  data.tar.gz: c532ca10792ce3bdf697ebebbff3be28e722bd2f
+SHA512:
+  metadata.gz: 23bc712a7f410702280f18435b709b0181a946d38a1f71f68db9f233e54e310a145070ffb1162445965c10d3c6a1c05ab02fff37b353cf2522647f03529ce472
+  data.tar.gz: e05592a21ceab1c630cf0da1ccdd75f8d1a42685aac99eea263ee16e87c843fa5592379ed3e34bc953d3f37b4e08ae6ac7f778292252a99371fb952b81774131

data/.travis.yml

@@ -5,6 +5,8 @@ before_install:
 install:
   - bundle install --without debugger
 
+cache: bundler
+
 script:
   - bundle exec ruby test/suite.rb
 
@@ -13,10 +15,10 @@ notifications:
   - ngiger@ywesee.com
 rvm:
   - ruby-head
-  - 2.1.2
+  - 2.1.3
   - 2.0.0
   - 1.9.3
-  - 1.8.7
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: 1.8.7

data/History.txt

@@ -1,3 +1,7 @@
-=== 0.1
+=== 0.1.1
+
+* Some improvments to merge yaml Files.
+
+=== 0.1.0
 
 * Initial release

data/README.textile

@@ -2,16 +2,27 @@ h1. medreg
 
 * https://github.com/zdavatz/medreg
 
+We use Travis-CI to ensure that our builds are always passing the unit test. !https://travis-ci.org/ngiger/medreg.svg?branch=master!:https://travis-ci.org/ngiger/medreg
+
 h2. DESCRIPTION
 
 Create yaml file for all
-* companies in the health care fromh https://www.medregbm.admin.ch/
+* companies in the health care from https://www.medregbm.admin.ch/
 * medical persons from http://www.medregom.admin.ch/
 
 h2. INSTALL:
 
 * gem install medreg
 
+
+h2. Useage
+
+* @medreg -h@ # give helpl
+* @medreg @ # get info from medreg for all doctors and pharmacies
+* @medreg persons@ # get info from medreg for all doctors
+* @medreg companies@ # get info from medreg for all pharmacies
+* @merge_yaml output input_file_1 ..@ # merge all input files into the output
+
 h2. DEVELOPERS:
 
 * Zeno R.R. Davatz

data/bin/merge_yaml

@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby
+
+require 'pathname'
+root = Pathname.new(__FILE__).realpath.parent.parent
+$:.unshift root.join('lib') if $0 == __FILE__
+
+require 'optparse'
+require "date"
+require 'medreg'
+require 'medreg/version'
+require 'medreg/person'
+
+ODDB = Medreg
+def help
+  <<EOS
+#$0 ver.#{Medreg::VERSION}
+Usage:
+  #{File.basename(__FILE__)} output input_file_1..
+    Merge all input files into output_file
+EOS
+end
+
+parser = OptionParser.new
+opts = {}
+parser.on_tail('-h', '--help') { puts help; exit }
+
+args = ARGV.dup
+begin
+  parser.parse!(args)
+rescue OptionParser::MissingArgument,
+       OptionParser::InvalidArgument,
+       OptionParser::InvalidOption
+  puts help
+  exit 1
+end
+
+begin
+  unless args.size >= 2
+    puts help
+    exit 1
+  end
+  all = {}
+  to_add = {}
+  puts args.inspect
+  args[1..-1].each{
+    |input|
+    next if File.size(input) < 100
+    puts "reading from file #{input} #{File.size(input)} bytes"
+    to_add = YAML.load_file(input)
+    all = all.merge(to_add)
+    puts "Added to_add #{to_add.class} #{to_add.size}. Have now #{all.size} items"
+  }
+  puts "Have now #{all.size} items to be save into #{args[0]}"
+  File.open(args[0], 'w+') {|f| f.write(all.to_yaml) }
+  puts "Saved #{all.size} items into #{args[0]}. Size is #{(File.size(args[0])/1024).to_i} kBytes"
+rescue Interrupt
+  puts "Unterbrochen. Breche mit Fehler ab"
+  exit 1
+end
+
+puts "#{__FILE__} completed successfully" if $VERBOSE

data/lib/medreg/company_importer.rb

@@ -13,7 +13,7 @@ require 'psych' if RUBY_VERSION.match(/^1\.9/)
 require "yaml"
 
 module Medreg
-  DebugImport         = defined?(MiniTest)
+  DebugImport           = defined?(Minitest) ? true : false
   BetriebeURL         = 'https://www.medregbm.admin.ch/Betrieb/Search'
   BetriebeXLS_URL     = "https://www.medregbm.admin.ch/Publikation/CreateExcelListBetriebs"
   RegExpBetriebDetail = /\/Betrieb\/Details\//
@@ -63,25 +63,36 @@ module Medreg
       @@logInfo       = []
       FileUtils.rm_f(Companies_YAML) if File.exists?(Companies_YAML)
       @yaml_file      = File.open(Companies_YAML, 'w+')
+      @companies_prev_import = 0
       @companies_created = 0
-      @companies_updated = 0
       @companies_skipped = 0
       @companies_deleted = 0
       @archive = ARCHIVE_PATH
-      @@all_companies    = []
+      @@all_companies    = {}
       setup_default_agent
     end
+    def save_import_to_yaml(filename)
+      File.open(filename, 'w+') {|f| f.write(@@all_companies.to_yaml) }
+      save_for_log "Saved #{@@all_companies.size} doctors in #{filename}"
+    end
     def update
       saved = @glns_to_import.clone
+      r_loop = ResilientLoop.new(File.basename(__FILE__, '.rb'))
+      @state_yaml = r_loop.state_file.sub('.state', '.yaml')
+      if File.exist?(@state_yaml) and File.size(@state_yaml) > 10
+        @@all_companies = YAML.load_file(@state_yaml)
+        @companies_prev_import = @@all_companies.size
+        puts "Got #{@companies_prev_import} items from previous import saved in #{@state_yaml}"
+      end
       latest = get_latest_file
       save_for_log "parse_xls #{latest} specified GLN ids #{saved.inspect}"
       parse_xls(latest)
       @info_to_gln.keys
       get_detail_to_glns(saved.size > 0 ? saved : @glns_to_import)
-      return @companies_created, @companies_updated, @companies_deleted, @companies_skipped
+      save_import_to_yaml(Companies_YAML)
+      return @companies_created, @companies_prev_import, @companies_deleted, @companies_skipped
     ensure
-      File.open(Companies_YAML, 'w+') {|f| f.write(@@all_companies.to_yaml) }
-      save_for_log "Saved #{@@all_companies.size} companies in #{Companies_YAML}"
+      save_import_to_yaml(@state_yaml) if @companies_created > 0
     end
     def setup_default_agent
       @agent = Mechanize.new
@@ -139,7 +150,7 @@ module Medreg
         while nr_tries < max_retries  and not success
           begin
             r_loop.try_run(gln, defined?(Minitest) ? 500 : 5 ) do
-              Medreg.log "Searching for company with GLN #{gln}. Skipped #{@companies_skipped}, created #{@companies_created} updated #{@companies_updated} of #{glns.size}).#{nr_tries > 0 ? ' nr_tries is ' + nr_tries.to_s : ''}"
+              Medreg.log "Searching for company with GLN #{gln}. Created #{@companies_created}. At #{@companies_created+@companies_prev_import} of #{glns.size}.#{nr_tries > 0 ? ' nr_tries is ' + nr_tries.to_s : ''}"
               page_1 = @agent.get(BetriebeURL)
               raise Search_failure if page_1.content.match(failure)
               hash = [
@@ -156,7 +167,7 @@ module Medreg
                 raise Search_failure if page_3.content.match(failure)
                 company = parse_details(page_3, gln)
                 store_company(company)
-                @@all_companies << company
+                @@all_companies[gln] =  company
               else
                 Medreg.log "could not find gln #{gln}"
                 @companies_skipped += 1
@@ -169,8 +180,8 @@ module Medreg
             nr_tries += 1
             sleep defined?(MiniTest) ? 0.01 : 60
           end
-          if (@companies_created + @companies_updated) % 100 == 99
-            Medreg.log "Start saving #{gln} after #{@companies_created} created #{@companies_updated} updated"
+          if (@companies_created + @companies_prev_import) % 100 == 99
+            Medreg.log "Start saving after #{@companies_created} created #{@companies_prev_import} from previous import"
           end
         end
       }
@@ -193,7 +204,7 @@ module Medreg
     def report
       report = "Companies update \n\n"
       report << "New companies: "       << @companies_created.to_s << "\n"
-      report << "Updated companies: "   << @companies_updated.to_s << "\n"
+      report << "Companies from previous imports: "   << @companies_prev_import.to_s << "\n"
       report << "Deleted companies: "   << @companies_deleted.to_s << "\n"
       report
     end
@@ -255,7 +266,7 @@ module Medreg
       end
       @glns_to_import = @info_to_gln.keys.sort.uniq
     end
-    def Company.all_companies
+    def CompanyImporter.all_companies
       @@all_companies
     end
   end

data/lib/medreg/person_importer.rb

@@ -16,7 +16,7 @@ require "yaml"
 require 'timeout'
 
 module Medreg
-  DebugImport           = false
+  DebugImport           = defined?(Minitest) ? true : false
   Personen_Candidates   = File.expand_path(File.join(__FILE__, '../../../data/Personen_20*.xlsx'))
   Personen_YAML         = File.expand_path(File.join(__FILE__, "../../../data/persons_#{Time.now.strftime('%Y.%m.%d-%H%M')}.yaml"))
   Personen_CSV          = File.expand_path(File.join(__FILE__, "../../../data/persons_#{Time.now.strftime('%Y.%m.%d-%H%M')}.csv"))
@@ -57,7 +57,7 @@ module Medreg
       withTimeStamp = "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}: #{msg}" unless defined?(MiniTest)
       @@logInfo << withTimeStamp
     end
-    def initialize(app=nil, glns_to_import = [])
+    def initialize(glns_to_import = [])
       @glns_to_import = glns_to_import.clone
       @glns_to_import.delete_if {|item| item.size == 0}
       @info_to_gln    = {}
@@ -67,10 +67,10 @@ module Medreg
       FileUtils.mkdir_p(File.dirname(Personen_YAML))
       @yaml_file      = File.open(Personen_YAML, 'w+')
       @csv_file       = File.open(Personen_CSV,  'w+')
-      @persons_created = 0
-      @persons_updated = 0
+      @persons_prev_import = 0
       @persons_skipped = 0
       @persons_deleted = 0
+      @persons_created = 0
       @skip_to_doctor  = nil
       @archive = ARCHIVE_PATH
       @@all_doctors    = {}
@@ -92,18 +92,31 @@ module Medreg
         @@all_doctors.each{ |doctor| csv << [] }
       end
     end
+
+    def save_import_to_yaml(filename)
+      File.open(filename, 'w+') {|f| f.write(@@all_doctors.to_yaml) }
+      save_for_log "Saved #{@@all_doctors.size} doctors in #{filename}"
+    end
+
     def update
       saved = @glns_to_import.clone
+      r_loop = ResilientLoop.new(File.basename(__FILE__, '.rb'))
+      @state_yaml = r_loop.state_file.sub('.state', '.yaml')
+      if File.exist?(@state_yaml)
+        @@all_doctors = YAML.load_file(@state_yaml)
+        @persons_prev_import = @@all_doctors.size
+        puts "Got #{@persons_prev_import} items from previous import saved in #{@state_yaml}"
+      end
       latest = get_latest_file
       save_for_log "parse_xls #{latest} specified GLN glns #{saved.inspect}"
       parse_xls(latest)
       @info_to_gln.keys
       get_detail_to_glns(saved.size > 0 ? saved : @glns_to_import)
-      return @persons_created, @persons_updated, @persons_deleted, @persons_skipped
+      save_import_to_yaml(Personen_YAML)
+      return @persons_created, @persons_prev_import, @persons_deleted, @persons_skipped
     ensure
       # write_csv_file
-      File.open(Personen_YAML, 'w+') {|f| f.write(@@all_doctors.to_yaml) }
-      save_for_log "Saved #{@@all_doctors.size} doctors in #{Personen_YAML}"
+      save_import_to_yaml(@state_yaml) if @persons_created > 0
     end
     def setup_default_agent
       @agent = Mechanize.new
@@ -212,6 +225,7 @@ module Medreg
         end
         medregId = page_4.body.match(regExp)[1]
         page_5 = @agent.get(MedRegOmURL + "de/Detail/Detail?pid=#{medregId}")
+
         File.open(File.join(LOG_PATH, "#{gln}.html"), 'w+') { |f| f.write page_5.content } if DebugImport
         doc_hash = parse_details( Nokogiri::HTML(page_5.content), gln, info)
         store_doctor(doc_hash)
@@ -234,7 +248,7 @@ module Medreg
         nr_tries = 0
         while nr_tries < max_retries
           begin
-             Medreg.log "Searching for doctor with GLN #{gln}. Skipped #{@persons_skipped}, created #{@persons_created} updated #{@persons_updated} of #{glns.size}).#{nr_tries > 0 ? ' nr_tries is ' + nr_tries.to_s : ''}"
+             Medreg.log "Searching for doctor with GLN #{gln}. Created #{@persons_created}. At #{@persons_created+@persons_prev_import} of #{glns.size}.#{nr_tries > 0 ? ' nr_tries is ' + nr_tries.to_s : ''}"
               get_one_doctor(r_loop, gln)
               break
           rescue Mechanize::ResponseCodeError, Timeout::Error => e
@@ -251,8 +265,8 @@ module Medreg
         end
         raise "Max retries #{nr_tries} for #{gln.to_s} reached. Aborting import" if nr_tries == max_retries
         @persons_created += 1
-        if (@persons_created + @persons_updated) % 100 == 99
-           Medreg.log "Start saving after #{@persons_created} created #{@persons_updated} updated"
+        if (@persons_created + @persons_prev_import) % 100 == 99
+           Medreg.log "Start saving after #{@persons_created} created #{@persons_prev_import} from previous import"
         end
       }
       r_loop.finished
@@ -329,7 +343,7 @@ module Medreg
       report = "Persons update \n\n"
       report << "Skipped doctors: #{@persons_skipped}#{@skip_to_doctor ? '. Waited for ' + @skip_to_doctor.to_s : ''}" << "\n"
       report << "New doctors: "       << @persons_created.to_s << "\n"
-      report << "Updated doctors: "   << @persons_updated.to_s << "\n"
+      report << "Doctors from previous imports: "   << @persons_prev_import.to_s << "\n"
       report << "Deleted doctors: "   << @persons_deleted.to_s << "\n"
       report
     end
@@ -375,7 +389,7 @@ module Medreg
       }
     end
     def parse_xls(path)
-       Medreg.log "parsing #{path}"
+      Medreg.log "parsing #{path}"
       workbook = RubyXL::Parser.parse(path)
       positions = []
       rows = 0

data/lib/medreg/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Medreg
-    VERSION = '0.1'
+    VERSION = '0.1.1'
 end

data/medreg.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "flexmock"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "minitest" if /^1\./.match(RUBY_VERSION)
+  spec.add_development_dependency "minitest"
 end
 

data/test/test_company.rb

@@ -9,45 +9,24 @@ $: << File.expand_path("../../src", File.dirname(__FILE__))
 gem 'minitest'
 require 'minitest/autorun'
 require 'flexmock'
-require 'medreg/company'
+require 'medreg/company_importer'
 require 'tempfile'
 
 module Medreg
 class TestCompanyPlugin <Minitest::Test
   include FlexMock::TestCase
   Test_Companies_XLSX = File.expand_path(File.join(__FILE__, '../data/companies_20141014.xlsx'))
+  def rm_log_files
+    FileUtils.rm_f(Dir.glob("#{Medreg::LOG_PATH}/*"), :verbose => true)
+  end
   def setup
-    @config  = flexmock('config',
-             :empty_ids => nil,
-             :pointer   => 'pointer'
-            )
-    @config  = flexmock('config')
-    @company = flexmock('company', :pointer => 'pointer',
-                        :ean13= => 'ean13',
-                        :name= => 'name',
-                        :addresses= => 'addresses',
-                        :business_area= => 'business_area',
-                        :odba_isolated_store => 'odba_isolated_store',
-                        :oid => 'oid',
-                        :narcotics= => 'narcotics',
-                        :odba_store => 'odba_store',
-                       )
-    @app     = flexmock('appX',
-              :config => @config,
-              :create_company => @company,
-              :companies => [@company],
-              :company_by_gln => nil,
-              :company_by_origin => @company,
-              :update           => 'update',
-            )
-    @plugin = Medreg::Company.new(@app)
-    flexmock(@plugin, :get_latest_file => [true, Test_Companies_XLSX])
+    rm_log_files
     $stderr.puts "Test_Companies_XLSX #{Test_Companies_XLSX}"
   end
 
   def test_update_7601002026444
-    @plugin = Medreg::Company.new(@app, [7601001396371])
-    flexmock(@plugin, :get_latest_file => [true, Test_Companies_XLSX])
+    @plugin = Medreg::CompanyImporter.new([7601001396371])
+    flexmock(@plugin, :get_latest_file => Test_Companies_XLSX)
     flexmock(@plugin, :get_company_data => {})
     flexmock(@plugin, :puts => nil)
     startTime = Time.now
@@ -60,29 +39,29 @@ class TestCompanyPlugin <Minitest::Test
     assert_equal(0, updated)
     assert_equal(0, deleted)
     assert_equal(0, skipped)
-    assert_equal(1, Medreg::Company.all_companies.size)
+    assert_equal(1, Medreg::CompanyImporter.all_companies.size)
     assert(File.exists?(csv_file), "file #{csv_file} must be created")
-    linden = Medreg::Company.all_companies.first
+    linden = Medreg::CompanyImporter.all_companies[7601001396371]
     addresses = linden[:addresses]
     assert_equal(1, addresses.size)
     first_address = addresses.first
-    assert_equal(ODDB::Address2, first_address.class)
-    assert_equal(nil, first_address.fon)
+    assert_equal(Medreg::Address2, first_address.class)
+    assert_equal([], first_address.fon)
     assert_equal('5102 Rupperswil', first_address.location)
     assert_equal('öffentliche Apotheke', linden[:ba_type])
     assert_equal('5102', first_address.plz)
     assert_equal('Rupperswil', first_address.city)
     assert_equal('4', first_address.number)
     assert_equal('Mitteldorf', first_address.street)
-    assert_equal(nil, first_address.additional_lines)
+    assert_equal([], first_address.additional_lines)
     assert_equal('AB Lindenapotheke AG', first_address.name)
     inhalt = IO.read(csv_file)
     assert(inhalt.index('6011 Verzeichnis a/b/c BetmVV-EDI') > 0, 'must find btm')
 #	7601001396371	AB Lindenapotheke AG		Mitteldorf	4	5102	Rupperswil	Aargau	Schweiz	öffentliche Apotheke	6011 Verzeichnis a/b/c BetmVV-EDI
   end
   def test_update_all
-    @plugin = Medreg::Company.new(@app)
-    flexmock(@plugin, :get_latest_file => [true, Test_Companies_XLSX])
+    @plugin = Medreg::CompanyImporter.new()
+    flexmock(@plugin, :get_latest_file => Test_Companies_XLSX)
     flexmock(@plugin, :get_company_data => {})
     flexmock(@plugin, :puts => nil)
     startTime = Time.now
@@ -101,12 +80,10 @@ class TestCompanyPlugin <Minitest::Test
   def test_get_latest_file
     current  = File.expand_path(File.join(__FILE__, "../../../data/xls/companies_#{Time.now.strftime('%Y.%m.%d')}.xlsx"))
     FileUtils.rm_f(current) if File.exists?(current)
-    @plugin = Medreg::Company.new(@app)
+    @plugin = Medreg::CompanyImporter.new()
     res = @plugin.get_latest_file
-    assert(res[0], 'needs_update must be true')
-    assert(res[1].match(/latest/), 'filename must match latest')
-    assert(File.exists?(res[1]), 'companies_latest.xls must exist')
-    assert(File.size(Test_Companies_XLSX) <File.size(res[1]))
+    assert(res.match(Time.now.strftime('%Y.%m.%d')), "filename must match latest not #{res}")
+    assert(File.size(Test_Companies_XLSX) <File.size(res))
   end
 end
 end

data/test/test_person.rb

@@ -2,12 +2,12 @@
 # encoding: utf-8
 
 $: << File.expand_path('..', File.dirname(__FILE__))
-$: << File.expand_path("../../src", File.dirname(__FILE__))
-
+$: << File.expand_path("../lib", File.dirname(__FILE__))
+puts File.expand_path("../lib", File.dirname(__FILE__))
 gem 'minitest'
 require 'minitest/autorun'
 require 'flexmock'
-require 'medreg/person'
+require 'medreg/person_importer'
 require 'tempfile'
 require 'ostruct'
 
@@ -16,20 +16,13 @@ Minitest::Test.i_suck_and_my_tests_are_order_dependent!()
 class TestPerson <Minitest::Test
   include FlexMock::TestCase
   RunTestTakingLong = false
-  Test_Personen_XLSX = File.expand_path(File.join(__FILE__, '../../data/xlsx/Personen_20141014.xlsx'))
+  Test_Personen_XLSX = File.expand_path(File.join(__FILE__, '../data/Personen_20141014.xlsx'))
+  def rm_log_files
+    FileUtils.rm_f(Dir.glob("#{Medreg::LOG_PATH}/*"), :verbose => true)
+  end
+
   def setup
-    @config = flexmock('config')
-    @doctor = flexmock('doctor', :pointer => 'pointer', :oid => 'oid')
-    @app    = flexmock('app',
-              :config => @config,
-             :doctors => [@doctor],
-             :create_doctor => @doctor,
-             :doctor_by_gln => nil,
-             :doctor_by_origin => @doctor,
-             :update           => 'update'
-            )
-    @plugin = Medreg::Person.new(@app)
-    flexmock(@plugin, :get_latest=> Test_Personen_XLSX)
+    rm_log_files
   end
 
   SomeTestCases = {
@@ -41,12 +34,13 @@ class TestPerson <Minitest::Test
   def test_aaa_zuest # name starts with aaa we want this test to be run as first
     {  7601000254207 => OpenStruct.new(:family_name => 'Züst', :first_name => 'Peter', :authority  => 'Glarus')}.each do
       |gln, info|
-      @plugin = Medreg::Person.new(@app, [gln])
-      flexmock(@plugin, :get_latest_file => [ true, Test_Personen_XLSX ] )
+       rm_log_files
+      @plugin = Medreg::PersonImporter.new([gln])
+      flexmock(@plugin, :get_latest_file => Test_Personen_XLSX )
       flexmock(@plugin, :get_doctor_data => {})
-      assert(File.exists?(Test_Personen_XLSX))
+      assert(File.exists?(Test_Personen_XLSX) , "File #{Test_Personen_XLSX} must exist")
       startTime = Time.now
-      csv_file = ODDB::Doctors::Personen_YAML
+      csv_file = Medreg::Personen_YAML
       FileUtils.rm_f(csv_file) if File.exists?(csv_file)
       created, updated, deleted, skipped = @plugin.update
       diffTime = (Time.now - startTime).to_i
@@ -74,7 +68,7 @@ class TestPerson <Minitest::Test
       addresses = zuest[:addresses]
       assert_equal(1, addresses.size)
       first_address = addresses.first
-       assert_equal(ODDB::Address2, first_address.class)
+       assert_equal(Medreg::Address2, first_address.class)
       assert_equal(1, first_address.fon.size)
       assert_equal(['Bahnhofstr. 3'], first_address.additional_lines)
       assert_equal('8753 Mollis', first_address.location)
@@ -87,33 +81,17 @@ class TestPerson <Minitest::Test
       assert_equal('3', first_address.number)
     end
   end
-  def test_parse
-    SomeTestCases.each{
-      |gln, info|
-      info.gln = gln
-      root = File.expand_path(File.join(__FILE__, "../.."))
-      @plugin = Medreg::Person.new(@app, [gln])
-      html_file = "#{root}/data/html/medreg/#{gln}.html"
-      assert(File.exist?(html_file), "File \#{html_file} must exist")
-      doc_hash = @plugin.parse_details(Nokogiri::HTML(File.read(html_file)),
-                                      gln,
-                                      info,
-                                      )
-      assert(doc_hash.is_a?(Hash), 'doc_hash must be a Hash')
-      assert(doc_hash[:addresses], 'doc_hash must have addresses')
-      assert(doc_hash[:addresses].size > 0, 'doc_hash must have at least one address')
-    }
-  end
 
   def test_update_single
     SomeTestCases.each{
       |gln, info|
-      @plugin = Medreg::Person.new(@app, [gln])
-      flexmock(@plugin, :get_latest_file => [ true, Test_Personen_XLSX ] )
+       rm_log_files
+      @plugin = Medreg::PersonImporter.new([gln])
+      flexmock(@plugin, :get_latest_file => Test_Personen_XLSX )
       flexmock(@plugin, :get_doctor_data => {})
       assert(File.exists?(Test_Personen_XLSX))
       startTime = Time.now
-      csv_file = ODDB::Doctors::Personen_YAML
+      csv_file = Medreg::Personen_YAML
       FileUtils.rm_f(csv_file) if File.exists?(csv_file)
       created, updated, deleted, skipped = @plugin.update
       diffTime = (Time.now - startTime).to_i
@@ -122,7 +100,7 @@ class TestPerson <Minitest::Test
       assert_equal(1, created)
       assert_equal(0, updated)
       assert(File.exists?(csv_file), "file #{csv_file} must be created")
-      expected = "Doctors update \n\nNumber of doctors: 1\nSkipped doctors: 0\nNew doctors: 1\nUpdated doctors: 0\nDeleted doctors: 0\n"
+      expected = "Persons update \n\nSkipped doctors: 0\nNew doctors: 1\nDoctors from previous imports: 0\nDeleted doctors: 0\n"
       assert_equal(expected, @plugin.report)
     }
   end
@@ -130,13 +108,13 @@ class TestPerson <Minitest::Test
   def test_update_some_glns
     glns_ids_to_search = [7601000078261, 7601000813282, 7601000254207, 7601000186874, 7601000201522, 7601000295958,
                           7601000010735, 7601000268969, 7601000019080, 7601000239730 ]
-    @plugin = Medreg::Person.new(@app, glns_ids_to_search)
+    @plugin = Medreg::PersonImporter.new(glns_ids_to_search)
 
-    flexmock(@plugin, :get_latest_file => [ true, Test_Personen_XLSX ] )
+    flexmock(@plugin, :get_latest_file => Test_Personen_XLSX )
     flexmock(@plugin, :get_doctor_data => {})
     assert(File.exists?(Test_Personen_XLSX))
     startTime = Time.now
-    csv_file = ODDB::Doctors::Personen_YAML
+    csv_file = Medreg::Personen_YAML
     FileUtils.rm_f(csv_file) if File.exists?(csv_file)
     created, updated, deleted, skipped = @plugin.update
     diffTime = (Time.now - startTime).to_i
@@ -148,7 +126,26 @@ class TestPerson <Minitest::Test
   end if RunTestTakingLong
 
   def test_zzz_get_latest_file # name starts with zzz we want this test to be run as last one (takes longest)
-    @plugin = Medreg::Person.new(@app, [7601000813282])
+    @plugin = Medreg::PersonImporter.new([7601000813282])
     needs_update, latest = @plugin.get_latest_file
   end if RunTestTakingLong
+
+  def test_parse
+    SomeTestCases.each{
+      |gln, info|
+      info.gln = gln
+      root = File.expand_path(File.join(__FILE__, "../.."))
+      @plugin = Medreg::PersonImporter.new([gln])
+      html_file = File.expand_path(File.join(__FILE__, "../data/#{gln}.html"))
+      assert(File.exist?(html_file), "File #{html_file} must exist")
+      doc_hash = @plugin.parse_details(Nokogiri::HTML(File.read(html_file)),
+                                      gln,
+                                      info,
+                                      )
+      assert(doc_hash.is_a?(Hash), 'doc_hash must be a Hash')
+      assert(doc_hash[:addresses], 'doc_hash must have addresses')
+      assert(doc_hash[:addresses].size > 0, 'doc_hash must have at least one address')
+    }
+  end
+
 end

data/test/test_run.rb

@@ -14,7 +14,10 @@ module ODBA
     def setup
     end
     def test_company_importer
-      assert Medreg.run('company')
+      # TODO: assert Medreg.run('company')
+    end
+    def test_person_importer
+      # TODO: assert Medreg.run('person')
     end
   end
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: medreg
 version: !ruby/object:Gem::Version
-  version: '0.1'
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Niklaus Giger, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -46,98 +41,90 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Personen und Betriebe Adressen für die Schweiz.
 email: ngiger@ywesee.com, zdavatz@ywesee.com
 executables:
 - medreg
+- merge_yaml
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - History.txt
 - LICENSE
 - README.textile
 - Rakefile
 - bin/medreg
+- bin/merge_yaml
 - lib/medreg.rb
 - lib/medreg/address.rb
 - lib/medreg/ba_type.rb
@@ -149,6 +136,9 @@ files:
 - lib/medreg/resilient_loop.rb
 - lib/medreg/version.rb
 - medreg.gemspec
+- test/data/7601000010735.html
+- test/data/7601000813282.html
+- test/data/Personen_20141014.xlsx
 - test/data/companies_20141014.xlsx
 - test/suite.rb
 - test/test_company.rb
@@ -157,26 +147,25 @@ files:
 homepage: https://github.com/zdavatz/medreg
 licenses:
 - GPL-v2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Helper module for ch.oddb.org
 test_files: []