mork 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ce19962ba0e1e21013a7081f9ac040e57d0bfa1
-  data.tar.gz: 2b86b3f7a6338384e6b9ffdf9157cb0a92205dea
+  metadata.gz: cedc2c2924bff45051c7d4fdace910882b95ade7
+  data.tar.gz: 4a97e442ee44a1e615e9d92dd1be2dfa8af01545
 SHA512:
-  metadata.gz: 7d6a2ef2db4358a02a2ba9d3cbdac0505d9208b2b169fbfee67e76a71311844b970a306d19c8a72fbd400288ef269397c645d65f126b284c4832c6283870ba79
-  data.tar.gz: 3efa05963a68fd82f672f4c0aadf06d739e3eec442a7e0f0c70c82f0422c35f699df3495ab5196d264ab4497ccc85cd579eefbaac3819ccfa5d427e47c61bf83
+  metadata.gz: 77283aab2e31e1189a7579f49b6a535b374381254df3b75a4ded1eb2ea871ba11987b441237afef320e59a5fd605a8b9a1863b80c27547221064696f52a75642
+  data.tar.gz: b2ea3c69c2fd974d4d047af7ad2aec052dcd34046ca06a5ad20666dd31df1485dd906b52164929ae8c826c857783f7ac25f0aa84da5ea6f2f1266e6548f7226e

data/lib/mork/grid.rb

@@ -39,6 +39,10 @@ module Mork
       columns * rows
     end
     
+    def max_choices_per_question
+      @params[:items][:max_cells].to_i
+    end
+    
     def barcode_bits
       @params[:barcode][:bits].to_i
     end
@@ -68,7 +72,11 @@ module Mork
     # the distance from the registration frame to the left edge
     # of the c-th choice cell of the q-th question
     def cell_x(q,c)
-      first_x + column_width * (q / rows) + cell_spacing * c - cell_width / 2
+      item_x(q) + cell_spacing * c
+    end
+    
+    def item_x(q)
+      first_x + column_width * (q / rows) - cell_width / 2
     end
     
     def cal_cell_x

data/lib/mork/grid_const.rb

@@ -69,7 +69,7 @@ module Mork
       bits:         40,
       left:         15,
       width:         3,
-      height:        2.5,
+      height:        3,
       spacing:       4
     }, # barcode end
     control: {

data/lib/mork/grid_omr.rb

@@ -73,7 +73,6 @@ module Mork
     # areas on the sheet that are certainly white/black
     def paper_white_area()         barcode_bit_area -1               end
     def ink_black_area()           barcode_bit_area  0               end
-    def max_choices_per_question() @params[:items][:max_cells].to_i  end
     def rm_max_search_area_side()  (ppu_x * page_width / 4).round    end
     
     private

data/lib/mork/grid_pdf.rb

@@ -18,62 +18,66 @@ module Mork
       ]
     end
     
-    def barcode_bit_areas_for(code)
+    def barcode_width
+      super.mm
+    end
+    
+    def barcode_height
+      super.mm
+    end
+    
+    def barcode_xy_for(code)
       black = barcode_bits.times.reject { |x| (code>>x)[0]==0 }
-      black.collect { |x| barcode_area x+1 }
+      black.collect { |x| barcode_xy x+1 }
     end
     
-    def calibration_cell_areas
-      rows.times.collect do |q|
-        {
-          p: [(reg_frame_width-cell_spacing).mm, (reg_frame_height - cell_y(q)).mm],
-          w: cell_width.mm,
-          h: cell_height.mm
-        }
-      end
+    def ink_black_xy
+      barcode_xy 0
     end
     
-    # Coordinates at which to place calibration cell labels (usually an ‘X’)
-    def calibration_letter_xy(q)
-      [
-        (reg_frame_width-cell_spacing).mm + 2.mm,
-        item_text_y(q)
-      ]
+    def calibration_cells_xy
+      rows.times.collect do |q|
+        [(reg_frame_width-cell_spacing).mm, item_y(q).mm]
+      end
     end
     
     # Coordinates at which to place item numbers
     def qnum_xy(q)
       [
-        cell_x(q, 0).mm - qnum_width - @params[:items][:number_margin].to_f.mm,
-        item_text_y(q)
+        item_x(q).mm - qnum_width - qnum_margin,
+        item_y(q).mm
       ]
     end
     
-    # Coordinates at which to place choice labels
-    def choice_letter_xy(q, c)
-      [
-        cell_x(q, c).mm + 2.mm,
-        item_text_y(q)
-      ]
+    def width_of_cell
+      cell_width.mm
     end
     
-    def choice_cell_area(q, c)
-      {
-        p: [cell_x(q, c).mm, (reg_frame_height - cell_y(q)).mm],
-        w: cell_width.mm,
-        h: cell_height.mm
-      }
+    def height_of_cell
+      cell_height.mm
+    end
+    
+    def choice_spacing
+      cell_spacing.mm
+    end
+    
+    def item_xy(q)
+      [item_x(q).mm, item_y(q).mm]
+    end
+    
+    def cround
+      @cround ||= [width_of_cell, height_of_cell].min / 2
     end
 
-    def page_size()      [page_width.mm, page_height.mm]        end
-    def margins()        reg_margin.mm                          end
-    def ink_black_area() barcode_area(0)                        end
-    def qnum_width()     @params[:items][:number_width].to_f.mm end
-    def item_font_size() @params[:items][:font_size].to_f       end
-    def header_width(k)  @params[:header][k][:width].to_f.mm    end
-    def header_height(k) @params[:header][k][:height].to_f.mm   end
-    def header_size(k)   @params[:header][k][:size].to_f        end
-    def header_boxed?(k) @params[:header][k][:box] == true      end
+    def page_size()      [page_width.mm, page_height.mm]         end
+    def margins()        reg_margin.mm                           end
+    def qnum_margin()    @params[:items][:number_margin].to_f.mm end
+    def qnum_width()     @params[:items][:number_width].to_f.mm  end
+    def item_font_size() @params[:items][:font_size].to_f        end
+    def header_width(k)  @params[:header][k][:width].to_f.mm     end
+    def header_height(k) @params[:header][k][:height].to_f.mm    end
+    def header_size(k)   @params[:header][k][:size].to_f         end
+    def header_boxed?(k) @params[:header][k][:box] == true       end
 
     def header_xy(k)
       [
@@ -88,12 +92,18 @@ module Mork
         header_height(k) - 1.mm
       ]
     end
-  
 
     private
-    
-    def item_text_y(q)
-      (reg_frame_height - cell_y(q) - cell_height/4).mm
+
+    def item_y(q)
+      reg_frame_height - cell_y(q)
+    end
+
+    def barcode_xy(i)
+      [
+        barcode_bit_x(i).mm,
+        barcode_height
+      ]
     end
     
     def barcode_area(i)

data/lib/mork/mimage.rb

@@ -142,22 +142,16 @@ module Mork
     # if the 2nd arg is false, then stretching is not applied
     def write(fname=nil, reg=true)
       if fname
-        # img = MiniMagick::Image.open @path
-        # img.combine_options {|c| exec_mm_cmd c, reg }
-        # begin
-        #   img.write fname
-        #   @write = :ok
-        # rescue Exception
-        #   @write = :fail
-        # end
         MiniMagick::Tool::Convert.new(false) do |img|
           img << @path
-          img.distort(:perspective, perspective_points) if reg
-          @cmd.each { |cmd| img.send *cmd }
+          exec_mm_cmd img, reg
           img << fname
         end
       else
-        MiniMagick::Image.new(@path) { |c| exec_mm_cmd c, reg }
+        MiniMagick::Tool::Mogrify.new(false) do |img|
+          img << @path
+          exec_mm_cmd img, reg
+        end
       end
     end
     
@@ -166,10 +160,7 @@ module Mork
     # ============================================================#
     def exec_mm_cmd(c, reg)
       c.distort(:perspective, perspective_points) if reg
-      
-      @cmd.each do |cmd|
-        c.send *cmd
-      end
+      @cmd.each { |cmd| c.send *cmd }
     end
     
     def img_size

data/lib/mork/sheet_pdf.rb

@@ -2,6 +2,9 @@ require 'mork/grid_pdf'
 require 'prawn'
 
 module Mork
+  
+  #TODO: read the prawn manual, we should probably use views
+  
   class SheetPDF < Prawn::Document
     def initialize(content, grip=GridPDF.new)
       @grip = case grip
@@ -26,21 +29,6 @@ module Mork
 
     private
 
-    def process
-      # for each response sheet
-      @content.each_with_index do |content, i|
-        start_new_page if i>0
-        fill_color "000000"
-        stroke_color "000000"
-        line_width 0.3
-        registration_marks
-        barcode content[:barcode]
-        header content[:header]
-        questions_and_choices content[:choices]
-        calibration_cells
-      end
-    end
-    
     def my_page_params
       {
         page_size: @grip.page_size,
@@ -48,38 +36,50 @@ module Mork
       }
     end
     
-    def registration_marks
-      fill do
-        @grip.reg_marks.each do |r|
-          circle r[:p], r[:r]
+    def process
+      # for all sheets
+      line_width 0.3
+      font_size @grip.item_font_size
+      create_stamps
+      make_repeaters
+      # for each response sheet
+      @content.each_with_index do |content, i|
+        start_new_page if i>0
+        barcode content[:barcode]
+        header content[:header]
+        unless equal_choice_number?
+          questions_and_choices ch_len[i]
         end
       end
     end
     
-    def calibration_cells
-      font_size @grip.item_font_size do
-        stroke do
-          stroke_color "ff0000"
-          @grip.calibration_cell_areas.each_with_index do |a, i|
-            rounded_rectangle a[:p], a[:w], a[:h], [a[:h], a[:w]].min / 2
-            fill_color "ff0000"
-            text_box 'X', at: @grip.calibration_letter_xy(i)
+    def make_repeaters
+      if equal_choice_number?
+        repeat(:all) do
+          questions_and_choices ch_len.first
+        end
+      end
+      
+      repeat(:all) do
+        calibration_cells
+        fill do
+          @grip.reg_marks.each do |r|
+            circle r[:p], r[:r]
           end
         end
       end
     end
     
+    def calibration_cells
+      @grip.calibration_cells_xy.each { |c| stamp_at 'X', c }
+    end
+    
     def barcode(code)
-      fill do
-        # draw the dark calibration bar
-        c = @grip.ink_black_area
-        rectangle c[:p], c[:w], c[:h]
-        # draw the bars corresponding to the code
-        # least to most significant bit, left to right
-        @grip.barcode_bit_areas_for(code).each do |c|
-          rectangle c[:p], c[:w], c[:h]
-        end
-      end
+      # draw the dark calibration bar
+      stamp_at 'barcode', @grip.ink_black_xy
+      # draw the bars corresponding to the code
+      # least to most significant bit, left to right
+      @grip.barcode_xy_for(code).each { |c| stamp_at 'barcode', c }
     end
     
     def header(content)
@@ -99,24 +99,68 @@ module Mork
       end
     end
 
-    def questions_and_choices(content)
-      stroke do
-        content.length.times do |q|
-          fill_color "000000"
-          text_box "#{q+1}", at: @grip.qnum_xy(q),
-                             width: @grip.qnum_width,
-                             align: :right,
-                             size: @grip.item_font_size
-          stroke_color "ff0000"
-          font_size @grip.item_font_size
-          content[q].times do |c|
-            a = @grip.choice_cell_area q, c
-            rounded_rectangle a[:p], a[:w], a[:h], [a[:h], a[:w]].min / 2
-            fill_color "ff0000"
-            text_box (65+c).chr, at: @grip.choice_letter_xy(q, c)
+    def questions_and_choices(n_ch)
+      n_ch.each_with_index do |n, i|
+        text_box "#{i+1}",
+                 at: @grip.qnum_xy(i),
+                 width: @grip.qnum_width,
+                 height: @grip.height_of_cell,
+                 align: :right,
+                 valign: :center
+        stamp_at "s#{n}", @grip.item_xy(i)
+      end
+    end
+    
+    def create_stamps
+      create_choice_stamps
+      create_stamp('X') do
+        cell_stamp_content 'X', 0
+      end
+      create_stamp('barcode') do
+        fill do
+          rectangle [0,0], @grip.barcode_width, @grip.barcode_height
+        end
+      end
+    end
+    
+    def create_choice_stamps
+      ch_len.flatten.uniq.each do |t|
+        create_stamp("s#{t}") do
+          t.times do |i|
+            cell_stamp_content letter_for(i), @grip.choice_spacing*i
           end
         end
       end
     end
+
+    def cell_stamp_content(l, x)
+      stroke_rounded_rectangle [x,0],
+                               @grip.width_of_cell,
+                               @grip.height_of_cell,
+                               @grip.cround
+      text_box l,
+               at:     [x,0],
+               width:  @grip.width_of_cell,
+               height: @grip.height_of_cell,
+               align:  :center,
+               valign: :center
+    end
+    
+    def equal_choice_number?
+      return false unless ch_len.all? { |c| c.length == ch_len[0].length }
+      ch_len[0].each_with_index do |c, i|
+        return false unless ch_len.all? { |x| c == x[i] }
+      end
+      true
+    end
+    
+    def ch_len
+      @all_choice_lengths ||= @content.collect { |c| c[:choices] }
+    end
+    
+    # Choices are labeled 'A', 'B', ...
+    def letter_for(c)
+      (65+c).chr
+    end
   end
 end

data/lib/mork/version.rb

@@ -1,3 +1,3 @@
 module Mork
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/mork/sheet_pdf_spec.rb

@@ -62,11 +62,18 @@ module Mork
     it 'creates a PDF sheet with 160 items' do
       s = SheetPDF.new(content.merge({choices: [5] * 160}), 'spec/samples/grid160.yml')
       s.save('spec/out/i160.pdf')
+      system 'open spec/out/i160.pdf'
     end
 
-    it 'creates a multipage pdf' do
-      s = SheetPDF.new([content, content, content])
-      s.save('spec/out/p2.pdf')
+    it 'creates a PDF sheet with unequal choices per item' do
+      s = SheetPDF.new(content.merge({choices: [5, 4, 3, 2, 1, 5, 4, 3, 2, 1, 5, 4, 3, 2, 1, 5, 4, 3, 2, 1, 5, 4, 3, 2, 1, 5, 4, 3, 2, 1, 5, 4, 3, 2, 1]}), 'spec/samples/layout.yml')
+      s.save('spec/out/uneq.pdf')
+    end
+
+    it 'creates 20 PDF sheets' do
+      c = content
+      s = SheetPDF.new([c,c,c,c,c,c,c,c,c,c,c,c,c,c,c,c,c,c,c,c])
+      s.save('spec/out/p20.pdf')
     end
   end
 end

data/spec/samples/grid160.yml

@@ -47,7 +47,7 @@ barcode:
   bits: 40
   left: 15
   width: 3.0
-  height: 2.5
+  height: 3
   spacing: 4
 control:
   top: 40

data/spec/samples/layout.yml

@@ -6,6 +6,7 @@ reg_marks:
   radius:           2.5   # registration mark radius
   search:          12     # initial size of the registration mark search area (*)
   offset:           2     # distance between the search area and each page border (*)
+
 header:           
   name:                   # ‘name’ is just a label; you can add arbitrary header elements
     top:            5     # margin relative to registration frame top side

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mork
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Giuseppe Bertini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray