proformaxml 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a99c650e5288b8e0d9e377a808d4837c2e9f7d54830a52201d03ffc947d25b34
-  data.tar.gz: 99088e189b997b80f20d0abe18fa18dc3b113ebfb0db7ecf6b7b1120d811aa33
+  metadata.gz: d18194bbaa507eb74a566d374f500824deb6d40380291f0a691d9d98d5050466
+  data.tar.gz: 9903f5f2beae7909cb1e02f7e351f41d8c60fc3135a6ad8ea447441d07f696d0
 SHA512:
-  metadata.gz: dd7648193e3408806e11c069ebf7c86e14ff456ecf0d7050a6d4c9caf4ed6895e477421c22c23e61ff82ae644c5fb175f15632a443a324fbba50686e5ca9e2b0
-  data.tar.gz: 667600bb7fc60f57345d25609fd80f9d5c352a7f21e52672413e7aa9986df8b4b5353db7ad09d446974a3200e459a537e8a75255c1a17f184d544f448786fd7a
+  metadata.gz: 828392048a14868c751d143d338416a08b283f85d3d16665a3267ea466ec701589851ca711deef2880064c966a6cbb9cbded366c4fddea4da470695f063ce631
+  data.tar.gz: b7b22d6e668c3bbfbba4a8280991c3800b4b340260dfc8096f3c96d1e755e888647c30c0b2f0f0b6d0736284b7716bbc9227be071fbfb7ec81a971151add6504

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    proformaxml (1.5.0)
+    proformaxml (1.5.1)
       activemodel (>= 5.2.3, < 8.0.0)
       activesupport (>= 5.2.3, < 8.0.0)
       dachsfisch (~> 1.0.0)
@@ -11,24 +11,25 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.3.4)
-      activesupport (= 7.1.3.4)
-    activesupport (7.1.3.4)
+    activemodel (7.2.1)
+      activesupport (= 7.2.1)
+    activesupport (7.2.1)
       base64
       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)
     ast (2.4.2)
     base64 (0.2.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)
       nokogiri (>= 1.14.1, < 2.0.0)
@@ -60,20 +61,20 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.0)
     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.4.2)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
@@ -82,15 +83,15 @@ 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.7)
     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)
+    rexml (3.3.6)
       strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -109,7 +110,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.65.0)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -120,25 +121,26 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.1)
       parser (>= 3.3.1.0)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.1)
+    rubocop-rails (2.26.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.0.4)
       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)

data/lib/proformaxml/services/transform_task.rb

@@ -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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proformaxml
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Karol
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel