oddb2xml 1.1.4 → 1.1.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.5 / 11.01.2013
+
+* Add BG tags into article.xml from ywesee BM.txt
+
 === 1.1.4 / 10.01.2013
 
 * Add TITD tag into interaction.xml

data/lib/oddb2xml/builder.rb

@@ -17,7 +17,7 @@ end
 
 module Oddb2xml
   class Builder
-    attr_accessor :subject, :index, :items,
+    attr_accessor :subject, :index, :items, :flags,
                   :actions,
                   :orphans, :fridges,
                   :infos,
@@ -26,6 +26,7 @@ module Oddb2xml
       @subject    = nil
       @index      = {}
       @items      = {}
+      @flags      = {}
       @infos      = {}
       @actions    = []
       @orphans    = []
@@ -473,8 +474,12 @@ module Oddb2xml
                 end
               end
               #xml.TEMP
-              #xml.CDBG
-              #xml.BG
+              unless de_pac[:ean].empty?
+                flag = @flags[de_pac[:ean]]
+                # as same flag
+                xml.CDBG (flag ? 'Y' : 'N')
+                xml.BG   (flag ? 'Y' : 'N')
+              end
               #xml.EXP
               xml.QTY   de_pac[:additional_desc] unless de_pac[:additional_desc].empty?
               xml.DSCRD de_pac[:desc]            unless de_pac[:desc].empty?

data/lib/oddb2xml/cli.rb

@@ -17,6 +17,7 @@ module Oddb2xml
       @mutex = Mutex.new
       @items = {} # Items from Preparations.xml in BAG
       @index = {} # Base index from swissINDEX
+      @flags = {} # narcotics flag from ywesee
       @infos = {} # [option] FI from SwissmedicInfo
       @actions = [] # [addition] interactions from epha
       @orphans = [] # [addition] Orphaned drugs from Swissmedic xls
@@ -51,7 +52,7 @@ module Oddb2xml
         downloader = EphaDownloader.new
         io = downloader.download
         @mutex.synchronize do
-          @actions = EphaExtractor.new(io).to_hash
+          @actions = EphaExtractor.new(io).to_arry
         end
       end
       # bag
@@ -63,6 +64,14 @@ module Oddb2xml
           @items = hsh
         end
       end
+      # ywesee
+      threads << Thread.new do
+        downloader = YweseeBMDownloader.new
+        io = downloader.download
+        @mutex.synchronize do
+          @flags = YweseeBMExtractor.new(io).to_hash
+        end
+      end
       LANGUAGES.each do |lang|
         # swissindex
         types.each do |type|
@@ -96,13 +105,11 @@ module Oddb2xml
             builder.subject = sbj
             builder.index   = index
             builder.items   = @items
+            builder.flags   = @flags
             # additions
             %w[actions orphans fridges].each do |addition|
               builder.send("#{addition}=".intern, self.instance_variable_get("@#{addition}"))
             end
-            #builder.actions = @actions
-            #builder.orphans = @orphans
-            #builder.fridges = @fridges
             # optionals
             builder.infos = @infos
             builder.tag_suffix = @options[:tag_suffix]

data/lib/oddb2xml/downloader.rb

@@ -201,4 +201,24 @@ XML
       end
     end
   end
+  class YweseeBMDownloader < Downloader
+    def init
+      super
+      @url ||= 'http://www.ywesee.com/uploads/Main/BM_Update.txt'
+    end
+    def download
+      file = 'ywesee_bm_update.txt'
+      begin
+        response = @agent.get(@url)
+        response.save_as file
+        return File.open(file, 'r')
+      rescue Timeout::Error
+        retrievable? ? retry : raise
+      ensure
+        if File.exists? file
+          File.unlink file
+        end
+      end
+    end
+  end
 end

data/lib/oddb2xml/extractor.rb

@@ -204,7 +204,7 @@ module Oddb2xml
     def initialize(io)
       @io = io
     end
-    def to_hash
+    def to_arry
       data = []
       ixno = 0
       while line = @io.gets
@@ -225,4 +225,18 @@ module Oddb2xml
       data
     end
   end
