acrosslite 0.2.1 → 0.3.0

data/lib/acrosslite.rb

@@ -6,7 +6,7 @@ class Acrosslite
   attr_accessor :copyright, :title, :author
   attr_reader :across, :down, :solution, :diagram, :filepath
 
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 
   ACROSSLITE = 2
   ROWS       = 44
@@ -53,7 +53,7 @@ class Acrosslite
 
   def rows
     unless @rows 
-      @content_io.seek(ROWS)
+      @content_io.seek(ROWS, 0)
       @rows = @content_io.read(1).unpack('C').first
     end
     @rows
@@ -61,7 +61,7 @@ class Acrosslite
 
   def columns
     unless @columns 
-      @content_io.seek(COLUMNS)
+      @content_io.seek(COLUMNS, 0)
       @columns = @content_io.read(1).unpack('C').first
     end
     @columns
@@ -69,12 +69,12 @@ class Acrosslite
 
   def solution
     width = columns
+    height = rows
 
-#     if @solution.empty?
-    unless @solution.size == rows
-      @content_io.seek(SOLUTION)
+    if @solution.empty?
+      @content_io.seek(SOLUTION, 0)
 
-      rows.times do |r|
+      height.times do |r|
         @solution << @content_io.read(width).unpack("C#{width}").map {|c| c.chr}
       end
     end
@@ -83,11 +83,12 @@ class Acrosslite
 
   def diagram
     width = columns
+    height = rows
 
     if @diagram.empty?
-      @content_io.seek(SOLUTION + rows * width)
+      @content_io.seek(SOLUTION + height * width, 0)
 
-      rows.times do |r|
+      height.times do |r|
         @diagram << @content_io.read(width).unpack("C#{width}").map {|c| c.chr}
       end
     end
@@ -177,7 +178,7 @@ following attributes: rows, columns, solution, diagram, title, author, copyright
   def parse
     clues = Array.new
 
-    @content_io.seek(SOLUTION + area + area)
+    @content_io.seek(SOLUTION + area + area, 0)
 
     @title = next_field
     @author = next_field
@@ -191,11 +192,11 @@ following attributes: rows, columns, solution, diagram, title, author, copyright
     #----- determine answers -----#
     across_clue = down_clue = 1 # clue_number: incremented only in "down" area
 
-    0.upto(rows - 1) do |r|
-      0.upto(columns - 1) do |c|
-        next if solution[r][c] =~ /[.:]/
+    rows.times do |r|
+      columns.times do |c|
+        next if diagram[r][c] =~ /[.:]/
 
-        if c - 1 < 0 || solution[r][c - 1] == "."
+        if (c - 1 < 0 || diagram[r][c - 1] == ".") && (c + 1 < columns && diagram[r][c + 1] != ".")
           entry = Acrosslite::Entry.new
           answer = ''
 
@@ -223,7 +224,7 @@ following attributes: rows, columns, solution, diagram, title, author, copyright
           end
         end
 
-        if r - 1 < 0 || solution[r - 1][c] == "."
+        if (r - 1 < 0 || diagram[r - 1][c] == ".") && (r + 1 < rows && diagram[r + 1][c] != ".")
           entry = Acrosslite::Entry.new
           answer = ''
 

data/spec/acrosslite_spec.rb

@@ -8,7 +8,7 @@ describe Acrosslite do
     @example_files[:halloween] = File.join(basedir, "files/halloween2009.puz")
     @example_files[:crnet]     = File.join(basedir, "files/crnet100306.puz")
     @example_files[:tmcal]     = File.join(basedir, "files/tmcal100306.puz")
-    @example_files[:xp]        = File.join(basedir, "files/xp100306.puz")
+    @example_files[:xp]        = File.join(basedir, "files/xp110316.puz")
     @example_files[:ydx]       = File.join(basedir, "files/ydx100515.puz")
   end
 
@@ -21,7 +21,6 @@ describe Acrosslite do
   #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
   # Builder Tests
   #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=#
-
   it "should instantiate the puzzle with passing of file" do
     ac = Acrosslite.new(:filepath => @example_files[:halloween])
     ac.should be_an_instance_of Acrosslite

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Samuel Mullen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 -05:00
+date: 2010-06-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,9 +46,11 @@ files:
 - spec/acrosslite_spec.rb
 - spec/files/tmcal100306.puz
 - spec/files/crnet100306.puz
+- spec/files/xp110316.puz
 - spec/files/halloween2009.puz
+- spec/files/jnz100601.puz
 - spec/files/ydx100515.puz
-- spec/files/xp100306.puz
+- spec/files/can100607.puz
 has_rdoc: true
 homepage: http://github.com/samullen/acrosslite
 licenses: []
@@ -83,6 +85,8 @@ test_files:
 - spec/acrosslite_spec.rb
 - spec/files/tmcal100306.puz
 - spec/files/crnet100306.puz
+- spec/files/xp110316.puz
 - spec/files/halloween2009.puz
+- spec/files/jnz100601.puz
 - spec/files/ydx100515.puz
-- spec/files/xp100306.puz
+- spec/files/can100607.puz