mork 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77cd220a9af15fb52c434ad78e5436e922a92d9b
-  data.tar.gz: 7ec01ec5ef0fe665822dbcf2da5b4c59682db51c
+  metadata.gz: e1d8680deb48b3f4cfa54e859ecc4070513a4c7c
+  data.tar.gz: f7f0e1946eb795913a3460ddda3222fe5a706193
 SHA512:
-  metadata.gz: 4f59e836632c2cb223193480692b52631b09a7739b61e8b839f36babdd77ccef7785a0515c54cc670327547b9ca1f26e99bc8a389914b2864d51547de249e575
-  data.tar.gz: 29829dc19f2217b4beadd263f181290c585f5e54f0463b6b62d10b489b517deac42ffdf76d3c543a5942d84dbad364f0e7b4db871bb3fde87d7ce9a0ff5d0e30
+  metadata.gz: 23fb14992bb44471554dc8c27b0bf5f28a2109848fd4e4c51c791969dccf32e4e34ead8c67a40b4c4a768f096a087e96818ec6f3adad43612b23971c31a7f231
+  data.tar.gz: c7c205813250d74ce995cd212c1eb37dca022269a17b2965e0bf6e1db81c93f4c3edb6fac964848cff5902c2ab16a4611ab1db25d0de5f92ce557aad4489475c

data/lib/mork/grid.rb

@@ -6,12 +6,17 @@ module Mork
   # All returned values are in the arbitrary units given in the configuration file
   class Grid
     
-    def initialize(options = {})
+    def initialize(options=nil)
+      @params = DGRID
       case options.class.to_s
+      when 'NilClass'
+        if File.exists? 'config/grid.yml'
+          @params.merge! symbolize YAML.load_file('config/grid.yml')
+        end
       when "Hash"
-        @params = DGRID.merge symbolize options
+        @params.merge! symbolize options
       when "String"
-        @params = DGRID.merge symbolize YAML.load_file(options)
+        @params.merge! symbolize YAML.load_file(options)
       else
         raise "Invalid options parameter: #{options.class.inspect}"
       end

data/lib/mork/sheet.rb

@@ -14,10 +14,19 @@ module Mork
       # grid itself; this method assumes a 'stretch' strategy, i.e. where the image
       # after registration has the same size in pixels as the original scanned file
       @grid.set_page_size @raw.width, @raw.height
+      @rm   = {}
       @rmsa = {}
       @ok_reg = register @raw
     end
     
+    def valid?
+      @ok_reg
+    end
+    
+    def status
+      @rm
+    end
+    
     # code
     # 
     # returns the sheet code as an integer
@@ -191,20 +200,18 @@ module Mork
     # ================
     
     def register(img)
-      @rm = []
-      @reg_status = []
       # find the XY coordinates of the 4 registration marks
-      @reg_status[0], @rm[0], @rm[1] = reg_centroid_on(img, :tl)
-      @reg_status[1], @rm[2], @rm[3] = reg_centroid_on(img, :tr)
-      @reg_status[2], @rm[4], @rm[5] = reg_centroid_on(img, :br)
-      @reg_status[3], @rm[6], @rm[7] = reg_centroid_on(img, :bl)
-      return false if @reg_status.any? { |c| c != :ok }
+      @rm[:tl] = reg_centroid_on(img, :tl)
+      @rm[:tr] = reg_centroid_on(img, :tr)
+      @rm[:br] = reg_centroid_on(img, :br)
+      @rm[:bl] = reg_centroid_on(img, :bl)
+      return false if @rm.any? { |k,v| v[:status] != :ok }
       # stretch the 4 points to fit the original size and return the resulting image
       @crop = img.stretch [
-        @rm[0], @rm[1],         0,          0,
-        @rm[2], @rm[3], img.width,          0,
-        @rm[4], @rm[5], img.width, img.height,
-        @rm[6], @rm[7],         0, img.height
+        @rm[:tl][:x], @rm[:tl][:y],         0,          0,
+        @rm[:tr][:x], @rm[:tr][:y], img.width,          0,
+        @rm[:br][:x], @rm[:br][:y], img.width, img.height,
+        @rm[:bl][:x], @rm[:bl][:y],         0, img.height
       ]
       true
     end
@@ -223,9 +230,9 @@ module Mork
               (cx > @rmsa[corner][:w] - @grid.rm_edgy_x)
           status = :edgy
         else
-          return :ok, cx + @rmsa[corner][:x], cy + @rmsa[corner][:y]
+          return {status: :ok, x: cx + @rmsa[corner][:x], y: cy + @rmsa[corner][:y]}
         end
-        return status if @rmsa[corner][:w] > @grid.rm_max_search_area_side
+        return {status: status, x: nil, y: nil} if @rmsa[corner][:w] > @grid.rm_max_search_area_side
       end
     end
     
@@ -235,7 +242,7 @@ module Mork
     
     def not_registered
       unless @ok_reg
-        puts "---=={ Unregistered image. Reason: '#{@reg_status.inspect}' }==---"
+        puts "---=={ Unregistered image. Reason: '#{@rm.inspect}' }==---"
         true
       end
     end

data/lib/mork/version.rb

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

data/spec/mork/sheet_spec.rb

@@ -32,6 +32,23 @@ module Mork
       before(:all) do
         @sheet = Sheet.new('spec/samples/sample01.jpg', Grid.new('spec/samples/grid01.yml'))
       end
+      
+      describe '#valid?' do
+        it 'returns true' do
+          @sheet.valid?.should be_truthy
+        end
+      end
+      
+      describe '#status' do
+        it 'returns :ok' do
+          @sheet.status.should == {
+            tl: { status: :ok, x:   54, y:   49},
+            tr: { status: :ok, x: 1543, y:   43},
+            br: { status: :ok, x: 1548, y: 2224},
+            bl: { status: :ok, x:   59, y: 2230}
+          }
+        end
+      end
 
       describe "#marked?" do
         it "should return true for some darkened choices" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mork
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Giuseppe Bertini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-07 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: narray