mork 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e92c32ca59c988cea80c3c77500fd756e53410d
-  data.tar.gz: 0334a33ef6ce0f4166ba19d57d9b82909f915c05
+  metadata.gz: 77cd220a9af15fb52c434ad78e5436e922a92d9b
+  data.tar.gz: 7ec01ec5ef0fe665822dbcf2da5b4c59682db51c
 SHA512:
-  metadata.gz: 7f7dd80d9be2d3a2ccd58ec2e1a077401269baeebcb2d84d0105b325f351bad0bef130607502d5e5eecb86af0004e49e12d6d8410251ac55013147d5261924af
-  data.tar.gz: 96b17f9ea0bf9a307d46a1f8cecbc6e39858f0c6303ea3d23690e8bfccb8602eccf5a08b5690046edef8bfb345a49b87994629586cbf90e41e7387df270541ca
+  metadata.gz: 4f59e836632c2cb223193480692b52631b09a7739b61e8b839f36babdd77ccef7785a0515c54cc670327547b9ca1f26e99bc8a389914b2864d51547de249e575
+  data.tar.gz: 29829dc19f2217b4beadd263f181290c585f5e54f0463b6b62d10b489b517deac42ffdf76d3c543a5942d84dbad364f0e7b4db871bb3fde87d7ce9a0ff5d0e30

data/.gitignore

@@ -5,4 +5,4 @@ quick.rb
 pkg/*
 tmp/*
 .rvmrc
-.rspec
+.rspec

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', all_after_pass: false do
+guard 'rspec', cmd: 'bundle exec rspec', all_after_pass: false do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/mork/(.+)\.rb$})     { |m| "spec/mork/#{m[1]}_spec.rb" }
 end

data/lib/mork/grid.rb

@@ -221,7 +221,13 @@ module Mork
     
     def pdf_ctrl_area_light
       {
-        p: [cell_spacing.mm + pdf_control_xy[0]+pdf_control_width+@params[:control][:margin].to_f.mm, pdf_control_xy[1]],
+        p: [
+          cell_spacing.mm +
+          pdf_control_xy[0] +
+          pdf_control_width +
+          ctrl_margin.mm,
+          pdf_control_xy[1]
+        ],
         w: cell_width.mm,
         h: cell_height.mm
       }
@@ -355,28 +361,29 @@ module Mork
     # ===============================
     # = Simple parameter extraction =
     # ===============================
-    def ctrl_cell_x()       @params[:control][:left].to_f + @params[:control][:width].to_f + ctrl_margin  end
-    def ctrl_margin()       @params[:control][:margin].to_f           end
-    def ctrl_cell_y()       @params[:control][:top].to_f              end
-    def code_height()       @params[:code][:height].to_f              end
-    def code_width()        @params[:code][:width].to_f               end
-    def page_width()        @params[:page_size][:width].to_f          end
-    def page_height()       @params[:page_size][:height].to_f         end
-    def cell_width()        @params[:items][:cell_width].to_f     end
-    def cell_height()       @params[:items][:cell_height].to_f    end
-    def cell_spacing()      @params[:items][:x_spacing].to_f      end
-    def item_spacing()      @params[:items][:y_spacing].to_f      end
-    def column_width()      @params[:items][:column_width].to_f   end
-    def row_spacing()       @params[:items][:y_spacing].to_f      end
-    def first_x()           @params[:items][:first_x].to_f        end
-    def first_y()           @params[:items][:first_y].to_f        end
-    def rows()              @params[:items][:rows]                end
-    def columns()           @params[:items][:columns]             end
-    def reg_margin()        @params[:regmarks][:margin].to_f          end
-    def reg_search()        @params[:regmarks][:search].to_f          end
-    def reg_radius()        @params[:regmarks][:radius].to_f          end
-    def reg_frame_width()   page_width  - reg_margin * 2              end
-    def reg_frame_height()  page_height - reg_margin * 2              end
-    def reg_off()           @params[:regmarks][:offset].to_f          end
+    def ctrl_cell_x()       @params[:control][:left].to_f + ctrl_width + ctrl_margin  end
+    def ctrl_margin()       @params[:control][:margin].to_f      end
+    def ctrl_width()        @params[:control][:width].to_f       end
+    def ctrl_cell_y()       @params[:control][:top].to_f         end
+    def code_height()       @params[:code][:height].to_f         end
+    def code_width()        @params[:code][:width].to_f          end
+    def page_width()        @params[:page_size][:width].to_f     end
+    def page_height()       @params[:page_size][:height].to_f    end
+    def cell_width()        @params[:items][:cell_width].to_f    end
+    def cell_height()       @params[:items][:cell_height].to_f   end
+    def cell_spacing()      @params[:items][:x_spacing].to_f     end
+    def item_spacing()      @params[:items][:y_spacing].to_f     end
+    def column_width()      @params[:items][:column_width].to_f  end
+    def row_spacing()       @params[:items][:y_spacing].to_f     end
+    def first_x()           @params[:items][:first_x].to_f       end
+    def first_y()           @params[:items][:first_y].to_f       end
+    def rows()              @params[:items][:rows]               end
+    def columns()           @params[:items][:columns]            end
+    def reg_margin()        @params[:regmarks][:margin].to_f     end
+    def reg_search()        @params[:regmarks][:search].to_f     end
+    def reg_radius()        @params[:regmarks][:radius].to_f     end
+    def reg_frame_width()   page_width  - reg_margin * 2         end
+    def reg_frame_height()  page_height - reg_margin * 2         end
+    def reg_off()           @params[:regmarks][:offset].to_f     end
   end
 end

data/lib/mork/grid_const.rb

@@ -11,7 +11,7 @@ module Mork
       margin:  10,
       radius:  2.5,
       search:  10,
-      offset:   3
+      offset:   2
     }, # regmarks end
     header: {
       name: {

data/lib/mork/npatch.rb

@@ -31,7 +31,7 @@ module Mork
     end
     
     def narr
-      @narr ||= NArray[@mim.pixels]
+      NArray[@mim.pixels]
     end
     
     def blurry_narr

data/lib/mork/sheet.rb

@@ -4,10 +4,10 @@ module Mork
       @raw = case im.class.to_s
              when "String"
                Mimage.new im
-             when "Mimage"
+             when "Mork::Mimage"
                im
              else
-               raise "A new sheet requires either a Mimage or the name of the source image file"         
+               raise "A new sheet requires either a Mimage or the name of the source image file, but it was a: #{im.class}"
              end
       @grid = grid
       # send page size to the grid, so that all later measurements can be done within the
@@ -42,6 +42,7 @@ module Mork
     # false otherwise
     def marked?(q, c)
       return if not_registered
+      # puts "SHADE: #{shade_of(q, c)}, Q: #{q}, C: #{c}, THR: #{choice_threshold}"
       shade_of(q, c) < choice_threshold
     end
     
@@ -102,23 +103,30 @@ module Mork
       @crop.highlight! @grid.choice_cell_area(q, c)
     end
 
-    def highlight_code
+    def highlight_code_areas
       return if not_registered
       @grid.code_bits.times do |bit|
         @crop.highlight! @grid.code_bit_area bit
       end
     end
     
-    def highlight_code_bit(i)
-      @crop.highlight!(@grid.code_bit_area(i)) if @ok_reg
+    def highlight_code
+      return if not_registered
+      @grid.code_bits.times do |bit|
+        if code_string.reverse[bit] == '1'
+          @crop.highlight! @grid.code_bit_area bit
+        end
+      end
     end
-
+    
     def highlight_dark_calibration_bit
-      @crop.highlight!(@grid.cal_area_black) if @ok_reg
+      return if not_registered
+      @crop.highlight!(@grid.cal_area_black)
     end
     
     def highlight_light_calibration_bit
-      @crop.highlight!(@grid.cal_area_white) if @ok_reg
+      return if not_registered
+      @crop.highlight!(@grid.cal_area_white)
     end
     
     def highlight_reg_area
@@ -126,11 +134,13 @@ module Mork
       @raw.highlight! @rmsa[:tr]
       @raw.highlight! @rmsa[:br]
       @raw.highlight! @rmsa[:bl]
-      @raw.join!(@rm) if @ok_reg
+      return if not_registered
+      @raw.join!(@rm)
     end
 
     def write(fname)
-      @crop.write(fname) if @ok_reg
+      return if not_registered
+      @crop.write(fname)
     end
     
     def write_raw(fname)
@@ -144,8 +154,10 @@ module Mork
         (0...@grid.max_questions)
       elsif r.is_a? Fixnum
         (0...r)
-      else
+      elsif r.is_a? Array
         r
+      else
+        raise "Invalid argument"
       end
     end
     
@@ -165,7 +177,7 @@ module Mork
     end
 
     def choice_threshold
-      @choice_threshold ||= (naverage(@grid.ctrl_area_dark)   + 
+      @choice_threshold ||= (naverage(@grid.ctrl_area_dark)   +
                              naverage(@grid.ctrl_area_light)) / 2
     end
     
@@ -202,7 +214,6 @@ module Mork
     def reg_centroid_on(img, corner)
       1000.times do |i|
         @rmsa[corner] = @grid.rm_search_area(corner, i)
-        puts "RM: #{@rmsa[corner].inspect}"
         cx, cy = NPatch.new(img.crop(@rmsa[corner])).dark_centroid
         if cx.nil?
           status = :insufficient_contrast  

data/lib/mork/sheet_pdf.rb

@@ -2,12 +2,16 @@ require 'prawn'
 
 module Mork
   class SheetPDF < Prawn::Document
-    def initialize(grid, info)
-      @grid = grid
+    def initialize(content, grid=Grid.new)
+      @grid = case grid.class.to_s
+              when "String"; Grid.new grid
+              when "Mork::Grid";      grid
+              else raise "Invalid initialization parameter"
+              end
       super my_page_params
-      # @info should be an array of hashes, one per page;
+      # @content should be an array of hashes, one per page;
       # convert to array if a single hash was passed
-      @info = info.class == Hash ? [info] : info
+      @content = content.class == Hash ? [content] : content
       process
     end
     
@@ -23,16 +27,16 @@ module Mork
 
     def process
       # for each response sheet
-      @info.each_with_index do |info, i|
+      @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
-        calibration_and_code info[:code]
-        header info[:header]
-        control info[:control] if info[:control]
-        questions_and_choices info[:choices]
+        calibration_and_code content[:code]
+        header content[:header]
+        control content[:control] if content[:control]
+        questions_and_choices content[:choices]
       end
     end
     
@@ -64,9 +68,9 @@ module Mork
       end
     end
     
-    def control(info)
+    def control(content)
       font_size @grid.pdf_control_size do
-        text_box info[:string], at: @grid.pdf_control_xy,
+        text_box content[:string], at: @grid.pdf_control_xy,
                                 width: @grid.pdf_control_width,
                                 align: :right
         stroke do
@@ -76,19 +80,19 @@ module Mork
           a = @grid.pdf_ctrl_area_dark
           rounded_rectangle a[:p], a[:w], a[:h], [a[:h], a[:w]].min / 2
           fill_color "ff0000"
-          draw_text info[:labels][0], at: @grid.pdf_dark_control_letter_xy
+          draw_text content[:labels][0], at: @grid.pdf_dark_control_letter_xy
           # light
           a = @grid.pdf_ctrl_area_light
           rounded_rectangle a[:p], a[:w], a[:h], [a[:h], a[:w]].min / 2
           fill_color "ff0000"
-          draw_text info[:labels][1], at: @grid.pdf_light_control_letter_xy
+          draw_text content[:labels][1], at: @grid.pdf_light_control_letter_xy
           
         end
       end
     end
     
-    def header(info)
-      info.each do |k,v|
+    def header(content)
+      content.each do |k,v|
         font_size @grid.pdf_header_size(k) do
           if @grid.pdf_header_boxed?(k)
             bounding_box @grid.pdf_header_xy(k), width: @grid.pdf_header_width(k), height: @grid.pdf_header_height(k) do
@@ -104,9 +108,9 @@ module Mork
       end
     end
 
-    def questions_and_choices(info)
+    def questions_and_choices(content)
       stroke do
-        info.length.times do |q|
+        content.length.times do |q|
           fill_color "000000"
           text_box "#{q+1}", at: @grid.pdf_qnum_xy(q),
                              width: @grid.pdf_qnum_width,
@@ -114,7 +118,7 @@ module Mork
                              size: @grid.pdf_qnum_size
           stroke_color "ff0000"
           font_size @grid.pdf_chlett_size
-          info[q].times do |c|
+          content[q].times do |c|
             a = @grid.pdf_choice_cell_area q, c
             rounded_rectangle a[:p], a[:w], a[:h], [a[:h], a[:w]].min / 2
             fill_color "ff0000"
@@ -125,11 +129,11 @@ module Mork
     end
 
     # def nquestions
-    #   @info[:choices].length
+    #   @content[:choices].length
     # end
     #
     # def nchoices(i)
-    #   @info[:choices][i]
+    #   @content[:choices][i]
     # end
   end
 end

data/lib/mork/version.rb

@@ -1,3 +1,3 @@
 module Mork
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/mork.gemspec

@@ -5,6 +5,7 @@ require "mork/version"
 Gem::Specification.new do |s|
   s.name        = "mork"
   s.version     = Mork::VERSION
+  s.licenses    = ['MIT']
   s.authors     = ["Giuseppe Bertini"]
   s.email       = ["giuseppe.bertini@gmail.com"]
   s.homepage    = ""
@@ -18,16 +19,14 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # dependencies:
-  s.add_dependency "narray"
-  s.add_dependency "rmagick"
-  s.add_dependency "prawn"
-  s.add_development_dependency 'rake'
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "cucumber"
-  s.add_development_dependency "guard-rspec"
-  s.add_development_dependency "guard-shell"
-  s.add_development_dependency "rb-fsevent"
-  s.add_development_dependency "awesome_print"
-  
-  # s.add_runtime_dependency "rest-client"
+  s.add_dependency 'narray',    '~> 0.6'
+  s.add_dependency 'rmagick',   '~> 2.13'
+  s.add_dependency 'prawn',     '1.0.0.rc2'
+  s.add_development_dependency 'rake',          '~> 10.3'
+  s.add_development_dependency 'rspec',         '~>  3.1'
+  s.add_development_dependency 'guard',         '~>  2.6'
+  s.add_development_dependency 'guard-rspec',   '~>  4.3'
+  s.add_development_dependency 'guard-shell',   '~>  0.6'
+  # s.add_development_dependency 'rb-fsevent'
+  s.add_development_dependency 'awesome_print', '~>  1.2'
 end

data/spec/mork/grid_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Mork
   describe Grid do
-    context 'default grid', focus: true do
+    context 'default grid' do
       before(:all) do
         @grid = Grid.new
         @grid.set_page_size 1601, 2281 # the size of sample01.jpg
@@ -34,44 +34,44 @@ module Mork
         context 'on the first iteration' do
           it 'returns an {:x, :y, :w, :h} hash of coordinates in pixels for the :tl reg_mark corner' do
             c = @grid.rm_search_area :tl, 0
-            c.should == { x: 23, y: 23, w: 76, h: 77 }
+            c.should == {:x=>15, :y=>15, :w=>76, :h=>77}
           end
 
           it 'returns an {:x, :y, :w, :h} hash of coordinates in pixels for the :tr reg_mark corner' do
             c = @grid.rm_search_area :tr, 0
-            c.should == { x: 1502, y: 23, w: 76, h: 77 }
+            c.should == { x: 1510, y: 15, w: 76, h: 77 }
           end
 
           it 'returns an {:x, :y, :w, :h} hash of coordinates in pixels for the :br reg_mark corner' do
             c = @grid.rm_search_area :br, 0
-            c.should == { x: 1502, y: 2181, w: 76, h: 77 }
+            c.should == { x: 1510, y: 2189, w: 76, h: 77 }
           end
 
           it 'returns an {:x, :y, :w, :h} hash of coordinates in pixels for the :bl reg_mark corner' do
             c = @grid.rm_search_area :bl, 0
-            c.should == { x: 23, y: 2181, w: 76, h: 77 }
+            c.should == { x: 15, y: 2189, w: 76, h: 77 }
           end
         end
 
         context 'on the third iteration' do
           it 'returns an {:x, :y, :w, :h} hash of coordinates in pixels for the :tl reg_mark corner' do
             c = @grid.rm_search_area :tl, 2
-            c.should == { x: 23, y: 23, w: 114, h: 115 }
+            c.should == { x: 15, y: 15, w: 114, h: 115 }
           end
 
           it 'returns an {:x, :y, :w, :h} hash of coordinates in pixels for the :tr reg_mark corner' do
             c = @grid.rm_search_area :tr, 2
-            c.should == { x: 1464, y: 23, w: 114, h: 115 }
+            c.should == { x: 1471, y: 15, w: 114, h: 115 }
           end
 
           it 'returns an {:x, :y, :w, :h} hash of coordinates in pixels for the :br reg_mark corner' do
             c = @grid.rm_search_area :br, 2
-            c.should == { x: 1464, y: 2143, w: 114, h: 115 }
+            c.should == { x: 1471, y: 2150, w: 114, h: 115 }
           end
 
           it 'returns an {:x, :y, :w, :h} hash of coordinates in pixels for the :bl reg_mark corner' do
             c = @grid.rm_search_area :bl, 2
-            c.should == { x: 23, y: 2143, w: 114, h: 115 }
+            c.should == { x: 15, y: 2150, w: 114, h: 115 }
           end
         end
       end

data/spec/mork/sheet_pdf_spec.rb

@@ -1,106 +1,41 @@
 require 'spec_helper'
 
 module Mork
+  
   describe SheetPDF do
+    it 'assigns the grid to @grid' do
+      s = SheetPDF.new(some_pdf_content)
+      s.instance_variable_get("@grid").should be_a Grid
+    end
+  
+    it 'creates a grid by loading the specified file' do
+      s = SheetPDF.new(some_pdf_content, 'spec/samples/grid01.yml')
+      s.instance_variable_get('@grid').should be_a Grid
+    end
     
-    it "should create a basic pdf" do
-      info = {
-        code: 1099511627775,
-        choices: [5] * 120,
-        header: {
-          name:  "Bertini Giuseppe VR123456",
-          title: "Esame di Fondamenti Morfologici e Funzionali della Vita - 18 gennaio 2013",
-          code:  "119.27",
-          signature: "Firma"
-        },
-        control: {
-          string: "Annerisci solo la casella ‘V’:",
-          labels: ['V', 'F']
-        }
-      }
-      
-      grid_opts = {
-        regmarks: {
-          margin:  10,
-          radius:  2.5,
-          search:  10
-        },
-        header: {
-          name: {
-            top:        5,
-            left:        7.5,
-            width:     170,
-            size:       14,
-          },
-          title: {
-            top:        15,
-            left:       7.5,
-            width:    180,
-            size:      12
-          },
-          code: {
-            top:         5,
-            left:      165,
-            width:      20,
-            size:       14
-          },
-          signature: {
-            top:        30,
-            left:      7.5,
-            width:     120,
-            height:     15,
-            size:        7,
-            box:      true,
-          }
-        }, # header end
-        items: {
-          columns:       4, 
-          column_width: 49,
-          rows:         30,
-          # from the top-left registration mark
-          # to the center of the first choice cell
-          first_x:      10.5,
-          first_y:      55.5,
-          # between choices
-          x_spacing:     7.0,
-          # between rows
-          y_spacing:     7.0,
-          # darkened area
-          cell_width:    6.0,
-          cell_height:   5.0,
-          # the maximum number of choices per question
-          max_cells:      5,
-          # font size for the question number
-          number_size:   10,
-          # distance between right side of q num and left side of first choice cell
-          number_width:   8,
-          # width of question number text box
-          number_margin:  2,
-          # font size for the choice letter
-          letter_size:    8
-        },
-        code: {
-          bits:    40,
-          left:     15,
-          width:    3.0,
-          height:   2.5,
-          spacing:  4
-        },
-        control: {
-          top:       40,
-          left:     123,
-          width:     50,
-          size:       9,
-          margin:     2.5
-        }
-      }
+    it 'raises an error with an invalid init parameter' do
+      lambda { SheetPDF.new(some_pdf_content, 2) }.should raise_error "Invalid initialization parameter"
+    end
+    
+    it 'assigns an array to @content' do
+      s = SheetPDF.new(some_pdf_content)
+      s.instance_variable_get("@content").should be_an Array
+    end
 
-      # s = SheetPDF.new(Grid.new(grid_opts), info)
-      # s.save("tmp/f1.pdf")
+    it 'assigns an array of hashes to @content' do
+      s = SheetPDF.new(some_pdf_content)
+      s.instance_variable_get("@content").first.should be_a Hash
+    end
 
-      info = {
-        code: 5512,
-        choices: [5] * 160,
+    it 'creates a basic PDF sheet' do
+      s = SheetPDF.new(some_pdf_content)
+      s.save("tmp/f1.pdf")
+    end
+    
+    it 'creates a PDF sheet with the maximum possible code' do
+      content = {
+        code: 1099511627775,
+        choices: [5] * 120,
         header: {
           name: "Bonazza Sara vr354320",
           title: "Esame di Fondamenti Morfologici e Funzionali della Vita - 18 gennaio 2013",
@@ -108,27 +43,14 @@ module Mork
           signature: "Firma"
         }
       }
-      s = SheetPDF.new(Grid.new, info)
+      s = SheetPDF.new(content)
       s.save("tmp/f2.pdf")
-
-      info = {
-        code: 8928348236,
-        choices: [5] * 160,
-        header: {
-          name: "G" * 60,
-          title: "E" * 100,
-          code:  "119.28",
-          signature: "Firma"
-        }
-      }
-      s = SheetPDF.new(Grid.new, info)
-      s.save("tmp/f3.pdf")
     end
 
     it "should create a multipage pdf" do
-      info = [
+      content = [
         {
-          code: 18446744073709551615,
+          code: 18446744073,
           choices: [5] * 100,
           header: {
             name: "Bertini Giuseppe VR123456 Bertini Giuseppe VR123456",
@@ -139,7 +61,7 @@ module Mork
         },
         {
           code: 5512,
-          choices: [5] * 160,
+          choices: [5] * 100,
           header: {
             name: "Bonazza Sara vr354320",
             title: "Esame di Fondamenti Morfologici e Funzionali della Vita - 18 gennaio 2013",
@@ -148,7 +70,7 @@ module Mork
           }
         }
       ]
-      s = SheetPDF.new(Grid.new, info)
+      s = SheetPDF.new(content)
       s.save("tmp/p2.pdf")
     end
   end