oddb2xml 1.5.2 → 1.5.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.5.3 / 08.07.2013
+
+*  Add -p option for zurrose transfer.dat
+
 === 1.5.2 / 12.06.2013
 
 * Improve NINCD detection

data/bin/oddb2xml

@@ -17,9 +17,10 @@ Usage:
     -c F, --compress=F   Compress format F. {tar.gz|zip}
     -f F, --format=F     File format F, default is xml. {xml|dat}
                          If F is given, -o option is ignored.
-    -o O, --option=O     Optional output. O, only 'fi' is available.
     -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.
@@ -46,6 +47,7 @@ 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', '--prices v',     /^zurrose$/)    {|v| opts[:price] = v.intern }
 #parser.on('--debug') {|v| opts[:debug] = true }
 parser.on_tail('-h', '--help') { puts help; exit }
 

data/lib/oddb2xml/builder.rb

@@ -19,7 +19,7 @@ module Oddb2xml
   class Builder
     attr_accessor :subject, :index, :items, :flags, :lppvs,
                   :actions, :migel, :orphans, :fridges,
-                  :infos, :packs,
+                  :infos, :packs, :prices,
                   :ean14, :tag_suffix,
                   :companies, :people
     def initialize
@@ -31,6 +31,7 @@ module Oddb2xml
       @infos      = {}
       @packs      = {}
       @migel      = {}
+      @prices     = {} # zurrose
       @actions    = []
       @orphans    = []
       @fridges    = []
@@ -645,7 +646,14 @@ module Oddb2xml
                   #xml.LINENO
                   #xml.NOUNITS
                 #}
-                if pac
+                if !@prices.empty? && de_idx[:ean] && \
+                  price = @prices[de_idx[:ean]] # zurrose
+                  xml.ARTPRI {
+                   xml.VDAT  datetime
+                   xml.PTYP  "ZURROSE"
+                   xml.PRICE price
+                  }
+                elsif pac
                   pac[:prices].each_pair do |key, price|
                     xml.ARTPRI {
                      xml.VDAT  price[:valid_date] unless price[:valid_date].empty?

data/lib/oddb2xml/cli.rb

@@ -22,6 +22,7 @@ module Oddb2xml
       @lppvs = {} # lppv.txt from files repo
       @infos = {} # [option] FI from SwissmedicInfo
       @packs = {} # [option] Packungen from Swissmedic for dat
+      @prices  = {} # [addition] prices from zurrose transfer.txt
       @migel   = {} # [addition] additional Non Pharma products from files repo
       @actions = [] # [addition] interactions from epha
       @orphans = [] # [addition] Orphaned drugs from Swissmedic xls
@@ -53,6 +54,9 @@ module Oddb2xml
         if @options[:nonpharma]
           threads << download(:migel) # oddb2xml_files
         end
+        if @options[:price] # zurrose
+          threads << download(@options[:price])
+        end
         threads << download(:package) # swissmedic
         threads << download(:bm_update) # oddb2xml_files
         threads << download(:lppv) # oddb2xml_files
@@ -109,7 +113,7 @@ module Oddb2xml
               builder.infos = @infos
               builder.packs = @packs
               # additional sources
-              %w[actions orphans fridges migel].each do |addition|
+              %w[actions orphans fridges migel prices].each do |addition|
                 builder.send("#{addition}=".intern, self.instance_variable_get("@#{addition}"))
               end
             end
@@ -225,6 +229,15 @@ module Oddb2xml
             @items = hsh
           end
         end
+      when :zurrose
+        Thread.new do
+          downloader = ZurroseDownloader.new(@options)
+          xml = downloader.download
+          @mutex.synchronize do
+            hsh = ZurroseExtractor.new(xml).to_hash
+            @prices = hsh
+          end
+        end
       when :index
         Thread.new do
           downloader = SwissIndexDownloader.new(@options, type, lang)

data/lib/oddb2xml/downloader.rb

@@ -8,12 +8,13 @@ module Oddb2xml
   module DownloadMethod
     private
     def download_as(file, option='r')
+      data = nil
       begin
         response = @agent.get(@url)
         response.save_as(file)
         response = nil # win
         io = File.open(file, option)
-        return io.read
+        data = io.read
       rescue Timeout::Error, Errno::ETIMEDOUT
         retrievable? ? retry : raise
       ensure
@@ -22,6 +23,7 @@ module Oddb2xml
           File.unlink(file)
         end
       end
+      return data
     end
   end
   class Downloader
@@ -109,6 +111,13 @@ module Oddb2xml
       download_as('oddb2xml_files_lppv.txt', 'r')
     end
   end
+  class ZurroseDownloader < Downloader
+    include DownloadMethod
+    def download
+      @url ||= 'http://zurrose.com/fileadmin/main/lib/download.php?file=/fileadmin/user_upload/downloads/DOS/IGM01_ohne_MwSt/Vollstamm/transfer.dat'
+      download_as('oddb2xml_zurrose_transfer.dat', 'r:iso-8859-1:utf-8')
+    end
+  end
   class MedregbmDownloader < Downloader
     include DownloadMethod
     def initialize(type=:company)

data/lib/oddb2xml/extractor.rb

@@ -407,4 +407,19 @@ module Oddb2xml
       data
     end
   end
+  class ZurroseExtractor < Extractor
+    def initialize(dat)
+      @io = StringIO.new(dat)
+    end
+    def to_hash
+      data = {}
+      while line = @io.gets
+        next unless line =~ /(7680\d{9})\r\n$/
+        ean   = $1.to_s
+        price = line[60,6].gsub(/(\d{2})$/, "." + $1.to_s).to_f.round(2).to_s
+        data[ean] = price
+      end
+      data
+    end
+  end
 end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

data/spec/downloader_spec.rb

@@ -284,3 +284,23 @@ describe Oddb2xml::MedregbmDownloader do
     end
   end
 end
+
+describe Oddb2xml::ZurroseDownloader do
+  include ServerMockHelper
+  before(:each) do
+    setup_zurrose_server_mock
+    @downloader = Oddb2xml::ZurroseDownloader.new
+  end
+  it_behaves_like 'any downloader'
+  context 'when download is called' do
+    let(:dat) { @downloader.download }
+    it 'should read dat as String' do
+      dat.should be_a String
+      dat.bytes.should_not nil
+    end
+    it 'should clean up current directory' do
+      dat.should_not raise_error(Timeout::Error)
+      File.exist?('oddb2xml_zurrose_transfer.dat').should be(false)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -228,6 +228,20 @@ module ServerMockHelper
         :headers => {'Content-Type' => 'text/plain; charset=utf-8'},
         :body    => stub_response)
   end
+  def setup_zurrose_server_mock
+    # dat
+    stub_dat_url  = 'http://zurrose.com/fileadmin/main/lib/download.php?file=/fileadmin/user_upload/downloads/DOS/IGM01_ohne_MwSt/Vollstamm/transfer.dat'
+    stub_response = File.read(File.expand_path('../data/zurrose_transfer.dat', __FILE__))
+    stub_request(:get, stub_dat_url).
+      with(:headers => {
+        'Accept' => '*/*',
+        'Host'   => 'zurrose.com',
+      }).
+      to_return(
+        :status  => 200,
+        :headers => {'Content-Type' => 'text/plain; charset=utf-8'},
+        :body    => stub_response)
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,186 +1,206 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: oddb2xml
-version: !ruby/object:Gem::Version
-  version: 1.5.2
+version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: 
+  segments: 
+  - 1
+  - 5
+  - 3
+  version: 1.5.3
 platform: ruby
-authors:
+authors: 
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-07-08 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: archive-tar-minitar
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: archive-tar-minitar
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mechanize
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.1
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mechanize
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 2
+        - 5
+        - 1
         version: 2.5.1
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: savon
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: savon
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: spreadsheet
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: webmock
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: hoe
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 3
+        - 4
+        version: "3.4"
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rdoc
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.4'
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: hoe
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.4'
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 2
+        - 13
+        version: "2.13"
+  type: :development
+  version_requirements: *id012
 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
-- README.md
-files:
+files: 
 - .gitignore
 - .rspec
 - Gemfile
@@ -234,30 +254,40 @@ files:
 - tools/cacert.pem
 - tools/set.bat
 - tools/win_fetch_cacerts.rb
-homepage: https://github.com/zdavatz/oddb2xml
+- .gemtest
+homepage: 
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
-- README.md
-require_paths:
+- README.txt
+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.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: oddb2xml creates xml files.
 test_files: []
+