bbmb 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5365fd813153ac20b43e196524e0c9545f75e53
-  data.tar.gz: 8646828879d9666acb695a24cc3623784a62151d
+  metadata.gz: c6e2c40f9e08bfaa1590a132dfd79a843dcab512
+  data.tar.gz: 5ba3de786806de5a811194f9b56385afad3dd8aa
 SHA512:
-  metadata.gz: 2f06402f1cea28e3315f9249cae42c88f7248b90ba8a5efb934e399267711b91c31250f7e4881fb74969cef1c11a9ca3a7fdd25dd24fda174747f334e253e255
-  data.tar.gz: 3fb14b307539caaa45e632ca72c4cb8fa6c545733d51da53dfb9c7efa1aa63f11739fd1cf845b6fb1fa5ec7efc52b3cb25a8676d404a723806f596c56f2d0b5a
+  metadata.gz: 2042e778619244928656a79f4ebf46a52ef3ab48c3e4e0c0dc17a4ed25486647960d5700e4796aae71451638727f622f1573246ff07efb8114e596adead7179d
+  data.tar.gz: 22b23be9e8bbd187a99b1e7beccda8378de9fdc072ed1457c9235534e7c325cee3964558055dc0d6a4ad2643ca02abfe015fc1c09b4f415e7d066a7dec1f8adc

data/.travis.yml

@@ -10,11 +10,11 @@ before_install:
 
 rvm:
   - 2.4.0
-  - 2.3.1
   - ruby-head
 
 matrix:
   allow_failures:
+    - 2.3.1 # FixNumber instead of Integer
     - rvm: ruby-head
 
 notifications:

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.1.7 / 16.05.2017
+
+* Fix renaming/adding an email-address (if not already in yus)
+* Fixed running some unit tests
+* Require sbsm >= 1.3.9
+
 === 2.1.6 / 16.05.2017
 
 * Fixed sorting via last_login when logged in as admin

data/bbmb.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ydbd-pg", '>= 0.5.2'
   spec.add_dependency "ydbi",    '>= 0.5.3'
   spec.add_dependency "json"
-  spec.add_dependency "sbsm",    '>= 1.3.8'
+  spec.add_dependency "sbsm",    '>= 1.3.9'
   spec.add_dependency "htmlgrid"
   spec.add_dependency "ydim",    '>= 0.5.1'
   spec.add_dependency "syck"

data/lib/bbmb/util/app.rb

@@ -0,0 +1,80 @@
+#!/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/util/updater'
+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'
+require 'bbmb/util/server'
+
+module BBMB
+  def self.persistence
+    @@persistence ||= BBMB::Persistence::ODBA
+  end
+  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
+        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
+        puts "installed BBMB.server #{BBMB.server}"
+        if(BBMB.config.update?)
+          @server.run_updater
+        end
+        if(BBMB.config.invoice?)
+          @server.run_invoicer
+        end
+        url = BBMB.config.server_url
+        url.untaint
+        DRb.start_service(url, @server)
+        $SAFE = 1
+        $0 = BBMB.config.name
+        SBSM.logger.info('start') { sprintf("starting bbmb-server on %s", url) }
+        DRb.thread.join
+        SBSM.logger.info('finished') { sprintf("starting bbmb-server on %s", url) }
+      rescue Exception => error
+        SBSM.logger.error('fatal') { error }
+        raise
+      end
+      def initialize
+          super
+          puts "Starting Rack-Service #{self.class} and service #{BBMB.config.server_url}"
+          Thread.new {
+              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/server.rb

@@ -44,7 +44,14 @@ module BBMB
         @app.inject_order(customer_id, products, infos, opts)
       end
       def rename_user(old_name, new_name)
-        @app.rename_user(old_name, new_name)
+        return if old_name.eql?(new_name)
+        @app.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 run_invoicer
         @invoicer ||= Thread.new {
@@ -200,16 +207,5 @@ module BBMB
         end
       end
     end
-    class App < SBSM::App
-      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
+  end
+end

data/lib/bbmb/version.rb

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

data/test/util/test_invoicer.rb

@@ -76,7 +76,7 @@ class TestInvoicer < Minitest::Test
     range = Time.local(2006,9)..Time.local(2006,10)
     @drb_server = DRb.start_service(@ydim_url, @ydim_server)
     sleep 0.5
-    result = Invoicer.create_invoice(range, Util::Money.new(24), [order1, order2], today.to_time + 3600)
+    result = Invoicer.create_invoice(range, Util::Money.new(24), [order1, order2], today)
     if result.is_a?(FlexMock::Undefined)
       msg = "Skipping this sometimes failing test "
       puts msg

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: 1.3.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: 1.3.9
 - !ruby/object:Gem::Dependency
   name: htmlgrid
   requirement: !ruby/object:Gem::Requirement
@@ -414,6 +414,7 @@ files:
 - lib/bbmb/persistence/odba/model/order.rb
 - lib/bbmb/persistence/odba/model/product.rb
 - lib/bbmb/persistence/odba/model/quota.rb
+- lib/bbmb/util/app.rb
 - lib/bbmb/util/invoicer.rb
 - lib/bbmb/util/mail.rb
 - lib/bbmb/util/multilingual.rb