bbmb 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 702ceb3e0e1946a527ab2c659f28c75e0a2c97d9
-  data.tar.gz: ffeb8fe8bdd1391bb3b164efcbed9921a8e45bbf
+  metadata.gz: 02ac82813c6ae6fe3a129dc874acd6135b85147a
+  data.tar.gz: 2651afaf8bce34e014edc3f1db4bf893b5601ee8
 SHA512:
-  metadata.gz: ba0abb06a32f248d24ac11d2ec49e3920ea738e32f48564464664099e206485badc27bf37212c7ec293ed8659bb61a17600a77d932b9f87657fd043c5e7bea7d
-  data.tar.gz: 5b01e5c6bae2b33a441e0035dc85b6d3453ff47e397d9b85d751af0fc54c557b8c8dcdcf0a871639e626330f25f2a200a9170bb6a947be87b52238c96b70eff3
+  metadata.gz: fac65074880f3c4204c1a79248498a024220726579fd22ccc432a82ea37d1493d25bee4714bdfcc2704749a265b9872e9eee23e3b3b6f53f65a29a07de170293
+  data.tar.gz: a133950797b7b90f42efdbf523cd8fe7e9f4728d6be360517274fe013dd131b785305b41b5a4af136b241e00a3a8f68a8e4dffc1ec270a5b6af1c121d5109cac

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.1.9 / 17.05.2017
+
+* Trying to set a customer to an already existing e-mail-address fails correctly
+  (Pending: When no customer with the given e-mail exists, allow it)
+
 === 2.1.8 / 17.05.2017
 
 * Fix logging the number of imported items

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

@@ -21,26 +21,18 @@ class Session < SBSM::Session
     SERVER_NAME = uri.host
   end
   attr_reader :email, :pass, :auth_session
-  def initializexx(app:,  cookie_name:, trans_handler:, validator:)
-    super(app,  cookie_name, trans_handler, validator)
-  end
   def login
     @email = user_input(:email)
     @password = user_input(:pass)
-    # @user.respond_to?(:session=)) is FALSE!!!!
     @user.session = self if(@user.respond_to?(:session=))
     # Before rack: @user = @app.login(user_input(:email), user_input(:pass))
-    @auth = DRb::DRbObject.new(nil, BBMB.config.auth_url)
-    @auth_session = @auth.login(user_input(:email), user_input(:pass), BBMB.config.auth_domain) # logs in claude meier without problem, but not admin
+    @auth_session = BBMB.auth.login(user_input(:email), user_input(:pass), BBMB.config.auth_domain) # logs in claude meier without problem, but not admin
     if @auth_session.valid?
       @user = BBMB::Html::Util::KnownUser.new(self) # TODO:Should we set it already in the initialize method?
     else
       @user = SBSM::UnknownUser
     end
-    SBSM.info "BBMB::Html::Util::Session login #{user_input(:email)} #{user_input(:pass)}  #{@user.class} @auth #{@auth} auth_session #{@auth_session}"
-    pp @auth
-    pp @auth_session
-    pp @user
+    SBSM.info "BBMB::Html::Util::Session login #{user_input(:email)} #{user_input(:pass)}  #{@user.class} BBMB.auth #{BBMB.auth} auth_session #{@auth_session}"
     @user
   end
   def logout

data/lib/bbmb/util/app.rb

@@ -27,29 +27,27 @@ module BBMB
   module Util
     class App < SBSM::App
       attr_accessor :db_manager, :yus_server
-      attr_accessor :auth, :config, :persistence, :server
-
       def start_service
         case BBMB.config.persistence
         when 'odba'
           DRb.install_id_conv ODBA::DRbIdConv.new
-          @persistence = BBMB::Persistence::ODBA
+          BBMB.persistence = BBMB::Persistence::ODBA
         end
-        @auth = DRb::DRbObject.new(nil, BBMB.config.auth_url)
-        puts "installed @auth #{@auth}"
-        @server = BBMB::Util::Server.new(@persistence, self)
-        @server.extend(DRbUndumped)
-        BBMB.server = @server
+        BBMB.auth = DRb::DRbObject.new(nil, BBMB.config.auth_url)
+        puts "installed BBMB.auth for #{BBMB.config.auth_url}"
+        BBMB.server = BBMB::Util::Server.new(BBMB.persistence, self)
+        BBMB.server.extend(DRbUndumped)
+        BBMB.server = BBMB.server
         puts "installed BBMB.server #{BBMB.server}"
         if(BBMB.config.update?)
-          @server.run_updater
+          BBMB.server.run_updater
         end
         if(BBMB.config.invoice?)
-          @server.run_invoicer
+          BBMB.server.run_invoicer
         end
         url = BBMB.config.server_url
         url.untaint
-        DRb.start_service(url, @server)
+        DRb.start_service(url, BBMB.server)
         $SAFE = 1
         $0 = BBMB.config.name
         SBSM.logger.info('start') { sprintf("starting bbmb-server on %s", url) }
@@ -66,15 +64,6 @@ module BBMB
               start_service
           }
       end
-      def login(email, pass)
-        session = BBMB.auth.login(email, pass, BBMB.config.auth_domain)
-        Html::Util::KnownUser.new(session)
-      end
-      def logout(session)
-        # Here we start when logging in from the home page
-        BBMB.auth.logout(session)
-      rescue DRb::DRbError, RangeError, NameError
-      end
     end
   end
 end

data/lib/bbmb/util/rack_interface.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+# Util::Server -- de.bbmb.org -- 01.09.2006 -- hwyss@ywesee.com
+
+require 'bbmb/config'
+require 'bbmb/html/util/known_user'
+require 'bbmb/html/util/session'
+require 'bbmb/html/util/validator'
+require 'bbmb/util/invoicer'
+require 'bbmb/util/invoicer'
+require 'bbmb/util/mail'
+require 'bbmb/model/order' # needed to be enable to invoice later
+require 'bbmb/model/customer'
+require 'date'
+require 'sbsm/app'
+require 'bbmb/persistence/odba'
+require 'bbmb/model/customer'
+require 'bbmb/model/quota'
+require 'bbmb/model/product'
+require 'bbmb/model/promotion'
+
+module BBMB
+  module Util
+    class RackInterface < SBSM::RackInterface
+      ENABLE_ADMIN = true
+      SESSION = Html::Util::Session
+      VALIDATOR = Html::Util::Validator
+      def initialize(app: BBMB::Util::App.new,
+                     auth: nil,
+                     validator: BBMB::Html::Util::Validator)
+        [ File.join(Dir.pwd, 'etc', 'config.yml'),
+        ].each do |config_file|
+          if File.exist?(config_file)
+            SBSM.info "BBMB.config.load from #{config_file}"
+            BBMB.config.load (config_file)
+            break
+          end
+        end
+        @app = app
+        super(app: app,
+              session_class: BBMB::Html::Util::Session,
+              unknown_user: Html::Util::KnownUser,
+              validator: validator,
+              cookie_name: 'virbac.bbmb'
+              )
+      end
+    end
+  end
+end

data/lib/bbmb/util/server.rb

@@ -45,7 +45,7 @@ module BBMB
       end
       def rename_user(old_name, new_name)
         return if old_name.eql?(new_name)
-        @app.auth.autosession(BBMB.config.auth_domain) do |session|
+        BBMB.auth.autosession(BBMB.config.auth_domain) do |session|
           if(old_name.nil?)
             session.create_entity(new_name)
           else
@@ -92,120 +92,5 @@ module BBMB
         }
       end
     end
-    class RackInterface < SBSM::RackInterface
-      ENABLE_ADMIN = true
-      SESSION = Html::Util::Session
-      VALIDATOR = Html::Util::Validator
-      attr_reader :updater, :auth
-      def initialize(app: BBMB::Util::App.new,
-                     auth: nil,
-                     validator: BBMB::Html::Util::Validator)
-        [ File.join(Dir.pwd, 'etc', 'config.yml'),
-        ].each do |config_file|
-          if File.exist?(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)
-        @app = app
-        super(app: app,
-              session_class: BBMB::Html::Util::Session,
-              unknown_user: Html::Util::KnownUser,
-              validator: validator,
-              cookie_name: 'virbac.bbmb'
-              )
-      end
-      def inject_order(customer_id, products, infos, opts={})
-        customer = Model::Customer.find_by_customer_id(customer_id) \
-          || Model::Customer.find_by_ean13(customer_id)
-        needed_create = false
-        unless customer
-          if idtype = opts[:create_missing_customer] && !customer_id.empty?
-            customer = Model::Customer.new(customer_id)
-            if idtype.to_s == 'ean13'
-              customer.ean13 = customer_id
-            end
-            BBMB.persistence.save(customer)
-            needed_create = true
-          else
-            raise "Unknown Customer #{customer_id}"
-          end
-        end
-        order = Model::Order.new(customer)
-        products.each { |info|
-          if(product = Model::Product.find_by_pcode(info[:pcode]) \
-              || Model::Product.find_by_ean13(info[:ean13]) \
-              || Model::Product.find_by_article_number(info[:article_number]))
-            order.add(info[:quantity], product)
-            [:article_number, :backorder].each do |key|
-              info.store key, product.send(key)
-            end
-            info.store :description, product.description.de
-            info[:deliverable] = info[:quantity]
-          else
-            info[:deliverable] = 0
-          end
-        }
-        infos.each { |key, value|
-          order.send("#{key}=", value)
-        }
-        customer.inject_order(order)
-        if opts[:deliver]
-          async do
-            send_order order, customer
-          end
-        end
-        if needed_create
-          BBMB::Util::Mail.notify_inject_error(order, opts)
-        end
-        { :order_id => order.order_id, :products => products }
-      end
-      def login(email, pass)
-          session = BBMB.auth.login(email, pass, BBMB.config.auth_domain)
-          Html::Util::KnownUser.new(session)
-        end
-        def logout(session)
-          BBMB.auth.logout(session)
-        rescue DRb::DRbError, RangeError, NameError
-        end
-      def rename_user(old_name, new_name)
-        return if old_name.eql?(new_name)
-        BBMB.auth.autosession(BBMB.config.auth_domain) do |session|
-          if(old_name.nil?)
-            session.create_entity(new_name)
-          else
-            session.rename(old_name, new_name)
-          end
-        end
-      end
-      def send_order order, customer
-        begin
-          Timeout.timeout(300) {
-            BBMB::Util::TargetDir.send_order(order)
-          }
-        rescue StandardError => err
-          err.message << " (Email: #{customer.email} - Customer-Id: #{customer.customer_id})"
-          BBMB::Util::Mail.notify_error(err)
-        end
-        begin
-          Timeout.timeout(300) {
-            BBMB::Util::Mail.send_order(order)
-          }
-        rescue StandardError => err
-          err.message << " (Email: #{customer.email} - Customer-Id: #{customer.customer_id})"
-          BBMB::Util::Mail.notify_error(err)
-        end
-        begin
-          Timeout.timeout(300) {
-            BBMB::Util::Mail.send_confirmation(order)
-          }
-        rescue StandardError => err
-          err.message << " (Email: #{customer.email} - Customer-Id: #{customer.customer_id})"
-          BBMB::Util::Mail.notify_error(err)
-        end
-      end
-    end
   end
 end

data/lib/bbmb/version.rb

@@ -1,3 +1,3 @@
 module BBMB
-  VERSION = '2.1.8'
+  VERSION = '2.1.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
@@ -421,6 +421,7 @@ files:
 - lib/bbmb/util/numbers.rb
 - lib/bbmb/util/password_generator.rb
 - lib/bbmb/util/polling_manager.rb
+- lib/bbmb/util/rack_interface.rb
 - lib/bbmb/util/server.rb
 - lib/bbmb/util/target_dir.rb
 - lib/bbmb/util/transfer_dat.rb