pangrid 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a62fd092cf1da1873a8785956e255402f9af4e
-  data.tar.gz: 535b5a21f16d48fead93813873f41d41c1c6e18d
+  metadata.gz: ca64b939037c4c658be062373bc66156605c3833
+  data.tar.gz: 8792223200b3f4a5bfdcd212127c6724b4a087ae
 SHA512:
-  metadata.gz: dec53c4e07f22ae3a78168b8896d582a541bf5448aa681c2dbbd9f378596d867104c10909878b830108d4bea0229333c8472ef50fb2f2113664e84ea6b5e5e4d
-  data.tar.gz: 521111576dbdffd31db91ce84f43522383bc2034dbf41607a51d0879fa2e7c42db9923375fee91f1db588dde132be154b05244d4b1f9d413423ca111e3dcbfbd
+  metadata.gz: a3361137ff447f19ae7f2db13ca66c259b10a1f13387382881c25d5f63e5b84a7516999bf19c27a4b984ee08553f8461e7db66389e8391fe2f867b8523bd3aa5
+  data.tar.gz: becb38b39f34b7e25876e5d1a7d148bb92a205fd59230fbb11ea465680099bf65bc46952391df8dafb8a6cf8f9aba7d073388d20504a92c2224058e0ccc689e7

data/lib/pangrid/data/webform.html

@@ -5,6 +5,7 @@
       <select name="from">
         <option value="across-lite-binary">AcrossLite binary (.puz)</option>
         <option value="across-lite-text">AcrossLite text</option>
+        <option value="reddit-blank">Reddit (grid + clues)</option>
       </select>
       &rarr;
       <select name="to">

data/lib/pangrid/plugins/acrosslite.rb

@@ -11,7 +11,8 @@ require 'ostruct'
 
 module Pangrid
 
-GRID_CHARS = {:black => '.', :null => '.'}
+GRID_CHARS = {:black => '.', :null => '?'}
+FILL_CHARS = {:black => '.', :null => '-'}
 
 # CRC checksum for binary format
 class Checksum
@@ -62,7 +63,7 @@ module AcrossLiteUtils
   def empty_fill(xw)
     # when converting from another format -> binary we won't typically have fill
     # information, since that is an internal property of the acrosslite player
-    grid = xw.to_array(GRID_CHARS) {|c| '-'}
+    grid = xw.to_array(FILL_CHARS) {|c| '-'}
     grid.map(&:join).join
   end
 end
@@ -138,6 +139,7 @@ class AcrossLiteBinary < Plugin
 
     # fill in some fields that might not be present (checksums needs this)
     pack_clues
+    xw.clues = xw.clues.map(&:to_s)
     xw.n_clues = xw.clues.length
     xw.fill ||= empty_fill(xw)
     xw.puzzle_type ||= 1
@@ -145,6 +147,9 @@ class AcrossLiteBinary < Plugin
     xw.version = "1.3"
     xw.notes ||= ""
     xw.extensions ||= []
+    xw.title ||= ""
+    xw.author ||= ""
+    xw.copyright ||= ""
 
     # extensions
     xw.encode_rebus!
@@ -383,6 +388,15 @@ class AcrossLiteText < Plugin
     # scan the grid for rebus squares and replace them with lookup keys
     xw.encode_rebus!
 
+    # fill in dummy clues if none exist
+    across, down = xw.number
+    if xw.across_clues.empty?
+      xw.across_clues = ["(no clue)"]*across.length
+    end
+    if xw.down_clues.empty?
+      xw.down_clues = ["(no clue)"]*down.length
+    end
+
     sections = [
       ['TITLE', [xw.title]],
       ['AUTHOR', [xw.author]],

data/lib/pangrid/plugins/reddit.rb

@@ -52,6 +52,83 @@ class RedditBlank < Plugin
     write_xw(xw)
   end
 
+  def is_grid_row(line)
+    line = line.gsub(/\s/, '')
+    ix = line.index('|')
+    return false unless ix
+    c = line[0...ix]
+    c == "" || c == "*.*" || c =~ /^(\^\d+)?[[:alpha:]]*$/ # allow partially filled grids
+  end
+
+  # make a best-attempt effort to strip off the clue number
+  def strip_clues(nums, clues)
+    nums.zip(clues).each_with_index.map do |(n, cl), i|
+      b = cl.index(n.to_s)
+      if b
+        e = b + n.to_s.length
+        if cl[0...b] =~ /\W*/ and cl[e + 1] =~ /\W/
+          cl[e+1 .. -1].sub(/^\W*\s/, '').strip
+        else
+          cl.strip
+        end
+      end
+    end
+  end
+
+  def read(data)
+    xw = XWord.new
+    lines = data.lines.map(&:chomp)
+
+    # split input into grid and clues
+    #
+    # grid format is from the reddit table markup:
+    # cell|cell|...    # table header; first row for us
+    # --|--|...        # alignment markers; drop this
+    # cell|cell|...    # rest of xword
+    #
+    # we have to be careful about leading/trailing |s
+    ix = lines.find_index {|row| row =~ /^[|\s-]+$/}
+    width = lines[ix].gsub(/\s/, '').split('|').reject(&:empty?).length
+    lines = [lines[(ix - 1)]] + lines[(ix + 1) .. -1]
+    grid = lines.take_while {|i| is_grid_row(i)}
+
+    clues = lines[grid.length .. -1]
+    clues = lines.reject {|i| i.strip.empty?}
+
+    # strip leading |s
+    grid = grid.map {|line| line.sub(/^\|/, '')}
+    grid = grid.map {|line| line.split("|", -1)[0..(width-1)]}
+    grid = grid.map {|line| line.map(&:strip)}
+    xw.width = grid[0].length
+    xw.height = grid.length
+    xw.solution = []
+    check("Grid is not rectangular") { grid.all? {|i| i.length == xw.width} }
+    grid = grid.map do |row|
+      xw.solution << row.map do |c|
+        cell = Cell.new
+        if c == '*.*'
+          cell.solution = :black
+        elsif c =~ /[[:alpha:]]/
+          cell.solution = c.gsub(/[^[:alpha:]]/, '')
+        else
+          cell.solution = :null
+        end
+        cell
+      end
+    end
+
+    # Clues
+    across, down = xw.number
+    aix = clues.find_index {|row| row =~ /^\W*across/i}
+    dix = clues.find_index {|row| row =~ /^\W*down/i}
+    xw.across_clues = clues[(aix + 1) .. (aix + across.length)]
+    xw.down_clues = clues[(dix + 1) .. (dix + down.length)]
+    xw.across_clues = strip_clues(across, xw.across_clues)
+    xw.down_clues = strip_clues(down, xw.down_clues)
+
+    xw
+  end
+
   def grid(xw)
     xw.to_array({:black => '*.*', :null => ' '}) do |c|
       c.number ? "^#{c.number}" : ''

data/lib/pangrid/plugins/text.rb

@@ -11,7 +11,7 @@ module Pangrid
 class Text < Plugin
   def write(xw)
     across, down = xw.number
-    rows = xw.to_array(:black => '#', :null => ' ')
+    rows = xw.to_array(:black => '#', :null => '.')
     grid = rows.map(&:join).join("\n") + "\n"
     ac = "Across:\n\n" + format_clues(across, xw.across_clues, 2)
     dn = "Down:\n\n" + format_clues(down, xw.down_clues, 2)

data/lib/pangrid/version.rb

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

data/lib/pangrid/xw.rb

@@ -147,6 +147,31 @@ class XWord < OpenStruct
       end
     end
   end
+
+  def inspect_grid
+    number
+    solution.map {|row|
+      row.map {|c|
+        s = c.solution
+        o = case s
+        when :black
+          "#"
+        when :null
+          "."
+        when String
+          c.to_char
+        when Rebus
+          c.to_char
+        else
+          raise PuzzleFormatError, "Unrecognised cell #{c}"
+        end
+        if c.number && c.number > 0
+          o = "#{c.number} #{o}"
+        end
+        o = o.rjust(4)
+      }.join("|")
+    }.join("\n")
+  end
 end
 
 end # module Pangrid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pangrid
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Martin DeMello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: martindemello@gmail.com