oddb2xml 2.8.1 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cc43d372c64564821c3594e837a93058f4b9aeb51bef7dd76036e694fed737a
-  data.tar.gz: 44e66c7136db33e6cbb656f070522cffe920f736a1a15ddfa2fa8363a79b3ca4
+  metadata.gz: 1b08f317299357e7ac742cf17126a08d8c8fb588e438a77800470b65ed085e7a
+  data.tar.gz: ff0beeb14aaba0ccf5ad431438570e352ecaa195ea19a61712c6f1d1c23f4116
 SHA512:
-  metadata.gz: 94d01ca34a3d6d535f14f873d377c5a46ae99a28c63330fe5fe14f886f416218d75df5ab3201fd05da9c607110de05666d6297fdfb9941a3b2f61a1a87517560
-  data.tar.gz: 6313c7015702732aa1be35b404b2b87a4230adc0b20bc8600bfa55d4c7e93ce8f16bab9cc13b6748927ce4ba13d0d97862ceabed64d81ae9baed397c436fd0ac
+  metadata.gz: 9a0a1b952a83d5b9d62244f487460325577c415d15d755beda84f63258a60e4de04c2d665395b7efb522c45f5cd07328b28bf36745cc6649faa4a9010f2ccd8e
+  data.tar.gz: 785408cf96d8ff18f9de68fa5579c433cb317fb247ff5304400d747d2a7973070461f339c1e8ad16ef6574930dbbea11d759b7a5f7ee3de824389abaf6debe67

data/.github/workflows/ruby.yml

@@ -9,7 +9,7 @@ name: Ruby
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, '*' ]
   pull_request:
     branches: [ master ]
 
@@ -21,19 +21,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu]
-        ruby: [2.6, 2.7, "3.0", 3.1, 3.2]
+        os: [ubuntu]
+        ruby: ["3.0", "3.1", "3.2"]
+    env:
+      BUNDLE_PATH: ".bundle/gems"
+      BUNDLE_WITHOUT: "debugger"
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
-
-    - name: Install dependencies
-      run: |
-        bundle config set path .bundle/gems --local
-        bundle config set without debugger  --local
-        bundle install
     - name: Test with RSpec
       run: bundle exec rspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.8.1)
+    oddb2xml (2.8.3)
       htmlentities
       httpi
       mechanize
@@ -25,22 +25,23 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     akami (1.3.1)
       gyoku (>= 0.4.0)
       nokogiri
     ast (2.4.2)
+    base64 (0.1.1)
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    connection_pool (2.3.0)
+    connection_pool (2.4.1)
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    flexmock (2.3.6)
+    flexmock (2.3.8)
     gyoku (1.4.0)
       builder (>= 2.1.2)
       rexml (~> 3.0)
@@ -53,6 +54,7 @@ GEM
       socksify
     json (2.6.3)
     language_server-protocol (3.17.0.3)
+    lint_roller (1.1.0)
     mechanize (2.7.7)
       domain_name (~> 0.5, >= 0.5.1)
       http-cookie (~> 1.0)
@@ -64,25 +66,26 @@ GEM
       webrick (~> 1.7)
       webrobots (>= 0.0.9, < 0.2)
     method_source (1.0.0)
-    mime-types (3.4.1)
+    mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    mini_portile2 (2.8.1)
+    mime-types-data (3.2023.0808)
+    mini_portile2 (2.8.4)
     minitar (0.9)
     multi_json (1.15.0)
     net-http-digest_auth (1.4.1)
-    net-http-persistent (4.0.1)
+    net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
     nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     nori (2.6.0)
     ntlm-http (0.1.1)
-    optimist (3.0.1)
-    ox (2.14.12)
-    parallel (1.22.1)
-    parser (3.2.0.0)
+    optimist (3.1.0)
+    ox (2.14.17)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     parslet (2.0.0)
     pry (0.14.2)
       coderay (~> 1.1)
@@ -94,44 +97,46 @@ GEM
       pry (~> 0.11)
       yard (~> 0.9.11)
     psych (3.3.4)
-    public_suffix (5.0.1)
-    racc (1.6.2)
+    public_suffix (5.0.3)
+    racc (1.7.1)
     rack (3.0.8)
     rainbow (3.1.1)
     rake (13.0.6)
     rdoc (6.3.3)
-    regexp_parser (2.6.2)
-    rexml (3.2.5)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.2)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.42.0)
+    rspec-support (3.12.1)
+    rubocop (1.56.4)
+      base64 (~> 0.1.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.15.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-ole (1.2.12.2)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     rubyXL (3.4.25)
       nokogiri (>= 1.10.8)
       rubyzip (>= 1.3.0)
@@ -149,32 +154,39 @@ GEM
     socksify (1.7.1)
     spreadsheet (1.3.0)
       ruby-ole
-    standard (1.22.1)
+    standard (1.31.1)
       language_server-protocol (~> 3.17.0.2)
-      rubocop (= 1.42.0)
-      rubocop-performance (= 1.15.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.56.2)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.2)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.2.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.19.0)
     standardrb (1.0.1)
       standard
-    timecop (0.9.6)
+    timecop (0.9.8)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
-    vcr (6.1.0)
+    unicode-display_width (2.5.0)
+    vcr (6.2.0)
     wasabi (3.7.0)
       addressable
       httpi (~> 2.0)
       nokogiri (>= 1.4.2)
-    webmock (3.18.1)
+    webmock (3.19.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
     webrobots (0.1.2)
     xml-simple (1.1.9)
       rexml
-    yard (0.9.28)
-      webrick (~> 1.7.0)
+    yard (0.9.34)
 
 PLATFORMS
   ruby
@@ -195,4 +207,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.26
+   2.3.24

data/lib/oddb2xml/builder.rb

@@ -545,15 +545,50 @@ module Oddb2xml
       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."
     end
 
+    def add_products_from_bag_preparations(add_to_products = false)
+      Oddb2xml.log "build_product add_products_from_bag_preparations. Starting with #{@products.size} products and #{@items.size} @items"
+      ean13_to_product = {}
+      @products.each { |ean13, obj|
+        ean13_to_product[ean13] = obj
+        obj[:pharmacode] ||= @refdata[ean13][:pharmacode] if @refdata[ean13]
+      }
+      size_old = ean13_to_product.size
+      Oddb2xml.log "build_product add_products_from_bag_preparations. Imported #{size_old} ean13_to_product from @products. Checking #{@items.size} @items"
+      @items.each do |ean13, item|
+        next if @products[ean13]
+        if add_to_products
+          @products[ean13] = {
+            seq: item,
+            pac: nil,
+            sequence_name: "",
+            desc_de: "#{item[:name_de]}, #{item[:desc_de]}, #{item[:packages][ean13][:desc_de]}",
+            desc_fr: "#{item[:name_fr]}, #{item[:desc_fr]}, #{item[:packages][ean13][:desc_fr]}",
+            no8: "",
+            ean13: ean13,
+            atc: item[:atc_code],
+            ith: "",
+            siz: "",
+            eht: "",
+            sub: "",
+            comp: "",
+            drug_index: ""
+          }
+        end
+        ean13_to_product[ean13] = item
+      end
+      corrected_size = ean13_to_product.size
+      Oddb2xml.log "build_product add_products_from_bag_preparations. Added #{corrected_size - size_old} corrected_size #{corrected_size} size_old #{size_old} ean13_to_product."
+    end
+
     def build_product
       self.class.class_eval do
         def check_name(obj, lang = :de)
           ean = obj[:ean13]
           refdata = @refdata[ean]
           if lang == :de
-            name = refdata && refdata[:desc_de] ? refdata[:desc_de] : obj[:sequence_name]
+            name = refdata && refdata[:desc_de] ? refdata[:desc_de] : (obj[:desc_de] || obj[:sequence_name])
           elsif lang == :fr
-            name = refdata && refdata[:desc_fr] ? refdata[:desc_fr] : obj[:sequence_name]
+            name = refdata && refdata[:desc_fr] ? refdata[:desc_fr] : (obj[:desc_fr] || obj[:sequence_name])
           elsif lang == :it
             name =  refdata[:desc_it] if refdata && refdata[:desc_it]
           else
@@ -568,6 +603,7 @@ module Oddb2xml
       prepare_interactions
       prepare_codes
       add_missing_products_from_swissmedic
+      add_products_from_bag_preparations(true)
       nbr_products = 0
       Oddb2xml.log "build_product #{@products.size + @missing.size} products"
       a_builder = Nokogiri::XML::Builder.new(encoding: "utf-8") do |xml|
@@ -1722,6 +1758,7 @@ module Oddb2xml
         prepare_articles
         prepare_products
         add_missing_products_from_swissmedic(true)
+        add_products_from_bag_preparations(true)
         prepare_calc_items(suppress_composition_parsing: true)
         @prepared = true
         @old_rose_size = @infos_zur_rose.size

data/lib/oddb2xml/calc.rb

@@ -95,8 +95,8 @@ module Oddb2xml
     UNKNOWN_GALENIC_FORM = 140
     UNKNOWN_GALENIC_GROUP = 1
     DATA_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "data"))
-    @@galenic_groups = YAML.load_file(File.join(DATA_DIR, "gal_groups.yaml"),  permitted_classes: [ Oddb2xml::GalenicForm, Oddb2xml::GalenicGroup, Symbol])
-    @@galenic_forms = YAML.load_file(File.join(DATA_DIR, "gal_forms.yaml"),  permitted_classes: [ Oddb2xml::GalenicForm, Oddb2xml::GalenicGroup, Symbol])
+    @@galenic_groups = YAML.safe_load_file(File.join(DATA_DIR, "gal_groups.yaml"),  permitted_classes: [ Oddb2xml::GalenicForm, Oddb2xml::GalenicGroup, Symbol])
+    @@galenic_forms = YAML.safe_load_file(File.join(DATA_DIR, "gal_forms.yaml"),  permitted_classes: [ Oddb2xml::GalenicForm, Oddb2xml::GalenicGroup, Symbol])
     @@new_galenic_forms = []
     @@names_without_galenic_forms = []
     @@rules_counter = {}

data/lib/oddb2xml/cli.rb

@@ -40,7 +40,7 @@ module Oddb2xml
       start_time = Time.now
       files2rm = Dir.glob(File.join(DOWNLOADS, "*"))
       FileUtils.rm_f(files2rm, verbose: true) if (files2rm.size > 0) && !Oddb2xml.skip_download?
-      if @options[:calc] && !(@options[:extended])
+      if @options[:calc] && !(@options[:extended] || @options[:firstbase])
         threads << download(:package) # swissmedic
       elsif @options[:address]
         [:company, :person].each do |type|
@@ -106,9 +106,9 @@ module Oddb2xml
     private
 
     def build
-      @the_files = {"calc" => "oddb_calc.xml"} if @options[:calc] && !(@options[:extended] || @options[:artikelstamm])
+      @the_files = {"calc" => "oddb_calc.xml"} if @options[:calc] && !(@options[:extended] || @options[:artikelstamm] || @options[:firstbase])
       builder = Builder.new(@options) do |builder|
-        if @options[:calc] && !(@options[:extended] || @options[:artikelstamm])
+        if @options[:calc] && !(@options[:extended] || @options[:artikelstamm] || @options[:firstbase])
           builder.packs = @packs
         elsif @options[:address]
           builder.companies = @companies
@@ -343,7 +343,9 @@ module Oddb2xml
     def files
       unless @the_files
         @the_files = {}
-        @the_files[:calc] = "oddb_calc.xml" if @options[:calc]
+        if @options[:calc]
+          @the_files[:calc] = "oddb_calc.xml"
+        end
         if @options[:artikelstamm]
           @the_files[:artikelstamm] = "artikelstamm_#{Date.today.strftime("%d%m%Y")}_v5.xml"
         elsif @options[:address]

data/lib/oddb2xml/options.rb

@@ -55,6 +55,11 @@ module Oddb2xml
       @opts.delete(:increment)
       @opts[:nonpharma] = @opts[:append]
       @opts.delete(:append)
+      if @opts[:firstbase]
+        @opts[:nonpharma] = true
+        # https://github.com/zdavatz/oddb2xml/issues/76
+        @opts[:calc] = true
+      end
       if @opts[:extended]
         @opts[:nonpharma] = true
         @opts[:price] = :zurrose
@@ -64,9 +69,6 @@ module Oddb2xml
         @opts[:extended] = true
         @opts[:price] = :zurrose
       end
-      if @opts[:firstbase]
-        @opts[:nonpharma] = true
-      end
       @opts[:price] = :zurrose if @opts[:price].is_a?(TrueClass)
       @opts[:price] = @opts[:price].to_sym if @opts[:price]
       @opts[:ean14] = @opts[:include]

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.8.1"
+  VERSION = "2.8.3"
 end

data/spec/builder_spec.rb

@@ -458,7 +458,7 @@ NR_LIMITATIONS = 15
 NR_INTERACTIONS = 2
 NR_CODES = 5
 NR_PRODNO = 31
-NR_PACKAGES = 47
+NR_PACKAGES = 61
 NR_PRODUCTS = 40
 REG_EXP_DESITIN = /1120000000LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk/
 describe Oddb2xml::Builder do

data/spec/options_spec.rb

@@ -15,7 +15,8 @@ Oddb2xml::DEFAULT_OPTS = {
   skip_download: false,
   log: false,
   percent: nil,
-  use_ra11zip: nil
+  use_ra11zip: nil,
+  firstbase: false,
 }
 
 describe Oddb2xml::Options do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.3
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip