RubyGems - tortoise - Versions diffs - 0.9.0 → 0.9.1 - Mend

tortoise 0.9.0 → 0.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

data/bin/tortoise +1 -1
data/lib/tortoise/interpreter.rb +4 -82
data/lib/tortoise/presenter.rb +89 -0
data/lib/tortoise/version.rb +1 -1
data/lib/tortoise.rb +1 -0
data/spec/data/{simple_out.txt → simple_out.ascii} +0 -0
data/spec/integration/tortoise_integration_spec.rb +1 -1
data/spec/tortoise/interpreter_spec.rb +22 -26
data/spec/tortoise/presenter_spec.rb +48 -0
metadata +10 -7

data/bin/tortoise CHANGED Viewed

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 $:.push File.expand_path("../../lib", __FILE__)
-require 'tortoise/interpreter'
+require 'tortoise'
 def print_usage
   puts "Usage: tortoise [OPTIONS] [FILE]\n\n"

data/lib/tortoise/interpreter.rb CHANGED Viewed

@@ -35,28 +35,11 @@ module Tortoise
       commands.each { |command| execute(command) }
     end
-    def to_ascii
-      s = ''
-      oriented_canvas.each do |column|
-        column.each do |pixel|
-          char = pixel ? 'X' : '.'
-          s += "#{char} "
-        end
-        s = s.strip + "\n"
+    # define presenter formats
+    %w(ascii html).each do |format|
+      define_method("to_#{format}") do
+        Tortoise::Presenter.new(self).send("to_#{format}")
       end
-      s
-    end
-    def to_html
-      <<-HTML
-        <!DOCTYPE html>
-        <html>
-        #{html_head}
-        <body>
-          #{html_canvas}
-        </body>
-        </html>
-      HTML
     end
     private
@@ -121,66 +104,5 @@ module Tortoise
       y = @size - 1 if y >= @size
       [x, y]
     end
-    def oriented_canvas
-      oriented = new_canvas
-      @canvas.each_with_index do |column, i|
-        column.each_with_index do |pixel, j|
-          oriented[@size-1-j][i] = pixel
-        end
-      end
-      oriented
-    end
-    def html_head
-      pixel_size = 8
-      <<-HTML
-        <head>
-        <title>Tortoise</title>
-        <style type="text/css">
-          * { margin: 0; padding: 0; }
-          body { background: #555; }
-          #canvas {
-            overflow: hidden;
-            border: #{pixel_size}px solid #000;
-            width: #{@size * pixel_size}px;
-            margin: 50px auto 10px auto;
-          }
-          .column {
-            float: left;
-          }
-          .pixel {
-            width: #{pixel_size}px;
-            height: #{pixel_size}px;
-          }
-          .empty {
-            background: #ddd;
-          }
-          .filled {
-            background: #111;
-          }
-        </style>
-        </head>
-      HTML
-    end
-    def html_canvas
-      html = "<div id='canvas'>"
-      @canvas.each do |column|
-        html += "<div class='column'>"
-        column.reverse.each do |pixel|
-          pixel_class = pixel ? 'filled' : 'empty'
-          html += "<div class='pixel #{pixel_class}'></div>"
-        end
-        html += "</div>"
-      end
-      html += "</div>"
-    end
   end
 end

data/lib/tortoise/presenter.rb ADDED Viewed

@@ -0,0 +1,89 @@
+module Tortoise
+  class Presenter
+    attr_reader :canvas
+    PIXEL_SIZE = 5
+    def initialize(interpreter)
+      @canvas = interpreter.canvas
+    end
+    def to_ascii
+      oriented_canvas.inject('') do |ascii, column|
+        column.each do |pixel|
+          char = pixel ? 'X' : '.'
+          ascii += "#{char} "
+        end
+        ascii = ascii.strip + "\n"
+      end
+    end
+    def to_html
+      <<-HTML
+        <!DOCTYPE html>
+        <html>
+        #{html_head}
+        <body>
+          #{html_canvas}
+        </body>
+        </html>
+      HTML
+    end
+    private
+    def new_canvas
+      Array.new(@canvas.size) { Array.new(@canvas.size) {false} }
+    end
+    def oriented_canvas
+      oriented = new_canvas
+      @canvas.each_with_index do |column, i|
+        column.each_with_index do |pixel, j|
+          oriented[@canvas.size-1-j][i] = pixel
+        end
+      end
+      oriented
+    end
+    def html_head
+      <<-HTML
+        <head>
+        <title>Tortoise</title>
+        <style type="text/css">
+          * { margin: 0; padding: 0; }
+          body { background: #555; }
+          .column { float: left; }
+          .empty { background: #ddd; }
+          .filled { background: #111; }
+          #canvas {
+            overflow: hidden;
+            border: #{PIXEL_SIZE}px solid #111;
+            width: #{@canvas.size * PIXEL_SIZE}px;
+            margin: 50px auto 10px auto; }
+          .pixel {
+            width: #{PIXEL_SIZE}px;
+            height: #{PIXEL_SIZE}px; }
+        </style>
+        </head>
+      HTML
+    end
+    def html_canvas
+      @canvas.inject("<div id='canvas'>") do |html, column|
+        html += "<div class='column'>"
+        column.reverse.each do |pixel|
+          pixel_class = pixel ? 'filled' : 'empty'
+          html += "<div class='pixel #{pixel_class}'></div>"
+        end
+        html += "</div>"
+      end + "</div>"
+    end
+  end
+end

data/lib/tortoise/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Tortoise
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/tortoise.rb CHANGED Viewed

@@ -1,2 +1,3 @@
 require 'tortoise/interpreter'
+require 'tortoise/presenter'
 require 'tortoise/version'

data/spec/data/{simple_out.txt → simple_out.ascii} RENAMED Viewed

File without changes

data/spec/integration/tortoise_integration_spec.rb CHANGED Viewed

@@ -3,7 +3,7 @@ require 'tortoise'
 describe Tortoise::Interpreter do
   it 'produces the expected ascii output' do
     input  = File.new('./spec/data/simple.logo').read
-    output = File.new('./spec/data/simple_out.txt').read
+    output = File.new('./spec/data/simple_out.ascii').read
     Tortoise::Interpreter.new(input).to_ascii.should == output
   end

data/spec/tortoise/interpreter_spec.rb CHANGED Viewed

@@ -11,11 +11,9 @@ describe Tortoise::Interpreter do
   it 'can be initialized with instructions' do
     instructions = <<-STEPS
       5
       REPEAT 2 [ RT 45 ]
       FD 1
     STEPS
     tortoise = Tortoise::Interpreter.new(instructions)
     tortoise.size.should == 5
     tortoise.direction.should == 90
@@ -51,7 +49,6 @@ describe Tortoise::Interpreter do
         RT 180
         FD 2
       STEPS
       tortoise.canvas.should == [
         [false, false, false, false, false],
         [false, false, false, false, false],
@@ -80,29 +77,6 @@ describe Tortoise::Interpreter do
     end
   end
-  describe '#to_ascii' do
-    it 'renders canvas to ascii' do
-      tortoise = Tortoise::Interpreter.new(5)
-      tortoise.draw <<-STEPS
-        RT 90
-        FD 1
-        REPEAT 2 [ RT 45 ]
-        FD 2
-        REPEAT 2 [ LT 45 ]
-        FD 1
-        RT 180
-        FD 2
-      STEPS
-      tortoise.to_ascii.should == "" +
-       ". . . . .\n" +
-       ". . . . .\n" +
-       ". . X X .\n" +
-       ". . . X .\n" +
-       ". . X X X\n"
-    end
-  end
   describe '#rt' do
     it 'can rotate the tortoise 45 degrees to the right' do
       tortoise.rt(45)
@@ -464,4 +438,26 @@ describe Tortoise::Interpreter do
       tortoise.direction.should == 90
     end
   end
+  describe 'canvas rendering' do
+    before do
+      @presenter = stub('presenter')
+      Tortoise::Presenter.stub(:new => @presenter)
+      @interpreter = Tortoise::Interpreter.new(5)
+    end
+    describe '#to_ascii' do
+      it 'delegates rendering to presenter' do
+        @presenter.should_receive(:to_ascii)
+        @interpreter.to_ascii
+      end
+    end
+    describe '#to_html' do
+      it 'delegates rendering to presenter' do
+        @presenter.should_receive(:to_html)
+        @interpreter.to_html
+      end
+    end
+  end
 end

data/spec/tortoise/presenter_spec.rb ADDED Viewed

@@ -0,0 +1,48 @@
+require 'tortoise/presenter.rb'
+describe Tortoise::Presenter do
+  it 'saves the interpreter canvas' do
+    interpreter = stub(:size => stub, :canvas => stub)
+    presenter = Tortoise::Presenter.new(interpreter)
+    presenter.canvas.should == interpreter.canvas
+  end
+  describe 'rendering engines' do
+    before do
+      interpreter = Tortoise::Interpreter.new <<-STEPS
+        5
+        RT 90
+        FD 1
+        REPEAT 2 [ RT 45 ]
+        FD 2
+        REPEAT 2 [ LT 45 ]
+        FD 1
+        RT 180
+        FD 2
+      STEPS
+      @presenter = Tortoise::Presenter.new(interpreter)
+    end
+    describe '#to_ascii' do
+      it 'renders ascii representation of canvas' do
+        @presenter.to_ascii.should == "" +
+          ". . . . .\n" +
+          ". . . . .\n" +
+          ". . X X .\n" +
+          ". . . X .\n" +
+          ". . X X X\n"
+      end
+    end
+    describe '#to_html' do
+      it 'renders html representation of canvas' do
+        html = @presenter.to_html
+        html.scan('html').size.should == 3
+        html.scan('body').size.should == 3
+        html.scan('canvas').size.should == 2
+        html.scan('column').size.should == 6
+        html.scan('pixel').size.should == 26
+      end
+    end
+  end
+end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tortoise
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease:
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70219246665200 !ruby/object:Gem::Requirement
+  requirement: &70296698732460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219246665200
+  version_requirements: *70296698732460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70219246663560 !ruby/object:Gem::Requirement
+  requirement: &70296698726480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219246663560
+  version_requirements: *70296698726480
 description: Tortoise is a Logo interpreter for ruby.
 email:
 - huntca@gmail.com
@@ -49,12 +49,14 @@ files:
 - bin/tortoise
 - lib/tortoise.rb
 - lib/tortoise/interpreter.rb
+- lib/tortoise/presenter.rb
 - lib/tortoise/version.rb
 - spec/data/complex.logo
 - spec/data/simple.logo
-- spec/data/simple_out.txt
+- spec/data/simple_out.ascii
 - spec/integration/tortoise_integration_spec.rb
 - spec/tortoise/interpreter_spec.rb
+- spec/tortoise/presenter_spec.rb
 - tortoise.gemspec
 homepage: https://github.com/huntca/tortoise
 licenses: []
@@ -83,6 +85,7 @@ summary: Tortoise is a Logo interpreter for ruby.
 test_files:
 - spec/data/complex.logo
 - spec/data/simple.logo
-- spec/data/simple_out.txt
+- spec/data/simple_out.ascii
 - spec/integration/tortoise_integration_spec.rb
 - spec/tortoise/interpreter_spec.rb
+- spec/tortoise/presenter_spec.rb