libis-tools 0.9.20 → 0.9.21

data/libis-tools.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
   spec.require_paths = ['lib']
+  spec.has_rdoc = 'yard'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.3'
@@ -35,9 +36,12 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'backports', '~> 3.6'
   spec.add_runtime_dependency 'nokogiri', '~> 1.6'
-  spec.add_runtime_dependency 'gyoku',  '~> 1.2'
-  spec.add_runtime_dependency 'nori', '~> 2.4'
+  spec.add_runtime_dependency 'gyoku',  '~> 1.3'
+  spec.add_runtime_dependency 'nori', '~> 2.6'
   spec.add_runtime_dependency 'recursive-open-struct', '~> 1.0'
   spec.add_runtime_dependency 'parslet', '~> 1.7'
   spec.add_runtime_dependency 'simple_xlsx_reader', '~> 1.0'
+  spec.add_runtime_dependency 'logging', '~> 2.0'
+  spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
+  spec.add_runtime_dependency 'yard', '~> 0.8'
 end

data/spec/config_spec.rb

@@ -11,21 +11,20 @@ describe 'Config' do
   subject(:config) { ::Libis::Tools::Config.clear! }
 
   it 'has defaults set' do
-    expect(config.logger).to be_a ::Logger
+    expect(config.logger).to be_a ::Logging::Logger
   end
 
   it 'clears all values' do
     # noinspection RubyResolve
     config.test_value = 5
-    config.logger.level = ::Logger::FATAL
+    config.logger.level = :FATAL
     # noinspection RubyResolve
     expect(config.test_value).to be 5
-    expect(config.logger.level).to be ::Logger::FATAL
+    expect(config.logger.level).to be ::Logging::level_num(:FATAL)
 
     config.clear!
     # noinspection RubyResolve
     expect(config.test_value).to be_nil
-    expect(config.logger.level).to be ::Logger::DEBUG
   end
 
   context 'adding values with setters' do

data/spec/logger_spec.rb

@@ -7,60 +7,59 @@ describe 'Logger' do
 
   class TestLogger
     include ::Libis::Tools::Logger
-    attr_accessor :options
-    def initialize
-      @options = {}
-    end
   end
 
   before(:context) do
   end
 
   before(:example) do
-    ::Libis::Tools::Config[:appname] = ''
-    @logoutput = StringIO.new
-    ::Libis::Tools::Config.logger = ::Logger.new @logoutput
-    ::Libis::Tools::Config.logger.level = ::Logger::DEBUG
+    appender = ::Logging::Appenders.string_io('StringIO', layout: ::Libis::Tools::Config.get_log_formatter)
+    ::Libis::Tools::Config.logger.add_appenders(appender)
+    @logoutput = appender.sio
+    ::Libis::Tools::Config.logger.level = :all
     @test_logger = TestLogger.new
   end
+  
+  let(:timestamp_regex) { '\[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3} #\d+\.\d+\]'}
 
   it 'should log debug output' do
     @test_logger.debug 'Debug message'
+    puts "LOG OUTPUT: #{@logoutput.string}"
     output = @logoutput.string.lines.map(&:chomp)
     expect(output.size).to eq 1
-    expect(output.first).to match /^D, \[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{6} #\d+\] DEBUG -- TestLogger: Debug message$/
+    expect(output.first).to match /^D, #{timestamp_regex} DEBUG : Debug message$/
   end
 
   it 'should log info output' do
     @test_logger.info 'Info message'
     output = @logoutput.string.lines.map(&:chomp)
     expect(output.size).to eq 1
-    expect(output.first).to match /^I, \[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{6} #\d+\]  INFO -- TestLogger: Info message$/
+    expect(output.first).to match /^I, #{timestamp_regex}  INFO : Info message$/
   end
 
   it 'should log warning output' do
     @test_logger.warn 'Warning message'
     output = @logoutput.string.lines.map(&:chomp)
     expect(output.size).to eq 1
-    expect(output.first).to match /^W, \[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{6} #\d+\]  WARN -- TestLogger: Warning message$/
+    expect(output.first).to match /^W, #{timestamp_regex}  WARN : Warning message$/
   end
 
   it 'should log error output' do
     @test_logger.error 'Error message'
     output = @logoutput.string.lines.map(&:chomp)
     expect(output.size).to eq 1
-    expect(output.first).to match /^E, \[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{6} #\d+\] ERROR -- TestLogger: Error message$/
+    expect(output.first).to match /^E, #{timestamp_regex} ERROR : Error message$/
   end
 
   it 'should log fatal output' do
     @test_logger.fatal 'Fatal message'
     output = @logoutput.string.lines.map(&:chomp)
     expect(output.size).to eq 1
-    expect(output.first).to match /^F, \[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{6} #\d+\] FATAL -- TestLogger: Fatal message$/
+    expect(output.first).to match /^F, #{timestamp_regex} FATAL : Fatal message$/
   end
 
   it 'should be quiet when asked to' do
-    @test_logger.options[:quiet] = true
+    ::Libis::Tools::Config.logger.level = :error
 
     @test_logger.debug 'Debug message'
     output = @logoutput.string.lines.map(&:chomp)
@@ -88,20 +87,4 @@ describe 'Logger' do
     expect(output).not_to be_empty
   end
 
-  it 'should display application name in log' do
-    ::Libis::Tools::Config[:appname] = 'Test Application'
-    @test_logger.info 'Info message'
-    output = @logoutput.string.lines.map(&:chomp)
-    expect(output.size).to eq 1
-    expect(output.first).to match /^I, \[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{6} #\d+\]  INFO -- Test Application: Info message$/
-  end
-
-  it 'should display name value in log' do
-    @test_logger.define_singleton_method(:name) { 'Logger for testing' }
-    @test_logger.info 'Info message'
-    output = @logoutput.string.lines.map(&:chomp)
-    expect(output.size).to eq 1
-    expect(output.first).to match /^I, \[\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{6} #\d+\]  INFO -- Logger for testing: Info message$/
-  end
-
 end

data/spec/mets_file_spec.rb

@@ -43,27 +43,27 @@ describe 'METS File' do
 
     let(:marc_record) {
       Libis::Tools::XmlDocument.parse <<-STR
-      <?xml version="1.0" encoding="UTF-8"?>
-      <record xsi:schemaLocation="http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd"
-        xmlns="http://www.loc.gov/MARC21/slim" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <leader>abcdefghiljklmnopqrstuvwxyz</leader>
-        <controlfield tag="001">1234567890</controlfield>
-        <datafield tag="010" ind1="a" ind2="b">
-          <subfield code="a">abc</subfield>
-          <subfield code="b">xyz</subfield>
-        </datafield>
-      </record>
-      STR
+        <?xml version="1.0" encoding="UTF-8"?>
+        <record xsi:schemaLocation="http://www.loc.gov/MARC21/slim http://www.loc.gov/standards/marcxml/schema/MARC21slim.xsd"
+          xmlns="http://www.loc.gov/MARC21/slim" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+          <leader>abcdefghiljklmnopqrstuvwxyz</leader>
+          <controlfield tag="001">1234567890</controlfield>
+          <datafield tag="010" ind1="a" ind2="b">
+            <subfield code="a">abc</subfield>
+            <subfield code="b">xyz</subfield>
+          </datafield>
+        </record>
+        STR
     }
 
     let(:src_record) {
       Libis::Tools::XmlDocument.parse <<-STR
-      <my_description xmlns="http://www.libis.be/description/">
-        <title>Title</title>
-        <importance>high</importance>
-        <location>here</location>
-      </my_description>
-      STR
+        <my_description xmlns="http://www.libis.be/description/">
+          <title>Title</title>
+          <importance>high</importance>
+          <location>here</location>
+        </my_description>
+        STR
     }
 
     let(:target) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 0.9.20
+  version: 0.9.21
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: nori
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: Some tool classes for other LIBIS gems.
 email:
 - kris.dekeyser@libis.be
@@ -243,8 +285,11 @@ files:
 - lib/libis/tools/metadata/sharepoint_mapping.rb
 - lib/libis/tools/metadata/sharepoint_record.rb
 - lib/libis/tools/metadata/var_field.rb
+- lib/libis/tools/mets_dnx.rb
 - lib/libis/tools/mets_file.rb
+- lib/libis/tools/mets_objects.rb
 - lib/libis/tools/parameter.rb
+- lib/libis/tools/thread_safe.rb
 - lib/libis/tools/version.rb
 - lib/libis/tools/xml_document.rb
 - libis-tools.gemspec
@@ -297,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: LIBIS toolbox.
@@ -330,3 +375,4 @@ test_files:
 - test/test_helper.rb
 - test/webservices/test_ca_item_info.rb
 - test/webservices/test_ca_search.rb
+has_rdoc: yard