oddb2xml 1.4.2 → 1.4.3

data/Gemfile

@@ -2,7 +2,7 @@ source :rubygems
 
 gem 'rubyzip'
 gem 'archive-tar-minitar'
-gem 'mechanize'
+gem 'mechanize', '~> 2.5.1'
 gem 'nokogiri'
 gem 'savon', '>= 2.0'
 gem 'spreadsheet'

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.4.3 / 18.02.2013
+
+* Remove slicing bug for ruby 1.8.7 (This is Array)
+* Fix spec for ruby 1.8.7
+* Update to use Mechanize 2.5.1
+
 === 1.4.2 / 15.02.2013
 
 * Add warning for ruby-1.8.7 user

data/Rakefile

@@ -21,7 +21,7 @@ Hoe.spec 'oddb2xml' do
   # gem.add_runtime_dependency
   self.extra_deps << ['rubyzip']
   self.extra_deps << ['archive-tar-minitar']
-  self.extra_deps << ['mechanize']
+  self.extra_deps << ['mechanize', '~> 2.5.1']
   self.extra_deps << ['nokogiri']
   self.extra_deps << ['savon', '>= 2.0']
   self.extra_deps << ['spreadsheet']

data/lib/oddb2xml/builder.rb

@@ -846,12 +846,12 @@ module Oddb2xml
       price = price_str.split('.')
       pre = ''
       las = ''
-      pre = "%0#{int_len}d" % (price[0] ? price[0].chr : '0')
+      pre = "%0#{int_len}d" % (price[0] ? price[0] : '0')
       las = if price[1]
-              if price[1].chr.size < frac_len
-                price[1].chr + "0"*(frac_len-price[2].to_s.size)
+              if price[1].size < frac_len
+                price[1] + "0"*(frac_len-price[2].to_s.size)
               else
-                price[1].chr[0,frac_len]
+                price[1][0,frac_len]
               end
             else
               '0'*frac_len

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/spec/cli_spec.rb

@@ -2,6 +2,22 @@
 
 require 'spec_helper'
 
+# for stdout/stderr on ruby 1.8.7
+# $stdout.should_receive(:puts).with() does not work
+module Kernel
+  def 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
+
 RSpec::Matchers.define :have_option do |option|
   match do |interface|
     key = option.keys.first
@@ -15,18 +31,16 @@ RSpec::Matchers.define :have_option do |option|
 end
 
 shared_examples_for 'any interface for product' do
-  it { cli.should respond_to(:run)  }
+  it { capture(:stdout) { cli.should respond_to(:run) } }
   it 'should run successfully' do
-    $stdout.should_receive(:puts).with(/products/)
-    cli.run
+    capture(:stdout){ cli.run }.should match(/products/)
   end
 end
 
 shared_examples_for 'any interface for address' do
-  it { cli.should respond_to(:run)  }
+  it { capture(:stdout) { cli.should respond_to(:run) } }
   it 'should run successfully' do
-    $stdout.should_receive(:puts).with(/addresses/)
-    cli.run
+    capture(:stdout){ cli.run }.should match(/addresses/)
   end
 end
 
@@ -51,14 +65,12 @@ describe Oddb2xml::Cli do
       cli.should have_option(:compress_ext => 'tar.gz')
     end
     it 'should create tar.gz file' do
-      $stdout.should_receive(:puts).with(/Pharma/)
-      cli.run
+      capture(:stdout) { cli.run }.should match(/Pharma/)
       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(/Pharma/)
-      cli.run
+      capture(:stdout) { cli.run }.should match(/Pharma/)
       Dir.glob('oddb_*.xml').each do |file|
         File.exists?(file).should be_nil
       end
@@ -85,14 +97,12 @@ describe Oddb2xml::Cli do
       cli.should have_option(:compress_ext => 'zip')
     end
     it 'should create zip file' do
-      $stdout.should_receive(:puts).with(/Pharma/)
-      cli.run
+      capture(:stdout) { cli.run }.should match(/Pharma/)
       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
+      capture(:stdout) { cli.run }.should match(/Pharma/)
       Dir.glob('oddb_*.xml').each do |file|
         File.exists?(file).should be_nil
       end
@@ -119,14 +129,12 @@ describe Oddb2xml::Cli do
       cli.should have_option(:nonpharma => true)
     end
     it 'should not create any compressed file' do
-      $stdout.should_receive(:puts).with(/NonPharma/)
-      cli.run
+      capture(:stdout) { cli.run }.should match(/NonPharma/)
       Dir.glob('oddb_*.tar.gz').first.should be_nil
       Dir.glob('oddb_*.zip').first.should be_nil
     end
     it 'should create xml files' do
-      $stdout.should_receive(:puts).with(/NonPharma/)
-      cli.run
+      capture(:stdout) { cli.run }.should match(/NonPharma/)
       expected = [
         'oddb_product.xml',
         'oddb_article.xml',
@@ -161,14 +169,12 @@ describe Oddb2xml::Cli 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
+      capture(:stdout) { cli.run }.should match(/Pharma/)
       Dir.glob('oddb_*.tar.gz').first.should be_nil
       Dir.glob('oddb_*.zip').first.should be_nil
     end
     it 'should create xml files with prefix swiss_' do
-      $stdout.should_receive(:puts).with(/Pharma/)
-      cli.run
+      capture(:stdout) { cli.run }.should match(/Pharma/)
       expected = [
         'swiss_product.xml',
         'swiss_article.xml',
@@ -203,14 +209,12 @@ describe Oddb2xml::Cli do
       cli.should have_option(:fi => true)
     end
     it 'should not create any compressed file' do
-      $stdout.should_receive(:puts).with(/Pharma/)
-      cli.run
+      capture(:stdout) { cli.run }.should match(/Pharma/)
       Dir.glob('oddb_*.tar.gz').first.should be_nil
       Dir.glob('oddb_*.zip').first.should be_nil
     end
     it 'should create xml files' do
-      $stdout.should_receive(:puts).with(/Pharma/)
-      cli.run
+      capture(:stdout) { cli.run }.should match(/Pharma/)
       expected = [
         'oddb_fi.xml',
         'oddb_fi_product.xml',
@@ -247,14 +251,12 @@ describe Oddb2xml::Cli do
       cli.should have_option(:address=> true)
     end
     it 'should not create any compressed file' do
-      $stdout.should_receive(:puts).with(/addresses/)
-      cli.run
+      capture(:stdout) { cli.run }.should match(/addresses/)
       Dir.glob('oddb_*.tar.gz').first.should be_nil
       Dir.glob('oddb_*.zip').first.should be_nil
     end
     it 'should create xml files' do
-      $stdout.should_receive(:puts).with(/addresses/)
-      cli.run
+      capture(:stdout) { cli.run }.should match(/addresses/)
       expected = [
         'oddb_betrieb.xml',
         'oddb_medizinalperson.xml',

data/spec/spec_helper.rb

@@ -49,8 +49,9 @@ module ServerMockHelper
       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'}).
+          'Accept' => '*/*',
+          #'Host'   => 'ws.e-mediat.net'
+        }).
         to_return(
           :status  => 200,
           :headers => {'Content-Type' => 'text/xml; charset=utf-8'},
@@ -60,8 +61,9 @@ module ServerMockHelper
       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'}).
+          'Accept' => '*/*',
+          #'Host'   => 'example.com'
+        }).
         to_return(
           :status  => 200,
           :headers => {'Content-Type' => 'text/xml; chaprset=utf-8'},

metadata

@@ -1,204 +1,157 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oddb2xml
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 1.4.3
   prerelease: 
-  segments: 
-  - 1
-  - 4
-  - 2
-  version: 1.4.2
 platform: ruby
-authors: 
+authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rubyzip
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &10008000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: archive-tar-minitar
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *10008000
+- !ruby/object:Gem::Dependency
+  name: archive-tar-minitar
+  requirement: &10005780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mechanize
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *10005780
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: &10003560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *10003560
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &10001120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: savon
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *10001120
+- !ruby/object:Gem::Dependency
+  name: savon
+  requirement: &9999560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: spreadsheet
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *9999560
+- !ruby/object:Gem::Dependency
+  name: spreadsheet
+  requirement: &9998780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *9998780
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &9998020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *9998020
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &9996860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *9996860
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &9996000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 4
-        version: "3.4"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.4'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *9996000
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &9995300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *9995300
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &9994120 !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: *id011
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *9994120
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &9993160 !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: *id012
+  prerelease: false
+  version_requirements: *9993160
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 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
@@ -255,37 +208,28 @@ files:
 - .gemtest
 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: oddb2xml creates xml files.
 test_files: []
-