oddb2xml 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91e209f6f384705d053e56609465c69349b2f09b
-  data.tar.gz: fee149a15fe84a106f74aa3b9c5018ea9a641951
+  metadata.gz: e34415925083cd7afcbb59f160b901d355f22faf
+  data.tar.gz: 8f3ba8afe9838a9595a4018323ad6ac0719c90ce
 SHA512:
-  metadata.gz: 13362a32f7f7c3f3bcf63826a7ead70e03678cd219439e2c88f87a3d2ac082ade71093790b2d6a2c59f86094e1c91152cf88fddbee5e3407f98f93be40e1f1e1
-  data.tar.gz: 3afe7a0686b90a0c1c33cde46fdd82f8f057d3ea2cb2decadcd2e07f0a796ee984b9fbdb2ce95d424c639d0bcc8e0c388adef0626c4e55e2dfd3916294b1c56c
+  metadata.gz: 65db04ccb0593a0eac016ed2c7ea9ec5ebaf9131315ef2d95acdc2d8af58223aa21f5f95c4c787ccd4a6c3642cbd5e6659d412936e95a67221fcc4cea64361bf
+  data.tar.gz: 1c5f35d25a0fe3032df867d891cd3d019071b5a069b7515c272c05a2af166a1edcc48169f28b11591dcf024b26a107e41e940ddb90a6bb9407a458545cc84891

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.0.2)
+    oddb2xml (2.0.3)
       archive-tar-minitar (~> 0.5.2)
       mechanize (~> 2.5.1)
       nokogiri (~> 1.5.10)

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.0.3 / 25.03.2015
+
+* Option -e implies --calc, too.
+
 === 2.0.2 / 24.03.2015
 
 * Fixed handling of chemicals and units with '%'

data/lib/oddb2xml/cli.rb

@@ -43,7 +43,7 @@ module Oddb2xml
     end
     def run
       threads = []
-      if @options[:calc]
+      if @options[:calc] and not @options[:extended]
         threads << download(:package) # swissmedic
       elsif @options[:address]
         [:company, :person].each do |type|
@@ -94,10 +94,11 @@ module Oddb2xml
     def build
       Oddb2xml.log("Start build")
       begin
-        @_files = {"calc"=>"oddb_calc.xml"} if @options[:calc]
+        # require 'pry'; binding.pry
+        @_files = {"calc"=>"oddb_calc.xml"} if @options[:calc] and not @options[:extended]
         files.each_pair do |sbj, file|
           builder = Builder.new(@options) do |builder|
-            if @options[:calc]
+            if @options[:calc] and not @options[:extended]
               builder.packs = @packs
               builder.subject = sbj
             elsif @options[:address]
@@ -222,7 +223,7 @@ module Oddb2xml
             @packs = SwissmedicExtractor.new(bin, :package).to_hash
             Oddb2xml.log("SwissmedicExtractor added #{@packs.size} packs from #{bin}")
             @packs
-          end unless @options[:calc]
+          end
         end
       when :bm_update
         Thread.new do
@@ -296,6 +297,7 @@ module Oddb2xml
     def files
       unless @_files
         @_files = {}
+        @_files[:calc] = "oddb_calc.xml" if @options[:calc]
         if @options[:address]
           @_files[:company] = "#{prefix}_betrieb.xml"
           @_files[:person]  = "#{prefix}_medizinalperson.xml"

data/lib/oddb2xml/options.rb

@@ -31,7 +31,9 @@ Usage:
     produced files are found under data
     -a,   --append       Additional target nonpharma
     -c F, --compress=F   Compress format F. {tar.gz|zip}
-    -e    --extended     pharma, non-pharma plus prices and non-pharma from zurrose. Products without EAN-Code will also be listed.
+    -e    --extended     pharma, non-pharma plus prices and non-pharma from zurrose.
+                         Products without EAN-Code will also be listed.
+                         File oddb_calc.xml will also be generated
     -f F, --format=F     File format F, default is xml. {xml|dat}
                          If F is given, -o option is ignored.
     -I x, --increment=x  Increment price by x percent. Forces -f dat -p zurrose.
@@ -63,6 +65,7 @@ EOS
       @parser.on('-e', '--extended')                       {|v| @opts[:extended] = true
                                                               @opts[:nonpharma] = true
                                                               @opts[:price] = :zurrose
+                                                              @opts[:calc] = true
                                                             }
       @parser.on('-f v', '--format v',     /^xml|dat$/)    {|v| @opts[:format] = v.intern }
       @parser.on('--calc')                                 {|v| @opts[:calc] = true }

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/spec/options_spec.rb

@@ -92,16 +92,7 @@ describe Oddb2xml::Options do
     expected = Default_opts.clone
     expected[:extended]  =  true
     expected[:nonpharma] =  true
-    expected[:price]      = :zurrose
-    specify { expect(options.opts).to eq expected }
-  end
-
-  context 'when -e is given' do
-    options = Oddb2xml::Options.new
-    options.parser.parse!('-e'.split(' '))
-    expected = Default_opts.clone
-    expected[:extended]  =  true
-    expected[:nonpharma] =  true
+    expected[:calc]      =  true
     expected[:price]      = :zurrose
     specify { expect(options.opts).to eq expected }
   end
@@ -112,6 +103,7 @@ describe Oddb2xml::Options do
     expected = Default_opts.clone
     expected[:extended]  =  true
     expected[:nonpharma] =  true
+    expected[:calc]      =  true
     expected[:price]      = :zurrose
     expected[:percent]    = 80
     specify { expect(options.opts).to eq expected }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip