oddb2xml 1.8.9 → 1.9.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDkwNTVmNTM3ZWRmMzAzODBjNjRiZDE2YzFjNTQxZGM1NTgzYTBlNA==
+  data.tar.gz: !binary |-
+    Yzk0NWQ0ZWJhZWRmMmQ0ODZhMDQxMWQzNWY2NGYxZjliZWFhNGVlYg==
+SHA512:
+  metadata.gz: !binary |-
+    YmY5MmMzYWRjNDc3OTFlM2E4ZmVhYjVkZmExYTVjOGM2NDM3YTBlNTU1MGQz
+    MGQ2Zjk3MDgyMDJhMmFlNDViMDI0NGNmYTI0ZTE4NzNiMDE4N2ViMWEyZjZk
+    NGNmYmVlYzcwZTMwOGQ3NWY0NjBjYjI4NDVkMGFkMzFmZjFmNGU=
+  data.tar.gz: !binary |-
+    MDAzMzVjODcxZjY2NGU1YjYyMGVkZDI4MjI5NzhlZjY5YzQzOTViMTQ1Mjc4
+    MTM4NTEzOTY3ZmIwMzgzZmQzNDQyNTY0YzlmNzUzYTVlMDBiNGFiODc1MjA3
+    YzMzZmQ5NjY2ZTQ3YTg5NzE2MDA5NDc4YjQ4YjNjOWMzZTExMGQ=

data/Gemfile.lock

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

data/History.txt

@@ -1,4 +1,10 @@
-=== 1.8.9 / upcoming
+=== 1.9.0 / 12.01.2015
+
+* Fixed adding prices from ZurRose if -f dat -p zurrose given
+* Reorganized switches
+* Added option -I x to add x percent to public prices for non-SL items
+
+=== 1.8.9 / 05.01.2015
 
 * Added option -e x to add x percent to public prices for non-SL items
 

data/bin/oddb2xml

@@ -7,77 +7,21 @@ $:.unshift root.join('lib') if $0 == __FILE__
 
 require 'optparse'
 require 'oddb2xml'
+require 'oddb2xml/options'
 
-def help
-  <<EOS
-#$0 ver.#{Oddb2xml::VERSION}
-Usage:
-  oddb2xml [option]
-    produced files are found under data
-    -a T, --append=T     Additional target. T, only 'nonpharma' is available.
-    -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.
-    -f F, --format=F     File format F, default is xml. {xml|dat}
-                         If F is given, -o option is ignored.
-    -i I, --include=I    Include target option for 'dat' format. only 'ean14' is available.
-                         'xml' format includes always ean14 records.
-    -o O, --option=O     Optional output. O, only 'fi' is available.
-    -p P, --price=P      Price source (transfer.dat). P, only 'zurrose' is available.
-    -t S, --tag-suffix=S XML tag suffix S. Default is none. [A-z0-9]
-                         If S is given, it is also used as prefix of filename.
-    -x N, --context=N    context N {product|address}. product is default.
-                         
-                         For debugging purposes
-    --skip-download      skips downloading files it the file is already under downloads.
-                         Downloaded files are saved under downloads
-    --log                log important actions
-    -h,   --help         Show this help message.
-EOS
-end
-
-parser = OptionParser.new
-opts = {
-  :fi           => false,
-  :adr          => false,
-  :nonpharma    => false,
-  :extended      => false,
-  :compress_ext => nil,
-  :format       => :xml,
-  :tag_suffix   => nil,
-  :debug        => false,
-  :ean14        => false,
-  :skip_download=> false,
-  :log          => false,
-  :percent      => 0,
-  }
-
-parser.on('-a v', '--append v',     /^nonpharma$/)  {|v| opts[:nonpharma] = true }
-parser.on('-c v', '--compress v',   /^tar\.gz|zip$/){|v| opts[:compress_ext] = v }
-parser.on('-e [x]', '--extended [x]')               {|v| opts[:extended] = true
-                                                    opts[:nonpharma] = :true
-                                                    opts[:price] = :zurrose
-                                                    opts[:percent] = v ? v.to_i : 0
-                                                    }
-parser.on('-f v', '--format v',     /^xml|dat$/)    {|v| opts[:format] = v.intern }
-parser.on('-o v', '--option v',     /^fi$/)         {|v| opts[:fi] = true }
-parser.on('-i v', '--include v',    /^ean14$/)      {|v| opts[:ean14] = true }
-parser.on('-t v', '--tag-suffix v', /^[A-z0-9]*$/i) {|v| opts[:tag_suffix] = v.upcase }
-parser.on('-x v', '--context v',    /^addr(ess)*$/i){|v| opts[:address] = true }
-parser.on('-p v', '--price v',      /^zurrose$/)    {|v| opts[:price] = v.intern }
-parser.on('--skip-download')                        {|v| opts[:skip_download] = true }
-parser.on('--log')                                  {|v| opts[:log] = :true }
-parser.on_tail('-h', '--help') { puts help; exit }
+options = Oddb2xml::Options.new
 
 args = ARGV.dup
 begin
-  parser.parse!(args)
+  options.parser.parse!(args)
 rescue OptionParser::MissingArgument,
        OptionParser::InvalidArgument,
        OptionParser::InvalidOption
-  puts help
+  puts Oddb2xml::Options.help
   exit
 end
 
+opts = options.opts
 # TEMP
 if path = args.first
   opts[:transfer_dat] = path

data/lib/oddb2xml/builder.rb

@@ -736,17 +736,14 @@ module Oddb2xml
                   xml.ARTPRI {
                     xml.VDAT  Time.parse(datetime).strftime("%d.%m.%Y")
                     xml.PTYP  "ZURROSE"
-                    xml.PRICE info_zur_rose[:price]
+                    price = info_zur_rose[:price]
+                    price = (price.to_f*(1 + (@options[:percent].to_f/100))).round_by(0.05).round(2) if @options[:percent] != nil
+                    xml.PRICE price
                   }
                   xml.ARTPRI {
                     xml.VDAT  Time.parse(datetime).strftime("%d.%m.%Y")
                     xml.PTYP  "ZURROSEPUB"
-                    price = info_zur_rose[:pub_price]
-                    if @options[:percent] != nil
-                      price = (price.to_f*(1 + (@options[:percent].to_f/100))).round_by(0.05).round(2)
-                    else
-                    end
-                    xml.PRICE price
+                    xml.PRICE info_zur_rose[:pub_price]
                   }
                 end
                 #xml.ARTMIG {
@@ -1033,9 +1030,20 @@ module Oddb2xml
             (pac ? pac[:name_de].to_s : '') +
             (idx[:additional_desc] ? idx[:additional_desc] : '')
           ).gsub(/"/, '')
+          price_doctor = pac ? format_price(pac[:prices][:exf_price][:price]).to_s : nil
+          price_public = pac ? format_price(pac[:prices][:pub_price][:price]).to_s : nil
+          if @infos_zur_rose[ean]
+            price_public ||= sprintf('%06i', ((@infos_zur_rose[ean][:pub_price].to_f)*100).to_i)
+            if  @infos_zur_rose[ean][:pub_price]
+              price_doctor ||= sprintf('%06i', ((@infos_zur_rose[ean][:price].to_f)*100).to_i)  if  @infos_zur_rose[ean][:price]
+              if @options[:percent] != nil
+                price_doctor = sprintf('%06i', (price_doctor.to_f*(1 + (@options[:percent].to_f/100))).round_by(0.05).round(2))
+              end
+            end
+          end
           row << format_name(abez)
-          row << "%#{DAT_LEN[:PRMO]}s"  % (pac ? format_price(pac[:prices][:exf_price][:price].to_s) : ('0' * DAT_LEN[:PRMO]))
-          row << "%#{DAT_LEN[:PRPU]}s"  % (pac ? format_price(pac[:prices][:pub_price][:price].to_s) : ('0' * DAT_LEN[:PRPU]))
+          row << "%#{DAT_LEN[:PRMO]}s"  % (price_doctor ? price_doctor.to_s : ('0' * DAT_LEN[:PRMO]))
+          row << "%#{DAT_LEN[:PRPU]}s"  % (price_public ? price_public.to_s : ('0' * DAT_LEN[:PRPU]))
           row << "%#{DAT_LEN[:CKZL]}s"  % if (@lppvs[ean])
                                             '2'
                                           elsif pac # sl_entry

data/lib/oddb2xml/cli.rb

@@ -5,6 +5,7 @@ require 'oddb2xml/builder'
 require 'oddb2xml/downloader'
 require 'oddb2xml/extractor'
 require 'oddb2xml/compressor'
+require 'oddb2xml/options'
 require 'oddb2xml/util'
 require 'rubyXL'
 

data/lib/oddb2xml/options.rb

@@ -0,0 +1,75 @@
+# encoding: utf-8
+require 'optparse'
+
+module Oddb2xml
+  
+  class Options
+    attr_reader :parser, :opts
+    def Options.default_opts
+      {
+        :fi           => false,
+        :adr          => false,
+        :address      => false,
+        :nonpharma    => false,
+        :extended     => false,
+        :compress_ext => nil,
+        :format       => :xml,
+        :tag_suffix   => nil,
+        :debug        => false,
+        :ean14        => false,
+        :skip_download=> false,
+        :log          => false,
+        :percent      => 0,
+      }
+    end
+    def Options.help
+  <<EOS
+#$0 ver.#{Oddb2xml::VERSION}
+Usage:
+  oddb2xml [option]
+    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.
+    -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.
+    -i,   --include      Include target option for ean14  for 'dat' format.
+                         'xml' format includes always ean14 records.
+    -o,   --option       Optional fachinfo output.
+    -p,   --price        Price source (transfer.dat) from ZurRose
+    -t S, --tag-suffix=S XML tag suffix S. Default is none. [A-z0-9]
+                         If S is given, it is also used as prefix of filename.
+    -x N, --context=N    context N {product|address}. product is default.
+
+                         For debugging purposes
+    --skip-download      skips downloading files it the file is already under downloads.
+                         Downloaded files are saved under downloads
+    --log                log important actions
+    -h,   --help         Show this help message.
+EOS
+    end
+    def initialize
+      @parser = OptionParser.new
+      @opts   = Options.default_opts
+      @parser.on('-a',   '--append')                       {|v| @opts[:nonpharma] = true }
+      @parser.on('-c v', '--compress v',   /^tar\.gz|zip$/){|v| @opts[:compress_ext] = v }
+      @parser.on('-e', '--extended')                       {|v| @opts[:extended] = true
+                                                              @opts[:nonpharma] = true
+                                                              @opts[:price] = :zurrose
+                                                            }
+      @parser.on('-f v', '--format v',     /^xml|dat$/)    {|v| @opts[:format] = v.intern }
+      @parser.on('-o',   '--option')                       {|v| @opts[:fi] = true }
+      @parser.on('-I v', '--increment v',  /^[0-9]+$/)     {|v| @opts[:percent] = v ? v.to_i : 0
+                                                                @opts[:price] = :zurrose
+                                                           }
+      @parser.on('-i',   '--include')                      {|v| @opts[:ean14] = true }
+      @parser.on('-t v', '--tag-suffix v', /^[A-z0-9]*$/i) {|v| @opts[:tag_suffix] = v.upcase }
+      @parser.on('-x v', '--context v',    /^addr(ess)*$/i){|v| @opts[:address] = true }
+      @parser.on('-p', '--price')                          {|v| @opts[:price] = :zurrose }
+      @parser.on('--skip-download')                        {|v| @opts[:skip_download] = true }
+      @parser.on('--log')                                  {|v| @opts[:log] = true }
+      @parser.on_tail('-h', '--help') { puts Options.help; exit }
+    end
+  end
+end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.8.9"
+  VERSION = "1.9.0"
 end

data/spec/builder_spec.rb

@@ -44,14 +44,16 @@ describe Oddb2xml::Builder do
   after(:each) do
     Dir.chdir @savedDir if @savedDir and File.directory?(@savedDir)
   end
-if false
+
   context 'XSD-generation: ' do
     let(:cli) do
         opts = {}
         @oddb2xml_xsd = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb2xml.xsd'))
         @article_xml  = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
         @product_xml  = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_product.xml'))
-        Oddb2xml::Cli.new(opts)
+        options = Oddb2xml::Options.new
+        options.parser.parse!([])
+        Oddb2xml::Cli.new(options.opts)
     end
 
     it 'should return true when validating xml against oddb2xml.xsd' do
@@ -74,8 +76,9 @@ if false
 
   context 'when no option is given' do
     let(:cli) do
-      opts = {}
-      Oddb2xml::Cli.new(opts)
+      options = Oddb2xml::Options.new
+      options.parser.parse!([])
+      Oddb2xml::Cli.new(options.opts)
     end
 
     it 'should pass validating via oddb2xml.xsd' do
@@ -121,10 +124,9 @@ if false
 
   context 'when -f dat is given' do
     let(:cli) do
-      opts = {
-        :format       => :dat,
-      }
-      Oddb2xml::Cli.new(opts)
+      options = Oddb2xml::Options.new
+      options.parser.parse!('-f dat'.split(' '))
+      Oddb2xml::Cli.new(options.opts)
     end
 
     it 'should contain the correct values fo CMUT from zurrose_transfer.dat' do
@@ -136,17 +138,16 @@ if false
       oddb_dat.should match(/^..2/), "should have a record with '2' in CMUT field"
       oddb_dat.should match(/^..3/), "should have a record with '3' in CMUT field"
       oddb_dat.should match(/1115819012LEVETIRACETAM DESITIN Filmtabl 250 mg 30 Stk/), "should have Desitin"
+      IO.readlines(dat_filename).each{ |line| check_article(line, false, false) }
       # oddb_dat.should match(/^..1/), "should have a record with '1' in CMUT field" # we have no
     end
   end
 
-  context 'when -a nonpharma -f dat is given' do
+  context 'when --append -f dat is given' do
     let(:cli) do
-      opts = {
-        :nonpharma    => 'true',
-        :format       => :dat,
-      }
-      Oddb2xml::Cli.new(opts)
+      options = Oddb2xml::Options.new
+      options.parser.parse!('--append -f dat'.split(' '))
+      Oddb2xml::Cli.new(options.opts)
     end
 
     it 'should generate a valid oddb_with_migel.dat' do
@@ -168,18 +169,57 @@ if false
       oddb_dat.should match(/76806206900842/), "should match EAN of Desitin"
     end
   end
+
+  context 'when --append -I 80 -e is given' do
+    let(:cli) do
+      options = Oddb2xml::Options.new
+      options.parser.parse!('--append -I 80 -e'.split(' '))
+      Oddb2xml::Cli.new(options.opts)
+    end
+
+    it 'should contain the correct prices' do
+      cleanup_directories_before_run
+      res = buildr_capture(:stdout){ cli.run }
+      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
+      File.exists?(@article_xml).should eq true
+      article_xml = IO.read(@article_xml)
+      product_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_product.xml'))
+      File.exists?(product_filename).should eq true
+      doc = REXML::Document.new File.new(@article_xml)
+      unless /1\.8\.7/.match(RUBY_VERSION)
+        price_zur_rose = XPath.match( doc, "//ART[DSCRD='SOFRADEX Gtt Auric']/ARTPRI[PTYP='ZURROSE']/PRICE").first.text
+        price_zur_rose.should eq '12.9'
+        price_zur_rose_pub = XPath.match( doc, "//ART[DSCRD='SOFRADEX Gtt Auric']/ARTPRI[PTYP='ZURROSEPUB']/PRICE").first.text
+        price_zur_rose_pub.should eq '15.45'
+      end
+    end
+  end
+
   context 'when option -e is given' do
     let(:cli) do
-      opts = {
-        :extended    => :true,
-        :nonpharma    => :true,
-        :price      => :zurrose,
-        :log      => true,
-        :skip_download => true,
-      }
-      Oddb2xml::Cli.new(opts)
+      options = Oddb2xml::Options.new
+      options.parser.parse!('-e'.split(' '))
+      Oddb2xml::Cli.new(options.opts)
     end
 
+    it 'should contain the correct prices' do
+      cleanup_directories_before_run
+      res = buildr_capture(:stdout){ cli.run }
+      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
+      File.exists?(@article_xml).should eq true
+      article_xml = IO.read(@article_xml)
+      product_filename = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_product.xml'))
+      File.exists?(product_filename).should eq true
+      doc = REXML::Document.new File.new(@article_xml)
+      unless /1\.8\.7/.match(RUBY_VERSION)
+        price_zur_rose = XPath.match( doc, "//ART[DSCRD='SOFRADEX Gtt Auric']/ARTPRI[PTYP='ZURROSE']/PRICE").first.text
+        price_zur_rose.should eq '7.2'
+        price_zur_rose_pub = XPath.match( doc, "//ART[DSCRD='SOFRADEX Gtt Auric']/ARTPRI[PTYP='ZURROSEPUB']/PRICE").first.text
+        price_zur_rose_pub.should eq '15.45'
+      end
+    end
+
+
     def checkItemForRefdata(doc, pharmacode, isRefdata)
       article = XPath.match( doc, "//ART[PHAR=#{pharmacode.to_s}]").first
       name =  article.elements['DSCRD'].text
@@ -378,23 +418,18 @@ if false
       checkItemForSALECD(doc, "0598003", 'I') # SOFRADEX
     end
   end
-end
+
   context 'testing -e option' do
     let(:cli) do
-      opts = {
-        :extended    => :true,
-        :skip_download => true,
-      }
-      Oddb2xml::Cli.new(opts)
+      options = Oddb2xml::Options.new
+      options.parser.parse!('-e --skip-download'.split(' '))
+      Oddb2xml::Cli.new(options.opts)
     end
 
-		let(:cli_e80) do
-      opts = {
-        :extended    => :true,
-        :percent     => 80,
-        :skip_download => true,
-      }
-      Oddb2xml::Cli.new(opts)
+    let(:cli_I80) do
+      options = Oddb2xml::Options.new
+      options.parser.parse!('-e -I 80 --skip-download'.split(' '))
+      Oddb2xml::Cli.new(options.opts)
     end
     search_path_rose = "//ART[PHAR=0023722]/ARTPRI[PTYP='ZURROSE']/PRICE"
     search_path_pub  = "//ART[PHAR=0023722]/ARTPRI[PTYP='ZURROSEPUB']/PRICE"
@@ -420,8 +455,8 @@ end
       XPath.match( doc, search_path_desitin).first.text.should eq '27.8'
     end
 
-    it 'should add 80 percent to zur_rose pubbprice if -e 80' do
-      res = buildr_capture(:stdout){ cli_e80.run }
+    it 'should add 80 percent to zur_rose pubbprice if -I 80' do
+      res = buildr_capture(:stdout){ cli_I80.run }
       @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
       File.exists?(@article_xml).should eq true
       FileUtils.cp(@article_xml, File.join(Oddb2xml::WorkDir, 'tst-e80.xml'))
@@ -432,15 +467,82 @@ end
       refdata =  article.elements['REF_DATA'].text
       smno    =  article.elements['SMNO'] ? article.elements['SMNO'].text : 'nil'
       XPath.match( doc, search_path_rose).size.should eq 1
-      XPath.match( doc, search_path_rose).first.text.should eq '9.85'
-      price = 15.20 # This is the zurrose pub price.
-      price2 = (price*1.8).round_by(0.05).round(2) # Our price should be now 80% higher
+      XPath.match( doc, search_path_rose).first.text.should eq '17.75'
       XPath.match( doc, search_path_pub).first.text
-      XPath.match( doc, search_path_pub).first.text.to_f.should eq price2
+      XPath.match( doc, search_path_pub).first.text.should eq '15.20'
       XPath.match( doc, search_path_desitin).first.text.should eq '27.8'
       # sl-entries have a PPUB price, but no ZURROSEPUB, and vice versa
       XPath.match( doc, "//ART[PHAR=0023722]/ARTPRI[PTYP='PPUB']").size.should eq 0
       XPath.match( doc, "//ART[SMNO='62069008']/ARTPRI[PTYP='ZURROSEPUB']").size.should eq 0
     end
   end
+
+  def check_article(line, check_prices = false, add_80_percents=0)
+    name          = line[10..59]
+    ckzl          = line[72]
+    ciks          = line[75]
+    price_doctor  = line[60..65].to_i
+    price_public  = line[66..71].to_i
+    puts "check_article: #{price_doctor} #{price_public} CKZL is #{ckzl} CIKS is #{ciks} name  #{name} " if $VERBOSE
+    return unless check_prices
+    if /11116999473TC/.match(line)
+      price_doctor.should eq 16455
+      line[60..65].should eq '016455'
+      ckzl.should eq '1'
+      price_public.should eq 20530     # this is a SL-product. Therefore we may not have a price increase
+      line[66..71].should eq '020530'  # the dat format requires leading zeroes and not point
+    end
+    if /1130598003SOFRADEX/.match(line)
+      price_public.should eq    1545  # this is a non  SL-product, but no price increase was requested
+      line[66..71].should eq '001545' # the dat format requires leading zeroes and not point
+
+      ckzl.should eq '3'
+      if add_80_percents
+        price_doctor.should eq    1292  # = 1545*1.8 this is a non  SL-product. Therefore we must increase its price as requsted
+        line[60..65].should eq '001292' # dat format requires leading zeroes and not poin
+      else
+        price_doctor.should eq     718  # this is a non  SL-product, but no price increase was requested
+        line[60..65].should eq '000718' # the dat format requires leading zeroes and not point
+      end
+    end
+  end
+
+  context 'when -f dat -p is given' do
+    let(:cli) do
+      options = Oddb2xml::Options.new
+      options.parser.parse!('-f dat -p'.split(' '))
+      Oddb2xml::Cli.new(options.opts)
+    end
+
+    it 'should contain the correct values fo CMUT from zurrose_transfer.dat' do
+      res = buildr_capture(:stdout){ cli.run }
+      res.should match(/products/)
+      dat_filename = File.join(Oddb2xml::WorkDir, 'oddb.dat')
+      File.exists?(dat_filename).should eq true
+      oddb_dat = IO.read(dat_filename)
+      oddb_dat.should match(/^..2/), "should have a record with '2' in CMUT field"
+      oddb_dat.should match(/^..3/), "should have a record with '3' in CMUT field"
+      oddb_dat.should match(/1115819012LEVETIRACETAM DESITIN Filmtabl 250 mg 30 Stk/), "should have Desitin"
+      IO.readlines(dat_filename).each{ |line| check_article(line, true, false) }
+      # oddb_dat.should match(/^..1/), "should have a record with '1' in CMUT field" # we have no
+    end
+  end
+
+  context 'when -f dat -I 80 is given' do
+    let(:cli) do
+      options = Oddb2xml::Options.new
+      options.parser.parse!('-f dat -I 80'.split(' '))
+      Oddb2xml::Cli.new(options.opts)
+    end
+    it 'should contain the corect prices' do
+      res = buildr_capture(:stdout){ cli.run }
+      res.should match(/products/)
+      dat_filename = File.join(Oddb2xml::WorkDir, 'oddb.dat')
+      File.exists?(dat_filename).should eq true
+      oddb_dat = IO.read(dat_filename)
+      oddb_dat_lines = IO.readlines(dat_filename)
+      IO.readlines(dat_filename).each{ |line| check_article(line, true, true) }
+    end
+  end
+
 end

data/spec/cli_spec.rb

@@ -58,14 +58,9 @@ describe Oddb2xml::Cli do
   end
   context 'when -c tar.gz option is given' do
     let(:cli) do
-      opts = {
-        :compress_ext => 'tar.gz',
-        :nonpharma    => false,
-        :fi           => false,
-        :address      => false,
-        :tag_suffix   => nil,
-      }
-      Oddb2xml::Cli.new(opts)
+      options = Oddb2xml::Options.new
+      options.parser.parse!('-c tar.gz'.split(' '))
+      Oddb2xml::Cli.new(options.opts)
     end
     it_behaves_like 'any interface for product'
     it 'should have compress option' do
@@ -85,14 +80,9 @@ describe Oddb2xml::Cli do
   end
   context 'when -c zip option is given' do
     let(:cli) do
-      opts = {
-        :compress_ext => 'zip',
-        :nonpharma    => false,
-        :fi           => false,
-        :address      => false,
-        :tag_suffix   => nil,
-      }
-      Oddb2xml::Cli.new(opts)
+      options = Oddb2xml::Options.new
+      options.parser.parse!('-c zip'.split(' '))
+      Oddb2xml::Cli.new(options.opts)
     end
     it_behaves_like 'any interface for product'
     it 'should have compress option' do
@@ -113,14 +103,9 @@ describe Oddb2xml::Cli do
   end
   context 'when -a nonpharma option is given' do
     let(:cli) do
-      opts = {
-        :compress_ext => nil,
-        :nonpharma    => true,
-        :fi           => false,
-        :address      => false,
-        :tag_suffix   => nil,
-      }
-      Oddb2xml::Cli.new(opts)
+      options = Oddb2xml::Options.new
+      options.parser.parse!('-a nonpharma'.split(' '))
+      Oddb2xml::Cli.new(options.opts)
     end
     it_behaves_like 'any interface for product'
     it 'should have nonpharma option' do
@@ -148,14 +133,9 @@ describe Oddb2xml::Cli do
   end
   context 'when -t _swiss option is given' do
     let(:cli) do
-      opts = {
-        :compress_ext => nil,
-        :nonpharma    => false,
-        :fi           => false,
-        :address      => false,
-        :tag_suffix   => '_swiss'.upcase,
-      }
-      Oddb2xml::Cli.new(opts)
+      options = Oddb2xml::Options.new
+      options.parser.parse!('-t _swiss'.split(' '))
+      Oddb2xml::Cli.new(options.opts)
     end
     it_behaves_like 'any interface for product'
     it 'should have tag_suffix option' do
@@ -183,14 +163,9 @@ describe Oddb2xml::Cli do
   end
   context 'when -o fi option is given' do
     let(:cli) do
-      opts = {
-        :compress_ext => nil,
-        :nonpharma    => false,
-        :fi           => true,
-        :address      => false,
-        :tag_suffix   => nil,
-      }
-      Oddb2xml::Cli.new(opts)
+      options = Oddb2xml::Options.new
+      options.parser.parse!('-o fi'.split(' '))
+      Oddb2xml::Cli.new(options.opts)
     end
     it_behaves_like 'any interface for product'
     it 'should have nonpharma option' do
@@ -220,14 +195,9 @@ describe Oddb2xml::Cli do
   end
   context 'when -x address option is given' do
     let(:cli) do
-      opts = {
-        :compress_ext => nil,
-        :nonpharma    => false,
-        :fi           => false,
-        :address      => true,
-        :tag_suffix   => nil,
-      }
-      Oddb2xml::Cli.new(opts)
+      options = Oddb2xml::Options.new
+      options.parser.parse!('-x address'.split(' '))
+      Oddb2xml::Cli.new(options.opts)
     end
     it_behaves_like 'any interface for address'
     it 'should have address option' do

data/spec/options_spec.rb

@@ -0,0 +1,187 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require "#{Dir.pwd}/lib/oddb2xml/options"
+module Kernel
+  def cli_capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval "$#{stream} = #{stream.upcase}"
+    end
+    result
+  end
+end
+
+describe Oddb2xml::Options do
+  include ServerMockHelper
+  Default_opts =  {
+    :fi           => false,
+    :adr          => false,
+    :address      => false,
+    :nonpharma    => false,
+    :extended     => false,
+    :compress_ext => nil,
+    :format       => :xml,
+    :tag_suffix   => nil,
+    :debug        => false,
+    :ean14        => false,
+    :skip_download=> false,
+    :log          => false,
+    :percent      => 0,
+  }
+  context 'when default_opts' do
+    specify { expect(Oddb2xml::Options.default_opts).to eq  Default_opts }
+  end
+
+  context 'when no options is passed' do
+    options = Oddb2xml::Options.new
+    specify { expect(options.opts).to eq Default_opts }
+  end
+
+  context 'when -c tar.gz option is given' do
+    options = Oddb2xml::Options.new
+    options.parser.parse!('-c tar.gz'.split(' '))
+    specify { expect(options.opts[:compress_ext]).to eq('tar.gz') }
+    expected = Default_opts.clone
+    expected[:compress_ext] = 'tar.gz'
+    specify { expect(options.opts).to eq expected }
+  end
+
+  context 'when -c tar.gz option --skip-download is given' do
+    options = Oddb2xml::Options.new
+    options.parser.parse!('-c tar.gz --skip-download'.split(' '))
+    expected = Default_opts.clone
+    expected[:compress_ext] = 'tar.gz'
+    expected[:skip_download] = true
+    specify { expect(options.opts).to eq expected }
+  end
+
+  context 'when -c tar.gz option --skip-download is given' do
+    options = Oddb2xml::Options.new
+    options.parser.parse!('-c tar.gz --skip-download'.split(' '))
+    expected = Default_opts.clone
+    expected[:compress_ext] = 'tar.gz'
+    expected[:skip_download] = true
+    specify { expect(options.opts).to eq expected }
+  end
+
+  context 'when -a is given' do
+    options = Oddb2xml::Options.new
+    options.parser.parse!('-a'.split(' '))
+    expected = Default_opts.clone
+    expected[:nonpharma] =  true
+    specify { expect(options.opts).to eq expected }
+  end
+
+  context 'when --append is given' do
+    options = Oddb2xml::Options.new
+    options.parser.parse!('--append '.split(' '))
+    expected = Default_opts.clone
+    expected[:nonpharma] =  true
+    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[: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[:price]      = :zurrose
+    specify { expect(options.opts).to eq expected }
+  end
+
+  context 'when -e -I 80 is given' do
+    options = Oddb2xml::Options.new
+    options.parser.parse!('-e -I 80'.split(' '))
+    expected = Default_opts.clone
+    expected[:extended]  =  true
+    expected[:nonpharma] =  true
+    expected[:price]      = :zurrose
+    expected[:percent]    = 80
+    specify { expect(options.opts).to eq expected }
+  end
+
+  context 'when -f dat is given' do
+    options = Oddb2xml::Options.new
+    options.parser.parse!('-f dat'.split(' '))
+    expected = Default_opts.clone
+    expected[:format]  =  :dat
+    specify { expect(options.opts).to eq expected }
+  end
+
+  context 'when -f dat -I 80 is given' do
+    options = Oddb2xml::Options.new
+    options.parser.parse!('-f dat -I 80'.split(' '))
+    expected = Default_opts.clone
+    expected[:format]  =  :dat
+    expected[:percent] = 80
+    expected[:price]   = :zurrose
+    specify { expect(options.opts).to eq expected }
+  end
+
+  context 'when -I 80 is given' do
+    options = Oddb2xml::Options.new
+    options.parser.parse!('-I 80'.split(' '))
+    expected = Default_opts.clone
+    expected[:percent]   = 80
+    expected[:price]   = :zurrose
+    specify { expect(options.opts).to eq expected }
+  end
+
+  context 'when -o is given' do
+    options = Oddb2xml::Options.new
+    options.parser.parse!('-o'.split(' '))
+    expected = Default_opts.clone
+    expected[:fi]  =  true
+    specify { expect(options.opts).to eq expected }
+  end
+
+  context 'when -i ean14 is given' do
+    options = Oddb2xml::Options.new
+    options.parser.parse!('-i ean14'.split(' '))
+    expected = Default_opts.clone
+    expected[:ean14]  =  true
+    specify { expect(options.opts).to eq expected }
+  end
+
+  context 'when -x addr is given' do
+    options = Oddb2xml::Options.new
+    options.parser.parse!('-x addr'.split(' '))
+    expected = Default_opts.clone
+    expected[:address]  =  true
+    specify { expect(options.opts).to eq expected }
+  end
+
+  context 'when -p zurrose is given' do
+    options = Oddb2xml::Options.new
+    options.parser.parse!('-p zurrose'.split(' '))
+    expected = Default_opts.clone
+    expected[:price]  =  :zurrose
+    specify { expect(options.opts).to eq expected }
+  end
+
+  context 'when -o fi --log is given' do
+    options = Oddb2xml::Options.new
+    options.parser.parse!('-o fi --log'.split(' '))
+    expected = Default_opts.clone
+    expected[:fi]  =  true
+    expected[:log]  =  true
+    specify { expect(options.opts).to eq expected }
+  end
+end
+

data/test_options.rb

@@ -49,9 +49,10 @@ prepare_for_gem_test
 # unfortunately it returns a very common name
 unless 'localhost.localdomain'.eql?(Socket.gethostbyname(Socket.gethostname).first)
   test_one_call('oddb2xml -e')
-  test_one_call('oddb2xml -e80')
-  test_one_call('oddb2xml -f dat -a nonpharma')
-  test_one_call('oddb2xml -a nonpharma')
+  test_one_call('oddb2xml -e -I80')
+  test_one_call('oddb2xml -f dat --append -I 80')
+  test_one_call('oddb2xml -f dat --append')
+  test_one_call('oddb2xml --append')
 end
 test_one_call('oddb2xml -t md -c tar.gz')
 test_one_call('oddb2xml -f xml')

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.8.9
-  prerelease: 
+  version: 1.9.0
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   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,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sax-machine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -206,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -214,7 +188,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -244,6 +217,7 @@ files:
 - lib/oddb2xml/compressor.rb
 - lib/oddb2xml/downloader.rb
 - lib/oddb2xml/extractor.rb
+- lib/oddb2xml/options.rb
 - lib/oddb2xml/util.rb
 - lib/oddb2xml/version.rb
 - lib/oddb2xml/xml_definitions.rb
@@ -295,6 +269,7 @@ files:
 - spec/data/zurrose_transfer.dat
 - spec/downloader_spec.rb
 - spec/extractor_spec.rb
+- spec/options_spec.rb
 - spec/spec_helper.rb
 - test_options.rb
 - tools/cacert.pem
@@ -303,27 +278,26 @@ files:
 homepage: https://github.com/zdavatz/oddb2xml
 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.3.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: oddb2xml creates xml files.
 test_files:
 - spec/builder_spec.rb
@@ -372,4 +346,5 @@ test_files:
 - spec/data/zurrose_transfer.dat
 - spec/downloader_spec.rb
 - spec/extractor_spec.rb
+- spec/options_spec.rb
 - spec/spec_helper.rb