oddb2xml 1.0.6 → 1.0.7

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.7 / 20.11.2012
+
+* Add -t --tag-suffix option for 'md'
+
 === 1.0.6 / 23.10.2012
 
 * Added nonpharma option

data/README.md

@@ -1,4 +1,19 @@
 oddb2xml
 ========
 
-oddb2xml, create xml files using swissINDEX and BAG-XML
+oddb2xml, creates xml files using swissINDEX, BAG-XML and Swissmedic XLS.
+
+
+usage
+-----
+
+```
+$ oddb2xml --help
+bin/oddb2xml ver.1.0.6
+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.
+    -h,   --help         Show this help message.
+```

data/bin/oddb2xml

@@ -13,20 +13,23 @@ 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.
-    -h,   --help        Show this help message.
+    -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.
+    -h,   --help         Show this help message.
 EOS
 end
 
 parser = OptionParser.new
 opts = {
-  :compress  => nil,
-  :nonpharma => false
+  :compress   => nil,
+  :nonpharma  => false,
+  :tag_suffix => '',
 }
 
 parser.on('-c v', '--compress v', /tar\.gz/) {|v| opts[:compress] = 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_tail('-h', '--help') { puts help; exit }
 
 args = ARGV.dup

data/lib/oddb2xml/builder.rb

@@ -2,13 +2,27 @@
 
 require 'nokogiri'
 
+module Nokogiri
+  module XML
+    class Document < Nokogiri::XML::Node
+      attr_writer :tag_suffix
+      alias :create_element_origin :create_element
+      def create_element name, *args, &block
+        name += (@tag_suffix || '')
+        create_element_origin(name, *args, &block)
+      end
+    end
+  end
+end
+
 module Oddb2xml
   class Builder
-    attr_accessor :subject, :index, :items
+    attr_accessor :subject, :index, :items, :tag_suffix
     def initialize
-      @subject = nil
-      @index   = {}
-      @items   = {}
+      @subject    = nil
+      @index      = {}
+      @items      = {}
+      @tag_suffix = ''
       if block_given?
         yield self
       end
@@ -36,6 +50,7 @@ module Oddb2xml
         seq
       end
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
+        xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T.%7N%z')
         xml.PRODUCT(
           'xmlns:xsd'         => 'http://www.w3.org/2001/XMLSchema',
@@ -170,6 +185,7 @@ module Oddb2xml
         objects << object
       end
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
+        xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T.%7N%z')
         xml.ARTICLE(
           'xmlns:xsd'         => 'http://www.w3.org/2001/XMLSchema',

data/lib/oddb2xml/cli.rb

@@ -59,9 +59,10 @@ module Oddb2xml
                 index[lang].merge!(@index[lang][type])
               end
             end
-            builder.subject = sbj
-            builder.index = index
-            builder.items = @items
+            builder.subject    = sbj
+            builder.index      = index
+            builder.items      = @items
+            builder.tag_suffix = @options[:tag_suffix]
           end
           xml = builder.to_xml
           File.open(file, 'w:utf-8'){ |fh| fh << xml }

data/lib/oddb2xml/version.rb

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

data/spec/cli_spec.rb

@@ -2,10 +2,22 @@
 
 require 'spec_helper'
 
+RSpec::Matchers.define :have_option do |option|
+  match do |interface|
+    key = option.keys.first
+    val = option.values.first
+    options = interface.instance_variable_get(:@options)
+    options[key] == val
+  end
+  description do
+    "have #{option.keys.first} option as #{option.values.first}"
+  end
+end
+
 shared_examples_for 'any interface' do
   it { cli.should respond_to(:run)  }
   it 'should run successfully' do
-    $stdout.should_receive(:puts).with(/product/)
+    $stdout.should_receive(:puts).with(/products/)
     cli.run
   end
 end
@@ -15,18 +27,20 @@ describe Oddb2xml::Cli do
   before(:each) do
     setup_server_mocks
   end
-  context "when -c tar.gz option is given" do
+  context 'when -c tar.gz option is given' do
     let(:cli) { Oddb2xml::Cli.new({:compress => 'tar.gz', :nonpharma => false}) }
-    it { cli.instance_variable_get(:@options).should == {:compress => 'tar.gz', :nonpharma => false} }
     it_behaves_like 'any interface'
-    it "should create tar.gz file" do
+    it 'should have compress option' do
+      cli.should have_option(:compress => 'tar.gz')
+    end
+    it 'should create tar.gz file' do
       $stdout.should_receive(:puts).with(/Pharma/)
       cli.run
       file = Dir.glob('oddb_*.tar.gz').first
       File.exists?(file).should be_true
     end
-    it "should not create any xml file" do
-      $stdout.should_receive(:puts).with(/Nonpharma/)
+    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
@@ -38,17 +52,19 @@ describe Oddb2xml::Cli do
       end
     end
   end
-  context "when -a nonpharma option is given" do
+  context 'when -a nonpharma option is given' do
     let(:cli) { Oddb2xml::Cli.new({:compress => nil, :nonpharma => true}) }
-    it { cli.instance_variable_get(:@options).should == {:compress => nil, :nonpharma => true} }
     it_behaves_like 'any interface'
-    it "should not create any compressed file" do
-      $stdout.should_receive(:puts).with(/Pharma/)
+    it 'should have nonpharma option' do
+      cli.should have_option(:nonpharma => true)
+    end
+    it 'should not create any compressed file' do
+      $stdout.should_receive(:puts).with(/NonPharma/)
       cli.run
       Dir.glob('oddb_*.tar.gz').first.should be_nil
     end
-    it "should create 2 xml files" do
-      $stdout.should_receive(:puts).with(/Nonpharma/)
+    it 'should create 2 xml files' do
+      $stdout.should_receive(:puts).with(/NonPharma/)
       cli.run
       Dir.glob('oddb_*.xml').each do |file|
         File.exists?(file).should be_true

data/spec/compressor_spec.rb

@@ -30,7 +30,20 @@ describe Oddb2xml::Compressor do
       end
     end
     context 'successfully' do
-      it 'pending'
+      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)
+      end
+      after(:each) do
+        Dir.glob('oddb_xml_*.tar.gz').each do |file|
+          File.unlink(file) if File.exists?(file)
+        end
+      end
     end
   end
 end

data/spec/downloader_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 shared_examples_for 'any downloader' do
   # this takes 5 sec. by call for sleep
-  it 'should count retry times as retrievable or not' do
+  it 'should count retry times as retrievable or not', :slow => true do
     expect {
       Array.new(3).map do
         Thread.new do
@@ -35,7 +35,7 @@ describe Oddb2xml::BagXmlDownloader do
       xml.should =~ /Preparations/
       xml.should =~ /DescriptionDe/
     end
-    it 'should cleanup current directory' do
+    it 'should clean up current directory' do
       xml.should_not raise_error(Timeout::Error)
       File.exist?('XMLPublications.zip').should be(false)
     end
@@ -46,19 +46,42 @@ describe Oddb2xml::SwissIndexDownloader do
   include ServerMockHelper
   before(:each) do
     setup_swiss_index_server_mock
-    @downloader = Oddb2xml::SwissIndexDownloader.new()
   end
-  it_behaves_like 'any downloader'
-  context 'when download_by is called with DE' do
-    let(:xml) { @downloader.download_by('DE') }
-    it 'should parse hash to xml' do
-      xml.should be_a String
-      xml.length.should_not == 0
+  context 'Pharma' do
+    before(:each) do
+      @downloader = Oddb2xml::SwissIndexDownloader.new(:pharma)
     end
-    it 'should return valid xml' do
-      xml.should =~ /xml\sversion="1.0"/
-      xml.should =~ /ITEM/
-      xml.should =~ /PHAR/
+    it_behaves_like 'any downloader'
+    context 'when download_by is called with DE' do
+      let(:xml) { @downloader.download_by('DE') }
+      it 'should parse response hash to xml' do
+        xml.should be_a String
+        xml.length.should_not == 0
+        xml.should =~ /xml\sversion="1.0"/
+      end
+      it 'should return valid xml' do
+        xml.should =~ /PHAR/
+        xml.should =~ /ITEM/
+      end
     end
   end
+  context 'NonPharma' do
+    before(:each) do
+      @downloader = Oddb2xml::SwissIndexDownloader.new(:nonpharma)
+    end
+    it_behaves_like 'any downloader'
+    context 'when download_by is called with DE' do
+      let(:xml) { @downloader.download_by('DE') }
+      it 'should parse response hash to xml' do
+        xml.should be_a String
+        xml.length.should_not == 0
+        xml.should =~ /xml\sversion="1.0"/
+      end
+      it 'should return valid xml' do
+        xml.should =~ /NONPHAR/
+        xml.should =~ /ITEM/
+      end
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -36,28 +36,30 @@ module ServerMockHelper
         :body    => stub_response)
   end
   def setup_swiss_index_server_mock
-    # wsdl
-    stub_wsdl_url = 'https://index.ws.e-mediat.net/Swissindex/Pharma/ws_Pharma_V101.asmx?WSDL'
-    stub_response = File.read(File.expand_path('../data/wsdl.xml', __FILE__))
-    stub_request(:get, stub_wsdl_url).
-      with(:headers => {
-        'Accept'     => '*/*',
-        'User-Agent' => 'Ruby'}).
-      to_return(
-        :status  => 200,
-        :headers => {'Content-Type' => 'text/xml; charset=utf-8'},
-        :body    => stub_response)
-    # soap (dummy)
-    stub_soap_url = 'https://example.com/test'
-    stub_response = File.read(File.expand_path('../data/swissindex.xml', __FILE__))
-    stub_request(:post, stub_soap_url).
-      with(:headers => {
-        'Accept'     => '*/*',
-        'User-Agent' => 'Ruby'}).
-      to_return(
-        :status  => 200,
-        :headers => {'Content-Type' => 'text/xml; chaprset=utf-8'},
-        :body    => stub_response)
+    ['Pharma', 'NonPharma'].each do |type|
+      # wsdl
+      stub_wsdl_url = "https://index.ws.e-mediat.net/Swissindex/#{type}/ws_#{type}_V101.asmx?WSDL"
+      stub_response = File.read(File.expand_path("../data/wsdl_#{type.downcase}.xml", __FILE__))
+      stub_request(:get, stub_wsdl_url).
+        with(:headers => {
+          'Accept'     => '*/*',
+          'User-Agent' => 'Ruby'}).
+        to_return(
+          :status  => 200,
+          :headers => {'Content-Type' => 'text/xml; charset=utf-8'},
+          :body    => stub_response)
+      # soap (dummy)
+      stub_soap_url = 'https://example.com/test'
+      stub_response = File.read(File.expand_path("../data/swissindex_#{type.downcase}.xml", __FILE__))
+      stub_request(:post, stub_soap_url).
+        with(:headers => {
+          'Accept'     => '*/*',
+          'User-Agent' => 'Ruby'}).
+        to_return(
+          :status  => 200,
+          :headers => {'Content-Type' => 'text/xml; chaprset=utf-8'},
+          :body    => stub_response)
+    end
   end
 end
 
@@ -65,6 +67,8 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+  config.filter_run_excluding :slow
+  #config.exclusion_filter = {:slow => true}
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing

metadata

@@ -1,48 +1,63 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: oddb2xml
-version: !ruby/object:Gem::Version
-  version: 1.0.6
+version: !ruby/object:Gem::Version 
+  hash: 25
   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-10-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-11-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &9947840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
-  prerelease: false
-  version_requirements: *9947840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: hoe
-  requirement: &9947060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 2
+        - 13
+        version: "2.13"
   type: :development
-  prerelease: false
-  version_requirements: *9947060
-description: ''
-email:
+  version_requirements: *id002
+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
@@ -73,28 +88,37 @@ 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: oddb2xml
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: ''
+summary: ""
 test_files: []
+