pangrid 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca64b939037c4c658be062373bc66156605c3833
-  data.tar.gz: 8792223200b3f4a5bfdcd212127c6724b4a087ae
+  metadata.gz: a5a1bfbede1e22eda584f80088055a2da23e973a
+  data.tar.gz: 287b4baf8fe41be20437f6c16ad9fd4eca3dbf64
 SHA512:
-  metadata.gz: a3361137ff447f19ae7f2db13ca66c259b10a1f13387382881c25d5f63e5b84a7516999bf19c27a4b984ee08553f8461e7db66389e8391fe2f867b8523bd3aa5
-  data.tar.gz: becb38b39f34b7e25876e5d1a7d148bb92a205fd59230fbb11ea465680099bf65bc46952391df8dafb8a6cf8f9aba7d073388d20504a92c2224058e0ccc689e7
+  metadata.gz: 987f63c04f51c1575d2d47a82f9fdcafd2645656e5a6facc5ea77e8e02fff8216ac2d591c52e23909e00a5c149a67bb80937c936b2b7b8d8328a34f3d4751446
+  data.tar.gz: 721b3f3ea706c965ca1a2fbd04d098a55c88aa97478dc2773c7faf03c46bc4461454000577117c7d3d53b8862ebc6ea9f706800be176731e7c33a0c9f4a1402c

data/lib/pangrid/plugins/qxw.rb

@@ -0,0 +1,46 @@
+# Qxw savefile for rectangular grids [http://www.quinapalus.com/qxw.html]
+
+module Pangrid
+
+QXW_GRID_ERROR = "Could not read grid from .qxw file"
+
+class Qxw < Plugin
+  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 = []
+    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]
+      cell = Cell.new
+      if b == 1
+        cell.solution = :black
+      elsif c == nil
+        cell.solution = :null
+      else
+        cell.solution = c
+      end
+      xw.solution[row] ||= []
+      xw.solution[row][col] = cell
+    end
+    check(QXW_GRID_ERROR) { xw.solution.length == xw.height }
+    check(QXW_GRID_ERROR) { xw.solution.all? {|i| i.compact.length == xw.width} }
+
+    # Placeholder clues
+    _, _, words_a, words_d = xw.number(true)
+    xw.across_clues = words_a.map {|i| "[#{i}]" }
+    xw.down_clues = words_d.map {|i| "[#{i}]" }
+
+    xw
+  end
+end
+
+end # module Pangrid

data/lib/pangrid/plugins/text.rb

@@ -27,7 +27,7 @@ class Text < Plugin
   end
 
   def format_clues(numbers, clues, indent)
-    numbers.zip(clues).map {|n, c| " "*indent + "#{n}. #{c}"}.join("\n")
+    numbers.zip(clues).map {|n, c| " "*indent + "#{n.to_s.rjust(2)}. #{c}"}.join("\n")
   end
 end
 

data/lib/pangrid/version.rb

@@ -1,3 +1,3 @@
 module Pangrid
-  VERSION='0.3.0'
+  VERSION='0.3.1'
 end

data/lib/pangrid/xw.rb

@@ -53,6 +53,15 @@ class Cell
     rebus? ? solution.to_char : solution
   end
 
+  def to_w
+    case solution
+    when :black; '#'
+    when :null; '.'
+    when Rebus; solution.inspect
+    else; solution
+    end
+  end
+
   def inspect
     case solution
     when :black; '#'
@@ -86,19 +95,40 @@ class XWord < OpenStruct
     boundary?(x, y - 1) && !boundary?(x, y) && !boundary?(x, y + 1)
   end
 
-  def number
+  # Word starting from a square
+  def word_from(x, y, dir)
+    s = ""
+    while !boundary?(x, y) do
+      s += solution[y][x].to_w
+      if dir == :across
+        x += 1
+      else
+        y += 1
+      end
+    end
+    s
+  end
+
+  def number(words = false)
     n, across, down = 1, [], []
+    words_a, words_d = [], []
     (0 ... height).each do |y|
       (0 ... width).each do |x|
-        across << n if across? x, y
-        down << n if down? x, y
+        if across? x, y
+          across << n
+          words_a << word_from(x, y, :across)
+        end
+        if down? x, y
+          down << n
+          words_d << word_from(x, y, :down)
+        end
         if across.last == n || down.last == n
           solution[y][x].number = n
           n += 1
         end
       end
     end
-    [across, down]
+    words ? [across, down, words_a, words_d] : [across, down]
   end
 
   def each_cell
@@ -137,7 +167,7 @@ class XWord < OpenStruct
       if c.rebus?
         r = c.solution
         if self.rebus[s]
-          sym, char = self.rebus[s]
+          sym, _ = self.rebus[s]
           r.symbol = sym.to_s
         else
           k += 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pangrid
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Martin DeMello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: martindemello@gmail.com
@@ -29,6 +29,7 @@ files:
 - lib/pangrid/plugins/acrosslite.rb
 - lib/pangrid/plugins/csv.rb
 - lib/pangrid/plugins/excel.rb
+- lib/pangrid/plugins/qxw.rb
 - lib/pangrid/plugins/reddit.rb
 - lib/pangrid/plugins/text.rb
 - lib/pangrid/utils.rb