pangrid 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e04bea2f4ebdb7947ec122f28a4a8feaa9cb4e7c4a27206abb6ef0fe7e6f254c
-  data.tar.gz: d5f32ec895146fe2141c5f68dcf775477b7a381577239e8225d8d8a155fe0c10
+  metadata.gz: 0ac52eb2d66dc1963f47ec468aae99c00fde378e31b72721d30250fb8ea8bd38
+  data.tar.gz: 6ec6d5b96446757c1f09752641f90a6d38133ca7fda271d71aa9ebc898150aa3
 SHA512:
-  metadata.gz: d8057bad79f07c4d761f136a8258171b5b7a3711d5d72d589282d7219153fbf6bbb28c29315ab0ee99eba74ef465d334dbef71fd7657e8881dfe42ad944076ac
-  data.tar.gz: e8bf9a1582e69ab4279505d19f957dbe3668cb471cd2644660fbaff073a08f3b608de57db830f637c6a97ada3f255e79bcbc59bab45f0e8d9e9ff345cc0636f8
+  metadata.gz: 0cd3c645277275fca375d33a510a0c26e7b871aada429e8127761be4105d4c2dd8a75911c9e1d447a55bac6f71b462cff0fe4c3f87cf98eefed73ea2dd15cec9
+  data.tar.gz: 8e6a99a7a24894a0b9814c703014d5e1eb1e4097dfa430f53bf6b42a6a32bd836fd7069a5df891916b2fe0f70056727b39976c8f128beb8cec8e2647299a9d49

data/lib/pangrid/plugins/qxw.rb

@@ -8,25 +8,33 @@ class Qxw < Plugin
 
   DESCRIPTION = "QXW grid reader (rectangular grids only)"
 
-  def read(data)
-    xw = XWord.new
-    lines = data.lines.map(&:chomp)
-    gp = lines.find {|x| x =~ /^GP( \d+){6}$/}
-    check("Could not read grid size from .qxw file") { gp }
-    type, w, h, _ = gp.scan(/\d+/).map(&:to_i)
-    check("Only rectangular grids are supported") { type == 0 }
-    xw.width = w
-    xw.height = h
-    xw.solution = []
+  def read_black(xw, lines)
+    # Read black cells
     grid = lines.select {|x| x =~ /^SQ /}
     grid.each do |line|
       parts = line.scan(/\w+/)
       check(QXW_GRID_ERROR) { parts.length == 6 || parts.length == 7 }
-      col, row, b, c = parts[1].to_i, parts[2].to_i, parts[5].to_i, parts[6]
+      _, col, row, _, _, b, _ = parts
+      col, row, b = col.to_i, row.to_i, b.to_i
+      next if b != 1
+      cell = Cell.new
+      cell.solution = :black
+      xw.solution[row] ||= []
+      xw.solution[row][col] = cell
+    end
+  end
+
+  def read_filled(xw, lines)
+    # Read filled cells
+    grid = lines.select {|x| x =~ /^SQCT /}
+    grid.each do |line|
+      parts = line.scan(/\w+/)
+      check(QXW_GRID_ERROR) { parts.length == 4 || parts.length == 5 }
+      _, col, row, d, c = parts
+      col, row, d = col.to_i, row.to_i, d.to_i
+      next if d != 0  # different char per direction, not supported for now
       cell = Cell.new
-      if b == 1
-        cell.solution = :black
-      elsif c == nil
+      if c == nil
         cell.solution = :null
       else
         cell.solution = c
@@ -34,6 +42,20 @@ class Qxw < Plugin
       xw.solution[row] ||= []
       xw.solution[row][col] = cell
     end
+  end
+
+  def read(data)
+    xw = XWord.new
+    lines = data.lines.map(&:chomp)
+    gp = lines.find {|x| x =~ /^GP( \d+){6}$/}
+    check("Could not read grid size from .qxw file") { gp }
+    type, w, h, _ = gp.scan(/\d+/).map(&:to_i)
+    check("Only rectangular grids are supported") { type == 0 }
+    xw.width = w
+    xw.height = h
+    xw.solution = []
+    read_filled(xw, lines)
+    read_black(xw, lines)
     check(QXW_GRID_ERROR) { xw.solution.length == xw.height }
     check(QXW_GRID_ERROR) { xw.solution.all? {|i| i.compact.length == xw.width} }
 

data/lib/pangrid/version.rb

@@ -1,3 +1,3 @@
 module Pangrid
-  VERSION='0.5.2'
+  VERSION='0.5.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pangrid
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Martin DeMello
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2024-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webrick
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A crossword file format converter