bbmb 2.1.3 → 2.1.4

data/lib/bbmb/util/transfer_dat.rb

@@ -24,7 +24,7 @@ module TransferDat
       result.quantity = line[70,4].to_i
       result
     rescue Exception => e
-      BBMB.logger.error('transfer') { 
+      SBSM.info('transfer') {
         [e.class, e.message, e.backtrace].pretty_inspect
       }
     end

data/lib/bbmb/util/updater.rb

@@ -8,17 +8,17 @@ module BBMB
   module Util
 module Updater
   def Updater.run
-    PollingManager.new.poll_sources { |filename, io|
+    PollingManager.new.poll_sources do |filename, io|
       importer, *args = BBMB.config.importers[filename]
       if(importer)
         import(importer, args, io)
       end
-    }
+    end
   end
   def Updater.import(importer, args, io)
     klass = Util.const_get(importer)
     count = klass.new(*args).import(io)
-    BBMB.logger.debug('updater') { sprintf("%s imported %i entities", importer.to_i, count.to_i) }
+    SBSM.info('updater') { sprintf("%s imported %i entities", importer.class, (count && count.defined?(:to_i)) ? count.to_i : 0) }
   end
 end
   end

data/lib/bbmb/version.rb

@@ -1,3 +1,3 @@
 module BBMB
-  VERSION = '2.1.3'
+  VERSION = '2.1.4'
 end

data/test/html/state/test_customers.rb

@@ -1,3 +1,4 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 require 'test_helper'
 
 require 'htmlgrid/list'
@@ -15,8 +16,6 @@ module BBMB
         def setup
           super
           BBMB.config = flexmock('config')
-          BBMB.logger = flexmock('logger')
-          BBMB.logger.should_receive(:debug)
           BBMB.persistence = flexmock('persistence', :all => [])
           app      = flexmock('app')
           user     = flexmock('user', :pagestep => 1)

data/test/model/test_customer.rb

@@ -43,7 +43,7 @@ class TestCustomer < Minitest::Test
   def test_email_writer__both_nil
     BBMB.server = flexmock('server')
     @customer.email = nil
-    assert_equal(nil, @customer.email)
+    assert_nil(@customer.email)
   end
   def test_protect
     assert_equal false, @customer.protects?(:email)

data/test/model/test_order.rb

@@ -77,9 +77,9 @@ class TestOrder <  Minitest::Test
     assert_equal([], @order.positions)
   end
   def test_commit
-    assert_equal(nil, @order.commit_time)
+    assert_nil(@order.commit_time)
     assert_raises(RuntimeError) { @order.commit!('commit_id', Time.now) }
-    assert_equal(nil, @order.commit_time)
+    assert_nil(@order.commit_time)
     position = flexmock('position')
     @order.positions.push(position)
     position.should_receive(:article_number).and_return('12345')

data/test/model/test_product.rb

@@ -21,7 +21,7 @@ class TestProduct < Minitest::Test
       assert_nil(@product.send(key))
       @product.send("#{key}=", "2")
       int = @product.send(key)
-      assert_instance_of(Fixnum, int)
+      assert_instance_of(Integer, int)
       assert_equal(2, int)
       @product.send("#{key}=", nil)
       assert_nil(@product.send(key))
@@ -60,9 +60,9 @@ class TestProduct < Minitest::Test
     refute_equal(@product, other)
   end
   def test_price
-    assert_equal(nil, @product.price)
+    assert_nil(@product.price)
     assert_equal(0, @product.price_effective)
-    assert_equal(nil, @product.price(1))
+    assert_nil(@product.price(1))
     assert_equal(0, @product.price_effective(1))
     @product.l1_price = 11.50
     assert_equal(11.50, @product.price)
@@ -87,29 +87,13 @@ class TestProduct < Minitest::Test
     @product.l6_price = 16.50
     assert_equal(16.50, @product.price(6))
   end
-
-  def test_to_info
+  def test_info
     info = @product.to_info
     assert_instance_of(ProductInfo, info)
     assert_equal('article_number', info.article_number)
-    assert_equal(info, info.to_info)
-  end
-
-  def test_to_product
-    product = @product.to_info.to_product
-    assert_instance_of(Product, product)
-    assert_equal('article_number', product.article_number)
-    assert_equal(product, product.to_product)
-    %w{
-      backorder_date catalogue1 catalogue2 catalogue3
-      description ean13 expiry_date partner_index pcode status
-    }.map do |attr|
-      assert_equal(@product.send(attr), product.send(attr))
-    end
-    assert_equal(@product.promotion, product.promotion)
-    assert_equal(@product.sale, product.sale)
+    info1 = info.to_info
+    assert_equal(info, info1)
   end
-
   def test_price_levels__no_promo
     @product.l1_qty = 1
     @product.l1_price = 10
@@ -186,7 +170,7 @@ class TestProduct < Minitest::Test
     assert_equal(5, @product.price_qty(12))
   end
   def test_freebies__no_promo
-    assert_equal(nil, @product.freebies(1))
+    assert_nil(@product.freebies(1))
   end
   def test_freebies__with_old_promo
     @product.promotion = promo = Promotion.new
@@ -198,8 +182,8 @@ class TestProduct < Minitest::Test
     promo.l2_qty = 12
     promo.l2_price = 7
     promo.l2_free = 3
-    assert_equal(nil, @product.freebies(5))
-    assert_equal(nil, @product.freebies(6))
+    assert_nil(@product.freebies(5))
+    assert_nil(@product.freebies(6))
   end
   def test_freebies__with_current_promo
     @product.promotion = promo = Promotion.new
@@ -211,7 +195,7 @@ class TestProduct < Minitest::Test
     promo.l2_qty = 12
     promo.l2_price = 7
     promo.l2_free = 3
-    assert_equal(nil, @product.freebies(5))
+    assert_nil(@product.freebies(5))
     assert_equal(1, @product.freebies(6))
     assert_equal(1, @product.freebies(11))
     assert_equal(3, @product.freebies(12))
@@ -250,7 +234,7 @@ class TestProduct < Minitest::Test
     assert_equal(10, @product.qty_level(2))
     promo.l1_price = 2
     assert_equal(5, @product.qty_level(1))
-    assert_equal(nil, @product.qty_level(2))
+    assert_nil(@product.qty_level(2))
   end
 end
   end

data/test/model/test_promotion.rb

@@ -26,13 +26,13 @@ class TestPromotion < Minitest::Test
     assert_equal(false, @promo.current?)
   end
   def test_price_qty
-    assert_equal(nil, @promo.price_qty(1))
+    assert_nil(@promo.price_qty(1))
     @promo.l1_qty = 6
     @promo.l1_price = 10
-    assert_equal(nil, @promo.price_qty(5))
+    assert_nil(@promo.price_qty(5))
     assert_equal(10, @promo.price_qty(6))
     @promo.l1_discount = 10
-    assert_equal(nil, @promo.price_qty(5))
+    assert_nil(@promo.price_qty(5))
     assert_equal(10, @promo.price_qty(6))
   end
 end

data/test/test_bbmb.rb

@@ -5,7 +5,6 @@ module BBMB
     def test_global_readers
       assert_respond_to(BBMB, :config)
       assert_respond_to(BBMB, :persistence)
-      assert_respond_to(BBMB, :logger)
       assert_respond_to(BBMB, :server)
     end
   end

data/test/util/test_invoicer.rb

@@ -21,6 +21,9 @@ class TestInvoicer < Minitest::Test
     File.open(keypath, 'w') { |fh| fh.puts(key) }
     YDIM::Client::CONFIG.private_key = keypath
     BBMB.config = flexmock($default_config.clone, 'config')
+    @session = flexmock('session')
+    @ydim_server = flexmock('ydim')
+    @ydim_server.should_receive(:login).and_return(@session)
     @drb_server = false
     @ydim_url = 'druby://localhost:10082'
     @ydim_config = flexmock(YDIM::Client::CONFIG, 'ydim_config')
@@ -28,6 +31,7 @@ class TestInvoicer < Minitest::Test
   end
 
   def teardown
+    # require 'pry'; binding.pry
     @drb_server.stop_service if @drb_server
     BBMB.config = $default_config.clone
     super
@@ -70,8 +74,8 @@ class TestInvoicer < Minitest::Test
     @ydim_server.should_receive(:logout).with(session)
     range = Time.local(2006,9)..Time.local(2006,10)
     @drb_server = DRb.start_service(@ydim_url, @ydim_server)
+    sleep 0.1
     result = Invoicer.create_invoice(range, Util::Money.new(24), [order1, order2], today)
-    skip 'has error when with SEED=14031 bundle exec rake --verbose test'
     assert_equal(invoice, result)
     assert_equal("01.09.2006 - 30.09.2006", invoice.description)
     assert_equal(today, invoice.date)
@@ -91,7 +95,6 @@ class TestInvoicer < Minitest::Test
     Invoicer.send_invoice(123)
   end
   def test_run
-    skip 'has error when with SEED=14031 bundle exec rake --verbose test'
     order1 = flexmock('order1')
     order1.should_receive(:total).and_return(Util::Money.new(11.00))
     order1.should_receive(:commit_time).and_return(Time.local(2006,8,31,23,59,59))
@@ -108,7 +111,7 @@ class TestInvoicer < Minitest::Test
     BBMB.persistence.should_receive(:all).and_return([])
     BBMB.config.should_receive(:ydim_config)
     BBMB.config.should_receive(:ydim_id).and_return(7)
-    BBMB.config.should_receive(:error_recipients).and_return(BBMB::Util::TestMail::TestRecipient)
+    BBMB.config.should_receive(:error_recipients).and_return(::TestRecipient)
     BBMB.config.should_receive(:invoice_percentage).and_return(1)
     BBMB.config.should_receive(:invoice_format).and_return("%s - %s")
     BBMB.config.should_receive(:invoice_item_format).and_return("%.2f -> %i")
@@ -116,9 +119,6 @@ class TestInvoicer < Minitest::Test
     BBMB.config.should_receive(:invoice_newyear).and_return('1.1.')
     BBMB.config.should_receive(:invoice_monthly_baseline)
     BBMB.config.should_receive(:invoice_monthly_baseamount)
-    session = flexmock('session')
-    @ydim_server = flexmock('ydim')
-    @ydim_server.should_receive(:login).and_return(session)
     today = Date.new(2006,10)
     data = {
       :price    => 0.21,
@@ -127,10 +127,10 @@ class TestInvoicer < Minitest::Test
       :time     => Time.local(2006,10),
       :unit     => "1.0%",
     }
-    session.should_receive(:add_items)
+    @session.should_receive(:add_items)
     @ydim_server.should_receive(:logout)
     range = Time.local(2006,9)...Time.local(2006,10)
-    session.should_receive(:send_invoice).with(39)
+    @session.should_receive(:send_invoice).with(39)
     @drb_server = DRb.start_service(@ydim_url, @ydim_server)
     Invoicer.run(range, today)
     @drb_server.stop_service

data/test/util/test_polling_manager.rb

@@ -223,6 +223,8 @@ module BBMB
         assert(blk_called, "poll_message never called its block")
       end
       def test_poll
+        skip "Must fix  test_poll using the mail gem"
+
         src = <<-EOS
 Content-Type: multipart/mixed; boundary="=-1158308026-727155-3822-1761-1-="
 MIME-Version: 1.0
@@ -237,29 +239,22 @@ Content-Disposition: attachment; filename="ywsarti.csv"
 attached data
 --=-1158308026-727155-3822-1761-1-=--
         EOS
-        mail = flexmock('mail')
-        mail.should_receive(:pop).and_return(src)
-        mail.should_receive(:mark_for_delete=).with(true)
-        mail.should_receive(:multipart?).and_return(true)
-        mail.should_receive(:parts).and_return([])
-        flexstub(::Mail).should_receive(:delivery_method).and_return(
-          ::Mail::TestMailer.new({}))
-        flexstub(::Mail::TestMailer).should_receive(:deliveries)
-          .and_return([mail])
-        flexstub(Net::POP3).should_receive(:start).with(
-          'mail.ywesee.com',
-          110,
-          'data@bbmb.ch',
-          'test', Proc
-        ).and_return { |host, port, user, pass, block|
+        flexstub(Net::POP3).should_receive(:start).with('mail.ywesee.com', 110, 
+          'data@bbmb.ch', 
+          'test', Proc).and_return { |host, port, user, pass, block|
           pop = flexmock('pop')
           pop.should_receive(:each_mail).and_return { |block2|
+            mail = flexmock('mail')
+            mail.should_receive(:pop).and_return(src)
+            mail.should_receive(:delete)
             block2.call(mail)
           }
           block.call(pop)
         }
-        # check nothing raised
-        assert_equal([mail],  @mission.poll(&lambda {|name| }))
+        @mission.poll { |name, data|
+          assert_equal('ywsarti.csv', name)
+          assert_equal('attached data', data)
+        }
       end
       def test_poll__error
         skip "Must fix  test_poll__error using the mail gem"

data/test/util/test_server.rb

@@ -2,8 +2,8 @@
 # encoding: utf-8
 $: << File.expand_path('..', File.dirname(__FILE__))
 
-require 'test_helper'
 require 'bbmb/util/server'
+require 'test_helper'
 
 module BBMB
   module Util
@@ -13,7 +13,7 @@ class TestServer < Minitest::Test
   def setup
     super
     BBMB.config = $default_config.clone
-    @server = Server.new
+    @server = BBMB::Util::RackInterface.new
     Model::Customer.instances.clear
     Model::Product.instances.clear
   end
@@ -133,8 +133,6 @@ class TestServer < Minitest::Test
     @server.rename_user('test@bbmb.ch', 'test@bbmb.ch')
   end
   def test_run_invoicer
-    BBMB.logger = flexmock('logger')
-    BBMB.logger.should_ignore_missing
     error_mock = flexmock(RuntimeError.new, 'error')
     flexstub(Mail).should_receive(:notify_error).at_least.once.and_return { |error|
       assert_instance_of(RuntimeError, error_mock)
@@ -159,8 +157,6 @@ class TestServer < Minitest::Test
   def test_run_updater
     BBMB.config = flexmock('config')
     BBMB.config.should_receive(:update_hour).and_return(0)
-    BBMB.logger = flexmock('logger')
-    BBMB.logger.should_ignore_missing
     flexstub(Mail).should_receive(:notify_error).times(1).and_return { |error|
       assert_instance_of(RuntimeError, error)
     }

data/test/util/test_transfer_dat.rb

@@ -12,12 +12,9 @@ class TestTransferDat <  Minitest::Test
   include FlexMock::TestCase
   def setup
     super
-    BBMB.logger = flexmock('logger')
-    BBMB.logger.should_receive(:error)
   end
   def teardown
     super
-    BBMB.logger = nil
   end
   def test_parse_line
     src = "030201899    0624427Mycolog creme tube 15 g                           000176803710902940"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sbsm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: htmlgrid
   requirement: !ruby/object:Gem::Requirement
@@ -332,7 +318,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ywesee distributed invoice manager. A Ruby gem
+description: A Ruby gem for browser based orders of approved medical drugs in Switzerland
 email: mhatakeyama@ywesee.com, zdavatz@ywesee.com, ngiger@ywesee.com
 executables:
 - bbmb_admin
@@ -463,10 +449,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: ywesee distributed invoice manager
+summary: browser based orders of medical drugs
 test_files:
 - test/data/ydim.yml
 - test/html/state/test_customers.rb
@@ -485,4 +471,3 @@ test_files:
 - test/util/test_server.rb
 - test/util/test_target_dir.rb
 - test/util/test_transfer_dat.rb
-has_rdoc: