bbmb 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaa30df636673ef2b0750209b94e560b321b1003
-  data.tar.gz: 722f5f6e81069348fd13ccfe66bca2baeda41030
+  metadata.gz: 99f53619764278010c43b1ce96b01da6110c1102
+  data.tar.gz: 4ea021144c1d8eb96b5c9041e8c6dfb27c2a3b40
 SHA512:
-  metadata.gz: 6a18a4776e43b0532aa0d7f453fad64c9a17a586fe36d4c9001c34ccf8a848017ed71152c8bdf329794406c375d06cd5d5a2fbb3e1559b7b920e96ad4afaa5bb
-  data.tar.gz: 34b1eb5c2a44ec0c04d1f2cad8d9c5db9044cafe3ce7abcbd902e67a2b1214e2e513a4c57df5a96adb1146c3fae033dc22c141e2fa12c8bd1c4727e3804d6cf9
+  metadata.gz: fd9c1e936e5f436281c0ffdd4fbcdcd95a5a2576a29506f4f07169c71d9fa212e75de70f5c09810dbb60afed3041a6d2afa7ffa5abee164e6996a553827c2ef8
+  data.tar.gz: 8fdb5702e160bc11111bedcdacbec1e9faf9bfa61d9ffad53c12b2ae6832757073da0df6a3159a18941e69a70565d12a76a1585edf11b7552c2462bd4ad18e37

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.0.4 / 20.06.2016
+
+* Use gem 'mail' to send e-mails
+* Added config.mail_suppress_sending
+
 === 2.0.3 / 08.06.2016
 
 * Added a DEFAULT_FLAVOR sandoz to work without rockit

data/bin/{admin → bbmb_admin}

@@ -5,7 +5,7 @@ require 'drb'
 require 'sbsm/drb'
 require 'bbmb'
 require 'bbmb/config'
-require 'encoding/character/utf-8'
+require 'bbmb/util/invoicer'
 require 'readline'
 include Readline
 

data/bin/bbmbd

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-$KCODE = 'u'
-
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'drb'
@@ -9,8 +7,6 @@ require 'logger'
 require 'ydim/invoice'
 require 'bbmb/config'
 require 'bbmb/util/server'
-require 'bbmb/util/server'
-require 'pp'
 
 module BBMB
   @config.load_files.each { |local|

data/bin/update_articles_and_products

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+$: << File.expand_path('../lib', File.dirname(__FILE__))
+
+require 'drb'
+require 'logger'
+require 'ydim/invoice'
+require 'bbmb/config'
+require 'bbmb/util/server'
+
+module BBMB
+  @config.load_files.each { |local|
+    require local
+  }
+  require File.join('bbmb', 'persistence', @config.persistence)
+  case @config.persistence
+  when 'odba'
+    DRb.install_id_conv ODBA::DRbIdConv.new
+    @persistence = BBMB::Persistence::ODBA
+  end
+
+  log_file = @config.log_file
+  if(log_file.is_a?(String))
+    FileUtils.mkdir_p(File.dirname(log_file))
+    log_file = File.open(log_file, 'a')
+    at_exit { log_file.close }
+  end
+  @logger = Logger.new(log_file)
+  @logger.level = Logger.const_get(@config.log_level)
+  @logger.debug('config') { @config.pretty_inspect }
+
+  VERSION = `git rev-parse HEAD`
+
+  @auth = DRb::DRbObject.new(nil, @config.auth_url)
+
+  begin
+    @server = BBMB::Util::Server.new(@persistence)
+    @server.extend(DRbUndumped)
+    puts "#{Time.now}: Calling update"
+    @server.update
+    puts "#{Time.now}: Finished update"
+  rescue Exception => error
+    @logger.error('fatal') { error }
+    raise
+  end
+end

data/lib/bbmb/config.rb

@@ -61,6 +61,7 @@ module BBMB
     'load_files'                      => ['bbmb/util/csv_importer'],
     'log_file'                        => STDERR,
     'log_level'                       => 'INFO',
+    'mail_suppress_sending'           => false,
     'mail_confirm_body'               => nil,
     'mail_confirm_cc'                 => [],
     'mail_confirm_from'               => 'confirm.test@bbmb.ch',
@@ -84,6 +85,7 @@ module BBMB
     'server_url'                      => 'druby://localhost:12000',
     'session_timeout'                 => 3600,
     'smtp_authtype'                   => nil,
+    'smtp_domain'                     => 'localdomain',
     'smtp_helo'                       => 'localhost.localdomain',
     'smtp_pass'                       => nil,
     'smtp_port'                       => 25,

data/lib/bbmb/util/mail.rb

@@ -2,11 +2,9 @@
 # Util::Mail -- bbmb.ch -- 19.11.2012 -- yasaka@ywesee.com
 # Util::Mail -- bbmb.ch -- 27.09.2006 -- hwyss@ywesee.com
 
+require 'mail'
 require 'bbmb/config'
-require 'net/smtp'
-require 'rmail'
 require 'pp'
-require 'bbmb/util/smtp_tls'
 
 module BBMB
   module Util
@@ -14,62 +12,77 @@ module Mail
   def Mail.notify_confirmation_error(order)
     config = BBMB.config
     if to = config.confirm_error_to
-      header, message = setup
       customer = order.customer
-      from = header.from = config.confirm_error_from
-      header.to = to
-      cc = header.cc = config.confirm_error_cc
-      header.subject = config.confirm_error_subject % customer.customer_id
-      message.body = config.confirm_error_body % customer.customer_id
-      Mail.sendmail message, from, to, cc
+      from = config.confirm_error_from
+      cc = config.confirm_error_cc
+      subject = config.confirm_error_subject % customer.customer_id
+      body = config.confirm_error_body % customer.customer_id
+      Mail.sendmail body, subject, from, to, cc
     end
   end
   def Mail.notify_debug(subject, body)
-    header, message = setup
     config = BBMB.config
-    from = header.from = config.mail_order_from
-    to = header.to = config.error_recipients
-    header.subject = sprintf "%s: %s", BBMB.config.name, subject
-    message.body = body
-    Mail.sendmail(message, from, to)
+    from = config.mail_order_from
+    to = config.error_recipients
+    subject = sprintf "%s: %s", BBMB.config.name, subject
+    Mail.sendmail(body, subject, from, to)
   end
   def Mail.notify_error(error)
-    header, message = setup
     config = BBMB.config
-    from = header.from = config.mail_order_from
-    to = header.to = config.error_recipients
-    header.subject = sprintf "%s: %s", BBMB.config.name, error.message
-    message.body = [ error.class, error.message, 
-      error.backtrace.pretty_inspect ].join("\n")
-    Mail.sendmail(message, from, to)
+    from = config.mail_order_from
+    to = config.error_recipients
+    subject = sprintf "%s: %s", BBMB.config.name, error.message
+    body = [ error.class, error.message,
+    error.backtrace.pretty_inspect ].join("\n")
+    Mail.sendmail(body, subject, from, to)
   end
   def Mail.notify_inject_error(order, opts={})
     config = BBMB.config
     if to = config.inject_error_to
       customer = order.customer
-      header, message = setup
-      from = header.from = config.inject_error_from
-      header.to = to
-      cc = header.cc = config.inject_error_cc
-      header.subject = config.inject_error_subject % [
+      from = config.inject_error_from
+      cc = config.inject_error_cc
+      subject = config.inject_error_subject % [
         order.order_id,
         opts[:customer_name] || customer.customer_id,
       ]
-      message.body = config.inject_error_body % [
+      body = config.inject_error_body % [
         opts[:customer_name] || customer.customer_id,
         order.commit_time.strftime('%d.%m.%Y %H:%M:%S'),
         customer.customer_id,
       ]
-      Mail.sendmail message, from, to, cc
+      Mail.sendmail body, subject, from, to, cc
     end
   end
-  def Mail.sendmail(message, from, to, cc=[])
+  def Mail.sendmail(my_body, my_subject, from_addr, to_addr, cc_addrs=[], my_reply_to = nil)
     config = BBMB.config
-    Net::SMTP.start(config.smtp_server, config.smtp_port, config.smtp_helo,
-                    config.smtp_user, config.smtp_pass, 
-                    config.smtp_authtype) { |smtp|
-      smtp.sendmail(message.to_s, from, [to, cc].flatten.compact)
-    }
+    if config.mail_suppress_sending
+      puts "#{__FILE__}:#{__LINE__} Suppress sending mail with subject: #{my_subject}"
+      puts "    from #{from_addr} to: #{to_addr} cc: #{cc_addrs} reply_to: #{my_reply_to}"
+
+      ::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}"
+      ::Mail.defaults do
+      options = { :address              => config.smtp_server,
+                  :port                 => config.smtp_port,
+                  :domain               => config.smtp_domain,
+                  :user_name            => config.smtp_user,
+                  :password             => config.smtp_pass,
+                  :authentication       => 'plain',
+                  :enable_starttls_auto => true  }
+        delivery_method :smtp, options
+      end
+    end
+    ::Mail.deliver do
+      from from_addr
+      to to_addr
+      cc cc_addrs
+      reply_to (my_reply_to ? my_reply_to : from_addr)
+      subject my_subject
+      body my_body
+    end
   end
   def Mail.send_confirmation(order)
     config = BBMB.config
@@ -92,50 +105,28 @@ module Mail
       end
     end
 
-    header, message = setup
-    from = header.from = config.mail_confirm_from
-    header.to = to
-    header.subject = config.mail_confirm_subject % order.order_id
-    header.add('Message-ID', sprintf('<%s@%s>', order.order_id,
-                                     from.tr('@', '.')))
-    header.add('Reply-To', reply_to)
-    message.body = sprintf body, *parts
+    from = config.mail_confirm_from
+    subject = config.mail_confirm_subject % order.order_id
+    body = sprintf *parts
 
-    Mail.sendmail(message, from, to, config.mail_confirm_cc)
+    Mail.sendmail(body, subject, from, to, config.mail_confirm_cc, reply_to)
   end
   def Mail.send_order(order)
-    header, message = setup
     config = BBMB.config
-    from = header.from = config.mail_order_from
-    to = header.to = config.mail_order_to
-    cc = header.cc = config.mail_order_cc
-    header.subject = config.mail_order_subject % order.order_id
-    header.add('Message-ID', sprintf('<%s@%s>', order.order_id, 
-                                     from.tr('@', '.')))
-    message.body = order.to_target_format
-
-    Mail.sendmail(message, from, to, cc)
+    from = config.mail_order_from
+    to = config.mail_order_to
+    cc = config.mail_order_cc
+    subject = config.mail_order_subject % order.order_id
+    body = order.to_target_format
+    Mail.sendmail(body, subject, from, to, cc)
   end
   def Mail.send_request(email, organisation, body)
-    header, message = setup
     config = BBMB.config
-    from = header.from = config.mail_request_from
-    to = header.to = config.mail_request_to
-    cc = header.cc = config.mail_request_cc
-    header.subject = config.mail_request_subject % organisation
-    header.add('Reply-To', email)
-    message.body = body
-    Mail.sendmail(message, from, to, cc)
-  end
-  def Mail.setup
-    message = RMail::Message.new
-    header = message.header
-    header.add('Date', Time.now.rfc822)
-    header.add('Mime-Version', '1.0')
-    header.add('User-Agent', BBMB.config.name)
-    header.add('Content-Type', 'text/plain', nil, 'charset' => 'utf-8')
-    header.add('Content-Disposition', 'inline')
-    [header, message]
+    from = config.mail_request_from
+    to = config.mail_request_to
+    cc = config.mail_request_cc
+    subject = config.mail_request_subject % organisation
+    Mail.sendmail("", subject, from, to, cc, email)
   end
 end
   end

data/lib/bbmb/util/server.rb

@@ -8,13 +8,15 @@ require 'bbmb/html/util/validator'
 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/drbserver'
 
 module BBMB
   module Util
     class Server < SBSM::DRbServer
-      ENABLE_ADMIN = true 
+      ENABLE_ADMIN = true
 	    SESSION = Html::Util::Session
 	    VALIDATOR = Html::Util::Validator
       attr_reader :updater
@@ -87,6 +89,7 @@ module BBMB
         }
       end
       def run_invoicer
+        BBMB.logger.debug("run_invoicer starting")
         @invoicer ||= Thread.new {
           Thread.current.abort_on_exception = true
           loop {
@@ -96,11 +99,13 @@ module BBMB
             now = Time.now
             at = Time.local(day.year, day.month)
             secs = at - now
-            BBMB.logger.debug("invoicer") { 
+            BBMB.logger.debug("invoicer") {
               "sleeping %.2f seconds" % secs
             }
             sleep(secs)
+            BBMB.logger.debug("invoice starting")
             invoice(start...at)
+            BBMB.logger.debug("invoice finished")
           }
         }
       end
@@ -115,11 +120,11 @@ module BBMB
             at = Time.local(day.year, day.month, day.day, 
                             BBMB.config.update_hour)
             secs = at - now
-            BBMB.logger.debug("updater") { 
-              "sleeping %.2f seconds" % secs
-            }
+            BBMB.logger.debug("updater") { "sleeping %.2f seconds" % secs }
             sleep(secs)
+            BBMB.logger.debug("update starting")
             update
+            BBMB.logger.debug("update finished")
           }
         }
       end

data/lib/bbmb/version.rb

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

data/test/util/test_mail.rb

@@ -10,25 +10,40 @@ require 'bbmb/util/mail'
 module BBMB
   module Util
     class TestMail < Minitest::Test
+      SendRealMail = false
+      if SendRealMail
+        TestRecipient = 'ngiger@ywesee.com'
+      else
+        TestRecipient = 'to.test@bbmb.ch'
+      end
       include FlexMock::TestCase
       def setup_config
         config = BBMB.config
-        config.error_recipients = ['to.test@bbmb.ch']
+        config.mail_suppress_sending = true
+        config.error_recipients = [TestRecipient]
         config.mail_order_from = 'from.test@bbmb.ch'
-        config.mail_order_to = 'to.test@bbmb.ch'
-        config.mail_order_cc = 'cc.test@bbmb.ch'
+        config.mail_order_to = TestRecipient
         config.mail_order_subject = 'order %s'
         config.mail_request_from = 'from.request.test@bbmb.ch'
         config.mail_request_to = 'to.request.test@bbmb.ch'
         config.mail_request_cc = 'cc.request.test@bbmb.ch'
         config.mail_request_subject = 'Request %s'
         config.name = 'Application/User Agent'
-        config.smtp_authtype = :plain
-        config.smtp_helo = 'helo.domain'
         config.smtp_pass = 'secret'
         config.smtp_port = 25
         config.smtp_server = 'mail.test.com'
         config.smtp_user = 'user'
+        if SendRealMail
+          config.mail_suppress_sending = false
+          config.mail_order_cc = 'ngiger@ywesee.com'
+          config.mail_order_cc = 'ngiger@ywesee.com'
+          config.smtp_server = 'smtp.gmail.com'
+          config.smtp_domain = 'ywesee.com'
+          config.smtp_user =  'ngiger@ywesee.com'
+          config.smtp_pass =  'topsecret'
+          config.smtp_port = 587
+        end
+
         config.mail_confirm_reply_to = 'replyto-test@bbmb.ch'
         config.mail_confirm_from = 'from-test@bbmb.ch'
         config.mail_confirm_cc = []
@@ -63,8 +78,8 @@ Totale dell'ordine incl. %10.2f
           "%3i x %-36s à %7.2f, total  %10.2f",
           "%3i x %-36s a %7.2f, totale %10.2f",
         ]
-        config.inject_error_to = 'to.test@bbmb.ch'
-        config.confirm_error_to = 'to.test@bbmb.ch'
+        config.inject_error_to = TestRecipient
+        config.confirm_error_to = TestRecipient
         config
       end
       def test_inject_error
@@ -75,39 +90,26 @@ Totale dell'ordine incl. %10.2f
         order.should_receive(:customer).and_return(customer)
         order.should_receive(:order_id).and_return('12345678-90')
         order.should_receive(:commit_time).and_return Time.local(2009, 8, 7, 11, 14, 4)
-        smtp = flexmock('smtp')
-        flexstub(Net::SMTP).should_receive(:start).and_return {
-          |srv, port, helo, user, pass, type, block|
-          assert_equal('mail.test.com', srv)
-          assert_equal(25, port)
-          assert_equal('helo.domain', helo)
-          assert_equal('user', user)
-          assert_equal('secret', pass)
-          assert_equal(:plain, type)
-          block.call(smtp)
-        }
         headers = <<-EOS
 Mime-Version: 1.0
 User-Agent: Application/User Agent
 Content-Type: text/plain; charset="utf-8"
 Content-Disposition: inline
 From: errors.test@bbmb.ch
-To: to.test@bbmb.ch
+To: #{TestRecipient}
 Cc: 
 Subject: Order 12345678-90 with missing customer: Pharmacy Health
         EOS
         body = <<-EOS
 The order Pharmacy Health, committed on 07.08.2009 11:14:04, assigned to the unknown customer: 12345678
         EOS
-        smtp.should_receive(:sendmail).and_return { |message, from, recipients|
-          assert(message.include?(headers),
-                 "missing headers:\n#{headers}\nin message:\n#{message}")
-          assert(message.include?(body),
-                 "missing body:\n#{body}\nin message:\n#{message}")
-          assert_equal('errors.test@bbmb.ch', from)
-          assert_equal(['to.test@bbmb.ch'], recipients)
-        }
+        saved_length = ::Mail::TestMailer.deliveries.length
         Mail.notify_inject_error(order, :customer_name => 'Pharmacy Health')
+        unless SendRealMail
+          assert_equal(saved_length + 1, ::Mail::TestMailer.deliveries.length)
+          assert_equal(['errors.test@bbmb.ch'], ::Mail::TestMailer.deliveries.last.from)
+          assert(body.match ::Mail::TestMailer.deliveries.last.body.raw_source)
+        end
       end
       def test_confirm_error
         config = setup_config
@@ -134,7 +136,7 @@ User-Agent: Application/User Agent
 Content-Type: text/plain; charset="utf-8"
 Content-Disposition: inline
 From: errors.test@bbmb.ch
-To: to.test@bbmb.ch
+To: #{TestRecipient}
 Cc: 
 Subject: Customer 12345678 without email address
         EOS
@@ -147,7 +149,7 @@ Customer 12345678 does not have an email address configured
           assert(message.include?(body),
                  "missing body:\n#{body}\nin message:\n#{message}")
           assert_equal('errors.test@bbmb.ch', from)
-          assert_equal(['to.test@bbmb.ch'], recipients)
+          assert_equal([TestRecipient], recipients)
         }
         Mail.notify_confirmation_error(order)
       end
@@ -170,7 +172,7 @@ User-Agent: Application/User Agent
 Content-Type: text/plain; charset="utf-8"
 Content-Disposition: inline
 From: from.test@bbmb.ch
-To: to.test@bbmb.ch
+To: #{TestRecipient}
 Subject: Application/User Agent: error-message
         EOS
         body = <<-EOS
@@ -183,7 +185,7 @@ error-message
           assert(message.include?(body), 
                  "missing body:\n#{body}\nin message:\n#{message}")
           assert_equal('from.test@bbmb.ch', from)
-          assert_equal(['to.test@bbmb.ch'], recipients)
+          assert_equal([TestRecipient], recipients)
         }
         Mail.notify_error(RuntimeError.new("error-message"))
       end
@@ -210,7 +212,7 @@ User-Agent: Application/User Agent
 Content-Type: text/plain; charset="utf-8"
 Content-Disposition: inline
 From: from.test@bbmb.ch
-To: to.test@bbmb.ch
+To: #{TestRecipient}
 Cc: cc.test@bbmb.ch
 Subject: order order-id
 Message-ID: <order-id@from.test.bbmb.ch>
@@ -226,7 +228,7 @@ i2-data
           #assert(message.include?(attachment), 
                  #"missing attachment:\n#{attachment}\nin message:\n#{message}")
           assert_equal('from.test@bbmb.ch', from)
-          assert_equal(['to.test@bbmb.ch', 'cc.test@bbmb.ch'], recipients)
+          assert_equal([TestRecipient, 'cc.test@bbmb.ch'], recipients)
         }
         Mail.send_order(order)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba
@@ -321,9 +321,9 @@ dependencies:
 description: ywesee distributed invoice manager. A Ruby gem
 email: mhatakeyama@ywesee.com, zdavatz@ywesee.com, ngiger@ywesee.com
 executables:
-- admin
+- bbmb_admin
 - bbmbd
-- migrate_bbmb_to_utf_8
+- update_articles_and_products
 extensions: []
 extra_rdoc_files: []
 files:
@@ -337,9 +337,9 @@ files:
 - Rakefile
 - bbmb.gemspec
 - bbmb.jpeg
-- bin/admin
+- bin/bbmb_admin
 - bin/bbmbd
-- bin/migrate_bbmb_to_utf_8
+- bin/update_articles_and_products
 - lib/bbmb.rb
 - lib/bbmb/config.rb
 - lib/bbmb/html/state/change_password.rb
@@ -407,7 +407,6 @@ files:
 - lib/bbmb/util/password_generator.rb
 - lib/bbmb/util/polling_manager.rb
 - lib/bbmb/util/server.rb
-- lib/bbmb/util/smtp_tls.rb
 - lib/bbmb/util/target_dir.rb
 - lib/bbmb/util/transfer_dat.rb
 - lib/bbmb/util/updater.rb

data/bin/migrate_bbmb_to_utf_8

@@ -1,236 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-puts "#{Time.now}: Loading #{__FILE__}"
-STDOUT.sync = true
-
-require 'syck'
-
-here = File.expand_path(File.join(File.dirname(File.dirname(__FILE__)), 'lib'))
-$: << here
-require 'logger'
-require 'needle'
-require 'odba/id_server'
-require 'rrba/server'
-require 'yus/entity'
-require 'yus/privilege'
-require 'ydim/autoinvoicer'
-require 'ydim/client'
-require 'ydim/currency_converter'
-require 'ydim/currency_updater'
-require 'ydim/factory'
-require 'ydim/root_user'
-require 'ydim/server'
-require 'ydim/util'
-require 'odba/connection_pool'
-require 'odba/drbwrapper'
-require 'ydim/odba'
-require 'ydim/root_session'
-require 'ydim/root_user'
-
-require File.join(here, 'bbmb/persistence/odba.rb')
-
-module YDIM
-  class Server
-    # http://stackoverflow.com/questions/2982677/ruby-1-9-invalid-byte-sequence-in-utf-8
-    # https://robots.thoughtbot.com/fight-back-utf-8-invalid-byte-sequences
-    def sanitize_utf8(string)
-      return nil if string.nil?
-      # return string.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
-      return string if string.valid_encoding?
-      if string.force_encoding(Encoding::ISO_8859_1).valid_encoding?
-        string.force_encoding(Encoding::ISO_8859_1).clone.encode(Encoding::UTF_8)
-      else
-        string.chars.select { |c| c.valid_encoding? }.join
-      end
-    end
-    def _migrate_to_utf8 queue, table, opts={}
-      while obj = queue.shift do
-        if obj.is_a?(Numeric)
-          begin
-            obj = ODBA.cache.fetch obj
-          rescue ODBA::OdbaError
-            return
-          end
-        else
-          obj = obj.odba_instance
-        end
-        puts " #{__LINE__}: Migrating #{obj.class} #{obj.to_s}" if $VERBOSE
-        return unless obj
-        _migrate_obj_to_utf8 obj, queue, table, opts
-        obj.odba_store unless obj.odba_unsaved?
-      end
-    end
-    def _migrate_obj_to_utf8 obj, queue, table, opts={}
-      obj.instance_variables.each do |name|
-        child = obj.instance_variable_get name
-        if child.respond_to?(:odba_unsaved?) && !child.odba_unsaved? \
-          && obj.respond_to?(:odba_serializables) \
-          && obj.odba_serializables.include?(name)
-          child.instance_variable_set '@odba_persistent', nil
-        end
-        child = _migrate_child_to_utf8 child, queue, table, opts
-        obj.instance_variable_set name, child
-      end
-      if obj.is_a?(Array)
-        obj.collect! do |child|
-          _migrate_child_to_utf8 child, queue, table, opts
-        end
-      end
-      if obj.is_a?(Hash)
-        obj.dup.each do |key, child|
-          obj.store key, _migrate_child_to_utf8(child, queue, table, opts)
-        end
-      end
-      obj
-    end
-    def _migrate_child_to_utf8 child, queue, table, opts={}
-      @serialized ||= {}
-      case child
-      when ODBA::Persistable, ODBA::Stub
-        if child = child.odba_instance
-          if child.odba_unsaved?
-            _migrate_to_utf8 [child], table, opts
-          elsif opts[:all]
-            odba_id = child.odba_id
-            unless table[odba_id]
-              table.store odba_id, true
-              queue.push odba_id
-            end
-          end
-        end
-      when String
-        old = child.encoding
-        if ( child.encoding != Encoding::UTF_8 && child.force_encoding(Encoding::ISO_8859_1).valid_encoding? ) ||
-           ( child.encoding == Encoding::UTF_8 && !child.valid_encoding? )
-          child = child.force_encoding(Encoding::ISO_8859_1).clone.encode(Encoding::UTF_8)
-          puts "force_encoding from ISO_8859_1 #{old}. is now #{child}"
-        end
-        case child.encoding.to_s
-        when /ASCII-8BIT|US-ASCII/
-          # nothing todo
-        when /UTF-8/
-          puts "UTF-8: for #{child.to_s}" if $VERBOSE
-          child = sanitize_utf8(child)
-        when /ISO-8859-1/i
-          child = sanitize_utf8(child)
-          # child = child.force_encoding('UTF-8')
-          puts "force_encoding from #{old}. is now #{child}"
-        else
-          puts "Unhandeled encoding #{child.encoding}"
-        # child = child.force_encoding
-        end
-      when
-        Yus::Entity,
-        Yus::Privilege,
-        YDIM::AutoInvoice,
-        YDIM::Debitor,
-        YDIM::Debitor,
-        YDIM::Invoice,
-        YDIM::Invoice::Info,
-        YDIM::Item
-        child = _migrate_obj_to_utf8 child, queue, table, opts
-      when Float, Fixnum, TrueClass, FalseClass, NilClass,
-        Symbol, Time, Date, DateTime,
-        YDIM::Factory,
-        YDIM::CurrencyConverter,
-        YDIM::MobileCurrencyConverter
-        # do nothing
-      else
-        @ignored ||= {}
-        unless @ignored[child.class]
-          @ignored.store child.class, true
-          warn "ignoring #{child.class}"
-        end
-      end
-      child
-    rescue SystemStackError
-      puts child.class
-      raise
-    end
-  end
-end
-
-@logger = Logger.new('/tmp/ migrate_to_utf8.log')
-@logger.level = Logger::DEBUG
-config = YDIM::Server.config
-module Yus
-  class Entity
-    include ODBA::Persistable
-    class << self
-      alias :all :odba_extent
-    end
-  end
-  class Privilege
-    include ODBA::Persistable
-    class << self
-      alias :all :odba_extent
-    end
-  end
-end
-module BBMB
-  module Model
-    class Order
-      include ODBA::Persistable
-      class << self
-        alias :all :odba_extent
-      end
-    end
-    class ProductInfo
-      include ODBA::Persistable
-      class << self
-        alias :all :odba_extent
-      end
-    end
-    class Customer
-      include ODBA::Persistable
-      class << self
-        alias :all :odba_extent
-      end
-    end
-    class Promotion
-      include ODBA::Persistable
-      class << self
-        alias :all :odba_extent
-      end
-    end
-    class Quota
-      include ODBA::Persistable
-      class << self
-        alias :all :odba_extent
-      end
-    end
-    class Subject
-      include ODBA::Persistable
-      class << self
-        alias :all :odba_extent
-      end
-    end
-  end
-end
-
-ODBA.storage.dbi = ODBA::ConnectionPool.new(config.db_driver_url,
-  config.db_user, config.db_auth, :client_encoding => 'LATIN1')
-ODBA.cache.setup
-DRb.install_id_conv ODBA::DRbIdConv.new
-
-@server = YDIM::Server.new(config, @logger)
-puts "DB used is #{config.db_name} user: #{config.db_user} auth: #{config.db_auth}"
-@server.extend(DRbUndumped)
-session = YDIM::RootSession.new(YDIM::RootUser.new(1))
-session.serv = @server
-{ # :orders => BBMB::Model::Order.odba_extent,
-  # :products => BBMB::Model::ProductInfo.odba_extent,
-  # :customers => BBMB::Model::Customer.odba_extent,
-  # :promotions => BBMB::Model::Promotion.odba_extent,
-  # :quota => BBMB::Model::Quota.odba_extent,
-  # :subject => BBMB::Model::Subject.odba_extent,
-  :entitites => Yus::Entity.odba_extent,
-  :privileges => Yus::Privilege.odba_extent,
-  :debitors => YDIM::Debitor.odba_extent,
-  :invoices => YDIM::Invoice.odba_extent,
-  :autoinvoices => YDIM::AutoInvoice.odba_extent,
-  }.each do |name, to_migrate|
-  puts "#{Time.now}: Start migrating #{to_migrate.size} #{name}"
-  @server._migrate_to_utf8(to_migrate, {})
-end
-puts "#{Time.now}: Finished migrate_to_utf8"

