bbmb 2.0.0 → 2.0.1

data/lib/bbmb.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # Bbmb -- bbmb.ch -- 17.12.2019 -- zdavatz@ywesee.com
+require 'bbmb/version'
 
 module BBMB
-  VERSION = '2.0.0'
   class << self
     attr_accessor :auth, :config, :logger, :persistence, :server
   end

data/lib/bbmb/html/state/global.rb

@@ -3,7 +3,6 @@
 
 require 'sbsm/state'
 require 'bbmb/html/state/login'
-require 'encoding/character/utf-8'
 
 module BBMB
   module Html

data/lib/bbmb/html/view/json.rb

@@ -2,7 +2,7 @@
 # Html::View::Json -- bbmb.ch -- 26.09.2006 -- hwyss@ywesee.com
 
 require 'htmlgrid/component'
-require 'json/objects'
+require 'json'
 
 module BBMB
   module Html

data/lib/bbmb/model/order.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 # Model::Order -- bbmb.ch -- 22.09.2006 -- hwyss@ywesee.com
 
-require 'encoding/character/utf-8'
 require 'bbmb/config'
 require 'bbmb/util/numbers'
 require 'csv'
@@ -214,9 +213,10 @@ class Order
   end
   def to_csv
     result = ''
-    CSV::Writer.generate(result, 
-                         BBMB.config.target_format_fs,
-                         BBMB.config.target_format_rs) { |writer|
+    BBMB.config.target_format_fs ||= ','
+    BBMB.config.target_format_rs ||= "\n"
+    CSV.generate(result, { :col_sep => BBMB.config.target_format_fs,
+                           :row_sep => BBMB.config.target_format_rs}) { |writer|
       @positions.each { |position|
         writer << [
           @customer.customer_id,
@@ -248,7 +248,7 @@ class Order
   end
   private
   def _formatted_comment(replacement=';')
-    u(@comment.to_s.gsub(/[\r\n]+/, replacement))[0,60] if @comment
+    @comment.to_s.gsub(/[\r\n]+/, replacement)[0,60] if @comment
   end
 end
   end

data/lib/bbmb/persistence/odba.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# Persistence::ODBA -- bbmb.ch -- 13.06.2013 -- yasaka@ywesee.com
 # Persistence::ODBA -- bbmb.ch -- 14.09.2006 -- hwyss@ywesee.com
 
 require 'bbmb/config'
@@ -35,7 +36,7 @@ module BBMB
       end
     end
   end
-  ODBA.storage.dbi = ODBA::ConnectionPool.new("DBI:pg:#{@config.db_name}",
+  ODBA.storage.dbi = ODBA::ConnectionPool.new("DBI:Pg:#{@config.db_name}",
                                              @config.db_user, @config.db_auth)
   ODBA.cache.setup
   ODBA.cache.prefetch

data/lib/bbmb/util/invoicer.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 # Util::Invoicer -- bbmb.ch -- 03.10.2006 -- hwyss@ywesee.com
 
-require 'iconv'
 require 'ydim/config'
 require 'ydim/client'
 require 'openssl'
@@ -9,7 +8,6 @@ require 'openssl'
 module BBMB
   module Util
 module Invoicer
-  @iconv = Iconv.new('ISO-8859-1//TRANSLIT//IGNORE', 'UTF-8')
   class << self
     def run(range, date=Date.today)
       orders = orders(range)
@@ -43,27 +41,27 @@ Outstanding:   %10.2f
       baseamount = Util::Money.new(BBMB.config.invoice_monthly_baseamount)
       ydim_connect { |client|
         ydim_inv = client.create_invoice(BBMB.config.ydim_id)
-        ydim_inv.description = sprintf(@iconv.iconv(BBMB.config.invoice_format),
+        ydim_inv.description = sprintf(BBMB.config.invoice_format,
                                        time_range.first.strftime("%d.%m.%Y"),
                                        (time_range.last - 1).strftime("%d.%m.%Y"))
         ydim_inv.date = date
         ydim_inv.currency = currency
         ydim_inv.payment_period = 30
         items = []
-        item_format = @iconv.iconv(BBMB.config.invoice_item_format)
+        item_format = BBMB.config.invoice_item_format
         item_args = [orders.size]
         time = Time.local(date.year, date.month, date.day)
         if baseamount > 0
-          item_format = @iconv.iconv(BBMB.config.invoice_item_overrun_format)
+          item_format = BBMB.config.invoice_item_overrun_format
           basepart = [baseline, owed].min
           text = sprintf(BBMB.config.invoice_item_baseline_format,
                          basepart, owed, *item_args)
           item_data = {
             :price    => baseamount.to_f,
             :quantity => 1,
-            :text     => @iconv.iconv(number_format(text)),
+            :text     => number_format(text),
             :time			=> time,
-            :unit     => @iconv.iconv(BBMB.config.invoice_item_baseamount_unit),
+            :unit     => BBMB.config.invoice_item_baseamount_unit,
           }
           item_args.unshift owed
           items.push item_data
@@ -74,7 +72,7 @@ Outstanding:   %10.2f
           item_data = {
             :price    =>  owed.to_f * BBMB.config.invoice_percentage / 100,
             :quantity =>  1,
-            :text     =>  @iconv.iconv(number_format(text)),
+            :text     =>  number_format(text),
             :time			=>	Time.local(date.year, date.month, date.day),
             :unit     =>  "%0.1f%" % BBMB.config.invoice_percentage,
           }

data/lib/bbmb/util/mail.rb

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
+# Util::Mail -- bbmb.ch -- 19.11.2012 -- yasaka@ywesee.com
 # Util::Mail -- bbmb.ch -- 27.09.2006 -- hwyss@ywesee.com
 
 require 'bbmb/config'
 require 'net/smtp'
 require 'rmail'
 require 'pp'
+require 'bbmb/util/smtp_tls'
 
 module BBMB
   module Util

data/lib/bbmb/util/smtp_tls.rb

@@ -0,0 +1,70 @@
+require "openssl"
+require "net/smtp"
+
+Net::SMTP.class_eval do
+  private
+  def do_start(helodomain, user, secret, authtype)
+    raise IOError, 'SMTP session already started' if @started
+
+    if RUBY_VERSION == '1.8.6'
+      check_auth_args user, secret, authtype if user or secret
+    else # > 1.8.7
+      check_auth_args user, secret if user or secret
+    end
+
+    sock = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
+    @socket = Net::InternetMessageIO.new(sock)
+    @socket.read_timeout = 60 #@read_timeout
+    @socket.debug_output = STDERR #@debug_output
+
+    check_response(critical { recv_response() })
+    do_helo(helodomain)
+
+    raise 'openssl library not installed' unless defined?(OpenSSL)
+    starttls
+    ssl = OpenSSL::SSL::SSLSocket.new(sock)
+    ssl.sync_close = true
+    ssl.connect
+    @socket = Net::InternetMessageIO.new(ssl)
+    @socket.read_timeout = 60 #@read_timeout
+    @socket.debug_output = STDERR #@debug_output
+    do_helo(helodomain)
+
+    authenticate user, secret, authtype if user
+    @started = true
+  ensure
+    unless @started
+      # authentication failed, cancel connection.
+      @socket.close if not @started and @socket and not @socket.closed?
+      @socket = nil
+    end
+  end
+
+  def do_helo(helodomain)
+    begin
+      if @esmtp
+        ehlo helodomain
+      else
+        helo helodomain
+      end
+    rescue Net::ProtocolError
+      if @esmtp
+        @esmtp = false
+        @error_occured = false
+        retry
+      end
+      raise
+    end
+  end
+
+  def starttls
+    getok('STARTTLS')
+  end
+
+  def quit
+    begin
+      getok('QUIT')
+    rescue EOFError
+    end
+  end
+end

data/lib/bbmb/util/transfer_dat.rb

@@ -18,9 +18,9 @@ module TransferDat
   def TransferDat.parse_line(line)
     begin
       result = Model::Order::Info.new
-      result.pcode  = u(line[13,7].to_i.to_s)
-      result.description = u(line[20,50].strip)
-      result.ean13 = u(line[74,13])
+      result.pcode  = line[13,7].to_i.to_s
+      result.description = line[20,50].strip
+      result.ean13 = line[74,13]
       result.quantity = line[70,4].to_i
       result
     rescue Exception => e

data/lib/bbmb/version.rb

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# Bbmb -- bbmb.ch -- 17.12.2019 -- zdavatz@ywesee.com
+
+module BBMB
+  VERSION = '2.0.1'
+end

data/readme.md

@@ -0,0 +1,30 @@
+# bbmb
+
+* https://github.com/zdavatz/bbmb
+
+You can find a graphical overview here
+
+* https://github.com/zdavatz/bbmb/bbmb.jpeg
+
+## DESCRIPTION:
+
+Browserbasierte Medikamenten Bestellung (bbmb).
+
+## FEATURES/PROBLEMS:
+
+* Switch to use the Google SMTP.
+
+## INSTALL:
+
+* sudo gem install bbmb
+* For configuration see Guide.txt
+
+## DEVELOPERS:
+
+* Masaomi Hatakeyama
+* Zeno Davatz
+* Hannes Wyss (up to Version 2.0)
+
+## LICENSE:
+
+* GPLv2

data/test/model/test_customer.rb

@@ -4,16 +4,16 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
+require "minitest/autorun"
+require 'flexmock/test_unit'
 require 'bbmb'
 require 'bbmb/model/customer'
 require 'bbmb/model/order'
 require 'stub/persistence'
-require 'flexmock'
 
 module BBMB
   module Model
-class TestCustomer < Test::Unit::TestCase
+class TestCustomer < Minitest::Test
   include FlexMock::TestCase
   def setup
     Customer.clear_instances
@@ -39,9 +39,7 @@ class TestCustomer < Test::Unit::TestCase
   end
   def test_email_writer__both_nil
     BBMB.server = flexmock('server')
-    assert_nothing_raised { 
-      @customer.email = nil
-    }
+    @customer.email = nil
     assert_equal(nil, @customer.email)
   end
   def test_protect
@@ -65,9 +63,7 @@ class TestCustomer < Test::Unit::TestCase
     order = flexmock(Model::Order.new(@customer))
     time = Time.now
     order.should_receive(:commit!).with(1, time).times(1)
-    assert_nothing_raised {
-      @customer.inject_order(order, time)
-    }
+    @customer.inject_order(order, time)
     assert_equal({1 => order}, @customer.archive)
   end
 end

data/test/model/test_order.rb

@@ -3,19 +3,27 @@
 
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
+require "minitest/autorun"
+require 'flexmock/test_unit'
 require 'bbmb/model/order'
 require 'date'
-require 'flexmock'
-require 'test/unit'
 
 module BBMB
   module Model
-class TestOrder < Test::Unit::TestCase
+class TestOrder <  Minitest::Test
   include FlexMock::TestCase
   def setup
     @customer = flexmock("customer")
     @customer.should_receive(:quota)
     @order = Order.new(@customer)
+    @position = flexmock('position')
+    @position.should_receive(:pcode).and_return(nil).by_default
+    @position.should_receive(:price).and_return(nil).by_default
+    @position.should_receive(:ean13).and_return("EAN13").by_default
+    @position.should_receive(:article_number).and_return("ArticleNumber").by_default
+    @position.should_receive(:quantity).and_return(17).by_default
+    @position.should_receive(:freebies).and_return(nil).by_default
+    BBMB.config.i2_100 = 'YWESEE'
   end
   def test_add
     assert_equal(true, @order.empty?)
@@ -128,12 +136,8 @@ class TestOrder < Test::Unit::TestCase
   def test_to_i2
     @customer.should_receive(:customer_id).and_return(7)
     @customer.should_receive(:organisation).and_return('Organisation')
-    position = flexmock('position')
-    position.should_receive(:ean13).and_return("EAN13")
-    position.should_receive(:article_number).and_return("ArticleNumber")
-    position.should_receive(:quantity).and_return(17)
-    position.should_ignore_missing
-    @order.positions.push(position)
+    @position.should_ignore_missing
+    @order.positions.push(@position)
     @order.reference = "Reference"
     @order.comment = "Comment"
     @order.commit!('8', Time.local(2006,9,27,9,50,12))
@@ -170,12 +174,8 @@ class TestOrder < Test::Unit::TestCase
   def test_to_i2__no_comment
     @customer.should_receive(:customer_id).and_return(7)
     @customer.should_receive(:organisation).and_return('Organisation')
-    position = flexmock('position')
-    position.should_receive(:ean13).and_return("EAN13")
-    position.should_receive(:article_number).and_return("ArticleNumber")
-    position.should_receive(:quantity).and_return(17)
-    position.should_ignore_missing
-    @order.positions.push(position)
+    @position.should_ignore_missing
+    @order.positions.push(@position)
     @order.reference = "Reference"
     @order.commit!('8', Time.local(2006,9,27,9,50,12))
     @order.priority = 41
@@ -210,12 +210,8 @@ class TestOrder < Test::Unit::TestCase
   def test_to_i2__configurable_origin
     @customer.should_receive(:customer_id).and_return(7)
     @customer.should_receive(:organisation).and_return('Organisation')
-    position = flexmock('position')
-    position.should_receive(:ean13).and_return("EAN13")
-    position.should_receive(:article_number).and_return("ArticleNumber")
-    position.should_receive(:quantity).and_return(17)
-    position.should_ignore_missing
-    @order.positions.push(position)
+    @position.should_ignore_missing
+    @order.positions.push(@position)
     @order.reference = "Reference"
     @order.comment = "Comment"
     @order.commit!('8', Time.local(2006,9,27,9,50,12))
@@ -322,6 +318,8 @@ class TestOrder < Test::Unit::TestCase
     @customer.should_receive(:ean13).and_return(1234567890123)
     @customer.should_receive(:organisation).and_return('Organisation')
     position = flexmock('position')
+    position.should_receive(:pcode).and_return(nil)
+    position.should_receive(:price).and_return(nil)
     position.should_receive(:ean13).and_return("EAN13")
     position.should_receive(:article_number).and_return("ArticleNumber")
     position.should_receive(:quantity).and_return(17)
@@ -341,12 +339,8 @@ class TestOrder < Test::Unit::TestCase
     @customer.should_receive(:customer_id).and_return(7)
     @customer.should_receive(:ean13).and_return(1234567890123)
     @customer.should_receive(:organisation).and_return('Organisation')
-    position = flexmock('position')
-    position.should_receive(:ean13).and_return("EAN13")
-    position.should_receive(:article_number).and_return("ArticleNumber")
-    position.should_receive(:quantity).and_return(17)
-    position.should_ignore_missing
-    @order.positions.push(position, position)
+    @position.should_ignore_missing
+    @order.positions.push(@position, @position)
     @order.reference = "Reference"
     @order.commit!('8', Time.local(2006,9,27,9,50,12))
     @order.priority = 41
@@ -360,12 +354,8 @@ class TestOrder < Test::Unit::TestCase
     @customer.should_receive(:customer_id).and_return(7)
     @customer.should_receive(:ean13).and_return(1234567890123)
     @customer.should_receive(:organisation).and_return('Organisation')
-    position = flexmock('position')
-    position.should_receive(:ean13).and_return("EAN13")
-    position.should_receive(:article_number).and_return("ArticleNumber")
-    position.should_receive(:quantity).and_return(17)
-    position.should_ignore_missing
-    @order.positions.push(position)
+    @position.should_ignore_missing
+    @order.positions.push(@position)
     @order.reference = "Reference"
     @order.comment = "Comment"
     @order.commit!('8', Time.local(2006,9,27,9,50,12))
@@ -405,7 +395,7 @@ class TestOrder < Test::Unit::TestCase
     assert_equal(expected, @order.to_target_format)
   end
 end
-class TestOrderPosition < Test::Unit::TestCase
+class TestOrderPosition < Minitest::Test
   include FlexMock::TestCase
   def setup
     @product = flexmock('product')

data/test/model/test_product.rb

@@ -3,13 +3,14 @@
 
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
+require "minitest/autorun"
+require 'flexmock/test_unit'
 require 'bbmb/model/product'
 require 'bbmb/model/promotion'
 
 module BBMB
   module Model
-class TestProduct < Test::Unit::TestCase
+class TestProduct < Minitest::Test
   def setup
     @product = Product.new("article_number")
   end
@@ -50,11 +51,11 @@ class TestProduct < Test::Unit::TestCase
     assert_equal(false, @product.backorder)
   end
   def test_equals
-    assert_not_equal(@product, 'article_number')
+    refute_equal(@product, 'article_number')
     other = Product.new("article_number")
     assert_equal(@product, other)
     other = Product.new("foobar")
-    assert_not_equal(@product, other)
+    refute_equal(@product, other)
   end
   def test_price
     assert_equal(nil, @product.price)