oddb2xml 2.8.2 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4ff8b8b33c1b2c3ea41660576b5f9d116e99640a56098d429e2525138d9c8a1
-  data.tar.gz: 7ed3e2d40e97d0631119bd1c1e87f4d1de599939b21a95313487d7664cbc4a05
+  metadata.gz: 1b08f317299357e7ac742cf17126a08d8c8fb588e438a77800470b65ed085e7a
+  data.tar.gz: ff0beeb14aaba0ccf5ad431438570e352ecaa195ea19a61712c6f1d1c23f4116
 SHA512:
-  metadata.gz: 0c3ca2d08823ffb6909f86c2b08c72334ff671126a8dcead06ac5872cc2fd17d9f175d0f1b65a28647e13847027215a02365a2d3beecfa7aa1ae8b24a896fd00
-  data.tar.gz: 3880524ed3c9602c1f693b4b4d8d52f548c2c4e34561675b5954936de9fd746019fb5287cd46484c9797cf7f874a6ba053d03e4f43d43812c024b97a9f871443
+  metadata.gz: 9a0a1b952a83d5b9d62244f487460325577c415d15d755beda84f63258a60e4de04c2d665395b7efb522c45f5cd07328b28bf36745cc6649faa4a9010f2ccd8e
+  data.tar.gz: 785408cf96d8ff18f9de68fa5579c433cb317fb247ff5304400d747d2a7973070461f339c1e8ad16ef6574930dbbea11d759b7a5f7ee3de824389abaf6debe67

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.8.2)
+    oddb2xml (2.8.3)
       htmlentities
       httpi
       mechanize

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,10 +69,6 @@ module Oddb2xml
         @opts[:extended] = true
         @opts[:price] = :zurrose
       end
-      if @opts[:firstbase]
-        @opts[:nonpharma] = true
-        @opts[:calc] = 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.2"
+  VERSION = "2.8.3"
 end

metadata

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