mumuki-qsim-runner 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8344af1b99d0efa137e744b790bac1c493ef67b257a4058db638ed8935ad4606
-  data.tar.gz: 1ae990e1197ffabdc7269893730067d67062ae748c5aa537d01fc266499615a4
+  metadata.gz: 5be822481a8dcdd5175e7359e5539597f0d97536bba0b67968d49a2e7249a08c
+  data.tar.gz: 3f9dab23f429cf07f1eb744d5a6cc46032547ff25ffaf0fc0a85579622e011c0
 SHA512:
-  metadata.gz: d7156538f1ede88f2edce45fd6f09ef0c99bf3d79bde43f0a36fc467317f94f269399d9dc7e5e575d9db15e8ab8f590dda220c67f50355090789116244163951
-  data.tar.gz: 99d427cdd46eab7d8a90923a06d06712e127f585ee9dff967e559574c44260f14a169019621c7ed64e8b9b7acfba3d3b8c037650c4b45dfacfba5adf2173a97c
+  metadata.gz: 37018b380d5d5405d8c262be206c792ae8f0b1f46a93e5d95af82bf2f87bb7d9e481fd9155eaf5fc3bd15536942f1db2dd5150077e04d95e9a7796ab6f6e4c90
+  data.tar.gz: a5c37a7c73968714c9770bebf5cbed872ee8b1b32c19c51a23d8f23e710ed073c61a0e30c82496a9c8c643d3ecb4621eddae324d5b1057a17f8773bdb7662587

data/lib/checker.rb

@@ -5,10 +5,10 @@ module Qsim
       super
     end
 
-    def check_equal(result, records)
-      records.each do |record, expected|
-        actual = result[:records][record]
-        fail I18n.t(:check_equal_failure, record: record, expected: expected, actual: actual) unless actual == expected
+    def check_equal(result, state)
+      state.each do |target, expected|
+        actual = target_value result, target
+        fail I18n.t(:check_equal_failure, record: target, expected: expected, actual: actual) unless actual == expected
       end
     end
 
@@ -22,6 +22,17 @@ module Qsim
 
     private
 
+    def target_value(result, target)
+      case target
+      when /R\d/
+        result[:records][target]
+      when /[0-9A-F]{4}/
+        result[:memory][target]
+      else
+        error I18n.t :unknown_target, target: target
+      end
+    end
+
     def renderer
       @renderer ||= Qsim::HtmlRenderer.new
     end

data/lib/html_renderer.rb

@@ -9,7 +9,7 @@ module Qsim
         fields = range(output_key, output)
                    .map { |key| [key_for(output_key, key), '0000'] }
                    .to_h
-                   .merge(result[output_key])
+                   .tap { |it| it.merge!(result[output_key].slice(*it.keys)) }
                    .sort
         @result[output_key] = fields
       end

data/lib/locales/en.yml

@@ -4,3 +4,4 @@ en:
   special_records: 'Special records'
   flags: 'Flags'
   check_equal_failure: "<b>%{record}</b> should be <b>%{expected}</b>, but was <b>%{actual}</b>"
+  unknown_target: "Unknown target %{target}."

data/lib/locales/es.yml

@@ -4,3 +4,4 @@ es:
   special_records: 'Registros especiales'
   flags: 'Banderas'
   check_equal_failure: "<b>%{record}</b> debería contener el valor <b>%{expected}</b>, pero se encontró <b>%{actual}</b>"
+  unknown_target: "Objetivo %{target} desconocido."

data/lib/test_hook.rb

@@ -45,7 +45,7 @@ class QsimTestHook < Mumukit::Templates::FileHook
   def to_examples(examples)
     examples.each_with_index.map do |example, index|
       example[:preconditions] = classify(example.fetch(:preconditions, {}))
-      example.merge(id: index, output: @output)
+      { id: index, output: @output }.deep_merge example
     end
   end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module QsimVersionHook
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/view/records.html.erb

@@ -20,7 +20,7 @@
     <h5><%= I18n.t :memory %></h5>
     <table class="table table-bordered qsim-fields">
       <tbody>
-      <% @result[:memory].each_slice(10) do |group| %>
+      <% @result[:memory].each_slice(16) do |group| %>
           <tr>
             <% group.each.with_index do |record, index| %>
                 <% if index.zero? %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-qsim-runner
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Federico Aloi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit