mumuki-sqlite-runner 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3734b0af25cc1a8f563c7bfda8e13a7891f78421fbcda0710553bc3c5140ee8e
-  data.tar.gz: 78b63bfb30f4f4ef26742db5e5b1f98deb80a9b89ff64d1eeddc2b0111b7ceb9
+  metadata.gz: c247a76a413469d5e8c749ee216bf4d406429c560e50c69dd62ff119125d9004
+  data.tar.gz: b02f32da0c03682efbe31da8e906b9a21e52a0e6f99af670ef6fa4f1ec588011
 SHA512:
-  metadata.gz: eb05abd4833c0f3f7ab3a3d6125bbbfd6a1fceea140b9dead9be60a37c4030b562a2c0548614854b0afc1a3f4e2c4db9b42cca954fa8e81c48de5f6c73fa354b
-  data.tar.gz: 30cd885678391688ff8fe2b0d3cea9a34cc51a4bf31d5bae8eee956102a7986b2f646f8db194ac4ef00bf3d883ded8418f77e4eaa4c2ca1749cdfac06fc52c82
+  metadata.gz: bfdbc18de9b34c2b219aa222a499a91650a61b2dc213f2ac480a17be3de1d894f8b99739257b6a645d32f6f62472c63e0e4bb2b37cd3fe96ad67d608827998a5
+  data.tar.gz: 94addefc89c3405e2b649e1c5a49bfd38538e25290b70891c0859d8756036a4dc6efdc8f187e425c9eba28574cf6e15a1c8d90e0d13d3e14ba4ed6a39d2d759c

data/lib/test_hook.rb

@@ -54,7 +54,7 @@ class SqliteTestHook < Mumukit::Templates::FileHook
   # Make diff between expected and student dataset result and mark each line one according comparision
   def diff(expected, student)
     zipped = expected.zip(student).map do |expected_i, student_i|
-      diff = Diffy::SplitDiff.new student_i << "\n", expected_i << "\n"
+      diff = Diffy::SplitDiff.new expected_i << "\n", student_i << "\n"
       choose_left_right(diff, expected_i, student_i).map { |e| post_process_diff e }
     end
     zipped.transpose.map { |dataset| post_process_datasets dataset }
@@ -66,12 +66,19 @@ class SqliteTestHook < Mumukit::Templates::FileHook
     [expected, student]
   end
 
+  # split lines grouping by diff mark & data content
+  # then append mark as dataset column & re join
   def post_process_diff(data)
-    data.scan(/^(\s|-|\+)(.+)/)
-        .map { |mark, content| mark << '|' << content }
+    data.scan(/^(\s|-|\+)*(.+)/)
+        .map { |mark, content| "#{proper_mark(mark)}#{content}" }
         .join("\n")
   end
 
+  def proper_mark(mark)
+    mark = mark.to_s
+    "#{mark}|" unless mark.blank?
+  end
+
   # Transforms array datasets into hash with :id & :rows
   def post_process_datasets(datasets)
     datasets.map.with_index do |dataset, i|

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module SqliteVersionHook
-  VERSION = '3.3.0'
+  VERSION = '3.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-sqlite-runner
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Leandro Di Lorenzo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit