maze-solver 1.0.2 → 1.0.3

data/.travis.yml

@@ -1,12 +1,9 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 1.9.3
   - 1.9.2
+  - 1.9.3
+  - 2.0.0
   - jruby-19mode
-  - rbx-19mode
-  - ruby-head
   - jruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
+  - rbx
+  - ruby-head

data/Gemfile

@@ -10,3 +10,10 @@ gem 'coveralls', require: false
 gem 'json', '~> 1.7.7'
 gem 'rake'
 gem 'rspec'
+
+platforms :rbx do
+  gem 'racc'
+  gem 'iconv'
+  gem 'rubinius-coverage'
+  gem 'rubysl', '~> 2.0'
+end

data/lib/maze_solver.rb

@@ -3,47 +3,45 @@
 require 'maze_solver/version'
 
 module MazeSolver
-
   # Maze solver: solves a maze
   class MazeSolver
-
     def initialize(args = {})
-      if args[:from_grid]
-        @grid = args[:from_grid].split("\n")
-      elsif args[:from_file]
-        @grid = from_file(args[:from_file])
-      end
+      @grid = if args[:from_grid]
+                args[:from_grid].split("\n")
+              elsif args[:from_file]
+                from_file(args[:from_file])
+              end
       pad_short_rows
     end
 
     def pad_short_rows
-      w = self.width
-      @grid.each { |row| row << ' ' * (w - row.length) if w > row.length }
+      w = width
+      grid.each { |row| row << ' ' * (w - row.length) if w > row.length }
     end
 
     def height
-      @grid.size
+      grid.size
     end
 
     def width
-      @grid.map { |row| row.length }.max
+      grid.map { |row| row.length }.max
     end
 
     def visitable?(x, y)
       row, column = y, x
       return false unless (0...height).include? row
       return false unless (0...width).include? column
-      @grid[row][column].chr == ' '
+      grid[row][column].chr == ' '
     end
 
     def visit(x, y)
       row, column = y, x
-      @grid[row][column] = '.'
+      grid[row][column] = '.'
     end
 
     def unvisit(x, y)
       row, column = y, x
-      @grid[row][column] = ' '
+      grid[row][column] = ' '
     end
 
     def solve(start_x, start_y, end_x, end_y)
@@ -68,13 +66,16 @@ module MazeSolver
     end
 
     def to_s
-      @grid.join("\n") << "\n"
+      grid.join("\n") << "\n"
     end
 
     def from_file(filename)
-      @grid = File.open(filename, 'r').readlines
-      @grid.each { | row | row.strip! }
+      grid = File.open(filename, 'r').readlines
+      grid.each { | row | row.strip! }
     end
 
+    private
+
+    attr_accessor :grid
   end
 end

data/lib/maze_solver/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module MazeSolver
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/spec/maze_solver_spec.rb

@@ -2,71 +2,70 @@
 
 require 'spec_helper'
 
-describe MazeSolver do
+describe MazeSolver::MazeSolver do
   context 'a simple 8 x 3 maze' do
-    before do
-    @maze = MazeSolver::MazeSolver.new(from_grid: <<-GRID
+    let(:grid) do <<-GRID
 ********
 
 ********
 GRID
-      )
     end
 
-    specify { @maze.width.should eq 8 }
-    specify { @maze.height.should eq 3 }
+    subject(:maze) { described_class.new(from_grid: grid) }
 
-    it 'should be possible to visit an empty space' do
-      @maze.should be_visitable(0, 1)
+    its(:width) { should eq 8 }
+    its(:height) { should eq 3 }
+
+    it 'is possible to visit an empty space' do
+      expect(maze).to be_visitable(0, 1)
     end
 
-    it 'should not be possible to visit a wall' do
-      @maze.should_not be_visitable(0, 0)
+    it 'is not possible to visit a wall' do
+      expect(maze).to_not be_visitable(0, 0)
     end
 
-    it 'should not be possible to visit outside the maze' do
-      @maze.should_not be_visitable(8, 3)
+    it 'is not possible to visit outside the maze' do
+      expect(maze).to_not be_visitable(8, 3)
     end
 
-    it 'should not be possible to visit a visited space' do
-      @maze.visit(0, 1)
-      @maze.should_not be_visitable(0, 1)
+    it 'is not possible to visit a visited space' do
+      maze.visit(0, 1)
+      expect(maze).to_not be_visitable(0, 1)
     end
 
-    it 'should be possible to visit an unvisited space' do
-      @maze.visit(0, 1)
-      @maze.unvisit(0, 1)
-      @maze.should be_visitable(0, 1)
+    it 'is possible to visit an unvisited space' do
+      maze.visit(0, 1)
+      maze.unvisit(0, 1)
+      expect(maze).to be_visitable(0, 1)
     end
 
-    it 'should be soluble' do
-      @maze.solve(0, 1, 7, 1).should be_true
+    it 'is soluble' do
+      expect(maze.solve(0, 1, 7, 1)).to be_true
     end
 
-    it 'should be soluble backwards' do
-      @maze.solve(7, 1, 0, 1).should be_true
+    it 'is soluble backwards' do
+      expect(maze.solve(7, 1, 0, 1)).to be_true
     end
 
-    it 'should be printable' do
-      @maze.to_s.should eq "********\n" +
+    it 'is printable' do
+      expect(maze.to_s).to eq "********\n" +
         "        \n" +
         "********\n"
     end
 
-    it 'should be printable when solved' do
-      @maze.solve(0, 1, 7, 1)
-      @maze.to_s.should eq <<-GRID
+    it 'is printable when solved' do
+      maze.solve(0, 1, 7, 1)
+      expect(maze.to_s).to eq <<-GRID
 ********
 ........
 ********
       GRID
     end
-
   end
 
   context 'a bigger maze' do
-    it 'should be soluble' do
-      maze = MazeSolver::MazeSolver.new(from_grid: <<-GRID
+    let(:grid) do
+      <<-GRID
 ********
   **   *
 * ** * *
@@ -75,15 +74,19 @@ GRID
 * **** *
 *      *
 ********
-GRID
-      )
-      maze.solve(0, 1, 3, 3).should be_true
+      GRID
+    end
+
+    subject(:maze) { described_class.new(from_grid: grid) }
+
+    it 'is soluble' do
+      expect(maze.solve(0, 1, 3, 3)).to be_true
     end
   end
 
   context 'an impossible maze' do
-    it 'should be insoluble' do
-      maze = MazeSolver::MazeSolver.new(from_grid: <<-GRID
+    let(:grid) do
+      <<-GRID
 ********
   **   *
 * **** *
@@ -93,14 +96,18 @@ GRID
 *      *
 ********
 GRID
-      )
-      maze.solve(0, 1, 3, 3).should be_false
+    end
+
+    subject(:maze) { described_class.new(from_grid: grid) }
+
+    it 'is insoluble' do
+      expect(maze.solve(0, 1, 3, 3)).to be_false
     end
   end
 
   context 'from file' do
-    before do
-      test_maze = StringIO.new(<<-DOC
+    let(:test_maze) do
+      StringIO.new(<<-DOC
 ****************** *
 *     *       **** *
 * ***** *****   ** *
@@ -108,14 +115,15 @@ GRID
 * *          ** ** *
 * ********** **    *
 ************ *******
-DOC
-      )
-      File.stub(:open).with('test.maze', 'r').and_return(test_maze)
+                   DOC
+                  )
     end
 
-    it 'should be creatable' do
+    before { File.stub(:open).with('test.maze', 'r').and_return(test_maze) }
+
+    it 'is creatable' do
       maze = MazeSolver::MazeSolver.new(from_file: 'test.maze')
-      maze.solve(18, 0, 12, 6).should be_true
+      expect(maze.solve(18, 0, 12, 6)).to be_true
     end
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: maze-solver
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Pete Johns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies: []
 description: A gem to solve a 2D maze.
 email:
@@ -35,27 +36,29 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/johnsyweb/ruby_maze_solver#readme
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Written as an exercise
 test_files:
 - spec/maze_solver_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 338a84ceee7c42e5f6dca79527f869eae3903f3c
-  data.tar.gz: ccfd4aef6af02f769b59fc14974a8c314776a612
-SHA512:
-  metadata.gz: a989cc66fee38cae3df91bb38a7cf0f9eca56cc0bc545f56da9e8a910d8e31024db68df8972d8261d8a7f15b775193bde39a1ef82f80cd9825c5e77cc2a2905b
-  data.tar.gz: 09ebc17ba7541645bcebff9282459b8fed2deb947a46d5d333a3505802e79bc414c2cccfbfa7c4d655d0510f21bd71c2d40889456e91d61b2dc37375882f24b4