From dd3216d76f73325122c7647df83f6003f1593df6 Mon Sep 17 00:00:00 2001 From: Niklaus Giger Date: Mon, 6 Jun 2016 17:14:01 +0200 Subject: [PATCH] List of customers is displayed now --- bin/admin | 2 -- bin/bbmbd | 2 -- bin/migrate_bbmb_to_utf_8 | 2 +- lib/bbmb/html/state/global.rb | 2 +- lib/bbmb/html/util/known_user.rb | 16 ++++++++++++++++ lib/bbmb/html/util/session.rb | 40 ++++++++++++++++++++++++---------------- lib/bbmb/util/server.rb | 1 + lib/bbmb/version.rb | 2 +- test/util/test_invoicer.rb | 8 ++++---- test/util/test_mail.rb | 3 +-- 10 files changed, 49 insertions(+), 29 deletions(-) diff --git a/bin/admin b/bin/admin index d12ab25..d4ddfb9 100755 --- a/bin/admin +++ b/bin/admin @@ -1,8 +1,6 @@ #!/usr/bin/env ruby # Admin -- bbmb -- 09.07.2003 -- hwyss@ywesee.com -$KCODE = 'u' - require 'drb' require 'sbsm/drb' require 'bbmb' diff --git a/bin/bbmbd b/bin/bbmbd index d0bca84..b727105 100755 --- a/bin/bbmbd +++ b/bin/bbmbd @@ -1,7 +1,5 @@ #!/usr/bin/env ruby -$KCODE = 'u' - $: << File.expand_path('../lib', File.dirname(__FILE__)) require 'drb' diff --git a/bin/migrate_bbmb_to_utf_8 b/bin/migrate_bbmb_to_utf_8 index 0fe9c6e..3944022 100755 --- a/bin/migrate_bbmb_to_utf_8 +++ b/bin/migrate_bbmb_to_utf_8 @@ -111,7 +111,7 @@ module YDIM child = child.force_encoding(Encoding::ISO_8859_1).clone.encode(Encoding::UTF_8) puts "force_encoding from ISO_8859_1 #{old}. is now #{child}" end - binding.pry unless child.valid_encoding? + # binding.pry unless child.valid_encoding? case child.encoding.to_s when /ASCII-8BIT|US-ASCII/ # nothing todo diff --git a/lib/bbmb/html/state/global.rb b/lib/bbmb/html/state/global.rb index f53f5a2..68dccf4 100644 --- a/lib/bbmb/html/state/global.rb +++ b/lib/bbmb/html/state/global.rb @@ -2,7 +2,6 @@ # Html::State::Global -- bbmb.ch -- 18.09.2006 -- hwyss@ywesee.com require 'sbsm/state' -require 'bbmb/html/state/login' module BBMB module Html @@ -59,3 +58,4 @@ end end end end +require 'bbmb/html/state/login' diff --git a/lib/bbmb/html/util/known_user.rb b/lib/bbmb/html/util/known_user.rb index d608916..7deca65 100644 --- a/lib/bbmb/html/util/known_user.rb +++ b/lib/bbmb/html/util/known_user.rb @@ -3,6 +3,22 @@ require 'sbsm/user' +# monkey patching pagestep +class SBSM::UnknownUser + def pagestep + return 10 + end + + def entity_valid?(email) + end + def allowed?(action, key=nil) + false + end + def last_login(param) + "last login: #{param}" + end +end + module BBMB module Html module Util diff --git a/lib/bbmb/html/util/session.rb b/lib/bbmb/html/util/session.rb index 3cf8700..815cc8b 100644 --- a/lib/bbmb/html/util/session.rb +++ b/lib/bbmb/html/util/session.rb @@ -1,30 +1,36 @@ #!/usr/bin/env ruby -# Html::Util::Session -- bbmb.ch -- 15.09.2006 -- hwyss@ywesee.com +# encoding: utf-8 require 'bbmb/config' -require 'bbmb/html/util/known_user' -require 'bbmb/html/state/login' require 'sbsm/session' -require 'sbsm/redirector' +require 'bbmb/html/state/global' +require 'bbmb/html/util/lookandfeel' +require 'bbmb/html/util/known_user' + module BBMB - module Html - module Util + module Html + module Util class Session < SBSM::Session - include SBSM::Redirector - DEFAULT_LANGUAGE = 'de' - DEFAULT_STATE = State::Login - EXPIRES = BBMB.config.session_timeout - PERSISTENT_COOKIE_NAME = "bbmb-barcodereader" + # DEFAULT_FLAVOR = "bbmb" + DEFAULT_LANGUAGE = 'de' + #DEFAULT_STATE = Html::State::Init + DEFAULT_STATE = State::Login + # LOOKANDFEEL = Html::Custom::Lookandfeel def login @user = @app.login(user_input(:email), user_input(:pass)) @user.session = self if(@user.respond_to?(:session=)) @user end def logout + puts "#{__FILE__}: app.logout if #{@user.respond_to?(:auth_session)}" @app.logout(@user.auth_session) if(@user.respond_to?(:auth_session)) super end + + def invoices + @app.invoice_infos(user_input(:status) || 'is_open') + end def lookandfeel if(@lookandfeel.nil? \ || (@lookandfeel.language != persistent_user_input(:language))) @@ -34,6 +40,7 @@ class Session < SBSM::Session @lookandfeel end def process(request) + puts "Processing request KnownUser? #{@user.is_a?(KnownUser)}" begin if(@user.is_a?(KnownUser) && @user.auth_session.expired?) logout @@ -43,10 +50,11 @@ class Session < SBSM::Session end super end - def validate(key, value) - @validator.validate(key, value) - end + + def method_missing(meth, *args) + @app.send(meth, *args) + end end - end - end + end + end end diff --git a/lib/bbmb/util/server.rb b/lib/bbmb/util/server.rb index cf266ea..8d1e0be 100644 --- a/lib/bbmb/util/server.rb +++ b/lib/bbmb/util/server.rb @@ -69,6 +69,7 @@ module BBMB Mail.notify_error(e) end def login(email, pass) + puts "lib/bbmb/util/server.rb #{email}" session = BBMB.auth.login(email, pass, BBMB.config.auth_domain) Html::Util::KnownUser.new(session) end diff --git a/lib/bbmb/version.rb b/lib/bbmb/version.rb index 03b3f17..622943b 100644 --- a/lib/bbmb/version.rb +++ b/lib/bbmb/version.rb @@ -2,5 +2,5 @@ # Bbmb -- bbmb.ch -- 17.12.2019 -- zdavatz@ywesee.com module BBMB - VERSION = '2.0.2' + VERSION = '2.0.3' end diff --git a/test/util/test_invoicer.rb b/test/util/test_invoicer.rb index ac5640e..88a7b69 100755 --- a/test/util/test_invoicer.rb +++ b/test/util/test_invoicer.rb @@ -3,7 +3,7 @@ $: << File.expand_path('..', File.dirname(__FILE__)) -$: << File.expand_path('../lib', File.dirname(__FILE__)) +$: << File.expand_path('../../lib', File.dirname(__FILE__)) require "minitest/autorun" @@ -80,7 +80,7 @@ class TestInvoicer < Minitest::Test } range = Time.local(2006,9)...Time.local(2006,10) result = Invoicer.create_invoice(range, Util::Money.new(24), [order1, order2], today) - skip('Why does this test fail?') + # skip('Why does this test fail?') assert_equal(invoice, result) assert_equal("01.09.2006 - 30.09.2006", invoice.description) assert_equal(today, invoice.date) @@ -99,7 +99,7 @@ class TestInvoicer < Minitest::Test @ydim_server.should_receive(:logout).and_return { |client| assert_equal(session, client) } - skip('this test failes') + # skip('this test failes') Invoicer.send_invoice(123) end def test_run @@ -155,7 +155,7 @@ class TestInvoicer < Minitest::Test range = Time.local(2006,9)...Time.local(2006,10) session.should_receive(:send_invoice).with(39) Invoicer.run(range, today) - skip('Why does this test sometimes passl?') + # skip('Why does this test sometimes passl?') assert_equal("01.09.2006 - 30.09.2006", invoice.description) assert_equal(today, invoice.date) assert_equal('CHF', invoice.currency) diff --git a/test/util/test_mail.rb b/test/util/test_mail.rb index f03ef05..2c0166a 100755 --- a/test/util/test_mail.rb +++ b/test/util/test_mail.rb @@ -1,8 +1,7 @@ #!/usr/bin/env ruby # Util::TestMail -- bbmb.ch -- 27.09.2006 -- hwyss@ywesee.com - -$: << File.expand_path('../lib', File.dirname(__FILE__)) +$: << File.expand_path('../../lib', File.dirname(__FILE__)) require "minitest/autorun" require 'flexmock/test_unit' -- 1.8.5.2