bbmb 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb9850553e28e9f603b495d864c1e17bb9a0f835
-  data.tar.gz: 83b72979f233b9d7e2c15eb3d9f4a3cda2af93e0
+  metadata.gz: d5365fd813153ac20b43e196524e0c9545f75e53
+  data.tar.gz: 8646828879d9666acb695a24cc3623784a62151d
 SHA512:
-  metadata.gz: d5f630e2f4112e7c5b17061ff6f24e0a7aad3fb21725cacabd480cd94cdff7c166377855651d18b6be4f59559134c484c1f16d821abbf6321daf2727799022b6
-  data.tar.gz: c4f8e3782a87607ee8ce8171e583d56c8cc2c92889f366bc66dcd6491e82a75c125d5c18b3dbe82bad8f59a574f0cd851b05862e5924fdc5512559427c2487b3
+  metadata.gz: 2f06402f1cea28e3315f9249cae42c88f7248b90ba8a5efb934e399267711b91c31250f7e4881fb74969cef1c11a9ca3a7fdd25dd24fda174747f334e253e255
+  data.tar.gz: 3fb14b307539caaa45e632ca72c4cb8fa6c545733d51da53dfb9c7efa1aa63f11739fd1cf845b6fb1fa5ec7efc52b3cb25a8676d404a723806f596c56f2d0b5a

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.1.6 / 16.05.2017
+
+* Fixed sorting via last_login when logged in as admin
+* Nicer tracing on how updater/invoicer start
+* Removed some dead code and debug statements
+
 === 2.1.5 / 16.05.2017
 
 * Improved fix for orders with unreachable ODBA-IDs for positions

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

@@ -72,7 +72,7 @@ module BBMB
         end
 
         def last_login
-          @last_login ||= @session.user.last_login(email)
+          @last_login ||= @session.auth_session.last_login(email)
         end
 
         def valid

data/lib/bbmb/html/util/known_user.rb

@@ -17,16 +17,8 @@ class KnownUser < SBSM::User
   # login BBMB.config.auth_domain + ".Customer"
   attr_reader :auth_session
   PREFERENCE_KEYS = [ :home, :pagestep ]
-  PREFERENCE_KEYS.each { |key|
-    define_method(key) {
-      remote_call(:get_preference, key)
-    }
-  } if false
   def initialize(session)
-    puts "BBMB::Html::Util::KnownUser.new object_id is #{self.object_id} SBSM::Session ? #{self.is_a? SBSM::Session} auth_session is #{session.class}"
     @auth_session = session.auth_session
-    # puts "backtrace #{caller.join("\n")}"
-    # @auth_session.auth.allowed?('edit', 'yus.entities')
   end
   def allowed?(action, key=nil)
     if @auth_session
@@ -34,18 +26,7 @@ class KnownUser < SBSM::User
       return @auth_session.remote_call(:allowed?, action, key)
     end
     SBSM.debug('User ' + sprintf('allowed?(%s, %s)', action, key))
-    if defined?(yus_user) && yus_user
-      allowed = yus_user.send(:allowed?, action, key)
-    end if false
     return true
-    # SBSM.debug('User'+ sprintf('allowed?(%s, %s) -> %s', action, key, allowed))
-    return allowed
-    # session.rb:25:in `login' BBMB::Html::Util::Session login claude.meier@gmx.net 5972659ce6c7f9b2356c0e650c7c40a3
-    allowed = remote_call(:allowed?, action, key)
-    SBSM.debug('User') {
-      sprintf('%s: allowed?(%s, %s) -> %s', name, action, key, allowed)
-    }
-    allowed
   rescue => error
     puts error
     puts error.backtrace.join("\n")
@@ -55,7 +36,6 @@ class KnownUser < SBSM::User
       && (entity = @auth_session.find_entity(email)) && entity.valid?)
   end
   def navigation
-    puts "BBMB::Html::Util::KnownUser navigation returning  [ :logout ]"
     [ :logout ]
   end
   def get_preference(key)
@@ -76,7 +56,6 @@ class KnownUser < SBSM::User
     puts error
     puts error.backtrace.join("\n")
   end
-  # alias :method_missing :remote_call
 end
     end
   end

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

@@ -6,7 +6,6 @@ module BBMB
     module View
 class NavigationLink < HtmlGrid::Link
   def init
-    puts "NavigationLink unless #{@session.event} == #{@name}"
     unless(@session.event == @name)
       self.href = @lookandfeel._event_url(@name)
     end

data/lib/bbmb/util/server.rb

@@ -26,11 +26,11 @@ module BBMB
   module Util
     class Server
       def initialize(persistence, app)
-        puts "Self #{self.class} initialize"
         @persistence = persistence
         @app = app
       end
       def invoice(range)
+        SBSM.info "invoice started at #{Time.now} for #{range}"
         Invoicer.run(range)
       rescue Exception => e
         Mail.notify_error(e)
@@ -47,7 +47,6 @@ module BBMB
         @app.rename_user(old_name, new_name)
       end
       def run_invoicer
-        SBSM.debug("run_invoicer starting")
         @invoicer ||= Thread.new {
           Thread.current.abort_on_exception = true
           loop {
@@ -57,19 +56,16 @@ module BBMB
             now = Time.now
             at = Time.local(day.year, day.month)
             secs = at - now
-            SBSM.debug("invoicer") {
-              "sleeping %.2f seconds" % secs
-            }
+            msg = "run_invoicer sleeping %.2f seconds (or more than %d days)" % [ secs, secs/3600/24 ]
+            SBSM.debug(msg)
             sleep(secs)
-            SBSM.debug("invoice starting")
             invoice(start...at)
-            SBSM.debug("invoice finished")
           }
         }
       end
       def run_updater
         run_only_once_at_startup = false
-        SBSM.debug("updater") { "run_updater run_only_once_at_startup? #{run_only_once_at_startup} " }
+        SBSM.debug("run_only_once_at_startup? #{run_only_once_at_startup} hour: #{BBMB.config.update_hour}")
         @updater ||= Thread.new {
           loop {
             day = Date.today
@@ -79,9 +75,8 @@ module BBMB
             end
             at = Time.local(day.year, day.month, day.day, BBMB.config.update_hour)
             secs = at - now
-            SBSM.debug("updater") { "sleeping %.2f seconds. run_only_once_at_startup #{run_only_once_at_startup}" % secs  }
+            SBSM.debug("updater sleeping %.2f seconds. run_only_once_at_startup #{run_only_once_at_startup}" % secs)
             if run_only_once_at_startup then puts "Skipped sleeping #{secs}" else sleep(secs) end
-
             SBSM.debug("update starting")
             update
             SBSM.debug("update finished")
@@ -101,13 +96,12 @@ module BBMB
         [ File.join(Dir.pwd, 'etc', 'config.yml'),
         ].each do |config_file|
           if File.exist?(config_file)
-            puts "BBMB.config.load from #{config_file}"
+            SBSM.info "BBMB.config.load from #{config_file}"
             BBMB.config.load (config_file)
             break
           end
         end
         @auth = DRb::DRbObject.new(nil, BBMB.config.auth_url)
-        puts "@auth is #{@auth} from #{self.class}"
         @app = app
         super(app: app,
               session_class: BBMB::Html::Util::Session,

data/lib/bbmb/version.rb

@@ -1,3 +1,3 @@
 module BBMB
-  VERSION = '2.1.5'
+  VERSION = '2.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger