proformaxml 0.10.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2230a680b6a36b22867d4c9749199e5ab0e601567998e343e3281a838867f6c7
-  data.tar.gz: 9e8486a4ed110915ff0e9ce4b6e4cf87df3ad02c8c0c94c02824ddd8696a56fc
+  metadata.gz: c50e2e72dc70055556ef14a9be087d9f557aeac25eb4c8a53c28f1132baaf20e
+  data.tar.gz: 392e5f8391908e2221a423b8ae69d97e25edc6ea184ed987e59487d9acf9a715
 SHA512:
-  metadata.gz: 20e9ee57cc1071bf2b8612f3397aeed1a98648f0fc363ddb8e3b22251c77e265208b6fbce75c9fe19cafd5a454fcf97d5f8dd90312a7758a2f86c673db9596ea
-  data.tar.gz: 1c9d253c304209ba0026b766585d851d99e4ea3a626c402d92feb78a245b9ffc7633130ccea1bfe7916315a9118eff54b092b0252c8b88487fccf0547aa70313
+  metadata.gz: aff94d81a98f927cd04cd85b9c0fed428fb93e0496e968d0079152e2a50269e3b6cced82a17cec7002ee0fb0fbc3c964a7a85513f597541f4ade0e91eeb3bc7d
+  data.tar.gz: e54b57f55f6731036eb9659357d734e991f2f3dafd63083e56119d73be12cea07ba779ead3c7e5c921ccbaf4e258d3042054281bc2a21720c00a3f2288b70a92

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    proformaxml (0.10.0)
+    proformaxml (1.0.0)
       activemodel (>= 5.2.3, < 8.0.0)
       activesupport (>= 5.2.3, < 8.0.0)
       dachsfisch (>= 0.1.0, < 1.0.0)
@@ -11,9 +11,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.7.2)
-      activesupport (= 7.0.7.2)
-    activesupport (7.0.7.2)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -27,7 +27,7 @@ GEM
       nokogiri (>= 1.14.1, < 2.0.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    factory_bot (6.2.1)
+    factory_bot (6.3.0)
       activesupport (>= 5.0.0)
     ffi (1.15.5)
     formatador (1.1.0)
@@ -55,7 +55,7 @@ GEM
     lumberjack (1.2.9)
     method_source (1.0.0)
     mini_portile2 (2.8.4)
-    minitest (5.19.0)
+    minitest (5.20.0)
     nenv (0.3.0)
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
@@ -99,7 +99,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rubocop (1.56.1)
+    rubocop (1.56.2)
       base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)

data/lib/proformaxml/helpers/export_helpers.rb

@@ -26,7 +26,7 @@ module ProformaXML
       def add_test_configuration(xml, test)
         xml.send(:'test-configuration') do
           add_filerefs(xml, test) if test.files
-          add_configuration(xml, test.configuration) unless test.configuration.nil?
+          add_dachsfisch_node(xml, test.configuration)
           if test.meta_data
             xml.send(:'test-meta-data') do
               meta_data(xml, test.meta_data)
@@ -55,10 +55,12 @@ module ProformaXML
         end
       end
 
-      def add_configuration(xml, configuration)
-        xml_snippet = Dachsfisch::JSON2XMLConverter.perform(json: configuration.to_json)
-        configuration.flat_map {|_, val| val['@xmlns'].to_a }.uniq.each do |namespace|
-          xml.doc.root.add_namespace(namespace[0], namespace[1])
+      def add_dachsfisch_node(xml, dachsfisch_node)
+        return if dachsfisch_node.nil?
+
+        xml_snippet = Dachsfisch::JSON2XMLConverter.perform(json: dachsfisch_node.to_json)
+        dachsfisch_node.flat_map {|_, val| val['@xmlns'].to_a }.uniq.each do |namespace|
+          xml.doc.root.add_namespace(namespace[0], namespace[1]) unless namespace[0] == '$'
         end
 
         xml << xml_snippet

data/lib/proformaxml/helpers/import_helpers.rb

@@ -97,7 +97,10 @@ module ProformaXML
 
       def convert_xml_node_to_json(any_node)
         xml_snippet = Nokogiri::XML::DocumentFragment.new(Nokogiri::XML::Document.new, any_node)
-        xml_snippet.children.first.add_namespace_definition(any_node.namespace.prefix, any_node.namespace.href)
+        unless any_node.namespace.prefix.nil?
+          xml_snippet.children.first.add_namespace_definition(any_node.namespace.prefix,
+            any_node.namespace.href)
+        end
         JSON.parse(Dachsfisch::XML2JSONConverter.perform(xml: xml_snippet.to_xml))
       end
 

data/lib/proformaxml/models/task.rb

@@ -8,8 +8,8 @@ require 'proformaxml/errors'
 
 module ProformaXML
   class Task < Base
-    attr_accessor :title, :description, :internal_description, :proglang, :uuid, :parent_uuid,
-      :language, :model_solutions, :files, :tests, :meta_data
+    attr_accessor :title, :description, :internal_description, :proglang, :uuid, :parent_uuid, :language,
+      :model_solutions, :files, :tests, :meta_data, :submission_restrictions, :external_resources, :grading_hints
 
     def initialize(attributes = {})
       super

data/lib/proformaxml/services/exporter.rb

@@ -24,7 +24,7 @@ module ProformaXML
 
       raise PostGenerateValidationError.new(errors) if errors.any?
 
-      # File.open('../testfile.zip', 'wb') { |file| file.write(write_to_zip(xmldoc).string) }
+      # File.binwrite('../testfile.zip', write_to_zip(xmldoc).string)
       write_to_zip(xmldoc)
     end
 
@@ -51,9 +51,12 @@ module ProformaXML
     end
 
     def add_objects_to_xml(xml)
+      add_dachsfisch_node(xml, @task.submission_restrictions)
       xml.files { files(xml) }
+      add_dachsfisch_node(xml, @task.external_resources)
       xml.send(:'model-solutions') { model_solutions(xml) } if @task.model_solutions.any? || @version == '2.0'
       xml.tests { tests(xml) }
+      add_dachsfisch_node(xml, @task.grading_hints)
     end
 
     def files(xml)

data/lib/proformaxml/services/importer.rb

@@ -44,6 +44,7 @@ module ProformaXML
       set_model_solutions
       set_tests
       set_meta_data
+      set_extra_data
     end
 
     def set_namespaces
@@ -86,6 +87,15 @@ module ProformaXML
       @task.meta_data = meta_data(meta_data_node, use_namespace: true) if meta_data_node.text.present?
     end
 
+    def set_extra_data
+      submission_restrictions_node = @task_node.xpath('xmlns:submission-restrictions').first
+      @task.submission_restrictions = convert_xml_node_to_json(submission_restrictions_node) unless submission_restrictions_node.nil?
+      external_resources_node = @task_node.xpath('xmlns:external-resources').first
+      @task.external_resources = convert_xml_node_to_json(external_resources_node) unless external_resources_node.nil?
+      grading_hints_node = @task_node.xpath('xmlns:grading-hints').first
+      @task.grading_hints = convert_xml_node_to_json(grading_hints_node) unless grading_hints_node.nil?
+    end
+
     def add_model_solution(model_solution_node)
       model_solution = ModelSolution.new
       model_solution.id = model_solution_node.attributes['id'].value

data/lib/proformaxml/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proformaxml
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Karol
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Implements parts of ProFormA-XML specification