RubyGems - proformaxml - Versions diffs - 1.5.0 → 1.5.2 - Mend

proformaxml 1.5.0 → 1.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/Gemfile.lock +43 -41
data/lib/proformaxml/services/transform_task.rb +47 -13
data/lib/proformaxml/version.rb +1 -1
metadata +7 -8
data/proformaxml.gemspec +0 -37

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a99c650e5288b8e0d9e377a808d4837c2e9f7d54830a52201d03ffc947d25b34
-  data.tar.gz: 99088e189b997b80f20d0abe18fa18dc3b113ebfb0db7ecf6b7b1120d811aa33
+  metadata.gz: d6a424eb17efb03a22dac8b018ed30feb977fad2d37a5362f792647a5f3a8c42
+  data.tar.gz: 1f277120bc96e89608064bdcd2357eab6914e2f1f115400505a79d05b880411c
 SHA512:
-  metadata.gz: dd7648193e3408806e11c069ebf7c86e14ff456ecf0d7050a6d4c9caf4ed6895e477421c22c23e61ff82ae644c5fb175f15632a443a324fbba50686e5ca9e2b0
-  data.tar.gz: 667600bb7fc60f57345d25609fd80f9d5c352a7f21e52672413e7aa9986df8b4b5353db7ad09d446974a3200e459a537e8a75255c1a17f184d544f448786fd7a
+  metadata.gz: 0ab036a003a5292b736e1ab0b501c452c2c03a3966982084649f7a45b5761af66df108882de8c1c79c0b5d8759f6bd7fb3f2968867798b8084d7f1c596e949dd
+  data.tar.gz: 16428bbc3cb3b2f7e5c609a1836ae96119ba1e72b09c71021e41b18fd46a89c8c532f659b83223a48677d4580e3fca96adbd84ceb75f5a94c8118d01d6d7a1b3

data/Gemfile.lock CHANGED Viewed

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    proformaxml (1.5.0)
-      activemodel (>= 5.2.3, < 8.0.0)
-      activesupport (>= 5.2.3, < 8.0.0)
+    proformaxml (1.5.2)
+      activemodel (>= 5.2.3, < 9.0.0)
+      activesupport (>= 5.2.3, < 9.0.0)
       dachsfisch (~> 1.0.0)
       nokogiri (>= 1.10.2, < 2.0.0)
       rubyzip (>= 1.2.2, < 3.0.0)
@@ -11,35 +11,39 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.3.4)
-      activesupport (= 7.1.3.4)
-    activesupport (7.1.3.4)
+    activemodel (8.0.0)
+      activesupport (= 8.0.0)
+    activesupport (8.0.0)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     ast (2.4.2)
     base64 (0.2.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.8)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    dachsfisch (1.0.0)
+    dachsfisch (1.0.2)
       nokogiri (>= 1.14.1, < 2.0.0)
     diff-lcs (1.5.1)
-    docile (1.4.0)
+    docile (1.4.1)
     drb (2.2.1)
-    factory_bot (6.4.6)
+    factory_bot (6.5.0)
       activesupport (>= 5.0.0)
     ffi (1.17.0)
     formatador (1.1.0)
-    guard (2.18.1)
+    guard (2.19.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -53,27 +57,27 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
+    json (2.8.1)
     language_server-protocol (3.17.0.3)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.1)
     lumberjack (1.2.10)
     method_source (1.1.0)
     mini_portile2 (2.8.7)
-    minitest (5.24.1)
-    mutex_m (0.2.0)
+    minitest (5.25.1)
     nenv (0.3.0)
-    nokogiri (1.16.6)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
@@ -82,75 +86,73 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    racc (1.8.0)
-    rack (3.1.6)
+    racc (1.8.1)
+    rack (3.1.8)
     rainbow (3.1.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     regexp_parser (2.9.2)
-    rexml (3.3.2)
-      strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
     rspec-collection_matchers (1.2.1)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.13.0)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-github (2.4.0)
       rspec-core (~> 3.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.65.0)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.34.1)
       parser (>= 3.3.1.0)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
-    rubocop-performance (1.21.1)
+    rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.1)
+    rubocop-rails (2.27.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.0.3)
+    rubocop-rspec (3.2.0)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
       rubocop-rspec (~> 3, >= 3.0.1)
     ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
+    securerandom (0.3.1)
     shellany (0.0.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.0)
-    thor (1.3.1)
+    thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
+    uri (1.0.1)
 PLATFORMS
   ruby
@@ -176,4 +178,4 @@ DEPENDENCIES
   simplecov
 BUNDLED WITH
-   2.5.15
+   2.5.23

data/lib/proformaxml/services/transform_task.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require 'proformaxml/helpers/export_helpers'
+require 'active_support/core_ext/array/wrap'
 module ProformaXML
   class TransformTask < ServiceBase
@@ -23,26 +23,60 @@ module ProformaXML
     private
     def transform_from_2_0_to_2_1
-      if @task.submission_restrictions.present?
-        @task.submission_restrictions['submission-restrictions']['file-restriction'].each do |fr|
-          fr['@use'] = fr.delete('@required') == 'true' ? 'required' : 'optional'
-        end
-      end
+      transform_submission_restrictions_from_2_0_to_2_1 unless @task.submission_restrictions.nil?
+      transform_external_resources_from_2_0_to_2_1 unless @task.external_resources.nil?
       @task.model_solutions.filter! {|model_solution| model_solution.id != 'ms-placeholder' }
     end
-    def transform_from_2_1_to_2_0
-      unless @task.submission_restrictions.nil?
-        @task.submission_restrictions['submission-restrictions']['file-restriction'].each do |fr|
-          fr['@required'] = (fr.delete('@use') == 'required').to_s
-        end
-        @task.submission_restrictions['submission-restrictions'].delete('description')
-        @task.submission_restrictions['submission-restrictions'].delete('internal-description')
+    def transform_external_resources_from_2_0_to_2_1
+      ensure_array(@task.external_resources['external-resources']['external-resource']).each do |external_resource|
+        external_resource['@used-by-grader'] = external_resource['@used-by-grader'] || 'false'
+        external_resource['@visible'] = external_resource['@visible'] || 'no'
+      end
+    end
+    def transform_submission_restrictions_from_2_0_to_2_1
+      ensure_array(@task.submission_restrictions['submission-restrictions']['file-restriction']).each do |fr|
+        fr['@use'] = if fr['@required'].nil? || fr.delete('@required') == 'true'
+                       'required'
+                     else
+                       'optional'
+                     end
       end
+    end
+    def transform_from_2_1_to_2_0
+      transform_submission_restrictions_from_2_1_to_2_0 unless @task.submission_restrictions.nil?
+      transform_external_resources_from_2_1_to_2_0 unless @task.external_resources.nil?
       add_model_solution_placeholder
     end
+    def transform_external_resources_from_2_1_to_2_0
+      ensure_array(@task.external_resources['external-resources']['external-resource']).each do |external_resource|
+        external_resource.delete('@visible')
+        external_resource.delete('@usage-by-lms')
+        external_resource.delete('@used-by-grader')
+      end
+    end
+    def transform_submission_restrictions_from_2_1_to_2_0
+      transform_file_restrictions_from_2_1_to_2_0
+      @task.submission_restrictions['submission-restrictions'].delete('description')
+      @task.submission_restrictions['submission-restrictions'].delete('internal-description')
+    end
+    def transform_file_restrictions_from_2_1_to_2_0
+      ensure_array(@task.submission_restrictions['submission-restrictions']['file-restriction']).each do |file_restriction|
+        file_restriction['@required'] = (file_restriction['@use'].nil? || file_restriction.delete('@use') == 'required').to_s
+      end
+    end
+    # when only one field is present, dachsfisch does not create an array. This method ensure, that we can work with an array
+    def ensure_array(data)
+      Array.wrap(data)
+    end
     def add_model_solution_placeholder
       return if @task.model_solutions&.any?

data/lib/proformaxml/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module ProformaXML
-  VERSION = '1.5.0'
+  VERSION = '1.5.2'
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proformaxml
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Karol
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -19,7 +19,7 @@ dependencies:
         version: 5.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 9.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 5.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 9.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 5.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 9.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 5.2.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 9.0.0
 - !ruby/object:Gem::Dependency
   name: dachsfisch
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,6 @@ files:
 - lib/proformaxml/services/validator.rb
 - lib/proformaxml/services/version_and_namespace_extractor.rb
 - lib/proformaxml/version.rb
-- proformaxml.gemspec
 homepage: https://github.com/openHPI/proformaxml
 licenses:
 - MIT
@@ -171,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.15
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Implements parts of ProFormA-XML specification

data/proformaxml.gemspec DELETED Viewed

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-require_relative 'lib/proformaxml/version'
-Gem::Specification.new do |spec|
-  spec.name          = 'proformaxml'
-  spec.version       = ProformaXML::VERSION
-  spec.authors       = ['Karol']
-  spec.email         = ['git@koehn.pro']
-  spec.summary       = 'Implements parts of ProFormA-XML specification'
-  spec.description   = 'Offers datastructure and (de)serializer according to ProFormA-XML specification.'
-  spec.homepage      = 'https://github.com/openHPI/proformaxml'
-  spec.license       = 'MIT'
-  spec.required_ruby_version = '>= 3.3'
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|circleci)|appveyor)})
-    end
-  end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{\Aexe/}) {|f| File.basename(f) }
-  spec.require_paths = ['lib']
-  spec.add_dependency 'activemodel', '>= 5.2.3', '< 8.0.0'
-  spec.add_dependency 'activesupport', '>= 5.2.3', '< 8.0.0'
-  spec.add_dependency 'dachsfisch', '~> 1.0.0'
-  spec.add_dependency 'nokogiri', '>= 1.10.2', '< 2.0.0'
-  spec.add_dependency 'rubyzip', '>= 1.2.2', '< 3.0.0'
-  spec.metadata['rubygems_mfa_required'] = 'true'
-end