oddb2xml 1.0.7 → 1.0.8

data/History.txt

@@ -1,5 +1,13 @@
 === 1.0.7 / 20.11.2012
 
+* Update spec for cli
+* Add zip compress option
+* Use -t option also as prefix of filename
+* Allow tag suffix as flexible word
+* Update help message
+
+=== 1.0.7 / 20.11.2012
+
 * Add -t --tag-suffix option for 'md'
 
 === 1.0.6 / 23.10.2012

data/README.md

@@ -1,19 +1,125 @@
-oddb2xml
-========
+# oddb2xml
 
 oddb2xml, creates xml files using swissINDEX, BAG-XML and Swissmedic XLS.
 
 
-usage
------
+## usage
+
+see `--help`.
 
 ```
 $ oddb2xml --help
-bin/oddb2xml ver.1.0.6
+oddb2xml ver.1.0.7
 Usage:
   oddb2xml [option]
-    -c F, --compress=F   Compress format F. Currently only 'tar.gz' is available.
-    -a T, --append=T     Additional target. T is only 'nonpharma' available.
-    -t S, --tag-suffix=S XML tag suffix S. default none. Only 'md' is available.
+    -c F, --compress=F   Compress format F. {tar.gz|zip}
+    -a T, --append=T     Additional target. T, only 'nonpharma' 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.
     -h,   --help         Show this help message.
 ```
+
+
+## example
+
+option examples.
+
+```
+$ oddb2xml                              # => oddb_article.xml, oddb_product.xml
+$ oddb2xml -t md                        # => md_article.xml, md_product.xml
+$ oddb2xml -a nonpharma -t md -c tar.gz # => md_xml_dd.mm.yyyy_hh.mm.tar.gz
+```
+
+output.
+
+```
+$ oddb2xml
+DE
+        Pharma products: 14801
+FR
+        Pharma products: 14801
+```
+
+### article.xml
+
+oddb2xml creates article.xml as oddb_article.xml by default.
+
+```
+<?xml version="1.0" encoding="utf-8"?>
+<ARTICLE xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://wiki.oddb.org/wiki.php?pagename=Swissmedic.Datendeklaration" CREATION_DATETIME="2012-11-21T13:09:23.6787110+0900" PROD_DATE="2012-11-21T13:09:23.6787110+0900" VALID_DATE="2012-11-21T13:09:23.6787110+0900">
+  <ART DT="">
+    <PHAR>31532</PHAR>
+    <PRDNO>4123</PRDNO>
+    <SMCAT>D</SMCAT>
+    <SMNO>29152039</SMNO>
+    <SALECD>A</SALECD>
+    <QTY>10 Stk</QTY>
+    <DSCRD>BEN-U-RON Supp 250 mg Kind</DSCRD>
+    <DSCRF>BEN-U-RON supp 250 mg enf</DSCRF>
+    <SORTD>BEN-U-RON SUPP 250 MG KIND</SORTD>
+    <SORTF>BEN-U-RON SUPP 250 MG ENF</SORTF>
+    <SYN1D>Ben-u-ron</SYN1D>
+    <SYN1F>Ben-u-ron</SYN1F>
+    <SLOPLUS>2</SLOPLUS>
+    <ARTCOMP/>
+    <ARTBAR>
+      <CDTYP>E13</CDTYP>
+      <BC>7680291520390</BC>
+      <BCSTAT>A</BCSTAT>
+    </ARTBAR>
+    <ARTPRI>
+      <VDAT>01.11.2012</VDAT>
+      <PTYP>PEXF</PTYP>
+      <PRICE>1.780086</PRICE>
+    </ARTPRI>
+    <ARTPRI>
+      <VDAT>01.11.2012</VDAT>
+      <PTYP>PPUB</PTYP>
+      <PRICE>3.3</PRICE>
+    </ARTPRI>
+  </ART>
+  ...
+  <RESULT>
+    <OK_ERROR>OK</OK_ERROR>
+    <NBR_RECORD>14801</NBR_RECORD>
+    <ERROR_CODE/>
+    <MESSAGE/>
+  </RESULT>
+</ARTICLE>
+```
+
+### product.xml
+
+For example, if `-t _swiss` is given then oddb2xml creates product.xml as swiss_product.xml.
+
+```
+<?xml version="1.0" encoding="utf-8"?>
+<PRODUCT_SWISS xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://wiki.oddb.org/wiki.php?pagename=Swissmedic.Datendeklaration" CREATION_DATETIME="2012-11-21T13:01:29.5903756+0900" PROD_DATE="2012-11-21T13:01:29.5903756+0900" VALID_DATE="2012-11-21T13:01:29.5903756+0900">
+  <PRD_SWISS DT="">
+    <PRDNO_SWISS>1167149</PRDNO_SWISS>
+    <DSCRD_SWISS>Allergovit Artemisia Inj Susp Kombi</DSCRD_SWISS>
+    <DSCRF_SWISS>Allergovit Artemisia susp inj combi </DSCRF_SWISS>
+    <ATC_SWISS>V01AA10</ATC_SWISS>
+    <IT_SWISS>07.13.30.</IT_SWISS>
+    <CPT_SWISS>
+      <CPTCMP_SWISS>
+        <LINE_SWISS>0</LINE_SWISS>
+        <QTY_SWISS>1000</QTY_SWISS>
+        <QTYU_SWISS>U.</QTYU_SWISS>
+      </CPTCMP_SWISS>
+      <CPTCMP_SWISS>
+        <LINE_SWISS>1</LINE_SWISS>
+        <QTY_SWISS>10000</QTY_SWISS>
+        <QTYU_SWISS>U.</QTYU_SWISS>
+      </CPTCMP_SWISS>
+    </CPT_SWISS>
+  </PRD_SWISS>
+  ...
+  <RESULT_SWISS>
+    <OK_ERROR_SWISS>OK</OK_ERROR_SWISS>
+    <NBR_RECORD_SWISS>5850</NBR_RECORD_SWISS>
+    <ERROR_CODE_SWISS/>
+    <MESSAGE_SWISS/>
+  </RESULT_SWISS>
+</PRODUCT_SWISS>
+```