data/lib/bbmb/util/smtp_tls.rb

@@ -1,70 +0,0 @@
-require "openssl"
-require "net/smtp"
-
-Net::SMTP.class_eval do
-  private
-  def do_start(helodomain, user, secret, authtype)
-    raise IOError, 'SMTP session already started' if @started
-
-    if RUBY_VERSION == '1.8.6'
-      check_auth_args user, secret, authtype if user or secret
-    else # > 1.8.7
-      check_auth_args user, secret if user or secret
-    end
-
-    sock = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
-    @socket = Net::InternetMessageIO.new(sock)
-    @socket.read_timeout = 60 #@read_timeout
-    @socket.debug_output = STDERR #@debug_output
-
-    check_response(critical { recv_response() })
-    do_helo(helodomain)
-
-    raise 'openssl library not installed' unless defined?(OpenSSL)
-    starttls
-    ssl = OpenSSL::SSL::SSLSocket.new(sock)
-    ssl.sync_close = true
-    ssl.connect
-    @socket = Net::InternetMessageIO.new(ssl)
-    @socket.read_timeout = 60 #@read_timeout
-    @socket.debug_output = STDERR #@debug_output
-    do_helo(helodomain)
-
-    authenticate user, secret, authtype if user
-    @started = true
-  ensure
-    unless @started
-      # authentication failed, cancel connection.
-      @socket.close if not @started and @socket and not @socket.closed?
-      @socket = nil
-    end
-  end
-
-  def do_helo(helodomain)
-    begin
-      if @esmtp
-        ehlo helodomain
-      else
-        helo helodomain
-      end
-    rescue Net::ProtocolError
-      if @esmtp
-        @esmtp = false
-        @error_occured = false
-        retry
-      end
-      raise
-    end
-  end
-
-  def starttls
-    getok('STARTTLS')
-  end
-
-  def quit
-    begin
-      getok('QUIT')
-    rescue EOFError
-    end
-  end
-end