bbmb 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67ee64829561f37c9cf3c4eb2346f7add7bb7092
-  data.tar.gz: 34b5e99df58800d3193b7d89328a0828ee9501ee
+  metadata.gz: c2eb42efa3ac9ef669280070946e16ae722ef14c
+  data.tar.gz: 69a025978a868913d8080c42b4ce574a5a1a33aa
 SHA512:
-  metadata.gz: 8ffe4cd1c37bca62263f89e50277040889f4ea6b5bce32da42b6308b97a5c60a5e36e295ce06afe6042aa3ee635fb8f372ef42f41124269a7879e6dc9dbb3e2d
-  data.tar.gz: 4699bbcbddc0678a2dd359a17bd772bda1f89a48b1d25969cb8f9e325fc008005f46e4374023d074c58ea55ebe7a2770b315a01a4e65bab897d84d80ba1aa12c
+  metadata.gz: 6aac0c230d1189d36609914bc5a8b495ed3543bf29ecf3563da1efe718ef486da98b8efe32d6924ed54651a5c1b03834ad50e6deb6b9cfb64026fd7847d622f0
+  data.tar.gz: e552995962a29f4765599c010b53823362198dac681a328bd2ef5ef4f1aab497312462b9c2bb5d92751a32a42b67fcdafd38f01d5d3add14365b4dfdceabf215

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.0.8 / 18.07.2016
+
+* Replaced Thread.exclusive with Mutex#synchronize
+* Implemented sorting for aktiviert and letztes login columns
+* Append executable permisson to bin commands
+
 === 2.0.7 / 18.07.2016
 
 * Fixed search filter

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

@@ -1,10 +1,10 @@
 # Html::State::Customers -- bbmb.ch -- 18.09.2006 -- hwyss@ywesee.com
 
+require 'ostruct'
 require 'bbmb/html/state/global_predefine'
 require 'bbmb/html/state/customer'
 require 'bbmb/html/view/customers'
 require 'bbmb/model/customer'
-require 'ostruct'
 
 module BBMB
   module Html
@@ -15,13 +15,29 @@ class Customers < Global
   FILTER = [ :customer_id, :organisation, :plz, :city, :email ]
   def init
     start = Time.now
-    @model = BBMB.persistence.all(Model::Customer)
+    @model  = BBMB.persistence.all(Model::Customer)
     @sortby = [:organisation]
     BBMB.logger.debug('State') {
       sprintf("Customers#init: loaded %i customers in %1.5fs",
               @model.size, Time.now - start)
     }
-    @filter = Proc.new { |model|
+    @filter = make_filter
+  end
+  def page(model)
+    page = OpenStruct.new
+    index = @session.user_input(:index).to_i
+    step = @session.user.pagestep || BBMB.config.pagestep
+    page.index = index
+    page.first = index + 1
+    page.step = step
+    page.total = model.size
+    page.customers = model[index, step]
+    page.last = index + page.customers.size
+    page
+  end
+  private
+  def make_filter
+    Proc.new { |model|
       input = @session.event_bound_user_input(:filter)
       if input
         pattern = Regexp.new(input.gsub('*', '.*'), 'ui')
@@ -38,22 +54,27 @@ class Customers < Global
         }
       end
       get_sortby!
+      if @sortby.include?(:valid) || @sortby.include?(:last_login)
+        # decorates customer objects with (yus) session
+        model = model.map { |m| CustomerDecorator.new(m, @session) }
+      end
       model.sort! { |a, b| compare_entries(a, b) }
-      @sort_reverse && model.reverse! 
+      @sort_reverse && model.reverse!
       page(model)
     }
   end
-  def page(model)
-    page = OpenStruct.new
-    index = @session.user_input(:index).to_i
-    step = @session.user.pagestep || BBMB.config.pagestep
-    page.index = index
-    page.first = index + 1
-    page.step = step
-    page.total = model.size
-    page.customers = model[index, step]
-    page.last = index + page.customers.size
-    page
+end
+class CustomerDecorator < SimpleDelegator
+  def initialize(model, session)
+    @source  = model
+    @session = session
+    self.__setobj__(@source)
+  end
+  def last_login
+    @last_login ||= @session.user.last_login(email)
+  end
+  def valid
+    @valid ||= @session.user.entity_valid?(email).to_s
   end
 end
     end

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

@@ -95,10 +95,18 @@ class CustomersList < HtmlGrid::List
   end
 =end 
   def last_login(model)
-    @session.user.last_login(model.email)
+    if model.respond_to?(:last_login)
+      model.last_login
+    else
+      @session.user.last_login(model.email)
+    end
   end
   def valid(model)
-    @lookandfeel.lookup(@session.user.entity_valid?(model.email).to_s)
+    if model.respond_to?(:valid)
+      @lookandfeel.lookup(model.valid)
+    else
+      @lookandfeel.lookup(@session.user.entity_valid?(model.email).to_s)
+    end
   end
   private
   def sort_link(header_key, matrix, component)

data/lib/bbmb/model/customer.rb

@@ -7,6 +7,8 @@ require 'bbmb/model/order'
 module BBMB
   module Model
 class Customer
+  MUTEX = Mutex.new
+
   attr_reader :customer_id, :email, :archive, :quotas
   attr_accessor :address1, :address2, :address3, :canton, :city,
     :drtitle, :ean13, :fax, :firstname, :language, :lastname,
@@ -35,7 +37,7 @@ class Customer
     ].compact
   end
   def commit_order!(commit_time = Time.now)
-    Thread.exclusive {
+    MUTEX.synchronize {
       id = @archive.keys.max.to_i.next
       order = current_order
       order.commit!(id, commit_time)
@@ -72,7 +74,7 @@ class Customer
     @favorites ||= Order.new(self)
   end
   def inject_order(order, commit_time = Time.now)
-    Thread.exclusive {
+    MUTEX.synchronize {
       id = @archive.keys.max.to_i.next
       order.commit!(id, commit_time)
       @archive.store(id, order)

data/lib/bbmb/version.rb

@@ -2,5 +2,5 @@
 # Bbmb -- bbmb.ch -- 17.12.2019 -- zdavatz@ywesee.com
 
 module BBMB
-  VERSION = '2.0.7'
+  VERSION = '2.0.8'
 end

metadata

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