xmlconv 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a0cc0602375720c02d07d9739b38ff86f435f38
-  data.tar.gz: 7f3d6a5737221b3f8a6edde132d0371930f7b155
+  metadata.gz: f51b6c935c67d4d4378708ecad815096b3955ab8
+  data.tar.gz: 3c2a81fd16985404d9c17f5d8917756c365dab0b
 SHA512:
-  metadata.gz: 433c00703555c1a93a404bf2b9214422598e1a7d13123a161ee1b2eb48a99108f20515099c7b401168511f3d59d4ac8b13cb5e1a1aee9c73cb923205d705cf19
-  data.tar.gz: 4e8b6f90feec79de4276ba716b4418dfe5cfc33cddeea9981ab2b3df03ef7e5ddaa55f053b3d22cc3a3825174d405d2c080737a468ad6046fe17ea0131f7dd8b
+  metadata.gz: d080c4f508a5cf819f9ecc8ce3cc3a14d3775c821a9fb2f4d32ac9f23cce5b9d3ca481afbdabbca6c136347a314894df68bb067b7814b4d36798a0eb6858cbc0
+  data.tar.gz: 85791f42f0005b8b9855cc0c8ab86ebe39a98cf7e3a59f8e21e855bad9da87950069dafd066f85d1b9ac3dbfa5b9d2f1ab5cd62f16a7098d0118b6cf46bd5643

data/.travis.yml

@@ -8,7 +8,7 @@ sudo: false
 before_install:
   - gem --version
 
-script: bundle exec test/suite.rb
+script: bundle exec ruby test/suite.rb
 
 rvm:
   - 2.3.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.2 / 07.06.2017
+
+* Added forgotten rack_interface.rb
+
 === 1.1.1 / 06.06.2017
 
 * Adapted to use the rack based SBSM

data/lib/xmlconv/config.rb

@@ -35,6 +35,7 @@ module XmlConv
     'invoice_item_format' => "Commission %s\n%s %1.2f Turnover\nout of %i transmitted invoices",
     'log_file'            => STDERR,
     'log_level'           => 'INFO',
+    'log_pattern'         => File.join(Dir.pwd, 'log', '%Y/%m/%d/app.log'),
     'mail_host'           => 'localhost',
     'mail_from'           => 'xmlconv@ywesee.com',
     'pass_hash'           => nil,

data/lib/xmlconv/util/rack_interface.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+require 'date'
+require 'sbsm/app'
+
+module XmlConv
+  module Util
+    class RackInterface < SBSM::RackInterface
+      ENABLE_ADMIN = true
+      SESSION = XmlConv::Util::Session
+      VALIDATOR = XmlConv::Util::Validator
+      def initialize(app: XmlConvApp,
+                     auth: nil,
+                     validator: XmlConv::Util::Validator)
+        [ File.join(Dir.pwd, 'etc', 'config.yml'),
+        ].each do |config_file|
+          if File.exist?(config_file)
+            SBSM.info "XmlConv.config.load from #{config_file}"
+            XmlConv.config.load (config_file)
+            break
+          end
+        end
+        @app = app
+        super(app: app,
+              session_class: XmlConv::Util::Session,
+              unknown_user: XmlConv::Util::KnownUser,
+              validator: validator,
+              cookie_name: 'virbac.bbmb'
+              )
+      end
+    end
+  end
+end

data/lib/xmlconv/version.rb

@@ -1,3 +1,3 @@
 module XmlConv
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlconv
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba
@@ -309,7 +309,6 @@ email: mhatakeyama@ywesee.com, zdavatz@ywesee.com, ngiger@ywesee.com
 executables:
 - migrate_xmlconv_to_utf_8
 - xmlconv_admin
-- xmlconvd
 extensions: []
 extra_rdoc_files: []
 files:
@@ -319,11 +318,9 @@ files:
 - History.txt
 - LICENSE
 - Manifest.txt
-- README.txt
 - Rakefile
 - bin/migrate_xmlconv_to_utf_8
 - bin/xmlconv_admin
-- bin/xmlconvd
 - converter_scripts/convert.rb
 - converter_scripts/xmlconv_convert.rb
 - data/grammar/i2.grammar
@@ -369,6 +366,7 @@ files:
 - lib/xmlconv/util/known_user.rb
 - lib/xmlconv/util/mail.rb
 - lib/xmlconv/util/polling_manager.rb
+- lib/xmlconv/util/rack_interface.rb
 - lib/xmlconv/util/session.rb
 - lib/xmlconv/util/transaction.rb
 - lib/xmlconv/util/validator.rb

data/README.txt

@@ -1,25 +0,0 @@
-= xmlconv
-
-* http://scm.ywesee.com/?p=xmlconv/.git;a=summary
-
-== DESCRIPTION:
-
-xmlconverter, convert XML to flat files.
-
-== REQUIREMENTS:
-
-* sandozxmlconv - sudo gem install sandozxmlconv
-
-== INSTALL:
-
-* sudo gem install xmlconv
-
-== DEVELOPERS:
-
-* Zeno R.R. Davatz
-* Masaomi Hatakeyama
-* Hannes Wyss (up to Version 1.0)
-
-== LICENSE:
-
-GPLv2.0

data/bin/xmlconvd

@@ -1,51 +0,0 @@
-#!/usr/bin/env ruby
-# XmlConv -- xmlconv2 -- 10.05.2012 -- yasaka@ywesee.com
-# XmlConv -- xmlconv2 -- 07.06.2004 -- hwyss@ywesee.com
-
-require 'drb/drb'
-require 'odba/connection_pool'
-require 'xmlconv/config'
-require 'xmlconv/util/application'
-require 'xmlconv/util/autoload'
-require 'logger'
-
-config = XmlConv::CONFIG
-
-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)
-XmlConv::LOGGER = logger
-if config.respond_to? :mail_suppress_sending
-  ::Mail.defaults do  delivery_method :test end
-  puts "Mail.mail_suppress_sending"
-elsif config.respond_to?(:smtp_server)
-  options = {}
-  options[:address] = config.smtp_server
-  options[:port] = config.smtp_port
-  options[:domain] = config.smtp_domain
-  options[:user_name] = config.smtp_user
-  options[:password] = config.smtp_pass
-  options[:authentication] = 'plain'
-  options[:enable_starttls_auto] = true
-  puts "Mail.defaults set to :smpt #{options}"
-  ::Mail.defaults do  delivery_method :smtp, options end
-end
-
-XmlConv::Util.autoload(config.plugin_dir, 'plugin')
-XmlConv::Util.autoload(config.postproc_dir, 'postproc')
-
-ODBA.storage.dbi = ODBA::ConnectionPool.new("DBI:Pg:#{config.db_name}",
-                                            config.db_user, config.db_auth)
-ODBA.cache.setup
-ODBA.cache.prefetch
-
-$0 = config.program_name
-DRb.start_service(config.server_url, XmlConvApp.new)
-logger.info(config.program_name) { "drb-service listening on #{config.server_url}" }
-
-DRb.thread.join