bbmb 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 509fc49dd58770c80b653a8978b68fcc409c0805
-  data.tar.gz: 4b0a696b35073a886f6ce95306ccc06d26c2bb6f
+  metadata.gz: b487ee07c8fd64af7c360241bf8c3c4a9ccb3778
+  data.tar.gz: a7198aa78b2da4fbf68ed8a9c89793cb5880eac8
 SHA512:
-  metadata.gz: c0591becd04827df23cb0e7f0099db759d3ce8298b0aa9fa79811359f27fb88c5fe8b22d7693af6e1ca1311fcd2ed7b1db8d7d2d69f7971a6c5b1e6b0950b4c1
-  data.tar.gz: 121df3abf31245a43270eace8db52c00ea77a127c027e23b15692fa35ba8b2ab3d75a3f6582a3824cdd81bb194a9a7aeb80c3c2a120bbe13b43be63f4c14ed6e
+  metadata.gz: 26ab6091e17afc1581e1fec5c4907fdebaf286a846c66cc3aba6bb09fa0af1f96ffa8d7f6bd3ede97b705a07e901281c3bdb5438253f8d774ff37d9765babb90
+  data.tar.gz: 1c01e22b9cbc39a7cdb6b593d2701c9f81bcc351d8c6955d9e38d6d8d2293f14f400d1155d2092cfefdc70c15ef75d526b829b80a0cf6e2d97e6072234023af3

data/Gemfile

@@ -2,10 +2,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :debugger do
-	if RUBY_VERSION.match(/^1/)
-		gem 'pry-debugger'
-	else
-		gem 'pry-byebug'
-    gem 'pry-doc'
-	end
+  gem 'pry-byebug'
+  gem 'pry-doc'
 end

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.3.2 / 20.06.2017
+
+* Use SBSM 1.4.5 and adapt KnownUser
+* Use SBSM.debug to log sending mail
+* Log postprocess TargetDir
+
 === 2.3.1 / 12.06.2017
 
 * Fix inject_order for xmlconv

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.4.2'
+  spec.add_dependency "sbsm",    '>= 1.4.5'
   spec.add_dependency "htmlgrid"
   spec.add_dependency "ydim",    '>= 0.5.1'
   spec.add_dependency "syck"

data/lib/bbmb/config.rb

@@ -96,8 +96,8 @@ module BBMB
   }
 
   config = RCLConf::RCLConf.new(ARGV, defaults)
-  raise "config file #{config.config} must exist" unless  File.exist?(config.config)
+  raise "config file #{config.config} must exist" if !defined?(MiniTest) && !File.exist?(config.config)
   puts "Loading BBMB config from #{config.config}"
-  config.load(config.config)
+  config.load(config.config) if File.exist?(config.config)
   @config = config
 end

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

@@ -17,8 +17,8 @@ class KnownUser < SBSM::User
   # login BBMB.config.auth_domain + ".Customer"
   attr_reader :auth_session
   PREFERENCE_KEYS = [ :home, :pagestep ]
-  def initialize(session)
-    @auth_session = session.auth_session
+  def initialize(auth_session)
+    @auth_session = auth_session
   end
   def allowed?(action, key=nil)
     if @auth_session

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

@@ -28,7 +28,7 @@ class Session < SBSM::Session
     # Before rack: @user = @app.login(user_input(:email), user_input(:pass))
     @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?
+      @user = BBMB::Html::Util::KnownUser.new(@auth_session)
     else
       @user = SBSM::UnknownUser
     end

data/lib/bbmb/util/mail.rb

@@ -65,8 +65,10 @@ module Mail
       puts msg unless defined?(::MiniTest)
       ::Mail.defaults do  delivery_method :test end
     else
-      puts "Mail.sendmail #{config.smtp_server} #{config.smtp_port} #{config.smtp_helo} smtp_user: #{ config.smtp_user}  #{ config.smtp_pass}  #{ config.smtp_authtype}"
-      puts "Mail.sendmail from #{from_addr} to #{to_addr} cc #{cc_addrs} message: #{my_body.class}"
+      msg = "Mail.sendmail #{config.smtp_server} #{config.smtp_port} #{config.smtp_helo} smtp_user: #{ config.smtp_user}  #{ config.smtp_pass}  #{ config.smtp_authtype}\n" +
+            "Mail.sendmail from #{from_addr} to #{to_addr} cc #{cc_addrs} subject: #{my_subject} message: #{my_body.class}"
+      puts msg
+      SBSM.debug(msg)
       return if to_addr == nil
       ::Mail.defaults do
       options = { :address              => config.smtp_server,

data/lib/bbmb/util/rack_interface.rb

@@ -38,7 +38,6 @@ module BBMB
         @app = app
         super(app: app,
               session_class: BBMB::Html::Util::Session,
-              unknown_user: Html::Util::KnownUser,
               validator: validator,
               cookie_name: 'virbac.bbmb'
               )

data/lib/bbmb/util/target_dir.rb

@@ -12,6 +12,7 @@ module TargetDir
   def TargetDir.send_order(order)
     content = order.to_target_format
     basename = BBMB.config.tmpfile_basename
+    SBSM.info("TargetDir.send_order #{order.order_id} basename #{basename} -> #{BBMB.config.order_destinations}")
     BBMB.config.order_destinations.each { |destination|
       uri = URI.parse(File.join(destination, order.filename))
       case uri.scheme

data/lib/bbmb/version.rb

@@ -1,3 +1,3 @@
 module BBMB
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end

data/test/util/test_target_dir.rb

@@ -15,7 +15,7 @@ class TestTargetDir < Minitest::Test
     BBMB.config = config = flexmock('config')
     bbmb_dir = File.expand_path('..', File.dirname(__FILE__))
     config.should_receive(:bbmb_dir).and_return(bbmb_dir)
-    @dir = File.expand_path('../data/destination', 
+    @dir = File.expand_path('../data/destination',
                             File.dirname(__FILE__))
   end
   def teardown
@@ -30,6 +30,7 @@ class TestTargetDir < Minitest::Test
     config.should_receive(:order_destinations).and_return([ftp])
     config.should_receive(:tmpfile_basename).and_return('bbmb')
     order = flexmock('order')
+    order.should_receive(:order_id).and_return('order_id')
     order.should_receive(:to_target_format).and_return('data')
     order.should_receive(:filename).and_return('order.csv')
     flexstub(Net::FTP).should_receive(:open)\
@@ -51,6 +52,7 @@ class TestTargetDir < Minitest::Test
     config.should_receive(:order_destinations).and_return([@dir])
     config.should_receive(:tmpfile_basename).and_return('bbmb')
     order = flexmock('order')
+    order.should_receive(:order_id).and_return('order_id')
     order.should_receive(:to_target_format).and_return('data')
     order.should_receive(:filename).and_return('order.csv')
     flexstub(Net::FTP).should_receive(:open).times(0)
@@ -66,6 +68,7 @@ class TestTargetDir < Minitest::Test
     config.should_receive(:order_destinations).and_return(['data/destination'])
     config.should_receive(:tmpfile_basename).and_return('bbmb')
     order = flexmock('order')
+    order.should_receive(:order_id).and_return('order_id')
     order.should_receive(:to_target_format).and_return('data')
     order.should_receive(:filename).and_return('order.csv')
     flexstub(Net::FTP).should_receive(:open).times(0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: htmlgrid
   requirement: !ruby/object:Gem::Requirement