pangrid 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a5a1bfbede1e22eda584f80088055a2da23e973a
-  data.tar.gz: 287b4baf8fe41be20437f6c16ad9fd4eca3dbf64
+SHA256:
+  metadata.gz: be115d7cba3bf82d65d241afb1fedb1becfa8085d447590960447fc479b57d90
+  data.tar.gz: 5520cd33d623bb0f55f11d0eb3fe4c9e2187dc437e3675bd2b97d40bb60cef08
 SHA512:
-  metadata.gz: 987f63c04f51c1575d2d47a82f9fdcafd2645656e5a6facc5ea77e8e02fff8216ac2d591c52e23909e00a5c149a67bb80937c936b2b7b8d8328a34f3d4751446
-  data.tar.gz: 721b3f3ea706c965ca1a2fbd04d098a55c88aa97478dc2773c7faf03c46bc4461454000577117c7d3d53b8862ebc6ea9f706800be176731e7c33a0c9f4a1402c
+  metadata.gz: 607c19e615b28a3ad2117765ebba9d5003aaec081e04b0dac4793fdc3a32e88d99b9fbe6c40b3739c116b20a0bcb7e263f00c223dca6898b35f65729c358fed9
+  data.tar.gz: 6df6cf0d9a78dbaef9213722a80538e0da262dcdb2026e862da07f0235154d2688f2bfc26397b67bd9a2e8a9975ff2a8a3c453fd6427a098d6dc912c011a1643

data/lib/pangrid/frontend/webrick.rb

@@ -26,11 +26,30 @@ class Servlet < WEBrick::HTTPServlet::AbstractServlet
     rescue Exception => e
       out = e.inspect
     end
-    
-    template = IO.read(TEMPLATE)
-    response.status = 200
-    response.content_type = "text/html"
-    response.body = template % out
+
+    response.header['Access-Control-Allow-Origin'] = '*'
+
+    case request.path
+    when "/"
+      template = IO.read(TEMPLATE)
+      response.status = 200
+      response.content_type = "text/html"
+      response.body = template % out
+    when "/blob"
+      response.status = 200
+      response.content_type = "application/octet-stream"
+      response.body = out
+    when "/json"
+      if request.query["to"] == "json"
+        response.status = 200
+        response.content_type = "text/json"
+        response.body = out
+      else
+        response.status = 200
+        response.content_type = "text/json"
+        response.body = '{ "error" : "non-json format requested" }'
+      end
+    end
   end
 end
 

data/lib/pangrid/plugin.rb

@@ -35,6 +35,8 @@ class Plugin
   FAILED = []
   MISSING_DEPS = {}
 
+  DESCRIPTION = ""
+
   def self.inherited(subclass)
     name = class_to_name(subclass.name)
     #puts "Registered #{subclass} as #{name}"
@@ -62,13 +64,13 @@ class Plugin
 
   def self.list_all
     puts "-------------------------------------------------------"
-    puts "Available plugins:"
+    puts "Available plugins (F = from, T = to):"
     puts "-------------------------------------------------------"
     REGISTRY.keys.sort.each do |name|
       plugin = REGISTRY[name]
       provides = [:read, :write].select {|m| plugin.method_defined? m}
-      provides = provides.map {|m| {read: 'from', write: 'to'}[m]}
-      puts "  " + name + " [" + provides.join(", ") + "]"
+      provides = provides.map {|m| {read: 'F', write: 'T'}[m]}.join
+      puts "  #{name} [#{provides}]".ljust(30) + plugin.const_get(:DESCRIPTION)
     end
     if !MISSING_DEPS.empty?
       puts

data/lib/pangrid/plugins/acrosslite.rb

@@ -75,6 +75,8 @@ class AcrossLiteBinary < Plugin
   # crossword, checksums
   attr_accessor :xw, :cs
 
+  DESCRIPTION = "AcrossLite binary format (.puz)"
+
   HEADER_FORMAT = "v A12 v V2 A4 v2 A12 c2 v3"
   HEADER_CHECKSUM_FORMAT = "c2 v3"
   EXT_HEADER_FORMAT = "A4 v2"
@@ -359,6 +361,8 @@ class AcrossLiteText < Plugin
 
   attr_accessor :xw, :rebus
 
+  DESCRIPTION = "AcrossLite text format"
+
   def initialize
     @xw = XWord.new
   end

data/lib/pangrid/plugins/csv.rb

@@ -26,6 +26,9 @@ require 'csv'
 module Pangrid
 
 class CSV < Plugin
+
+  DESCRIPTION = "CSV reader (see source comments for format)"
+
   def read(data)
     s = ::CSV.parse(data)
     s.reject! {|row| row.compact.empty?}

data/lib/pangrid/plugins/excel.rb

@@ -11,6 +11,9 @@ module Pangrid
 require_for_plugin 'excel', ['axlsx']
 
 class ExcelXSLX < Plugin
+
+  DESCRIPTION = "Excel writer. Useful to upload to google sheets."
+
   # styles
   STYLES = {
     :black => {:bg_color => "00"},

data/lib/pangrid/plugins/exolve.rb

@@ -0,0 +1,64 @@
+# Exolve (https://github.com/viresh-ratnakar/exolve) is a browser-based
+# crossword solver that allows you to embed the crossword and solving software
+# in a single HTML file.
+
+module Pangrid
+
+module ExolveWriter
+  def write(xw)
+    headers = format_headers(xw)
+    across, down = xw.number
+    grid = format_grid(xw)
+    ac = format_clues(across, xw.across_clues)
+    dn = format_clues(down, xw.down_clues)
+    across = ["exolve-across:"] + indent(ac)
+    down = ["exolve-down:"] + indent(dn)
+    grid = ["exolve-grid:"] + indent(grid)
+    body = headers + grid + across + down
+    out = ["exolve-begin"] + indent(body) + ["exolve-end"]
+    out.join("\n")
+  end
+
+  def format_headers(xw)
+    headers = [
+      'id', 'replace-with-unique-id',
+      'title', xw.title,
+      'setter', xw.author,
+      'width', xw.width,
+      'height', xw.height,
+      'copyright', xw.copyright,
+      'prelude', xw.preamble
+    ]
+    headers.each_slice(2).select {|k, v| v}.map {|k, v| "exolve-#{k}: #{v}"}
+  end
+
+  def format_clues(numbers, clues)
+    numbers.zip(clues).map {|n, c| "#{n.to_s.rjust(2)}. #{c}"}
+  end
+
+  def indent(lines)
+    lines.map {|x| "  " + x}
+  end
+end
+
+class ExolveFilled < Plugin
+  include ExolveWriter
+
+  DESCRIPTION = "Exolve writer with solutions"
+
+  def format_grid(xw)
+    xw.to_array(:black => '.', :null => '0').map(&:join)
+  end
+end
+
+class ExolveBlank < Plugin
+  include ExolveWriter
+
+  DESCRIPTION = "Exolve writer without solutions"
+
+  def format_grid(xw)
+    xw.to_array(:black => '.', :null => '0') {|c| 0}.map(&:join)
+  end
+end
+
+end # module Pangrid

data/lib/pangrid/plugins/json.rb

@@ -0,0 +1,78 @@
+# Json
+#
+# cell = { x : int, y : int, contents : string }
+#
+# xword = { rows : int, 
+#           cols : int, 
+#           cells : [cell],
+#           across : [string]
+#           down : [string]
+#         }
+
+require 'json'
+
+module Pangrid
+
+class Json < Plugin
+
+  DESCRIPTION = "Simple JSON format"
+
+  def write(xw)
+    cells = []
+    (0 ... xw.height).each do |y|
+      (0 ... xw.width).each do |x|
+        cell = xw.solution[y][x]
+        s = case cell.solution
+            when :black; '#'
+            when :null; ''
+            when Rebus; cell.solution.inspect
+            else; cell.solution
+            end
+
+        cells.push({ x: x, y: y, contents: s })
+      end
+    end
+
+    h = {
+      rows: xw.height,
+      cols: xw.width,
+      cells: cells,
+      across: xw.across_clues,
+      down: xw.down_clues
+    }
+
+    ::JSON.generate(h)
+  end
+
+  def read(data)
+    json = ::JSON.parse(data)
+    xw = XWord.new
+
+    xw.height = json['rows']
+    xw.width = json['cols']
+    xw.solution = Array.new(xw.height) { Array.new(xw.width) }
+    json['cells'].each do |c|
+      cell = Cell.new
+      s = c['contents']
+      cell.solution =
+        case s
+        when ""; :null
+        when "#"; :black
+        else
+          if s.length == 1
+            s
+          else
+            Rebus.new s
+          end
+        end
+      x, y = c['x'], c['y']
+      xw.solution[y][x] = cell
+    end
+    xw.across_clues = json['across']
+    xw.down_clues = json['down']
+    xw
+  end
+
+end
+
+end

data/lib/pangrid/plugins/qxw.rb

@@ -5,6 +5,9 @@ module Pangrid
 QXW_GRID_ERROR = "Could not read grid from .qxw file"
 
 class Qxw < Plugin
+
+  DESCRIPTION = "QXW grid reader (rectangular grids only)"
+
   def read(data)
     xw = XWord.new
     lines = data.lines.map(&:chomp)

data/lib/pangrid/plugins/reddit.rb

@@ -34,6 +34,8 @@ end
 class RedditFilled < Plugin
   include RedditWriter
 
+  DESCRIPTION = "Reddit format (with filled squares)"
+
   def write(xw)
     write_xw(xw)
   end
@@ -48,6 +50,8 @@ end
 class RedditBlank < Plugin
   include RedditWriter
 
+  DESCRIPTION = "Reddit format (with blank squares)"
+
   def write(xw)
     write_xw(xw)
   end

data/lib/pangrid/plugins/text.rb

@@ -9,6 +9,9 @@
 module Pangrid
 
 class Text < Plugin
+
+  DESCRIPTION = "Basic text format (mostly for debugging)"
+
   def write(xw)
     across, down = xw.number
     rows = xw.to_array(:black => '#', :null => '.')

data/lib/pangrid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pangrid
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Martin DeMello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2019-07-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: martindemello@gmail.com
@@ -29,6 +29,8 @@ files:
 - lib/pangrid/plugins/acrosslite.rb
 - lib/pangrid/plugins/csv.rb
 - lib/pangrid/plugins/excel.rb
+- lib/pangrid/plugins/exolve.rb
+- lib/pangrid/plugins/json.rb
 - lib/pangrid/plugins/qxw.rb
 - lib/pangrid/plugins/reddit.rb
 - lib/pangrid/plugins/text.rb
@@ -56,8 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A crossword file format converter