mork 0.6.0 → 0.7.0

data/lib/mork/sheet_pdf.rb

@@ -2,15 +2,15 @@ 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
               when String, Hash; GridPDF.new grip
               when Mork::GridPDF; grip
-              else raise 'Invalid initialization parameter'
+              else raise ArgumentError, 'Invalid initialization parameter'
               end
       super my_page_params
       # @content should be an array of hashes, one per page;
@@ -18,11 +18,11 @@ module Mork
       @content = content.class == Hash ? [content] : content
       process
     end
-    
+
     def save(fn)
       render_file fn
     end
-    
+
     def to_pdf
       render
     end
@@ -35,7 +35,7 @@ module Mork
         margin:    @grip.margins
       }
     end
-    
+
     def process
       # for all sheets
       line_width 0.3
@@ -52,14 +52,14 @@ module Mork
         end
       end
     end
-    
+
     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
@@ -69,11 +69,11 @@ module Mork
         end
       end
     end
-    
+
     def calibration_cells
       @grip.calibration_cells_xy.each { |c| stamp_at 'X', c }
     end
-    
+
     def barcode(code)
       # draw the dark calibration bar
       stamp_at 'barcode', @grip.ink_black_xy
@@ -81,7 +81,7 @@ module Mork
       # least to most significant bit, left to right
       @grip.barcode_xy_for(code).each { |c| stamp_at 'barcode', c }
     end
-    
+
     def header(content)
       content.each do |k,v|
         font_size @grip.header_size(k) do
@@ -110,7 +110,7 @@ module Mork
         stamp_at "s#{n}", @grip.item_xy(i)
       end
     end
-    
+
     def create_stamps
       create_choice_stamps
       create_stamp('X') do
@@ -122,7 +122,7 @@ module Mork
         end
       end
     end
-    
+
     def create_choice_stamps
       ch_len.flatten.uniq.each do |t|
         create_stamp("s#{t}") do
@@ -145,7 +145,7 @@ module Mork
                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|
@@ -153,11 +153,11 @@ module Mork
       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

data/lib/mork/version.rb

@@ -1,3 +1,3 @@
 module Mork
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/mork.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
 
   # dependencies:
   s.add_dependency 'narray',      '~> 0.6'
-  s.add_dependency 'mini_magick', '~> 4.0'
-  s.add_dependency 'prawn',       '~> 1.3'
+  s.add_dependency 'mini_magick', '~> 4.5'
+  s.add_dependency 'prawn',       '~> 2.1'
   s.add_development_dependency 'rake',          '~> 10.3'
   s.add_development_dependency 'rspec',         '~>  3.1'
   s.add_development_dependency 'guard',         '~>  2.6'

data/mork.sublime-project

@@ -0,0 +1,9 @@
+{
+	"folders":
+	[
+		{
+			"path": ".",
+			"folder_exclude_patterns": ["tmp", "log"]
+		}
+	]
+}

data/spec/mork/coord_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+module Mork
+  describe Coord do
+    let(:co) { Coord.new 50 }
+
+    it 'creates a Coord' do
+      expect(co).to be_a Coord
+    end
+
+    context 'returning coordinates' do
+      it 'works with just the width' do
+        expect(co.x).to eq  0
+        expect(co.y).to eq  0
+        expect(co.w).to eq 50
+        expect(co.h).to eq 50
+      end
+
+      it 'yields modified coords with a coefficient' do
+        c = Coord.new 50, cx: 1.07
+        expect(c.x).to eq  0
+        expect(c.y).to eq  0
+        expect(c.w).to eq (50 * 1.07).round
+        expect(c.h).to eq (50 * 1.07).round
+      end
+
+      it 'works with all arguments' do
+        c = Coord.new 50, cy: 1.04, h: 60, y: 25, cx: 0.97, x: 19
+        expect(c.y).to eq (25 * 1.04).round
+      end
+    end
+
+    context 'returning strings for imagemagick use' do
+      describe '#rect_points' do
+        it 'returns a well-formed string' do
+          expect(co.rect_points).to eq "0 0 50 50"
+        end
+      end
+
+      describe '#cropper' do
+        it 'returns a well-formed string' do
+          expect(co.cropper).to eq "50x50+0+0"
+        end
+      end
+    end
+
+    it 'returns an X range' do
+      expect(co.x_rng).to eq(0...50)
+    end
+
+    it 'returns a Y range' do
+      expect(co.y_rng).to eq(0...50)
+    end
+  end
+end

data/spec/mork/grid_omr_spec.rb

@@ -6,101 +6,46 @@ module Mork
       @grom = GridOMR.new 'spec/samples/layout.yml'
       @grom.set_page_size 1601, 2281
     end
-      
+
     describe '#choice_cell_area' do
       it 'returns the coordinates of the first choice cell' do
-        @grom.choice_cell_area(0,0).should == {x: 63, y: 436, w: 51, h: 41}
+        expect(@grom.choice_cell_area(0,0)).to have_coords(63, 436, 51, 41)
       end
-      
+
       it 'returns the coordinates of the last choice cell' do
-        @grom.choice_cell_area(119,4).should == {x: 1411, y: 2108, w: 51, h: 41}
+        expect(@grom.choice_cell_area(119,4)).to have_coords(1411, 2108, 51, 41)
       end
     end
-    
-    describe '#barcode_bit_area' do
-      # it 'returns the coordinates of the first barcode bit area' do
-      #   @grom.barcode_bit_area(0).should == {x: 160, y: 2260, w: 25, h: 21}
-      # end
-      #
-      # it 'returns the coordinates of the last barcode bit area' do
-      #   @grom.barcode_bit_area(39).should == {x: 1475, y: 2260, w: 25, h: 21}
-      # end
-      #
-      # it 'fails if an invalid barcode bit is requested' do
-      #   lambda { @grom.barcode_bit_area(40) }.should raise_error
-      # end
-    end
 
-    describe '#rm_search_area' do
-      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 = @grom.rm_search_area :tl, 0
-          c.should == {x: 15, y: 15, w: 91, h: 92}
-        end
-
-        it 'returns an {:x, :y, :w, :h} hash of coordinates in pixels for the :tr reg_mark corner' do
-          c = @grom.rm_search_area :tr, 0
-          c.should == { x: 1494, y: 15, w: 91, h: 92 }
-        end
-
-        it 'returns an {:x, :y, :w, :h} hash of coordinates in pixels for the :br reg_mark corner' do
-          c = @grom.rm_search_area :br, 0
-          c.should == { x: 1494, y: 2173, w: 91, h: 92 }
-        end
-
-        it 'returns an {:x, :y, :w, :h} hash of coordinates in pixels for the :bl reg_mark corner' do
-          c = @grom.rm_search_area :bl, 0
-          c.should == { x: 15, y: 2173, w: 91, h: 92 }
-        end
+    describe '#barcode_bit_area' do
+      it 'returns the coordinates of the first barcode bit area' do
+        expect(@grom.barcode_bit_area(0)).to have_coords(126, 2260, 25, 21)
       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 = @grom.rm_search_area :tl, 2
-          c.should == { x: 15, y: 15, w: 130, h: 131 }
-        end
-
-        it 'returns an {:x, :y, :w, :h} hash of coordinates in pixels for the :tr reg_mark corner' do
-          c = @grom.rm_search_area :tr, 2
-          c.should == { x: 1456, y: 15, w: 130, h: 131 }
-        end
-
-        it 'returns an {:x, :y, :w, :h} hash of coordinates in pixels for the :br reg_mark corner' do
-          c = @grom.rm_search_area :br, 2
-          c.should == { x: 1456, y: 2135, w: 130, h: 131 }
-        end
-
-        it 'returns an {:x, :y, :w, :h} hash of coordinates in pixels for the :bl reg_mark corner' do
-          c = @grom.rm_search_area :bl, 2
-          c.should == { x: 15, y: 2135, w: 130, h: 131 }
-        end
-      end
-    end
-    
-    describe '#rm_edgy_x' do
-      it 'returns the minimum acceptable number of pixels from the regmark center to the edge of the rm_search_area' do
-        @grom.rm_edgy_x.should == 24
-      end
-      it 'returns an integer' do
-        @grom.rm_edgy_x.should be_a Fixnum
+      it 'returns the coordinates of the last barcode bit area' do
+        expect(@grom.barcode_bit_area(39)).to have_coords(1441, 2260, 25, 21)
       end
     end
 
-    describe '#rm_edgy_y' do
-      it 'returns the minimum acceptable number of pixels from the regmark center to the edge of the rm_search_area' do
-        @grom.rm_edgy_y.should == 24
+    describe '#rm_crop_area' do
+      it 'returns a Coord object for the :tl reg_mark corner' do
+        c = @grom.rm_crop_area :tl
+        expect(c). to have_coords(15, 15, 91, 92)
       end
-      it 'returns an integer' do
-        @grom.rm_edgy_y.should be_a Fixnum
+
+      it 'returns a Coord object for the :tr reg_mark corner' do
+        c = @grom.rm_crop_area :tr
+        expect(c).to have_coords(1494, 15, 91, 92)
       end
-    end
-    
-    describe '#rm_max_search_area_side' do
-      it 'returns the maximum extent of the regmark search area, 1/4 of the raw image horizontal pixels' do
-        @grom.rm_max_search_area_side.should == 400
+
+      it 'returns a Coord object for the :br reg_mark corner' do
+        c = @grom.rm_crop_area :br
+        expect(c).to have_coords(1494, 2173, 91, 92)
       end
-      it 'returns an integer' do
-        @grom.rm_max_search_area_side.should be_a Fixnum
+
+      it 'returns a Coord object for the :bl reg_mark corner' do
+        c = @grom.rm_crop_area :bl
+        expect(c).to have_coords(15, 2173, 91, 92)
       end
     end
 
@@ -109,17 +54,49 @@ module Mork
         @grom.max_choices_per_question.should == 5
       end
     end
-    
+
     describe '#paper_white_area' do
       it 'returns the coordinates of the white area used for barcode calibration' do
-        @grom.paper_white_area.should == {x: 93, y: 2260, w: 25, h: 21}
+        expect(@grom.paper_white_area).to have_coords(93, 2260, 25, 21)
       end
     end
-    
+
     describe '#ink_black_area' do
       it 'returns the coordinates of the barcode calibration bar' do
-        @grom.ink_black_area.should == {x: 126, y: 2260, w: 25, h: 21}
+        expect(@grom.ink_black_area).to have_coords(126, 2260, 25, 21)
       end
     end
   end
-end
+end
+
+
+# it 'fails if an invalid barcode bit is requested' do
+#   lambda { @grom.barcode_bit_area(40) }.should raise_error
+# end
+
+# describe '#rm_edgy_x' do
+#   it 'returns the minimum acceptable number of pixels from the regmark center to the edge of the rm_crop_area' do
+#     @grom.rm_edgy_x.should == 24
+#   end
+#   it 'returns an integer' do
+#     @grom.rm_edgy_x.should be_a Fixnum
+#   end
+# end
+
+# describe '#rm_edgy_y' do
+#   it 'returns the minimum acceptable number of pixels from the regmark center to the edge of the rm_crop_area' do
+#     @grom.rm_edgy_y.should == 24
+#   end
+#   it 'returns an integer' do
+#     @grom.rm_edgy_y.should be_a Fixnum
+#   end
+# end
+
+# describe '#rm_max_search_area_side' do
+#   it 'returns the maximum extent of the regmark search area, 1/4 of the raw image horizontal pixels' do
+#     @grom.rm_max_search_area_side.should == 400
+#   end
+#   it 'returns an integer' do
+#     @grom.rm_max_search_area_side.should be_a Fixnum
+#   end
+# end

data/spec/mork/grid_spec.rb

@@ -4,7 +4,7 @@ module Mork
   describe Grid do
     context 'init params' do
       it 'does not work with an integer' do
-        expect {Grid.new 1}.to raise_error
+        expect {Grid.new 1}.to raise_error RuntimeError
       end
     end
 
@@ -12,13 +12,13 @@ module Mork
       before(:all) do
         @grid = Grid.new 'spec/samples/layout.yml'
       end
-      
+
       describe '#max_questions' do
         it 'returns the maximum number of questions in a sheet' do
           @grid.max_questions.should == 120
         end
       end
-      
+
       describe '#barcode_bits' do
         it 'returns the number of bits used to define the form barcode' do
           @grid.send(:barcode_bits).should == 40
@@ -26,7 +26,7 @@ module Mork
       end
     end
 
-    
+
     # describe "#cell_x" do
     #   context "for 1st-column questions" do
     #     it "returns the distance from the registration frame of the left edge of the 1st choice" do
@@ -68,7 +68,7 @@ end
 #   it "returns a hash" do
 #     grid.question_area(1).should be_an_instance_of(Hash)
 #   end
-#   
+#
 #   it "returns the location in pixels of the first question patch" do
 #     c = grid.question_area(1)
 #     c[:x].should be_within(4).of(90)
@@ -79,13 +79,13 @@ end
 #     c[:x].should be_within(4).of(90)
 #     c[:y].should be_within(4).of(3120)
 #   end
-# 
+#
 #   it "returns the location in pixels of the 121th question patch" do
 #     c = grid.question_area(121)
 #     c[:x].should be_within(4).of(1887)
 #     c[:y].should be_within(4).of(388)
 #   end
-# 
+#
 #   it "returns the location in pixels of the last question patch" do
 #     c = grid.question_area(160)
 #     c[:x].should be_within(4).of(1887)

data/spec/mork/magicko_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+module Mork
+  describe Magicko do
+    let(:sh) { sample_img :slanted }
+    let(:ma) { Magicko.new sh.filename }
+    let(:co) { Coord.new 50}
+    let(:pp) { { tl: {x: 10, y: 10}, tr: {x: 1000, y: 10}, bl: {x: 10, y: 1700}, br: {x: 1000, y: 1700}} }
+
+    it 'exists' do
+      expect(Magicko.new 1).to be_a Magicko
+    end
+
+    describe '#width' do
+      it 'returns the image width' do
+        expect(ma.width).to eq sh.width
+      end
+    end
+
+    describe '#height' do
+      it 'returns the image height' do
+        expect(ma.height).to eq sh.height
+      end
+    end
+
+    describe '#rm_patch' do
+      it 'returns an array of bytes for the registration mark area' do
+        expect(ma.rm_patch co).to be_an Array
+      end
+
+      it 'returns an Array of appropriate size' do
+        expect(ma.rm_patch(co).length).to eq 2500
+      end
+    end
+
+    describe '#registered_bytes' do
+      it 'returns an array of bytes for the registered image' do
+        expect(ma.registered_bytes pp).to be_an Array
+      end
+
+      it 'returns an array of bytes of the same size as the original image' do
+        expect(ma.registered_bytes(pp).length).to eq sh.height*sh.width
+      end
+    end
+  end
+end

data/spec/mork/mimage_spec.rb

@@ -3,11 +3,33 @@ require 'spec_helper'
 module Mork
   describe Mimage do
     let(:qna) { [5] * 100 }
+
+    context 'new age on slanted' do
+      let(:img) { sample_img 'slanted' }
+      let(:mim) { Mimage.new img.filename, qna, GridOMR.new(img.grid_file)  }
+      describe 'basics' do
+        it 'should be valid' do
+          mim.highlight_rm_centers
+          mim.highlight_rm_areas
+          mim.write 'spec/out/slanted.jpg', false
+          expect(mim.valid?).to be_truthy
+        end
+
+        it 'should return the correct regmark coordinates' do
+          [:tl, :tr, :br, :bl].each do |corner|
+            crn = mim.rm[corner]
+            expect(crn[:x]).to be_within(2).of(img.info[corner.to_s][0])
+
+          end
+        end
+      end
+    end
+
     context 'problematic sheets' do
       let(:mim)  { Mimage.new 'spec/samples/out-1.jpg', qna, GridOMR.new('spec/samples/grid.yml')  }
       let(:bila) { Mimage.new 'spec/samples/syst/bila0.jpg', qna, GridOMR.new('spec/samples/grid.yml') }
-      
-      xit 'writes all cell values to a text file' do
+
+      it 'writes all cell values to a text file', exclude: true do
         d=Dir['spec/samples/syst/*.jpg']
         d.each do |f|
           fn = File.basename f, '.jpg'
@@ -28,35 +50,23 @@ module Mork
         end
       end
     end
-    
+
     context 'Old specs' do
       let(:sgi) { sample_img 'sample-gray' }
       let(:sg)  { Mimage.new sgi.filename, qna, GridOMR.new(sgi.grid_file) }
-    
+
       describe 'basics' do
-        it 'returns the width' do
-          expect(sg.width).to eq sgi.width
-        end
-      
-        it 'returns the height' do
-          expect(sg.height).to eq sgi.height
-        end
-      
         it 'returns the pixels as an array' do
-          expect(sg.send :raw_pixels).to be_a NPatch
+          expect(sg.send :reg_pixels).to be_a NPatch
         end
-      
+
         it 'returns the correct number of pixels' do
-          expect(sg.send(:raw_pixels).length).to eq sgi.width * sgi.height
+          expect(sg.send(:reg_pixels).length).to eq sgi.width * sgi.height
         end
 
         it 'returns the stretched array' do
           expect(sg.send(:reg_pixels).length).to eq sgi.width * sgi.height
         end
-      
-        it 'raises an error if the file is not found' do
-          expect { Mimage.new 'non_existing_file' }.to raise_error
-        end
       end
 
       describe 'inspecting' do
@@ -75,4 +85,4 @@ module Mork
       end
     end
   end
-end
+end