gtin2atc 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGNiOTI1OWE4YWFkNDYzODUxMTQwYWE4NTEyOWU3OWU5MmYyN2Q4OA==
+    ZDRhOWFiNzFhNzM0YmE0N2NlYTA0NWI5MDEyOGRkNjY5YWZjYTU3Yg==
   data.tar.gz: !binary |-
-    ZTkzODk2MDEzYzE0MDFjOWNjYTczOTJlNGYwMTViNzZhYTQ0N2U1NQ==
+    YmZlMDkxMWRiM2VkNTY0MDZiMjk0YWFkYjM0MGY3ZDFjMDEzMTBlYw==
 SHA512:
   metadata.gz: !binary |-
-    ZTk1MzFjZDk5MDljN2Y1OGM1MDM1ZWRmNDhhNmM0YTY5ZTgxZDliNmFlMjcx
-    YjE2NWM5OTllMjhkNDA3Zjk1MzExODA0ODg4N2IwOTY0Yzc4MDI2M2Y3ZDll
-    YzliMjY2YmJhMWQ0YjI0ZGMwYzIyNWY0ZDZmM2Y4MmU3NDJhOTk=
+    Yzk0OGY2MTU2NmY2ZmY0NmRiYTM2MGI4Mzc0NzdhNjFmM2RlMGJjNTVjZDhm
+    NmEzMDI1NjYxNzk0Njg2MDhhYTQ4ZDNkZDNiZTUyYzE0MTRiODdiZmYxODc5
+    NjJhMDk3MDY1ODRlMzBmY2YxNzUyMTM4ZDQwNzZjNzNjMDQ0MTY=
   data.tar.gz: !binary |-
-    NDU0ZTA5NDY0OTZiYTQwZWRjMjIzMzlkYTIyN2RlZWI3Mjg2YTQ3YWZmY2Yw
-    MmIyMDlhY2NiYjM5NTFkOGUwYTcyOGYzMTI5MTU0OTI3M2M2YzVhZGRkNzYz
-    ZDNlYTg3OWFlMGZkY2E5YTRjYWE3YjFiNmQ4ZjkwNGNiZGQ3NWE=
+    ZDk1NDkxZmY0NGY3OTZjYzY3MTYwMzFmMmFkMjQ3OTExZmRmZWE2YTcxZDQ0
+    MmUxNWE4OGRiOGRiZmIzMGEyNGQwYmYzMTA1NWQzYmEwMTBiODFkNTcxNmVj
+    MWE1YzAyNDg3OTgyYjJlMTg4ZmQ3YTI4ZjhhOWNhYTExNjllMGU=

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.3 27.01.2015
+
+* Clearer filenames
+
 === 0.1.2 27.01.2015
 
 * Travis should install and test installed gem, too

data/lib/gtin2atc/builder.rb

@@ -8,6 +8,11 @@ require 'mechanize'
 module Gtin2atc
   class Builder
     Strip_For_Sax_Machine = '<?xml version="1.0" encoding="utf-8"?>'+"\n"
+    SameInAll             = 'atc where the same in bag, swissindex and swissmedic'
+    AtcNotInSwissindex    = 'atc not in swissindex'
+    AtcNotInSwissmedic    = 'atc not in swissmedic'
+    AtcNotInBag           = 'atc not in bag'
+    AtcDifferent          = 'atc differed'
     def initialize(opts)
       Util.set_logging(opts[:log])
       @do_compare = opts[:compare]
@@ -174,25 +179,25 @@ module Gtin2atc
         if not @data_swissindex[gtin]
           not_in_swissindex << "#{gtin}: Not in swissindex #{item}"
         elsif atc_code == @data_swissindex[gtin][:atc_code]
-          match_in_swissindex << "swissindex #{gtin}: ATC code #{atc_code} matches swissindex  #{@data_swissindex[gtin][:atc_code]}"
+          match_in_swissindex << "ATC code #{atc_code} for #{gtin} matches swissindex  #{@data_swissindex[gtin][:atc_code]}"
         elsif atc_code.length < @data_swissindex[gtin][:atc_code].length
-          longer_in_swissindex << "swissindex #{gtin}: ATC code #{atc_code} longer in swissindex  #{@data_swissindex[gtin][:atc_code]}"
+          longer_in_swissindex << "ATC code #{item[:atc_code]} for #{gtin} longer in swissindex  #{@data_swissindex[gtin][:atc_code]}"
         elsif atc_code.length > @data_swissindex[gtin][:atc_code].length
-          shorter_in_swissindex << "swissindex #{gtin}: ATC code #{atc_code} shorter in swissindex  #{@data_swissindex[gtin][:atc_code]}"
+          shorter_in_swissindex << "ATC code #{atc_code} for #{gtin} shorter in swissindex  #{@data_swissindex[gtin][:atc_code]}"
         else
-          matching_atc_codes << "swissindex #{gtin}: ATC code #{atc_code} differs from swissindex  #{@data_swissindex[gtin][:atc_code]}"
+          matching_atc_codes << "ATC code #{atc_code} for #{gtin} differs from swissindex  #{@data_swissindex[gtin][:atc_code]}"
         end
 
         if not @data_swissmedic[gtin]
           not_in_swissmedic <<  "#{gtin}: Not in swissmedic #{item}"
         elsif atc_code == @data_swissmedic[gtin][:atc_code]
-          match_in_swissmedic << "swissmedic #{gtin}: ATC code #{atc_code} matches swissmedic  #{@data_swissmedic[gtin][:atc_code]}"
+          match_in_swissmedic << "ATC code #{atc_code} for #{gtin} matches swissmedic  #{@data_swissmedic[gtin][:atc_code]}"
         elsif atc_code.length < @data_swissmedic[gtin][:atc_code].length
-          longer_in_swissmedic << "swissmedic #{gtin}: ATC code #{atc_code} longer in swissmedic  #{@data_swissmedic[gtin][:atc_code]}"
+          longer_in_swissmedic << "ATC code #{item[:atc_code]} for #{gtin} longer in swissmedic  #{@data_swissmedic[gtin][:atc_code]}"
         elsif atc_code.length > @data_swissmedic[gtin][:atc_code].length
-          shorter_in_swissmedic << "swissmedic #{gtin}: ATC code #{atc_code} shorter in swissmedic  #{@data_swissmedic[gtin][:atc_code]}"
+          shorter_in_swissmedic << "ATC code #{atc_code} for #{gtin} shorter in swissmedic  #{@data_swissmedic[gtin][:atc_code]}"
         else
-          different_atc_in_swissmedic << "swissmedic #{gtin}: ATC code #{atc_code} differs from swissmedic  #{@data_swissmedic[gtin][:atc_code]}"
+          different_atc_in_swissmedic << "ATC code #{atc_code} for #{gtin} differs from swissmedic  #{@data_swissmedic[gtin][:atc_code]}"
         end
         total1 = not_in_swissindex + match_in_swissindex + longer_in_swissindex +  shorter_in_swissindex + different_atc_in_swissindex
         total2 = not_in_swissmedic + match_in_swissmedic + longer_in_swissmedic +  shorter_in_swissmedic + different_atc_in_swissmedic
@@ -208,18 +213,20 @@ module Gtin2atc
   Not in swissindex #{not_in_swissindex.size}
 "
       Util.info "Comparing ATC-Codes between bag and swissmedic"
-      report('compare_bag_to_swissmedic', 'items had the same ATC code in bag, swissindex and swissmedic', matching_atc_codes)
-      report('compare_bag_to_swissmedic', 'are the same in swissmedic and bag, but not in swissindex', match_in_swissmedic)
-      report('compare_bag_to_swissmedic', 'are different in swissmedic and bag', different_atc_in_swissmedic)
-      report('compare_bag_to_swissmedic', 'are shorter in swissmedic than in bag', shorter_in_swissmedic)
-      report('compare_bag_to_swissmedic', 'are longer in swissmedic than in bag', longer_in_swissmedic)
+      topic_swissmedic = 'compare_bag_to_swissmedic'
+      report(topic_swissmedic, SameInAll, matching_atc_codes)
+      report(topic_swissmedic, 'atc are the same in swissmedic and bag, but not in swissindex', match_in_swissmedic)
+      report(topic_swissmedic, 'atc are different in swissmedic and bag', different_atc_in_swissmedic)
+      report(topic_swissmedic, 'atc are shorter in swissmedic than in bag', shorter_in_swissmedic)
+      report(topic_swissmedic, 'atc are longer in swissmedic than in bag', longer_in_swissmedic)
 
       Util.info "Comparing ATC-Codes between bag and swissindex"
-      report('compare_bag_to_swissindex', 'items had the same ATC code in bag, swissindex and swissmedic', matching_atc_codes)
-      report('compare_bag_to_swissindex', 'are the same in swissindex and bag, but not in swissmedic', match_in_swissindex)
-      report('compare_bag_to_swissindex', 'are different in swissmedic and bag', different_atc_in_swissindex)
-      report('compare_bag_to_swissindex', 'are shorter in swissindex than in bag', shorter_in_swissindex)
-      report('compare_bag_to_swissindex', 'are longer in swissindex than in bag', longer_in_swissindex)
+      topic_swissindex = 'compare_bag_to_swissindex'
+      report(topic_swissindex, SameInAll, matching_atc_codes)
+      report(topic_swissindex, 'atc are the same in swissindex and bag, but not in swissmedic', match_in_swissindex)
+      report(topic_swissindex, 'atc are different in swissmedic and bag', different_atc_in_swissindex)
+      report(topic_swissindex, 'atc are shorter in swissindex than in bag', shorter_in_swissindex)
+      report(topic_swissindex, 'atc are longer in swissindex than in bag', longer_in_swissindex)
     end
 
     def report(topic, msg, details)
@@ -229,7 +236,7 @@ module Gtin2atc
       File.open((full_msg+'.txt').gsub(/[: ,]+/, '_'), 'w+') {
         |file|
         file.puts full_msg
-        details.each{|detail| file.puts detail }
+        details.sort.each{|detail| file.puts detail }
       }
     end
     def check_swissmedic
@@ -256,13 +263,13 @@ module Gtin2atc
           next
         end
         if item[:atc_code] == @data_swissindex[gtin][:atc_code]
-          matching_atc_codes << "swissindex #{gtin}: ATC code #{item[:atc_code]} matches swissindex  #{@data_swissindex[gtin][:atc_code]}"
+          matching_atc_codes << "ATC code #{atc_code} for #{gtin} matches swissindex  #{@data_swissindex[gtin][:atc_code]}"
         elsif item[:atc_code].length < @data_swissindex[gtin][:atc_code].length
-          longer_in_swissindex << "swissindex #{gtin}: ATC code #{item[:atc_code]} longer  in swissindex  #{@data_swissindex[gtin][:atc_code]}"
+          longer_in_swissindex << "ATC code #{item[:atc_code]} for #{gtin} longer in swissindex  #{@data_swissindex[gtin][:atc_code]}"
         elsif item[:atc_code].length > @data_swissindex[gtin][:atc_code].length
-          shorter_in_swissmedic << "swissindex #{gtin}: ATC code #{item[:atc_code]} shorter in swissindex  #{@data_swissindex[gtin][:atc_code]}"
+          shorter_in_swissmedic << "ATC code #{atc_code} for #{gtin} shorter in swissindex  #{@data_swissindex[gtin][:atc_code]}"
         else
-          different_atc << "swissindex #{gtin}: ATC code #{item[:atc_code]} differs from swissindex  #{@data_swissindex[gtin][:atc_code]}"
+          different_atc << "ATC code #{atc_code} for #{gtin} differs from swissindex  #{@data_swissindex[gtin][:atc_code]}"
         end
         unless @data_bag[gtin]
           not_in_bag << "#{gtin}: Not in bag #{item}"
@@ -278,11 +285,12 @@ module Gtin2atc
   Not in swissindex #{not_in_swissindex.size}
   Comparing ATC-Codes between swissmedic and swissindex
 "
-   report('swissmedic', 'match in swissindex and swissmedic', matching_atc_codes)
-   report('swissmedic', 'are different in swissindex and swissmedic', different_atc)
-   report('swissmedic', 'are the same in swissindex and swissmedic', matching_atc_codes)
-   report('swissmedic', 'are shorter in swissindex', shorter_in_swissmedic)
-   report('swissmedic', 'are longer in swissindex', longer_in_swissindex)
+   topic = 'compare swissmedic to swisssindex'
+   report(topic, 'atc match in swissindex and swissmedic', matching_atc_codes)
+   report(topic, 'atc are different in swissindex and swissmedic', different_atc)
+   report(topic, 'atc are the same in swissindex and swissmedic', matching_atc_codes)
+   report(topic, 'atc are shorter in swissindex', shorter_in_swissmedic)
+   report(topic, 'atc are longer in swissindex', longer_in_swissindex)
     end
 
     def compare
@@ -320,11 +328,12 @@ module Gtin2atc
   swissindex #{@data_swissindex.size} entries. Fetched from #{@swissindex.origin}
   swissmedic #{@data_swissmedic.size} entries. Fetched from #{@swissmedic.origin}
 "
-      report('compare_all_gtins', 'items had the same ATC code in bag, swissindex and swissmedic', matching_atc_codes)
-      report('compare_all_gtins', 'not in bag', not_in_bag)
-      report('compare_all_gtins', 'not in swissindex', not_in_swissindex)
-      report('compare_all_gtins', 'not in swissmedic', not_in_swissmedic)
-      report('compare_all_gtins', 'ATC-Codes differed', different_atc)
+      topic = 'compare all'
+      report(topic, SameInAll,          matching_atc_codes)
+      report(topic, AtcNotInBag,        not_in_bag)
+      report(topic, AtcNotInSwissindex, not_in_swissindex)
+      report(topic, AtcNotInSwissmedic, not_in_swissmedic)
+      report(topic, AtcDifferent,       different_atc)
     end
   end
   class Swissmedic

data/lib/gtin2atc/version.rb

@@ -1,3 +1,3 @@
 module Gtin2atc
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/builder_spec.rb

@@ -132,7 +132,7 @@ describe Gtin2atc::Builder do
         /not in bag/,
         /not in swissmedic/,
         /not in swissindex/,
-        /ATC-Codes diff/,
+        /atc are different/,
       ].each {
         |pattern|
         unless pattern.match(@res)
@@ -153,8 +153,8 @@ describe Gtin2atc::Builder do
 
     it 'should produce a many report files' do
       @res = buildr_capture(:stdout){ cli.run }
-      Dir.glob(Gtin2atc::WorkDir + '/compare_all_gtins*.txt').size.should == 5
-      Dir.glob(Gtin2atc::WorkDir + '/swissmedic_*.txt').size.should == 5
+      Dir.glob(Gtin2atc::WorkDir + '/compare_all_*.txt').size.should == 5
+      Dir.glob(Gtin2atc::WorkDir + '/compare_swissmedic_to_swisssindex_*.txt').size.should == 5
       Dir.glob(Gtin2atc::WorkDir + '/compare_bag_to_swissindex_*.txt').size.should == 5
       Dir.glob(Gtin2atc::WorkDir + '/compare_bag_to_swissmedic_*.txt').size.should == 5
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtin2atc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Niklaus Giger, Zeno R.R. Davatz