dwc-archive 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb7ca119f1b5dd9f1657772d0fb8e80df64909f0739113a00366441045865e46
-  data.tar.gz: aa8fab9a533682f6ea4907b52dcae3b63d320331860c8936819815f84a26f9e1
+  metadata.gz: 6e4de59525e7e4a3f212dac828b97ff489f5ec40f764758a5b81b7fef09cc166
+  data.tar.gz: 2f408d2a04bac402c395928a6d048d2d28daed3235119c149684026b233e2126
 SHA512:
-  metadata.gz: b122be118cd7804cc299ea465ced05aba037df1e9265b8940fd7db369f73a72483fa9e11b1c6571e85c7ff68282c9512b25b73ae2095da0d96d00b3c18739da4
-  data.tar.gz: 4f787964ca02539f02ab97d7e0d3106fd6ae67331718a92a4313337c219bdf054921702cfed2d116147ff7b5d79405e63b483f59639371f3ca7e83b68b51b52f
+  metadata.gz: 145cd2d7d2f9e1c87c76ddca220fd56f1e44cca70ceb6995edfeba73d985e166709cf4254b6b2e19f143ffd02d879700587d61c6b9da239bdaff4288fde17cf9
+  data.tar.gz: e92697139838d7d720bfd9aca87ddf4537a8e272b6fabb04a05f92bfde047c9a45867e46e9b27b39d738c822ba6a843a73b3670b45da16ad9c2aca5df0523913

data/.github/workflows/build.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+3.0.0

data/dwc-archive.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   # gem.add_runtime_dependency "minitar", "~> 0.6"
-  gem.add_runtime_dependency "biodiversity", "~> 5.1.2"
+  gem.add_runtime_dependency "biodiversity", "~> 5.2.0"
   gem.add_runtime_dependency "nokogiri", "~> 1.11"
 
   gem.add_development_dependency "bundler", "~> 2.2"

data/lib/dwc_archive/ingester.rb

@@ -1,11 +1,9 @@
-# encoding: utf-8
 class DarwinCore
   # This module abstracts information for reading csv file to be used
   # in several classes which need such functionality
   module Ingester
-    attr_reader :data, :properties, :encoding, :fields_separator, :size
-    attr_reader :file_path, :fields, :line_separator, :quote_character,
-                :ignore_headers
+    attr_reader :data, :properties, :encoding, :fields_separator, :size, :file_path, :fields, :line_separator,
+                :quote_character, :ignore_headers
 
     def size
       @size ||= init_size
@@ -16,16 +14,19 @@ class DarwinCore
       res = []
       errors = []
       args = define_csv_args
-      min_size = @fields.map { |f| f[:index].to_i || 0 }.sort[-1] + 1
-      csv = CSV.new(open(@file_path), args)
+      min_size = @fields.map { |f| f[:index].to_i || 0 }.max + 1
+      csv = CSV.new(open(@file_path), **args)
       csv.each_with_index do |r, i|
         next if @ignore_headers && i == 0
+
         min_size > r.size ? errors << r : process_csv_row(res, errors, r)
         next if i == 0 || i % batch_size != 0
+
         DarwinCore.logger_write(@dwc.object_id,
                                 format("Ingested %s records from %s",
                                        i, name))
         next unless block_given?
+
         yield [res, errors]
         res = []
         errors = []
@@ -70,12 +71,14 @@ class DarwinCore
 
     def init_encoding
       @encoding = @properties[:encoding] || "UTF-8"
-      accepted_encoding = ["utf-8", "utf8", "utf-16", "utf16"].
+      accepted_encoding = %w[utf-8 utf8 utf-16 utf16].
                           include?(@encoding.downcase)
-      fail(
-        DarwinCore::EncodingError,
-        "No support for encodings other than utf-8 or utf-16 at the moment"
-      ) unless accepted_encoding
+      unless accepted_encoding
+        raise(
+          DarwinCore::EncodingError,
+          "No support for encodings other than utf-8 or utf-16 at the moment"
+        )
+      end
     end
 
     def init_file_path
@@ -83,14 +86,16 @@ class DarwinCore
              @data[:attributes][:location] ||
              @data[:files][:location]
       @file_path = File.join(@path, file)
-      fail DarwinCore::FileNotFoundError, "No file data" unless @file_path
+      raise DarwinCore::FileNotFoundError, "No file data" unless @file_path
     end
 
     def init_fields
       @data[:field] = [data[:field]] if data[:field].class != Array
       @fields = @data[:field].map { |f| f[:attributes] }
-      fail DarwinCore::InvalidArchiveError,
-           "No data fields are found" if @fields.empty?
+      if @fields.empty?
+        raise DarwinCore::InvalidArchiveError,
+              "No data fields are found"
+      end
     end
 
     def init_field_separator
@@ -100,7 +105,7 @@ class DarwinCore
     end
 
     def init_size
-      `wc -l #{@file_path}`.match(/^\s*([\d]+)\s/)[1].to_i
+      `wc -l #{@file_path}`.match(/^\s*(\d+)\s/)[1].to_i
     end
   end
 end

data/lib/dwc_archive/version.rb

@@ -2,5 +2,5 @@
 
 # Version constant of the class
 class DarwinCore
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/spec/lib/darwin_core_spec.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "set"
+
 describe DarwinCore do
   subject { DarwinCore }
   let(:file_dir) { File.expand_path("../files", __dir__) }
@@ -228,7 +230,8 @@ describe DarwinCore do
     let(:file_path) { File.join(file_dir, "data.tar.gz") }
     let(:normalized) { dwca.normalize_classification }
     let(:encodings) do
-      normalized.each_with_object(Set.new) do |taxon, e|
+      set = Set.new
+      normalized.each_with_object(set) do |taxon, e|
         taxon[1].classification_path.each { |p| e << p.encoding }
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dwc-archive
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Dmitry Mozzherin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: biodiversity
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -174,11 +174,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Handler of Darwin Core Archive files

data/.travis.yml

@@ -1,13 +0,0 @@
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-before_install:
-  - sudo apt-get update
-  - gem install bundler
-script:
-  - bundle exec cucumber
-  - bundle exec rake
-branches:
-  only:
-      - master