ydim 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90a5c5b25b62f89e7ca1befcf28f5c1725ebbfc3
-  data.tar.gz: 7ab7b0eb7d81c20f1f94cb39cf5ed0914a5114de
+  metadata.gz: 878732dac4f51ff26346c7392d8241feb891cf28
+  data.tar.gz: dccb435ce281b6174843f75530288557d45c30f3
 SHA512:
-  metadata.gz: 19aaa2dd84783ac4be344cf3a09fa1bef6c2ebe2aa706cf13fff41f1e5b9b45bcb04219520c9e51e49efdc2b6c196f007966f4558ce4cca8ff82f9d7a2ca52f0
-  data.tar.gz: 10dfc234b60cb74b21c2b2c3a69bddb0e3430ea31aebca051c8349411f40a234eec553d812b1b679887db95706c1f7f6309f5a6185d1df066aefa4d4d868be5f
+  metadata.gz: 84c88d7a0921fec44fbed80751e077a26138b2d8260251a83aaf3ae5e7a2418eebd96b7187d7a1af228557fa4f44eded00848c80927e787fca94fcd68dad886f
+  data.tar.gz: 2cfe94ce46a6dcba53096d3a596b54fe1067ac5dae6d2d110292921228779c63a3814ab6dcb0327ec8a3b2cdb3ffbe183768e65255360fdc9bc116e76db5a3b0

data/.travis.yml

@@ -8,12 +8,8 @@ sudo: false
 before_install:
   - gem --version
 
-script: bundle exec test/suite.rb
-
 rvm:
-  - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.4.0
   - ruby-head
   
 matrix:

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.4 / 08.03.2017
+
+* Using mail gem instead of rmail. Updated tests.
+
 === 1.0.3 / 10.05.2016
 
 * Moved bin/ydim* to lib/ydim/ to make the executables work

data/Rakefile

@@ -16,6 +16,17 @@ task :gem => :build do
 end
 
 task :spec => :clean
+require 'rake/testtask'
+
+task :default => [:clobber, :test, :gem]
+
+dir = File.dirname(__FILE__)
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = Dir.glob("#{dir}/test/suite.rb")
+  t.warning = false
+  t.verbose = false
+end
 
 require 'rake/clean'
 CLEAN.include FileList['pkg/*.gem']

data/get_db_ydim

@@ -0,0 +1,29 @@
+#!/bin/bash -v
+set -x
+DB_NAME=ydim
+
+yyyy=`date -d '1 days ago' +"%Y"`
+mm=`date -d '1 days ago' +"%m"`
+dd=`date -d '1 days ago' +"%d"`
+DB_DUMP=/var/backup/fast/db_dumps/${DB_NAME}.$yyyy$mm$dd.sql.gz
+
+
+m=(dummy January February March April May June July August September October November December)
+nm=`expr $mm + 0`
+cd /var/backup/fast/db_dumps/
+cmd="scp ywesee@ywesee.com:/var/backup/thinpower/db/postgresql/${m[nm]}-$yyyy/$yyyy-$mm-$dd/22\:00-postgresql_database-${DB_NAME}-backup.gz ${DB_NAME}.$yyyy$mm$dd.sql.gz"
+echo Calling $cmd
+$cmd
+ls -l $DB_DUMP
+sudo -u postgres dropdb $DB_NAME
+
+sudo -u postgres createdb -E UTF8 -T template0 $DB_NAME
+if [ $? -ne 0 ] ; then exit 1; fi
+if [ ! -f $DB_DUMP ] 
+then
+  echo "Cannot find $DB_DUMP. Have look at the get_db_dumps.rb script or get it directly from"
+  exit 1
+fi
+
+zcat $DB_DUMP | sudo -u postgres psql $DB_NAME
+if [ $? -ne 0 ] ; then exit 1; fi

data/lib/ydim/mail.rb

@@ -1,51 +1,36 @@
 #!/usr/bin/env ruby
-# Mail -- ydim -- 18.01.2006 -- hwyss@ywesee.com
 
-require 'net/smtp'
-require 'rmail'
-require 'ydim/smtp_tls'
+require 'ydim/server' # to pick up the configuration
+require 'mail'
 
 module YDIM
-	module Mail
-		def Mail.body(config, debitor, invoice)
-			salutation = config.salutation[debitor.salutation.to_s]
-			sprintf(config.mail_body, salutation, debitor.contact, invoice.description)
-		end
-		def Mail.send_invoice(config, invoice, sort_args={})
-			debitor = invoice.debitor
-			to = debitor.email
-			subject = sprintf('Rechnung %s #%i, %s', debitor.name,
-							invoice.unique_id, invoice.description)
-			invoice_name = sprintf("%s.pdf", subject.tr(' /', '_-'))
-			mpart = RMail::Message.new
-			header = mpart.header
-			header.to = to
-      cc = header.cc = debitor.emails_cc
-			header.from = config.mail_from
-      header.subject = encode_subject config, subject
-      header.date = Time.now
-			tpart = RMail::Message.new
-			mpart.add_part(tpart)
-			tpart.header.add('Content-Type', 'text/plain', nil, 
-                       'charset' => config.mail_charset)
-			tpart.body = body(config, debitor, invoice)
-			fpart = RMail::Message.new
-			mpart.add_part(fpart)
-			header = fpart.header
-			header.add('Content-Type', 'application/pdf')
-			header.add('Content-Disposition', 'attachment', nil,
-				{'filename' => invoice_name })
-			header.add('Content-Transfer-Encoding', 'base64')
-			fpart.body = [invoice.to_pdf(sort_args)].pack('m')
-			recipients = config.mail_recipients.dup.push(to).concat(cc).uniq
-			Net::SMTP.start(config.smtp_server, config.smtp_port,
-                      config.smtp_domain, config.smtp_user, config.smtp_pass,
-                      config.smtp_authtype) { |smtp|
-				recipients.each { |recipient|
-					smtp.sendmail(mpart.to_s, config.smtp_user, recipient)
-				}
-			}
-			recipients
+  module Mail
+    ::Mail.defaults do
+      delivery_method :smtp, {
+        :address => Server.config.smtp_server,
+        :port => Server.config.smtp_port,
+        :domain => Server.config.smtp_domain,
+        :user_name => Server.config.smtp_user,
+        :password => Server.config.smtp_pass,
+      }
+    end
+    def Mail.body(config, debitor, invoice)
+      salutation = config.salutation[debitor.salutation.to_s]
+      sprintf(config.mail_body, salutation, debitor.contact, invoice.description)
+    end
+    def Mail.send_invoice(config, invoice, sort_args={})
+      debitor = invoice.debitor
+      invoice_subject = sprintf('Rechnung %s #%i, %s', debitor.name,
+              invoice.unique_id, invoice.description)
+      @mail = ::Mail.new
+      @mail.to      = debitor.email
+      @mail.cc      = debitor.emails_cc
+      @mail.from    = config.mail_from
+      @mail.subject = invoice_subject
+      @mail.body    = body(config, debitor, invoice)
+      @mail.attachments['myfile.pdf'] = { :mime_type => 'application/x-pdf',
+                                    :content => invoice.to_pdf(sort_args) }
+      @mail.deliver
     rescue Timeout::Error
       retries ||= 3
       if retries > 0
@@ -55,41 +40,23 @@ module YDIM
       else
         raise
       end
-		end
+    end
     def Mail.send_reminder(config, autoinvoice)
-      subject = autoinvoice.reminder_subject.to_s.strip
-      subject.gsub! %r{<year>\s*}, ''
-      subject.gsub! %r{\s*</year>}, ''
-      body = autoinvoice.reminder_body.to_s.strip
-      body.gsub! %r{<invoice>\s*}, ''
-      body.gsub! %r{\s*</invoice>}, ''
-      unless(subject.empty? || body.empty?)
-        debitor = autoinvoice.debitor
-        to = debitor.email
-        mpart = RMail::Message.new
-        header = mpart.header
-        header.to = to
-        cc = header.cc = debitor.emails_cc
-        header.from = config.mail_from
-        header.subject = encode_subject config, subject
-        header.date = Time.now
-        header.add('Content-Type', 'text/plain', nil, 
-                   'charset' => config.mail_charset)
-        mpart.body = body
-        recipients = config.mail_recipients.dup.push(to).concat(cc).uniq
-        Net::SMTP.start(config.smtp_server, config.smtp_port,
-                        config.smtp_domain, config.smtp_user, config.smtp_pass,
-                        config.smtp_authtype) { |smtp|
-          recipients.each { |recipient|
-            smtp.sendmail(mpart.to_s, config.smtp_user, recipient)
-          }
-        }
-        recipients
-      end
-		end
-    def Mail.encode_subject(config, subject)
-      encoded = [subject].pack('M').gsub("=\n", '').gsub(' ', '=20')
-      sprintf("=?%s?q?%s?=", config.mail_charset, encoded)
+      debitor = autoinvoice.debitor
+      reminder_subject = autoinvoice.reminder_subject.to_s.strip
+      reminder_subject.gsub! %r{<year>\s*}, ''
+      reminder_subject.gsub! %r{\s*</year>}, ''
+      mail_body = autoinvoice.reminder_body.to_s.strip
+      mail_body.gsub! %r{<invoice>\s*}, ''
+      mail_body.gsub! %r{\s*</invoice>}, ''
+      return if reminder_subject.empty? || mail_body.empty?
+      @mail = ::Mail.new
+      @mail.to      = debitor.email
+      @mail.cc      = debitor.emails_cc
+      @mail.from    = config.mail_from
+      @mail.subject = reminder_subject
+      @mail.body    = mail_body
+      @mail.deliver
     end
 	end
 end

data/lib/ydim/version.rb

@@ -1,3 +1,3 @@
 module YDIM
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/test/test_item.rb

@@ -24,7 +24,7 @@ module YDIM
 			assert_equal(7.6, item.vat_rate)
 			assert_equal({}, item.data)
 			assert_equal(time, item.time)
-			assert_equal(nil, item.expiry_time)
+			assert_nil(item.expiry_time)
 		end
 		def test_total_netto
 			item = Item.new

data/test/test_mail.rb

@@ -6,10 +6,15 @@ $: << File.expand_path('../lib', File.dirname(__FILE__))
 require 'minitest/autorun'
 require 'flexmock/test_unit'
 require 'ydim/mail'
-
 module YDIM
   class TestMail < Minitest::Test
     include FlexMock::TestCase
+    def setup
+      ::Mail.defaults do
+        delivery_method :test
+      end
+      ::Mail::TestMailer.deliveries.clear
+    end
     def setup_config
       config = flexmock('Config')
       config.should_receive(:mail_body).and_return <<-MAIL
@@ -42,11 +47,12 @@ module YDIM
       debitor.should_receive(:contact).and_return('Melanie Esterhazy')
       invoice = flexmock('Invoice')
       invoice.should_receive(:description).and_return('Description')
-      body = Mail.body(setup_config, debitor, invoice)
-      assert_equal <<-EXPECTED, body
-        Sehr geehrte Frau Melanie Esterhazy
+      assert_equal(0, ::Mail::TestMailer.deliveries.size)
+      res = Mail.body(setup_config, debitor, invoice)
+      expected = %(        Sehr geehrte Frau Melanie Esterhazy
         Description
-      EXPECTED
+)
+      assert_equal(expected, res)
     end
     def test_send_invoice
       debitor = flexmock('Debitor')
@@ -60,16 +66,13 @@ module YDIM
       invoice.should_receive(:unique_id).and_return(12345)
       invoice.should_receive(:description).and_return('Description')
       invoice.should_receive(:to_pdf).times(1).and_return('pdf-document')
-      smtp = flexmock('SMTP')
-      flexstub(Net::SMTP).should_receive(:new).and_return(smtp)
-      smtp.should_receive(:start)
-      smtp.should_receive(:sendmail).with(String,
-        'smtp@ywesee.com', 'cc@ywesee.com').and_return { assert(true) }
-      smtp.should_receive(:sendmail).with(String,
-        'smtp@ywesee.com', 'test@ywesee.com').and_return { assert(true) }
-      smtp.should_receive(:sendmail).with(String,
-        'smtp@ywesee.com', 'test.cc@ywesee.com').and_return { assert(true) }
+      assert_equal(0, ::Mail::TestMailer.deliveries.size)
       Mail.send_invoice(setup_config, invoice)
+      assert_equal(1, ::Mail::TestMailer.deliveries.size)
+      assert_equal("        Sehr geehrter Herr Contact-Name\n" +
+                   "        Description\n",
+                   ::Mail::TestMailer.deliveries.first.body.to_s)
+      assert_equal('Rechnung Company-Name #12345, Description', ::Mail::TestMailer.deliveries.first.subject)
     end
     def test_send_reminder
       debitor = flexmock('Debitor')
@@ -84,16 +87,11 @@ module YDIM
       invoice.should_receive(:description).and_return('Description')
       invoice.should_receive(:reminder_subject).and_return('Reminder')
       invoice.should_receive(:reminder_body).and_return('Reminder Body')
-      smtp = flexmock('SMTP')
-      flexstub(Net::SMTP).should_receive(:new).and_return(smtp)
-      smtp.should_receive(:start)
-      smtp.should_receive(:sendmail).with(String,
-        'smtp@ywesee.com', 'cc@ywesee.com').and_return { assert(true) }
-      smtp.should_receive(:sendmail).with(String,
-        'smtp@ywesee.com', 'test@ywesee.com').and_return { assert(true) }
-      smtp.should_receive(:sendmail).with(String,
-        'smtp@ywesee.com', 'test.cc@ywesee.com').and_return { assert(true) }
+      assert_equal(0, ::Mail::TestMailer.deliveries.size)
       Mail.send_reminder(setup_config, invoice)
+      assert_equal(1, ::Mail::TestMailer.deliveries.size)
+      assert_equal("Reminder Body", ::Mail::TestMailer.deliveries.first.body.to_s)
+      assert_equal('Reminder',      ::Mail::TestMailer.deliveries.first.subject)
     end
   end
 end

data/ydim.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ydbd-pg", '>= 0.5.1'
   spec.add_dependency "ydbi",    '>= 0.5.1'
   spec.add_dependency "syck"
-  spec.add_dependency "rmail"
+  spec.add_dependency "mail"
   spec.add_dependency "rclconf"
   spec.add_dependency "needle"
   spec.add_dependency "ypdf-writer"

data/{bin/migrate_to_utf_8 → ydim_migrate_to_utf_8}

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+#encoding: ASCII-8BIT
 puts "#{Time.now}: Loading #{__FILE__}"
 STDOUT.sync = true
 
@@ -150,43 +150,17 @@ module YDIM
   end
 end
 
-puts "#{Time.now}: Calling migrate_to_utf8"
-@logger = Logger.new('migrate_to_utf8.log')
+@logger = Logger.new("/tmp/#{File.basename(__FILE__)}.log")
+@logger.info  "#{Time.now}: Calling  #{File.basename(__FILE__)}"
 @logger.level = Logger::DEBUG
 config = YDIM::Server.config
+@logger.info  "user: #{config.db_user} auth: #{config.db_auth}"
 
-ODBA.storage.dbi = ODBA::ConnectionPool.new(config.db_driver_url,
-  config.db_user, config.db_auth, :client_encoding => 'LATIN1')
+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
 
-if false
-server = YDIM::Server.new(config, logger)
-server.extend(DRbUndumped)
-
-puts config.inspect
-if(config.detach)
-  pidfile = '/var/run/ydimd.pid'
-  File.open(pidfile, 'w') { |fh| fh.puts $$ }
-  at_exit { File.unlink(pidfile) }
-  Process.fork and exit!(0)
-end
-
-begin
-  url = config.server_url
-  url.untaint
-  DRb.start_service(url, server)
-  $SAFE = 1
-  logger.info('start') {
-    sprintf("starting ydim-server on %s", config.server_url) }
-  DRb.thread.join
-rescue Exception => error
-  logger.error('fatal') { error }
-  raise
-end
-end
-
 @server = YDIM::Server.new(config, @logger)
 @server.extend(DRbUndumped)
 session = YDIM::RootSession.new(YDIM::RootUser.new(1))
@@ -195,7 +169,7 @@ session.serv = @server
   :invoices => session.invoices,
   :debitors => session.debitors,
   }.each do |name, to_migrate|
-  puts "#{Time.now}: Start migrating #{name}"
+  puts "#{Time.now}: Start migrating #{to_migrate.size} #{name}"
   @server._migrate_to_utf8(to_migrate, {})
 end
-puts "#{Time.now}: Finished migrate_to_utf8"
+@logger.info  "#{Time.now}: Finished #{File.basename(__FILE__)}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ydim
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rmail
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -265,7 +265,6 @@ dependencies:
 description: ywesee distributed invoice manager. A Ruby gem
 email: mhatakeyama@ywesee.com, zdavatz@ywesee.com, ngiger@ywesee.com
 executables:
-- migrate_to_utf_8
 - ydim-edit
 - ydim-inject
 - ydimd
@@ -280,10 +279,10 @@ files:
 - LICENSE.txt
 - Manifest.txt
 - Rakefile
-- bin/migrate_to_utf_8
 - bin/ydim-edit
 - bin/ydim-inject
 - bin/ydimd
+- get_db_ydim
 - install.rb
 - lib/pdfinvoice/config.rb
 - lib/pdfinvoice/invoice.rb
@@ -301,7 +300,6 @@ files:
 - lib/ydim/root_session.rb
 - lib/ydim/root_user.rb
 - lib/ydim/server.rb
-- lib/ydim/smtp_tls.rb
 - lib/ydim/util.rb
 - lib/ydim/version.rb
 - lib/ydim/ydim-edit
@@ -326,6 +324,7 @@ files:
 - test/test_root_user.rb
 - test/test_server.rb
 - ydim.gemspec
+- ydim_migrate_to_utf_8
 homepage: https://github.com/zdavatz/ydim
 licenses:
 - GPL-v2
@@ -346,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: ywesee distributed invoice manager
@@ -367,4 +366,3 @@ test_files:
 - test/test_root_session.rb
 - test/test_root_user.rb
 - test/test_server.rb
-has_rdoc: 

data/lib/ydim/smtp_tls.rb

@@ -1,58 +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
-    check_auth_args user, secret, authtype if user or secret
-
-    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
-end