+  class YweseeBMExtractor < Extractor
+    def initialize(io)
+      @io = io
+    end
+    def to_hash
+      data = {}
+      while line = @io.gets
+        next if line =~ /\d{13}/
+        ean = line.chomp.gsub("\"", '')
+        data[ean] = true
+      end
+      data
+    end
+  end
 end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/spec/downloader_spec.rb

@@ -157,16 +157,34 @@ describe Oddb2xml::EphaDownloader do
   end
   it_behaves_like 'any downloader'
   context 'when download is called' do
-    let(:xml) { @downloader.download }
+    let(:io) { @downloader.download }
     it 'should read csv to IO Object' do
-      xml.should be_a IO
-      xml.bytes.should_not nil
+      io.should be_a IO
+      io.bytes.should_not nil
     end
     it 'should clean up current directory' do
-      xml.should_not raise_error(Timeout::Error)
+      io.should_not raise_error(Timeout::Error)
       File.exist?('epha_interactions.csv').should be(false)
     end
   end
 end
 
-
+describe Oddb2xml::YweseeBMDownloader do
+  include ServerMockHelper
+  before(:each) do
+    setup_ywesee_server_mock
+    @downloader = Oddb2xml::YweseeBMDownloader.new
+  end
+  it_behaves_like 'any downloader'
+  context 'when download is called' do
+    let(:io) { @downloader.download }
+    it 'should read txt to IO Object' do
+      io.should be_a IO
+      io.bytes.should_not nil
+    end
+    it 'should clean up current directory' do
+      io.should_not raise_error(Timeout::Error)
+      File.exist?('ywesee_bm_update.txt').should be(false)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -22,6 +22,7 @@ module ServerMockHelper
     setup_swissmedic_server_mock
     setup_swissmedic_info_server_mock
     setup_epha_server_mock
+    setup_ywesee_server_mock
   end
   def setup_bag_xml_server_mock
     # zip
@@ -153,6 +154,20 @@ module ServerMockHelper
         :headers => {'Content-Type' => 'text/csv; charset=utf-8'},
         :body    => stub_response)
   end
+  def setup_ywesee_server_mock
+    # txt
+    stub_txt_url = 'http://www.ywesee.com/uploads/Main/BM_Update.txt'
+    stub_response = File.read(File.expand_path('../data/ywesee_bm_update.txt', __FILE__))
+    stub_request(:get, stub_txt_url).
+      with(:headers => {
+        'Accept' => '*/*',
+        'Host'   => 'www.ywesee.com',
+      }).
+      to_return(
+        :status  => 200,
+        :headers => {'Content-Type' => 'text/plain; charset=utf-8'},
+        :body    => stub_response)
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &19703040 !ruby/object:Gem::Requirement
+  requirement: &21104340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19703040
+  version_requirements: *21104340
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &19702540 !ruby/object:Gem::Requirement
+  requirement: &21103620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19702540
+  version_requirements: *21103620
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &19702040 !ruby/object:Gem::Requirement
+  requirement: &21103000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19702040
+  version_requirements: *21103000
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &19701580 !ruby/object:Gem::Requirement
+  requirement: &21102480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19701580
+  version_requirements: *21102480
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &19700940 !ruby/object:Gem::Requirement
+  requirement: &21101700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19700940
+  version_requirements: *21101700
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &19700500 !ruby/object:Gem::Requirement
+  requirement: &21101060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19700500
+  version_requirements: *21101060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19716280 !ruby/object:Gem::Requirement
+  requirement: &21100460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19716280
+  version_requirements: *21100460
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &19715780 !ruby/object:Gem::Requirement
+  requirement: &21099960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19715780
+  version_requirements: *21099960
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &19715200 !ruby/object:Gem::Requirement
+  requirement: &21099480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19715200
+  version_requirements: *21099480
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &19714660 !ruby/object:Gem::Requirement
+  requirement: &21098920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *19714660
+  version_requirements: *21098920
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &19714100 !ruby/object:Gem::Requirement
+  requirement: &21098500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19714100
+  version_requirements: *21098500
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &19713340 !ruby/object:Gem::Requirement
+  requirement: &21097920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *19713340
+  version_requirements: *21097920
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &19711960 !ruby/object:Gem::Requirement
+  requirement: &21097400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *19711960
+  version_requirements: *21097400
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables: