proiel 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccdb00c28a352d6f6481a76b5adf4bef5a426e98738c3ed4241134e202302aef
-  data.tar.gz: 299fde59d6c773a9f1246263f66ab3d37b4216f0b1dd873a552eb4c8d1cd6ef7
+  metadata.gz: 80cac3eb3e76f4949bceb8df85131bedbe08b2715fbe905286d482aea5e660b0
+  data.tar.gz: a521528792da8f22b61ec2e910c19d5dd5c38b20d345c059b49251c535daf15d
 SHA512:
-  metadata.gz: 105c8c89b0d3df2491fb51a03dbf96797af8e195edcdb1b901b12e81e0a632dac1e8b2ae6b398606fbc0b18b856134c338410094a5d03efd3783a7fed6b756e1
-  data.tar.gz: ce513c17bfa2301928551a49c81147f6da693c38a733b2cc749705f5f96dc2798c6dd48729e2929a3202f1061ba458c306470aedf6598c684744dfc2b74acfd4
+  metadata.gz: cd61cf4aa1575294a7f042a3ab9504213a25dc4a79d6b52871b9c7e925ca0ff022d58eb5e92915e2dca69fd7b99dde1dcfb93c6081af083f19800635f78df1dc
+  data.tar.gz: 18f3d2b16bd20e3d9414c7b31153997b305edb449a1160e03df8d39bca44d636533fcf16c8529b6c2b63f03ee8ab9d8536e4382d506949d51915416c03800ae3

data/README.md

@@ -3,7 +3,6 @@
 ## Status
 
 [![Gem Version](https://badge.fury.io/rb/proiel.svg)](http://badge.fury.io/rb/proiel)
-[![Build Status](https://secure.travis-ci.org/proiel/proiel.svg?branch=master)](http://travis-ci.org/proiel/proiel?branch=master)
 
 ## Description
 
@@ -12,7 +11,9 @@ PROIEL annotation scheme and the PROIEL XML-based interchange format.
 
 ## Installation
 
-This library requires Ruby >= 2.2. Install as
+This library requires Ruby >= 2.7 (as this is what Nokogiri 1.14.x requires).
+
+Install as
 
 ```shell
 gem install proiel

data/lib/proiel/alignment/builder.rb

@@ -8,7 +8,7 @@ module PROIEL
       # now a reasonable approximation.
       def self.compute_matrix(alignment, source, blacklist = [], log_directory = nil)
         matrix1 = group_backwards(alignment, source, blacklist)
-        raise unless matrix1.map { |r| r[:original]    }.flatten.compact == alignment.sentences.map(&:id)
+        raise unless matrix1.map { |r| r[:original] }.flatten.compact == alignment.sentences.map(&:id)
 
         matrix2 = group_forwards(alignment, source, blacklist)
         raise unless matrix2.map { |r| r[:translation] }.flatten.compact == source.sentences.map(&:id)

data/lib/proiel/chronology.rb

@@ -25,14 +25,14 @@ module PROIEL::Chronology
       # Handle missing Julian year 0 by shifting years after 1 BC down by 1 and then shifting the midpoint back
       # up again unless negative
       if i.first < 0 and i.last > 0
-        y = (i.first + i.last - 1)/2.0
+        y = (i.first + i.last - 1) / 2.0
         if y < 0
           y.floor
         else
           (y + 1).floor
         end
       else
-        ((i.first + i.last)/2.0).floor # a non-integer midpoint is within the year of the integer part
+        ((i.first + i.last) / 2.0).floor # a non-integer midpoint is within the year of the integer part
       end
     elsif i.is_a?(Integer)
       i
@@ -70,7 +70,7 @@ module PROIEL::Chronology
       a = -$1.to_i * 100
       [a, a + 99]
     when /^\s*(?:c\.\s+)?\d+(\s+BC)?\s*-\s*(c\.\s+)?\d+(\s+BC)?\s*$/
-      s.split('-').map { |i| self.parse(i) }.tap do |from, to|
+      s.split('-').map { |i| parse(i) }.tap do |from, to|
         raise ArgumentError, 'invalid range' unless from < to
       end
     else

data/lib/proiel/dictionary/builder.rb

@@ -34,7 +34,7 @@ module PROIEL
       index_homographs!
     end
 
-    CURRENT_SCHEMA_VERSION = '3.0'
+    CURRENT_SCHEMA_VERSION = '3.0'.freeze
 
     def to_xml(io)
       builder = ::Builder::XmlMarkup.new(target: io, indent: 2)
@@ -62,7 +62,7 @@ module PROIEL
       raise ArgumentError, 'file not found' unless File.exists?(filename)
 
       CSV.foreach(filename, headers: true, encoding: 'utf-8', col_sep: "\t",
-                  header_converters: :symbol, quote_char: "\b") do |row|
+                            header_converters: :symbol, quote_char: "\b") do |row|
         h = row.to_h
         data = languages.map { |l| [l, h[l]] }.to_h
 
@@ -182,7 +182,7 @@ module PROIEL
     end
 
     def index_homographs!
-      @lemmata.keys.group_by { |l| l.split(/[,#]/).first }.each do |m, homographs|
+      @lemmata.keys.group_by { |l| l.split(/[,#]/).first }.each do |_, homographs|
         if homographs.count > 1
           homographs.each do |form|
             @lemmata[form][:homographs] = homographs.reject { |homograph| homograph == form }
@@ -204,7 +204,6 @@ module PROIEL
         lemma[:paradigm][token.morphology][token.form] ||= 0
         lemma[:paradigm][token.morphology][token.form] += 1
 
-
         # Find verbal nodes
         if token.part_of_speech[/^V/]
           frame = PROIEL::Valency::Arguments.get_argument_frame(token)

data/lib/proiel/lemma.rb

@@ -45,7 +45,7 @@ module PROIEL
     private
 
     def from_xml(xml)
-      @n =  nullify(xml.n, :int)
+      @n = nullify(xml.n, :int)
 
       @distribution = xml.distribution.map { |h| [h.idref, nullify(h.n, :int)] }.to_h
       @glosses = xml.glosses.map { |h| [h.language.to_sym, h.gloss] }.to_h
@@ -55,7 +55,7 @@ module PROIEL
         xml.valency.map do |frame|
           {
             arguments: frame.arguments.map { |a| { relation: a.relation, lemma: a.lemma, part_of_speech: a.part_of_speech, mood: a.mood, case: a.case } },
-            tokens: frame.tokens.map { |t| { flags: t.flags, idref: t.idref  } },
+            tokens: frame.tokens.map { |t| { flags: t.flags, idref: t.idref } },
           }
         end
     end
@@ -75,4 +75,3 @@ module PROIEL
     end
   end
 end
-

data/lib/proiel/proiel_xml/validator.rb

@@ -43,15 +43,13 @@ module PROIEL
       # @return [true, false]
       #
       def wellformed?
-        begin
-          Nokogiri::XML(File.read(@filename)) { |config| config.strict }
+        Nokogiri::XML(File.read(@filename)) { |config| config.strict }
 
-          true
-        rescue Nokogiri::XML::SyntaxError => _
-          @errors << 'XML file is not wellformed'
+        true
+      rescue Nokogiri::XML::SyntaxError => _
+        @errors << 'XML file is not wellformed'
 
-          false
-        end
+        false
       end
 
       # Checks if the PROIEL XML file has a valid schema version number.

data/lib/proiel/sentence.rb

@@ -57,10 +57,14 @@ module PROIEL
       raise ArgumentError, 'integer or nil expected' unless alignment_id.nil? or alignment_id.is_a?(Integer)
       @alignment_id = alignment_id
 
-      raise ArgumentError, 'XML schema date time or nil expected' unless annotated_at.nil? or PROIEL::Utilities.xmlschema_datetime?(annotated_at)
+      unless annotated_at.nil? or PROIEL::Utilities.xmlschema_datetime?(annotated_at)
+        raise ArgumentError, 'XML schema date time or nil expected'
+      end
       @annotated_at = annotated_at ? DateTime.xmlschema(annotated_at).freeze : nil
 
-      raise ArgumentError, 'XML schema date time or nil expected' unless reviewed_at.nil? or PROIEL::Utilities.xmlschema_datetime?(reviewed_at)
+      unless reviewed_at.nil? or PROIEL::Utilities.xmlschema_datetime?(reviewed_at)
+        raise ArgumentError, 'XML schema date time or nil expected'
+      end
       @reviewed_at = reviewed_at ? DateTime.xmlschema(reviewed_at).freeze : nil
 
       raise ArgumentError, 'string or nil expected' unless annotated_by.nil? or annotated_by.is_a?(String)

data/lib/proiel/statistics.rb

@@ -26,11 +26,11 @@ module PROIEL
 
       x_mean = x.reduce(&:+).to_f / x.size
       y_mean = y.reduce(&:+).to_f / y.size
-      x_sqsum = x.reduce(0.0) { |sum, n| sum + n ** 2 }
+      x_sqsum = x.reduce(0.0) { |sum, n| sum + n**2 }
       xy_sum = x.zip(y).reduce(0.0) { |sum, (m, n)| sum + m * n }
 
       sxy = xy_sum - x.length * x_mean * y_mean
-      sx2 = x_sqsum - x.length * (x_mean ** 2)
+      sx2 = x_sqsum - x.length * (x_mean**2)
 
       beta = sxy / sx2
       alfa = y_mean - beta * x_mean

data/lib/proiel/token.rb

@@ -282,7 +282,7 @@ module PROIEL
     #
     # @return [Array<Token>] descendents
     def descendents
-      dependents.map { |dependent| [dependent ] + dependent.descendents }.flatten
+      dependents.map { |dependent| [dependent] + dependent.descendents }.flatten
     end
 
     memoize :descendents
@@ -405,18 +405,18 @@ module PROIEL
 
     # FIXME: extract this from the header of the PROIEL XML file instead and
     # subclass PositionalTag
-    POS_POSITIONAL_TAG_SEQUENCE = %i(major minor)
+    POS_POSITIONAL_TAG_SEQUENCE = %i(major minor).freeze
 
     # FIXME: extract this from the header of the PROIEL XML file instead and
     # subclass PositionalTag
     MORPHOLOGY_POSITIONAL_TAG_SEQUENCE = %i(
       person number tense mood voice gender case degree strength inflection
-    )
+    ).freeze
 
     NULL_PARTS_OF_SPEECH = {
       'V' => 'V-',
       'C' => 'C-',
       'P' => 'Pp',
-    }
+    }.freeze
   end
 end

data/lib/proiel/tokenization.rb

@@ -24,7 +24,7 @@ module PROIEL
 
       patterns = JSON.parse(File.read(filename))
 
-      regexes = patterns.map { |l, p| [l, self.make_regex(p)] }.to_h
+      regexes = patterns.map { |l, p| [l, make_regex(p)] }.to_h
 
       @@regexes ||= {}
       @@regexes.merge!(regexes)
@@ -59,7 +59,7 @@ module PROIEL
       form and form.length > 1
     end
 
-    WORD_PATTERN = /([^[\u{E000}-\u{F8FF}][[:word:]]]+)/
+    WORD_PATTERN = /([^[\u{E000}-\u{F8FF}][[:word:]]]+)/.freeze
 
     # Splits a token form using the tokenization patterns that apply for a
     # the specified language. Tokenization patterns must already have been

data/lib/proiel/treebank.rb

@@ -61,7 +61,7 @@ module PROIEL
       printed_text_date
       chronology_composition
       chronology_manuscript
-    )
+    ).freeze
 
     # Creates a new treebank object.
     def initialize
@@ -116,7 +116,7 @@ module PROIEL
           # FIXME: consolidate export times? This is a design flaw in PROIEL XML
           # 2.0: export time ought to be per source not per PROIEL XML file, so
           # not clear what to do here. Pass it down to the source object?
-          #@export_time = tf.proiel.export_time
+          # @export_time = tf.proiel.export_time
         else
           raise SchemaMismatch
         end

data/lib/proiel/utils.rb

@@ -13,4 +13,3 @@ module PROIEL
     end
   end
 end
-

data/lib/proiel/valency/arguments.rb

@@ -21,7 +21,7 @@ module PROIEL::Valency::Arguments
     'A' => :nominal,
     'M' => :nominal,
     'V' => :verbal,
-  }
+  }.freeze
 
   # Collapses dependents based on features
   def self.collapse_dependents(dependents)
@@ -43,7 +43,7 @@ module PROIEL::Valency::Arguments
       if lemmas.length == 1
         dependents.first
       else
-        #STDERR.puts "Different lemmas R/G: #{lemmas.inspect}"
+        # STDERR.puts "Different lemmas R/G: #{lemmas.inspect}"
         nil
       end
     when :nominal
@@ -51,7 +51,7 @@ module PROIEL::Valency::Arguments
       if cases.length == 1
         dependents.first
       else
-        #STDERR.puts "Different cases N/P: #{cases.inspect}"
+        # STDERR.puts "Different cases N/P: #{cases.inspect}"
         nil
       end
     when :verbal
@@ -59,11 +59,11 @@ module PROIEL::Valency::Arguments
       if moods.length == 1
         dependents.first
       else
-        #STDERR.puts "Different moods V: #{moods.inspect}"
+        # STDERR.puts "Different moods V: #{moods.inspect}"
         nil
       end
     else
-      #STDERR.puts "Unknown combination: #{dependents.map(&:pos).inspect}"
+      # STDERR.puts "Unknown combination: #{dependents.map(&:pos).inspect}"
       nil
     end
   end
@@ -94,7 +94,9 @@ module PROIEL::Valency::Arguments
         # coordinators. All relevant dependents have the relation PRED.
         dependents = argument.dependents.select { |d| d.relation == 'pred' }.map { |a| hoist_dependents(a) }
         local_argument = collapse_dependents(dependents)
-        features[:mood] = local_argument.morphology_hash[:mood] if local_argument and local_argument.morphology_hash[:mood]
+        if local_argument and local_argument.morphology_hash[:mood]
+          features[:mood] = local_argument.morphology_hash[:mood]
+        end
       when 'R'
         features[:lemma] = argument.lemma
         features[:part_of_speech] = argument.part_of_speech
@@ -103,7 +105,9 @@ module PROIEL::Valency::Arguments
         # coordinators. All relevant dependents have the relation OBL.
         dependents = argument.dependents.select { |d| d.relation == 'obl' }.map { |a| hoist_dependents(a) }
         local_argument = collapse_dependents(dependents)
-        features[:case] = local_argument.morphology_hash[:case] if local_argument and local_argument.morphology_hash[:case]
+        if local_argument and local_argument.morphology_hash[:case]
+          features[:case] = local_argument.morphology_hash[:case]
+        end
       when 'V'
         features[:mood] = argument.morphology_hash[:mood] if argument.morphology_hash[:mood]
       when 'D'
@@ -121,7 +125,7 @@ module PROIEL::Valency::Arguments
     end
   end
 
-  # Determines the arguments of a predicate
+  #  Determines the arguments of a predicate
   def self.collect_arguments(token)
     token.dependents.select do |dependent|
       case dependent.relation

data/lib/proiel/valency/obliqueness.rb

@@ -23,7 +23,7 @@ module PROIEL::Valency::Obliqueness
     obliqueness_of_relation(argument[:relation]) * 2 + (argument[:lemma].nil? ? 0 : 1)
   end
 
-  OBLIQUENESS_HIERARCHY = %w(sub ag obj xobj arg obl comp narg)
+  OBLIQUENESS_HIERARCHY = %w(sub ag obj xobj arg obl comp narg).freeze
 
   def self.obliqueness_of_relation(relation)
     OBLIQUENESS_HIERARCHY.index(relation) || OBLIQUENESS_HIERARCHY.length

data/lib/proiel/version.rb

@@ -1,9 +1,8 @@
 #--
-# Copyright (c) 2015-2018 Marius L. Jøhndal
+# Copyright (c) 2015-2023 Marius L. Jøhndal
 #
 # See LICENSE in the top-level source directory for licensing terms.
 #++
 module PROIEL
-  # Gem version
-  VERSION = '1.3.0'
+  VERSION = '1.3.2'.freeze
 end

data/lib/proiel/visualization/graphviz.rb

@@ -2,8 +2,8 @@ module PROIEL
   module Visualization
     module Graphviz
       DEFAULT_GRAPHVIZ_BINARY = 'dot'.freeze
-      DEFAULT_TEMPLATES = %i(classic linearized packed modern aligned-modern)
-      SUPPORTED_OUTPUT_FORMATS = %i(png svg)
+      DEFAULT_TEMPLATES = %i(classic linearized packed modern aligned-modern).freeze
+      SUPPORTED_OUTPUT_FORMATS = %i(png svg).freeze
 
       class GraphvizError < Exception
       end
@@ -39,7 +39,9 @@ module PROIEL
 
       def self.generate_image(dot_code, output_format, options = {})
         raise ArgumentError, 'string expected' unless dot_code.is_a?(String)
-        raise ArgumentError, 'string or symbol expected' unless output_format.is_a?(String) or output_format.is_a?(Symbol)
+        unless output_format.is_a?(String) or output_format.is_a?(Symbol)
+          raise ArgumentError, 'string or symbol expected'
+        end
         raise ArgumentError, 'invalid output format' unless SUPPORTED_OUTPUT_FORMATS.include?(output_format.to_sym)
 
         graphviz_binary = options[:graphviz_binary] || DEFAULT_GRAPHVIZ_BINARY
@@ -59,7 +61,9 @@ module PROIEL
       end
 
       def self.generate_dot(template, graph, options)
-        raise ArgumentError, 'invalid direction' unless options[:direction].nil? or %(TD LR).include?(options[:direction])
+        unless options[:direction].nil? or %(TD LR).include?(options[:direction])
+          raise ArgumentError, 'invalid direction'
+        end
 
         filename = template_filename(template)
 

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: proiel
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Marius L. Jøhndal
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-02 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.2.4
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: sax-machine
+  name: memoist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.16.2
 - !ruby/object:Gem::Dependency
-  name: memoist
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 1.14.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 1.14.4
 - !ruby/object:Gem::Dependency
-  name: builder
+  name: sax-machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,70 +100,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.18.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.18.5
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.25
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.25
 description: This provides a library of functions for reading and manipulating treebanks
   using the PROIEL dependency format.
 email:
@@ -174,8 +160,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- bin/console
-- bin/setup
 - lib/proiel.rb
 - lib/proiel/alignment.rb
 - lib/proiel/alignment/builder.rb
@@ -221,7 +205,7 @@ homepage: http://proiel.github.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -229,15 +213,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.12
+signing_key:
 specification_version: 4
 summary: A library for working with treebanks using the PROIEL dependency format
 test_files: []

data/bin/console

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-require 'bundler/setup'
-require 'proiel'
-
-require 'pry'
-Pry.start

data/bin/setup

@@ -1,5 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install