data/bin/oddb2xml

@@ -13,23 +13,24 @@ def help
 #$0 ver.#{Oddb2xml::VERSION}
 Usage:
   oddb2xml [option]
-    -c F, --compress=F   Compress format F. Currently only 'tar.gz' is available.
-    -a T, --append=T     Additional target. T is only 'nonpharma' available.
-    -t S, --tag-suffix=S XML tag suffix S. default none. Only 'md' is available.
+    -c F, --compress=F   Compress format F. {tar.gz|zip}
+    -a T, --append=T     Additional target. T, only 'nonpharma' 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.
     -h,   --help         Show this help message.
 EOS
 end
 
 parser = OptionParser.new
 opts = {
-  :compress   => nil,
-  :nonpharma  => false,
-  :tag_suffix => '',
+  :compress_ext => nil,
+  :nonpharma    => false,
+  :tag_suffix   => nil,
 }
 
-parser.on('-c v', '--compress v', /tar\.gz/) {|v| opts[:compress] = v }
+parser.on('-c v', '--compress v', /tar\.gz|zip/) {|v| opts[:compress_ext] = v }
 parser.on('-a v', '--append v', /nonpharma/) {|v| opts[:nonpharma] = v }
-parser.on('-t v', '--tag-suffix v', /md/i)   {|v| opts[:tag_suffix] = v.upcase }
+parser.on('-t v', '--tag-suffix v', /^[A-z0-9_]*$/i) {|v| opts[:tag_suffix] = v.upcase }
 parser.on_tail('-h', '--help') { puts help; exit }
 
 args = ARGV.dup

data/lib/oddb2xml/builder.rb

@@ -22,7 +22,7 @@ module Oddb2xml
       @subject    = nil
       @index      = {}
       @items      = {}
-      @tag_suffix = ''
+      @tag_suffix = nil
       if block_given?
         yield self
       end

data/lib/oddb2xml/cli.rb

@@ -48,7 +48,8 @@ module Oddb2xml
     private
     def build
       files = {}
-      SUBJECTS.each{ |sbj| files[sbj] = "oddb_#{sbj}.xml" }
+      prefix = (@options[:tag_suffix] || 'oddb').gsub(/^_|_$/, '').downcase
+      SUBJECTS.each{ |sbj| files[sbj] = "#{prefix}_#{sbj}.xml" }
       begin
         files.each_pair do |sbj, file|
           builder = Builder.new do |builder|
@@ -67,8 +68,8 @@ module Oddb2xml
           xml = builder.to_xml
           File.open(file, 'w:utf-8'){ |fh| fh << xml }
         end
-        if @options[:compress]
-          compressor = Compressor.new(@options[:compress])
+        if @options[:compress_ext]
+          compressor = Compressor.new(prefix, @options[:compress_ext])
           files.values.each do |file|
             compressor.contents << file
           end

data/lib/oddb2xml/compressor.rb

@@ -2,14 +2,15 @@
 
 require 'zlib'
 require 'archive/tar/minitar'
+require 'zip/zip'
 
 module Oddb2xml
  class Compressor
     include Archive::Tar
     attr_accessor :contents
-    def initialize(ext='tar.gz')
-      @compressed_file = 'oddb_xml_' + Time.now.strftime("%d.%m.%Y_%H.%M.#{ext}")
-      @contents = []
+    def initialize(prefix='oddb', ext='tar.gz')
+      @compress_file = "#{prefix}_xml_" + Time.now.strftime("%d.%m.%Y_%H.%M.#{ext}")
+      @contents      = []
       super()
     end
     def finalize!
@@ -17,17 +18,27 @@ module Oddb2xml
         return false
       end
       begin
-        tgz = Zlib::GzipWriter.new(File.open(@compressed_file, 'wb'))
-        Minitar.pack(@contents, tgz)
-        if File.exists? @compressed_file
+        case @compress_file
+        when /\.tar\.gz$/
+          tgz = Zlib::GzipWriter.new(File.open(@compress_file, 'wb'))
+          Minitar.pack(@contents, tgz)
+        when /\.zip$/
+          Zip::ZipFile.open(@compress_file, Zip::ZipFile::CREATE) do |zip|
+            @contents.each do |file|
+              filename = File.basename(file)
+              zip.add(filename, file)
+            end
+          end
+        end
+        if File.exists? @compress_file
           @contents.each do |file|
             File.unlink file
           end
         end
       rescue => error
         puts error
-        if File.exists? @compressed_file
-          File.unlink @compressed_file
+        if File.exists? @compress_file
+          File.unlink @compress_file
         end
         return false
       end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/spec/cli_spec.rb

@@ -28,10 +28,17 @@ describe Oddb2xml::Cli do
     setup_server_mocks
   end
   context 'when -c tar.gz option is given' do
-    let(:cli) { Oddb2xml::Cli.new({:compress => 'tar.gz', :nonpharma => false}) }
+    let(:cli) do
+      opts = {
+        :compress_ext => 'tar.gz',
+        :nonpharma    => false,
+        :tag_suffix   => nil,
+      }
+      Oddb2xml::Cli.new(opts)
+    end
     it_behaves_like 'any interface'
     it 'should have compress option' do
-      cli.should have_option(:compress => 'tar.gz')
+      cli.should have_option(:compress_ext => 'tar.gz')
     end
     it 'should create tar.gz file' do
       $stdout.should_receive(:puts).with(/Pharma/)
@@ -52,8 +59,47 @@ describe Oddb2xml::Cli do
       end
     end
   end
+  context 'when -c zip option is given' do
+    let(:cli) do
+      opts = {
+        :compress_ext => 'zip',
+        :nonpharma    => false,
+        :tag_suffix   => nil,
+      }
+      Oddb2xml::Cli.new(opts)
+    end
+    it_behaves_like 'any interface'
+    it 'should have compress option' do
+      cli.should have_option(:compress_ext => 'zip')
+    end
+    it 'should create zip file' do
+      $stdout.should_receive(:puts).with(/Pharma/)
+      cli.run
+      file = Dir.glob('oddb_*.zip').first
+      File.exists?(file).should be_true
+    end
+    it 'should not create any xml file' do
+      $stdout.should_receive(:puts).with(/Pharma/)
+      cli.run
+      Dir.glob('oddb_*.xml').each do |file|
+        File.exists?(file).should be_nil
+      end
+    end
+    after(:each) do
+      Dir.glob('oddb_*.zip').each do |file|
+        File.unlink(file) if File.exists?(file)
+      end
+    end
+  end
   context 'when -a nonpharma option is given' do
-    let(:cli) { Oddb2xml::Cli.new({:compress => nil, :nonpharma => true}) }
+    let(:cli) do
+      opts = {
+        :compress_ext => nil,
+        :nonpharma    => true,
+        :tag_suffix   => nil,
+      }
+      Oddb2xml::Cli.new(opts)
+    end
     it_behaves_like 'any interface'
     it 'should have nonpharma option' do
       cli.should have_option(:nonpharma => true)
@@ -62,6 +108,7 @@ describe Oddb2xml::Cli do
       $stdout.should_receive(:puts).with(/NonPharma/)
       cli.run
       Dir.glob('oddb_*.tar.gz').first.should be_nil
+      Dir.glob('oddb_*.zip').first.should be_nil
     end
     it 'should create 2 xml files' do
       $stdout.should_receive(:puts).with(/NonPharma/)
@@ -76,4 +123,36 @@ describe Oddb2xml::Cli do
       end
     end
   end
+  context 'when -t _swiss option is given' do
+    let(:cli) do
+      opts = {
+        :compress_ext => nil,
+        :nonpharma    => false,
+        :tag_suffix   => '_swiss'.upcase,
+      }
+      Oddb2xml::Cli.new(opts)
+    end
+    it_behaves_like 'any interface'
+    it 'should have tag_suffix option' do
+      cli.should have_option(:tag_suffix=> '_SWISS')
+    end
+    it 'should not create any compressed file' do
+      $stdout.should_receive(:puts).with(/Pharma/)
+      cli.run
+      Dir.glob('oddb_*.tar.gz').first.should be_nil
+      Dir.glob('oddb_*.zip').first.should be_nil
+    end
+    it 'should create 2 xml files with prefix swiss_' do
+      $stdout.should_receive(:puts).with(/Pharma/)
+      cli.run
+      Dir.glob('swiss_*.xml').each do |file|
+        File.exists?(file).should be_true
+      end
+    end
+    after(:each) do
+      Dir.glob('swiss_*.xml').each do |file|
+        File.unlink(file) if File.exists?(file)
+      end
+    end
+  end
 end

data/spec/compressor_spec.rb

@@ -2,25 +2,66 @@
 
 require 'spec_helper'
 
+shared_examples_for 'any compressor' do
+  it 'should create compress file' do
+    File.stub(:unlink).and_return(false)
+    @compressor.contents << File.expand_path('../data/oddb_article.xml', __FILE__)
+    @compressor.contents << File.expand_path('../data/oddb_product.xml', __FILE__)
+    @compressor.finalize!.should == true
+    compress_file = @compressor.instance_variable_get(:@compress_file)
+    File.exists?(compress_file).should == true
+    File.unstub!(:unlink)
+  end
+end
+
 describe Oddb2xml::Compressor do
-  context "when tar.gz ext is given at initialize" do
-    before(:each) do
-      @compressor = Oddb2xml::Compressor.new('tar.gz')
+  context 'at initialize' do
+    context 'any argment is given' do
+      before(:each) do
+        @compressor = Oddb2xml::Compressor.new
+      end
+      it 'should have empty contents as array' do
+        @compressor.contents.should be_a Array
+        @compressor.contents.should be_empty
+      end
+      it 'should have formated filename with datetime' do
+        @compressor.instance_variable_get(:@compress_file).
+          should =~ /oddb_xml_\d{2}.\d{2}.\d{4}_\d{2}.\d{2}.tar\.gz/
+      end
     end
-    it 'should have formated filename with datetime' do
-      @compressor.instance_variable_get(:@compressed_file).
-        should =~ /oddb_xml_\d{2}.\d{2}.\d{4}_\d{2}.\d{2}.tar\.gz/
+    context "when swiss prefix is given" do
+      before(:each) do
+        @compressor = Oddb2xml::Compressor.new('swiss', 'tar.gz')
+      end
+      it 'should have formated filename with datetime' do
+        @compressor.instance_variable_get(:@compress_file).
+          should =~ /swiss_xml_\d{2}.\d{2}.\d{4}_\d{2}.\d{2}.tar\.gz/
+      end
     end
-    it 'should have empty contents as array' do
-      @compressor.contents.should be_a Array
-      @compressor.contents.should be_empty
+    context "when tar.gz ext is given" do
+      before(:each) do
+        @compressor = Oddb2xml::Compressor.new('oddb', 'tar.gz')
+      end
+      it 'should have formated filename with datetime' do
+        @compressor.instance_variable_get(:@compress_file).
+          should =~ /oddb_xml_\d{2}.\d{2}.\d{4}_\d{2}.\d{2}.tar\.gz/
+      end
+    end
+    context "when zip ext is given" do
+      before(:each) do
+        @compressor = Oddb2xml::Compressor.new('oddb', 'zip')
+      end
+      it 'should have formated filename with datetime' do
+        @compressor.instance_variable_get(:@compress_file).
+          should =~ /oddb_xml_\d{2}.\d{2}.\d{4}_\d{2}.\d{2}.zip/
+      end
     end
   end
   context 'when finalize! is called' do
-    before(:each) do
-      @compressor = Oddb2xml::Compressor.new()
-    end
     context 'unexpectedly' do
+      before(:each) do
+        @compressor = Oddb2xml::Compressor.new
+      end
       it 'should fail with no contents' do
         @compressor.finalize!.should == false
       end
@@ -30,21 +71,23 @@ describe Oddb2xml::Compressor do
       end
     end
     context 'successfully' do
-      it 'should create compressed file' do
-        File.stub(:unlink).and_return(false)
-        @compressor.contents << File.expand_path('../data/oddb_article.xml', __FILE__)
-        @compressor.contents << File.expand_path('../data/oddb_product.xml', __FILE__)
-        @compressor.finalize!.should == true
-        compressed_file = @compressor.instance_variable_get(:@compressed_file)
-        File.exists?(compressed_file).should == true
-        File.unstub!(:unlink)
+      context 'with tar.gz' do
+        before(:each) do
+          @compressor = Oddb2xml::Compressor.new
+        end
+        it_behaves_like 'any compressor'
+      end
+      context 'with zip' do
+        before(:each) do
+          @compressor = Oddb2xml::Compressor.new('oddb', 'zip')
+        end
+        it_behaves_like 'any compressor'
       end
       after(:each) do
-        Dir.glob('oddb_xml_*.tar.gz').each do |file|
+        Dir.glob('oddb_xml_*').each do |file|
           File.unlink(file) if File.exists?(file)
         end
       end
     end
   end
 end
-

metadata

@@ -1,63 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oddb2xml
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.0.8
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 7
-  version: 1.0.7
 platform: ruby
-authors: 
+authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &17164840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *17164840
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &17164160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 2
-        - 13
-        version: "2.13"
+      - !ruby/object:Gem::Version
+        version: '2.13'
   type: :development
-  version_requirements: *id002
-description: ""
-email: 
+  prerelease: false
+  version_requirements: *17164160
+description: ''
+email:
 - yasaka@ywesee.com,  zdavatz@ywesee.com
-executables: 
+executables:
 - oddb2xml
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -88,37 +73,28 @@ files:
 - spec/spec_helper.rb
 homepage: 
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: oddb2xml
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: ""
+summary: ''
 test_files: []
-