bbmb 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b487ee07c8fd64af7c360241bf8c3c4a9ccb3778
-  data.tar.gz: a7198aa78b2da4fbf68ed8a9c89793cb5880eac8
+  metadata.gz: 2ff9459b32c6df0de3e361c40cab590525be4e23
+  data.tar.gz: dca078b97bb5d78f8e0eccf46d9936c3145eb617
 SHA512:
-  metadata.gz: 26ab6091e17afc1581e1fec5c4907fdebaf286a846c66cc3aba6bb09fa0af1f96ffa8d7f6bd3ede97b705a07e901281c3bdb5438253f8d774ff37d9765babb90
-  data.tar.gz: 1c01e22b9cbc39a7cdb6b593d2701c9f81bcc351d8c6955d9e38d6d8d2293f14f400d1155d2092cfefdc70c15ef75d526b829b80a0cf6e2d97e6072234023af3
+  metadata.gz: 594ade1264d92c1996750076cfbef881c13679daccad97a8ebd630754521bace73435ffb335d3b9e2558ecf738c616c46fff66c990f1283a24c9b5afba565152
+  data.tar.gz: 3a0907bcfd4a9d80096ea3f29f29b3dafb0b53ea23e46b1adab850e41896bdffca6d7573c3eae54c018e8722831907030895edde530b361f433f07667148fea7

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.3.3 / 25.07.2017
+
+* Handle transfer.dat with ISO 8859-1 encoding
+* Create new product if only pharmacode is giving and none exists
+
 === 2.3.2 / 20.06.2017
 
 * Use SBSM 1.4.5 and adapt KnownUser

data/lib/bbmb/util/server.rb

@@ -59,23 +59,28 @@ module BBMB
           end
         end
         order = Model::Order.new(customer)
-        products.each { |info|
-          if(product = Model::Product.find_by_pcode(info[:pcode]) \
+        products.each do |info|
+          product = Model::Product.find_by_pcode(info[:pcode]) \
              || Model::Product.find_by_ean13(info[:ean13]) \
-             || Model::Product.find_by_article_number(info[:article_number]))
+             || Model::Product.find_by_article_number(info[:article_number])
+          if info[:pcode] || product
+            unless product
+             product = Model::Product.new(info[:pcode])
+              product.description.de = "pharmacode #{info[:pcode]}"
+              product.odba_store
+            end
             order.add(info[:quantity], product)
             [:article_number, :backorder].each do |key|
               info.store key, product.send(key)
             end
-            info.store :description, product.description.de
+
+          info.store :description, product.description.de
             info[:deliverable] = info[:quantity]
           else
             info[:deliverable] = 0
           end
-        }
-        infos.each { |key, value|
-          order.send("#{key}=", value)
-        }
+        end
+        infos.each { |key, value| order.send("#{key}=", value) }
         customer.inject_order(order)
         if opts[:deliver]
           @app.send_order order, customer

data/lib/bbmb/util/transfer_dat.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# TransferDat -- bbmb -- 31.10.2002 -- hwyss@ywesee.com 
+# TransferDat -- bbmb -- 31.10.2002 -- hwyss@ywesee.com
 
 require 'bbmb/model/order'
 
@@ -7,9 +7,15 @@ module BBMB
   module Util
 module TransferDat
   def TransferDat.parse(io)
-    io.rewind
-    data = io.read
-    data.split(/[\r\n]+/).collect { |line|
+    begin
+      io.rewind
+      data = io.read
+      lines = data.split(/[\r\n]+/)
+    rescue ArgumentError => error
+      raise error unless io.is_a?(File)
+      lines = File.open(io, external_encoding: Encoding::ISO_8859_1).read.split(/[\r\n]+/)
+    end
+    lines.collect { |line|
       if(parsed = parse_line(line))
         yield parsed
       end

data/lib/bbmb/version.rb

@@ -1,3 +1,3 @@
 module BBMB
-  VERSION = '2.3.2'
+  VERSION = '2.3.3'
 end

data/test/util/test_server.rb

@@ -9,7 +9,7 @@ module BBMB
 class TestServer < Minitest::Test
   include FlexMock::TestCase
   def setup
-    skip ('This does not yet work with the new rack based')
+#    skip ('This does not yet work with the new rack based')
     require 'bbmb/util/server'
 
     super

data/test/util/test_transfer_dat.rb

@@ -43,6 +43,16 @@ class TestTransferDat <  Minitest::Test
     end
     assert_equal(2, count)
   end
+  def test_parse_iso_8859
+    data_dir = File.expand_path(File.join(__FILE__, '../../data'))
+    src = File.open(File.join(data_dir, 'transfer_leima_iso_8859-1.dat'))
+    count = 0
+    TransferDat.parse(src) do |info|
+      assert_instance_of(Model::Order::Info, info)
+      count += 1
+    end
+    assert_equal(92, count)
+  end
 end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba
@@ -426,6 +426,7 @@ files:
 - lib/bbmb/util/updater.rb
 - lib/bbmb/version.rb
 - readme.md
+- test/data/transfer_leima_iso_8859-1.dat
 - test/data/ydim.yml
 - test/examples/sandoz.xundart@bbmb.ch.20110524001038.928592
 - test/examples/simple_email.txt
@@ -470,6 +471,7 @@ signing_key:
 specification_version: 4
 summary: browser based orders of medical drugs
 test_files:
+- test/data/transfer_leima_iso_8859-1.dat
 - test/data/ydim.yml
 - test/examples/sandoz.xundart@bbmb.ch.20110524001038.928592
 - test/examples/simple_email.txt