mork 0.18.2 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cdb6af94ff682ccad23d669fb624d263ea4fb28d5911e3ada2ceeb200c8fd4a
-  data.tar.gz: 956342c055f892ee7e4c44187711b3660eefd8fcee68723bfd1cb2fb245d0a75
+  metadata.gz: 8d1ff44d3b000b420e231a5ab3823293dad26ef69ec29ade174e74db32b16b9c
+  data.tar.gz: 520167a98213a49bec5820fb7d2476416197484dd93785ed861bb4998b9ca2ec
 SHA512:
-  metadata.gz: 0c75eaac5ad245b5c86dde97f7e68c43a08486c248014e27963c8c1f763b2cc14fbe545d13f1d75675f1367daaf11df05f8109fdf88d752324cf7972a560e9e4
-  data.tar.gz: 8864848f8f6a4a9cada44dd6f74183928fcdbf15986c97a27eb4d95ba6f60f2c9f0dd6a95ec8029fe961df0f4289da21703e8b9472c4ba6ad3f70929c043ffeb
+  metadata.gz: 6c66b3b59d316efe183f978e7702c03608ef08208a202640648a5e76d023d54d9bd6985db7d9307d677ca5c6f85776f1264fe141f9edcebb8ecf206956f4ca49
+  data.tar.gz: 580d00362722d80ea7af5411486174f714328de9ddf936a59aa911f86525725e27c5452aaa909ea2d2bc89abd57ee6b46e7e9434f239201c7ae12ea738f06bdf

data/README.md

@@ -315,7 +315,7 @@ system 'open corrections.jpg' # this works in macOS
 
 `overlay_corrections` applies:
 
-- a green outline on the marked cell when the response is correct
+- a green outline and semitransparent green fill on the marked cell when the response is correct
 - a red outline on the expected cell and a red cross on the marked cell when the response is incorrect
 - a red outline on the expected cell when the response is blank or invalid
 

data/lib/mork/magicko.rb

@@ -81,6 +81,13 @@ module Mork
       coords.each { |c| @cmd << [:draw, shape(c, rounded)] }
     end
 
+    def highlight_green(coords, rounded)
+      return if coords.empty?
+      @cmd << [:stroke, 'none']
+      @cmd << [:fill, 'rgba(0, 255, 0, 0.3)']
+      coords.each { |c| @cmd << [:draw, shape(c, rounded)] }
+    end
+
     def outline(coords, rounded)
       outline_with_color(coords, rounded, 'green')
     end

data/lib/mork/sheet_omr.rb

@@ -165,10 +165,10 @@ module Mork
 
     # Applies correctness-aware overlays to the image using an answer key.
     #
-    # Correct responses receive a green outline on the marked cell. Incorrect
-    # responses receive a red outline on the expected cell and a red cross on
-    # the given cell. Blank or invalid responses receive only the red outline
-    # on the expected cell.
+    # Correct responses receive a green outline and semitransparent green fill
+    # on the marked cell. Incorrect responses receive a red outline on the
+    # expected cell and a red cross on the given cell. Blank or invalid
+    # responses receive only the red outline on the expected cell.
     #
     # @param correct_choices [Array<Integer, Array<Integer>, nil>] one entry per
     #   question. Each entry can be an integer choice index, a 1-element array
@@ -183,6 +183,7 @@ module Mork
       actual = marked_responses(marked)
 
       green_outlines = Array.new(expected.length) { [] }
+      green_highlights = Array.new(expected.length) { [] }
       red_outlines = Array.new(expected.length) { [] }
       red_crosses = Array.new(expected.length) { [] }
 
@@ -192,6 +193,7 @@ module Mork
         marked_cells = actual[question]
         if marked_cells == [choice]
           green_outlines[question] = [choice]
+          green_highlights[question] = [choice]
           next
         end
 
@@ -200,6 +202,7 @@ module Mork
       end
 
       @mim.overlay :outline_green, green_outlines
+      @mim.overlay :highlight_green, green_highlights
       @mim.overlay :outline_red, red_outlines
       @mim.overlay :check_red, red_crosses
     end

data/lib/mork/version.rb

@@ -1,3 +1,3 @@
 module Mork
-  VERSION = '0.18.2'
+  VERSION = '0.19.0'
 end

data/spec/mork/magicko_spec.rb

@@ -73,6 +73,14 @@ module Mork
         ma.outline [co], false
         expect(ma.instance_variable_get(:@cmd)).to include([:strokewidth, 6])
       end
+
+      it 'draws a semitransparent green fill over the cell' do
+        ma.highlight_green [co], false
+        commands = ma.instance_variable_get(:@cmd)
+        expect(commands).to include([:stroke, 'none'])
+        expect(commands).to include([:fill, 'rgba(0, 255, 0, 0.3)'])
+        expect(commands).to include([:draw, 'rectangle 0 0 50 50'])
+      end
     end
   end
 end

data/spec/mork/sheet_omr_spec.rb

@@ -167,6 +167,7 @@ module Mork
           allow(omr).to receive(:marked_choices).and_return([[1], [2], [], [3, 4]])
 
           expect(mim).to receive(:overlay).with(:outline_green, [[1], [], [], []]).ordered
+          expect(mim).to receive(:overlay).with(:highlight_green, [[1], [], [], []]).ordered
           expect(mim).to receive(:overlay).with(:outline_red, [[], [0], [2], [3]]).ordered
           expect(mim).to receive(:overlay).with(:check_red, [[], [2], [], []]).ordered
 
@@ -179,6 +180,7 @@ module Mork
           omr.set_choices [5] * 2
 
           expect(mim).to receive(:overlay).with(:outline_green, [[], []]).ordered
+          expect(mim).to receive(:overlay).with(:highlight_green, [[], []]).ordered
           expect(mim).to receive(:overlay).with(:outline_red, [[3], [1]]).ordered
           expect(mim).to receive(:overlay).with(:check_red, [[1, 2], [0]]).ordered
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mork
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.19.0
 platform: ruby
 authors:
 - Giuseppe Bertini