woyo-server 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45960ffc6a517d0d39ff864fc0e5c766c5dd3084
-  data.tar.gz: 3d5dc8d3fdfc234bf81aeee41f1abbb0c3858fa8
+  metadata.gz: 87c8e693d26deb5a3998f39f7c2e6d3e69df026a
+  data.tar.gz: 4198785cc371867a214a09b4e87d8ae72c2dbfe0
 SHA512:
-  metadata.gz: 70cafd0f24374923d895fdbf67f4100bb442db557a5b692fa877d84976fb89e928b3bd65e780ef4014e5656b6f93b51f97f3f1622baee38d712b0c89a2d21032
-  data.tar.gz: 71f69f2a72eb421cac6b813e47857bbb377f86c6e4df23aa4776bce2d52822ff6f7c51539594f64705e654d3bf598a5314d2375ada0357752542cadfa884e918
+  metadata.gz: 9a7e1b47a7bed1ff4a43b06d2eef01c55f240e4f433d50f9eacfbca4b5c88427357e3e4d48f94b3dda0ffa900c12126dddcaa8377dfa862f17abbeff43ceebe6
+  data.tar.gz: 05d70ebabd602d740197446c06534c3b728be0e629757a342ec1f65013348fb0b877cedf8cc1a369ad5e69878129f73674bf5d43cb2322e259dd0eab121547a7

data/.gitignore

@@ -21,3 +21,5 @@ tmp
 *.o
 *.a
 mkmf.log
+capybara-*.html
+

data/lib/woyo/runner.rb

@@ -58,8 +58,8 @@ class Runner
     [ 'public', 'views', 'world' ].each do |subdir|
       FileUtils.cp_r File.join( __dir__, '../../', subdir ), dir, preserve: true
     end
-    FileUtils.ln_s 'foundation-5.2.2', File.join(dir,'public/server/foundation')
-    FileUtils.ln_s 'jquery-2.1.1', File.join(dir,'public/server/jquery')
+    # FileUtils.ln_s 'foundation-5.2.2', File.join(dir,'public/server/foundation')
+    # FileUtils.ln_s 'jquery-2.1.1', File.join(dir,'public/server/jquery')
     return 0
   end
 
@@ -77,8 +77,8 @@ class Runner
     [ 'public', 'views', 'world' ].each do |subdir|
       FileUtils.cp_r File.join( __dir__, '../../', subdir ), '.', preserve: true
     end
-    FileUtils.ln_s 'foundation-5.2.2', 'public/server/foundation' unless File.exists? 'public/server/foundation'
-    FileUtils.ln_s 'jquery-2.1.1', 'public/server/jquery' unless File.exists? 'public/server/jquery'
+    # FileUtils.ln_s 'foundation-5.2.2', 'public/server/foundation' unless File.exists? 'public/server/foundation'
+    # FileUtils.ln_s 'jquery-2.1.1', 'public/server/jquery' unless File.exists? 'public/server/jquery'
     return 0
   end
 
@@ -91,7 +91,15 @@ class Runner
       print_error 'This is not a Woyo::Server directory'
       return -4
     end
+    # if @args.include?('-d') || @args.include?('--dev')
+    #   FileUtils.ln_s 'foundation-5.2.2', 'public/server/foundation'
+    #   FileUtils.ln_s 'jquery-2.1.1', 'public/server/jquery'
+    # end
     Woyo::Server.run!
+    # if @args.include?('-d') || @args.include?('--dev')
+    #   FileUtils.rm 'public/server/foundation'
+    #   FileUtils.rm 'public/server/jquery'
+    # end
     return 0
   end
 

data/lib/woyo/server/server.rb

@@ -1,19 +1,26 @@
 require 'sinatra/base'
+require 'sinatra/partial'
 require 'haml'
+require 'json'
 require 'woyo/world'
 
 module Woyo
 
 class Server < Sinatra::Application
 
-  def self.load_world
+  def self.load_world glob = 'world/*.rb' 
     world = Woyo::World.new
-    Dir['world/*.rb'].each do |filename|
-      world.instance_eval File.read filename
+    Dir[glob].each do |filename|
+      eval_world File.read( filename ), filename, world
     end
     world
   end
 
+  def self.eval_world text, filename, world = nil
+    world ||= Woyo::World.new
+    world.instance_eval text, filename
+  end
+
   configure do
     enable :sessions
     set root: '.'
@@ -27,18 +34,24 @@ class Server < Sinatra::Application
   end
 
   get '/' do
-    redirect to 'default.html' if world.locations.empty? || ( !@location && !world.start )
-    @location ||= world.locations[world.start]
-    session[:location] = @location
-    haml :location
+    redirect to 'default.html' if world.name.nil? && world.description.nil? && world.start.nil?
+    @world = world
+    session[:location_id] = world.start
+    haml :world
   end
 
-  get '/go/*' do |way|
-    @location = session[:location].ways[way.to_sym].to
-    session[:location] = @location
+  get '/location' do
+    @location = world.locations[session[:location_id]]
     haml :location
   end
 
+  get '/go/*' do |way_id|
+    way = world.locations[session[:location_id]].ways[way_id.to_sym]
+    session[:location_id] = way.to.id if way.open?
+    content_type :json
+    way.go.to_json
+  end
+
   get '/do/*/*?/*?' do |item,action,tool|
     # do default or optional action on required item with optional tool
   end

data/lib/woyo/server/version.rb

@@ -1,3 +1,3 @@
 module Woyo
-  SERVER_VERSION = "0.0.5"
+  SERVER_VERSION = "0.0.6"
 end

data/public/server/css/server.css

@@ -0,0 +1,10 @@
+
+body {
+  display:none;
+}
+
+p.going {
+  display:none;
+  padding-left:1em;
+}
+

data/public/server/default.html

@@ -4,8 +4,8 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>WOYO - World Of Your Own</title>
-    <link rel="stylesheet" href="foundation/css/foundation.css" />
-    <script src="foundation/js/vendor/modernizr.js"></script>
+    <link rel="stylesheet" href="foundation-5.2.2/css/foundation.css" />
+    <script src="foundation-5.2.2/js/vendor/modernizr.js"></script>
   </head>
   <body>
 
@@ -32,8 +32,8 @@
       </div>
     </div>
 
-    <script src="foundation/js/vendor/jquery.js"></script>
-    <script src="foundation/js/foundation.min.js"></script>
+    <script src="foundation-5.2.2/js/vendor/jquery.js"></script>
+    <script src="foundation-5.2.2/js/foundation.min.js"></script>
     <script>
       $(document).foundation();
     </script>

data/public/server/js/server.js

@@ -0,0 +1,23 @@
+
+$(document).foundation();
+
+$(document).ready( function() {
+  $("body").fadeIn('slow');
+  $(".way .go").click( function() {
+    $go_link = $(this);
+    go_url = $go_link.attr("href");
+    $.get( go_url, function(json) {
+      if ( json.go == true ) {
+        $go_link.siblings(".going").text(json.going).fadeIn('slow', function() {
+          $("body").fadeOut('slow', function() {
+            window.location.reload(true);
+          });
+        });
+      } else {
+        $go_link.siblings(".going").text(json.going).fadeIn('slow');
+      };
+    });
+    return false;
+  });
+});
+ 

data/spec/spec_helper.rb

@@ -1,9 +1,10 @@
 require 'rack/test'
+ENV['RACK_ENV'] = 'test'
+
 require 'capybara/rspec'
 Capybara.app = Woyo::Server
 Capybara.ignore_hidden_elements = false
-
-ENV['RACK_ENV'] = 'test'
+#Capybara.default_driver = :selenium #:rack_test
 
 module RSpecMixin
   include Rack::Test::Methods

data/spec/woyo/server/1_server_spec.rb

@@ -1,10 +1,18 @@
 require_relative '../../../lib/woyo/server'
 require 'spec_helper.rb'
+require 'fileutils'
 
-describe Woyo::Server, :type => :feature do
+describe Woyo::Server, :type => :feature  do
 
   before :all do
+    # directories
+    @original_path = Dir.pwd
+    File.basename(@original_path).should eq 'woyo-server'
+    @test_dir = 'tmp/test'
+    # worlds
     @small_world = Woyo::World.new do
+      name "Small World"
+      description "It's a small world after all"
       location :small
     end
     @home_world = Woyo::World.new do
@@ -55,98 +63,261 @@ describe Woyo::Server, :type => :feature do
   end
 
   # these must be the first tests so that Woyo::Server.setting.world is not set
-  # that is why this file is name 1_server_spec.rb
+  # that is why this file is named 1_server_spec.rb
 
-  it 'welcome page is displayed if there is no world' do
-    visit '/'
-    status_code.should eq 200
-    page.should have_content 'Woyo'
-  end
+  context 'with no world' do
 
-  it 'welcome page links to github docs' do
-    visit '/'
-    status_code.should eq 200
-    page.should have_link '', href: 'https://github.com/iqeo/woyo-world/wiki'
-    page.should have_link '', href: 'https://github.com/iqeo/woyo-server/wiki'
-  end
+    it 'welcome page is displayed if there is no world' do
+      visit '/'
+      status_code.should eq 200
+      page.should have_content 'Woyo'
+    end
 
-  it 'uses foundation framework' do
-    visit '/'
-    status_code.should eq 200
-    page.should have_css 'head link[href="foundation/css/foundation.css"]'
-    page.should have_css 'head script[src="foundation/js/vendor/modernizr.js"]'
-  end
+    it 'welcome page links to github docs' do
+      visit '/'
+      status_code.should eq 200
+      page.should have_link '', href: 'https://github.com/iqeo/woyo-world/wiki'
+      page.should have_link '', href: 'https://github.com/iqeo/woyo-server/wiki'
+    end
+
+    it 'uses foundation framework' do
+      visit '/'
+      status_code.should eq 200
+      page.should have_css 'head link[href="foundation-5.2.2/css/foundation.css"]'
+      page.should have_css 'head script[src="foundation-5.2.2/js/vendor/modernizr.js"]'
+    end
 
-  it 'accepts a world (without start - display welcome)' do
-    Woyo::Server.set :world, @small_world
-    visit '/'
-    status_code.should eq 200
-    page.should have_content 'Woyo'
   end
 
-  it 'accepts a world (with start)' do
-    @small_world.start = :small
-    Woyo::Server.set :world, @small_world
-    visit '/'
-    status_code.should eq 200
+  context 'loads the world' do
+
+    it 'from files in directory' do
+      content1 = "
+        name 'Simple'
+        start :one
+        location :one do
+          description 'First'
+        end
+      "
+      content2 = "
+        location :two do
+          description 'Second'
+        end
+      "
+      FileUtils.mkdir_p @test_dir
+      File.write File.join( @test_dir, 'file1.rb' ), content1
+      File.write File.join( @test_dir, 'file2.rb' ), content2
+      world = nil
+      expect { world = Woyo::Server.load_world File.join( @test_dir, '*.rb' ) }.to_not raise_error
+      Woyo::Server.set :world, world
+      visit '/'
+      status_code.should eq 200
+      page.should have_title /^Simple$/
+    end
+
+    it 'shows filename and lineno in backtrace upon error' do
+      bad_world = "
+        location :bad do
+          raise 'boom'
+        end
+      "
+      expect { Woyo::Server.eval_world bad_world, 'bad_world' }.to raise_error { |e|
+        e.message.should eq 'boom'
+        e.backtrace.first.should =~ /^bad_world.3/
+      }
+    end
+
   end
 
-  it 'describes the start location' do 
-    Woyo::Server.set :world, @home_world
-    visit '/'
-    page.should have_selector '.location#location_home'
-    page.should have_selector '.location#location_home .name',                      text: 'Home'
-    page.should have_selector '.location#location_home .description',               text: 'Where the heart is.'
-    page.should have_selector '.way#way_out'
-    page.should have_selector '.way#way_out .name',         text: 'Door'
-    page.should have_selector '.way#way_out .description',  text: 'A sturdy wooden door'
-    page.should have_selector '.way#way_down'
-    page.should have_selector '.way#way_down .name',        text: 'Stairs'
-    page.should have_selector '.way#way_down .description', text: 'Rickety stairs lead down'
-  end               
-
-  it 'goes way to another location' do
-    Woyo::Server.set :world, @home_world
-    visit '/'
-    page.should have_selector '.way#way_out a#go_out'
-    click_on 'go_out'
-    page.should have_selector '.location#location_garden .name', text: 'Garden'
+  context 'describes the world' do
+
+    it 'title is world name' do
+      Woyo::Server.set :world, @small_world
+      visit '/'
+      status_code.should eq 200
+      page.should have_title /^Small World$/
+    end
+
+    it 'without start location' do
+      Woyo::Server.set :world, @small_world
+      visit '/'
+      status_code.should eq 200
+      page.should have_selector '.world .name',        text: "Small World"
+      page.should have_selector '.world .description', text: "It's a small world after all"
+      page.should have_selector '.world .no-start'
+      page.should_not have_selector '.world .start'
+    end
+
+    it 'with start location' do
+      @small_world.start = :small
+      Woyo::Server.set :world, @small_world
+      visit '/'
+      status_code.should eq 200
+      page.should have_selector '.world .name',                      text: "Small World"
+      page.should have_selector '.world .description',               text: "It's a small world after all"
+      page.should have_selector '.world .start a[href="/location"]', text: "Start"
+      page.should_not have_selector '.world .no-start'
+    end
+
   end
 
-  it 'tracks location (go and come back)' do
-    Woyo::Server.set :world, @home_world
-    visit '/'
-    page.should have_selector '.location#location_home .name',                text: 'Home'
-    page.should have_selector '.way#way_out a#go_out'
-    click_on 'go_out'
-    page.should have_selector '.location#location_garden .name',              text: 'Garden'
-    page.should have_selector '.way#way_in a#go_in'
-    click_on 'go_in'
-    page.should have_selector '.location#location_home .name',                text: 'Home'
+  context 'describes locations' do
+
+    it 'title is location name'  do
+      Woyo::Server.set :world, @small_world
+      visit '/'
+      click_on 'start'
+      status_code.should eq 200
+      page.should have_title /^Small$/
+    end
+
+    it 'start location' do 
+      Woyo::Server.set :world, @home_world
+      visit '/'
+      click_on 'start'
+      status_code.should eq 200
+      page.should have_selector '.location#location_home'
+      page.should have_selector '.location#location_home .name',                      text: 'Home'
+      page.should have_selector '.location#location_home .description',               text: 'Where the heart is.'
+      page.should have_selector '.way#way_out'
+      page.should have_selector '.way#way_out .name',         text: 'Door'
+      page.should have_selector '.way#way_out .description',  text: 'A sturdy wooden door'
+      page.should have_selector '.way#way_down'
+      page.should have_selector '.way#way_down .name',        text: 'Stairs'
+      page.should have_selector '.way#way_down .description', text: 'Rickety stairs lead down'
+    end               
+
   end
 
-  it 'tracks location (loop both directions)' do
-    Woyo::Server.set :world, @home_world
-    visit '/'
-    page.should have_selector '.location#location_home .name',                text: 'Home'
-    page.should have_selector '.way#way_out a#go_out'
-    click_on 'go_out'
-    page.should have_selector '.location#location_garden .name',              text: 'Garden'
-    page.should have_selector '.way#way_down a#go_down'
-    click_on 'go_down'
-    page.should have_selector '.location#location_cellar .name',              text: 'Cellar'
-    page.should have_selector '.way#way_up a#go_up'
-    click_on 'go_up'
-    page.should have_selector '.location#location_home .name',                text: 'Home'
-    page.should have_selector '.way#way_down a#go_down'
-    click_on 'go_down'
-    page.should have_selector '.location#location_cellar .name',              text: 'Cellar'
-    page.should have_selector '.way#way_out a#go_out'
-    click_on 'go_out'
-    page.should have_selector '.location#location_garden .name',              text: 'Garden'
-    page.should have_selector '.way#way_in a#go_in'
-    click_on 'go_in'
-    page.should have_selector '.location#location_home .name',                text: 'Home'
+  context 'ways' do
+
+    before :all do
+      @ways_world = Woyo::World.new do
+        start :home
+        location :home do
+          way :door do
+            description open: 'A sturdy wooden door',                       closed: 'Never closed'
+            going       open: 'The door opens, leading to a sunlit garden', closed: 'Never closed'
+            to :garden
+          end
+          way :stairs do
+            description closed: 'Broken stairs lead down into darkness.', open: 'Never open' 
+            going       closed: 'The broken stairs are impassable.',      open: 'Never open' 
+          end
+          way :window do
+            description 'A nice view.'
+            going       'Makes no difference.'
+            to :yard
+          end
+        end
+      end
+      Woyo::Server.set :world, @ways_world
+    end
+
+    context 'are described' do
+
+      before :each do
+        visit '/'
+        click_on 'start'
+        status_code.should eq 200
+      end
+
+      it 'open' do
+        page.should have_selector '.way#way_door a#go_door'
+        page.should have_selector '.way#way_door .name',         text: 'Door'
+        page.should have_selector '.way#way_door .description',  text: 'A sturdy wooden door'
+      end
+
+      it 'closed' do
+        page.should have_selector '.way#way_stairs a#go_stairs'
+        page.should have_selector '.way#way_stairs .name',         text: 'Stairs'
+        page.should have_selector '.way#way_stairs .description',  text: 'Broken stairs lead down into darkness.'
+      end
+
+    end
+
+    context 'are described with default' do
+
+      it 'open' do
+        window = @ways_world.locations[:home].ways[:window]
+        window.open!
+        window.should be_open
+        visit '/'
+        click_on 'start'
+        status_code.should eq 200
+        page.should have_selector '.way#way_window a#go_window'
+        page.should have_selector '.way#way_window .name',         text: 'Window'
+        page.should have_selector '.way#way_window .description',  text: 'A nice view.'
+      end
+
+      it 'closed' do
+        window = @ways_world.locations[:home].ways[:window]
+        window.close!
+        window.should be_closed
+        visit '/'
+        click_on 'start'
+        status_code.should eq 200
+        page.should have_selector '.way#way_window a#go_window'
+        page.should have_selector '.way#way_window .name',         text: 'Window'
+        page.should have_selector '.way#way_window .description',  text: 'A nice view.'
+      end
+
+    end
+
+    context 'are described going', :js => true do
+
+      before :each do
+        visit '/'
+        page.find('body', visible: true)
+        click_on 'start'
+      end
+
+      it 'open' do
+        page.should have_selector '.way#way_door a#go_door'
+        click_link 'go_door'
+        page.should have_selector '.way#way_door .going',            text: 'The door opens, leading to a sunlit garden' 
+        sleep 3
+        page.should have_selector '.location#location_garden .name', text: 'Garden'
+      end
+
+      it 'closed' do
+        page.should have_selector '.way#way_stairs a#go_stairs'
+        click_link 'go_stairs'
+        page.should have_selector '.way#way_stairs .going',        text: 'The broken stairs are impassable.'
+        page.should have_selector '.location#location_home .name', text: 'Home'
+      end
+
+    end
+
+    context 'are described going with default', :js => true do
+
+      it 'open' do
+        window = @ways_world.locations[:home].ways[:window]
+        window.open!
+        window.should be_open
+        visit '/'
+        click_on 'start'
+        page.should have_selector '.way#way_window a#go_window'
+        click_link 'go_window'
+        page.should have_selector '.way#way_window .going',        text: 'Makes no difference.' 
+        sleep 3
+        page.should have_selector '.location#location_yard .name', text: 'Yard'
+      end
+
+      it 'closed' do
+        window = @ways_world.locations[:home].ways[:window]
+        window.close!
+        window.should be_closed
+        visit '/'
+        click_on 'start'
+        page.should have_selector '.way#way_window a#go_window'
+        click_link 'go_window'
+        page.should have_selector '.way#way_window .going',        text: 'Makes no difference.' 
+        page.should have_selector '.location#location_home .name', text: 'Home'
+      end
+
+    end
+
   end
 
 end

data/spec/woyo/server/runner_spec.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 require 'stringio'
 require 'open-uri'
 
-STDERR.sync = true
+STDOUT.sync = true
 STDERR.sync = true
 
 describe Woyo::Runner do
@@ -20,10 +20,10 @@ describe Woyo::Runner do
       'world'         => %w( . .. .gitkeep ),
       'views'         => %w( . .. app server ),
       'views/app'     => %w( . .. .gitkeep ),
-      'views/server'  => %w( . .. layout.haml location.haml ),
+      'views/server'  => %w( . .. layout.haml location.haml way.haml world.haml ),
       'public'        => %w( . .. app server ),
       'public/app'    => %w( . .. html images js css ),
-      'public/server' => %w( . .. default.html foundation foundation-5.2.2 jquery jquery-2.1.1 ),
+      'public/server' => %w( . .. css default.html foundation-5.2.2 jquery-2.1.1 js ),
     }
     @original_path = Dir.pwd
     File.basename(@original_path).should eq 'woyo-server'
@@ -31,6 +31,7 @@ describe Woyo::Runner do
   end
 
   it 'prints a helpful message to stderr for help (-h/--help) switch' do
+    pending
     [['-h'],['--help']].each do |args|
       Woyo::Runner.run( args, out: @output, err: @error ).should eq 0
       @error.string.should include 'woyo'
@@ -108,6 +109,7 @@ describe Woyo::Runner do
     end
 
     it 'help (-h/--help) explains new command' do
+      pending
       [['-h'],['--help']].each do |help|
         Woyo::Runner.run( ['new'] + help, out: @output, err: @error ).should eq 0
         @error.string.should include 'woyo new'
@@ -153,12 +155,13 @@ describe Woyo::Runner do
       Woyo::Server.set :world, Woyo::World.new { start :home ; location(:home) { name 'Home' } }
       page = ''
       expect { page = open("http://127.0.0.1:4567/").read }.to_not raise_error
-      page.should include 'Home'
+      page.should include 'Start'
       Woyo::Server.stop!
       thread.join
     end
 
     it 'help (-h/--help) explains server command' do
+      pending
       [['-h'],['--help']].each do |help|
         Woyo::Runner.run( ['server'] + help, out: @output, err: @error ).should eq 0
         @error.string.should include 'woyo server'
@@ -193,6 +196,7 @@ describe Woyo::Runner do
     # it 'starts a world application console'
 
     # it 'help (-h/--help) explains console command' do
+    # pending
     #   [['-h'],['--help']].each do |help|
     #     Woyo::Runner.run( ['console'] + help, out: @output, err: @error ).should eq 0
     #     @error.string.should include 'woyo console'
@@ -275,6 +279,7 @@ describe Woyo::Runner do
     end
 
     it 'help (-h/--help) explains update command' do
+      pending
       [['-h'],['--help']].each do |help|
         Woyo::Runner.run( ['update'] + help, out: @output, err: @error ).should eq 0
         @error.string.should include 'woyo update'

data/tmux

@@ -16,7 +16,6 @@ tmux send-keys    -t rspec "rs" C-m
 
 tmux new-window   -n irb -d
 tmux send-keys    -t irb "cd ." C-m
-tmux send-keys    -t irb "irb" C-m
-
+tmux send-keys    -t irb "bundle exec irb -r 'woyo/server'" C-m 
 tmux swap-window  -s vim -t shell
 

data/todo.txt

@@ -0,0 +1,11 @@
+
+Debugger
+Use haml tenplate for default page including layout.haml
+Test location description states
+Document DSL attributes and groups usage
+  -> way descriptions
+  -> way going
+  -> location descriptions
+Auto generate DSL docs from tests ?
+Test worlds in separate files - useful for manual testing
+

data/views/server/layout.haml

@@ -3,15 +3,23 @@
   %head
     %meta{ :charset => "utf-8" }
     %meta{ :name => "viewport", :content => "width=device-width, initial-scale=1.0" }
-    %link{ :rel => "stylesheet", :href => "/foundation/css/foundation.css" }
-    %script{ :src => "/foundation/js/vendor/modernizr.js" }
-    %title WOYO - World of Your Own
+    %link{ :rel => "stylesheet", :href => "/foundation-5.2.2/css/foundation.css" }
+    %link{ :rel => "stylesheet", :href => "/css/server.css" }
+    %script{ :src => "/foundation-5.2.2/js/vendor/modernizr.js" }
+
+    %title<
+      - case 
+      - when @world
+        = @world.name
+      - when @location
+        = @location.name
 
   %body
 
     = yield
 
-    %script{ :src => "/foundation/js/vendor/jquery.js" }
-    %script{ :src => "/foundation/js/foundation.min.js" }
-    %script $(document).foundation();
- 
+    %script{ :src => "/foundation-5.2.2/js/vendor/jquery.js" }
+    %script{ :src => "/foundation-5.2.2/js/foundation.min.js" }
+    %script{ :src => "/js/server.js" }
+
+

data/views/server/location.haml

@@ -1,14 +1,7 @@
-%div.row
-  %div.large-12.columns
-    %div.location{ :id => "location_#{@location.id}" }
+.row
+  .large-12.columns
+    .location{ :id => "location_#{@location.id}" }
       %h1.name= @location.name
       %p.description= @location.description
-
-    - @location.ways.each do |id,way|
-      %div.row
-        %div.large-12.columns
-          %div.way{ :id => "way_#{id}" }
-            %a{ :id => "go_#{id}", :href => "/go/#{id}" }
-              %h3.name= way.name
-              %p.description= way.description
+      = partial :way, collection: @location.ways.values
 

data/views/server/way.haml

@@ -0,0 +1,7 @@
+.row
+  .large-12.columns
+    .way{ :id => "way_#{way.id}" }
+      %a.go{ :id => "go_#{way.id}", :href => "/go/#{way.id}" }
+        %h3.name= way.name
+        %p.description= way.description
+      %p.going

data/views/server/world.haml

@@ -0,0 +1,15 @@
+.row
+  .large-12.columns
+    .world
+      %h1.name= @world.name
+      %p.description= @world.description
+
+      .row
+        .large-12.columns
+          - if @world.start
+            .start
+              %a#start{ :href => "/location" } Start
+          - else
+            .no-start
+              %p No start location defined
+

data/woyo-server.gemspec

@@ -23,10 +23,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack-test", "~> 0.6.2"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "capybara"
+  spec.add_development_dependency "selenium-webdriver"
 
   spec.add_runtime_dependency "woyo-world", Woyo::SERVER_VERSION
   spec.add_runtime_dependency "sinatra", "~> 1.4.5"
   spec.add_runtime_dependency "sinatra-contrib", "~> 1.4.2"
+  spec.add_runtime_dependency "sinatra-partial"
   spec.add_runtime_dependency "haml"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: woyo-server
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Gerard Fowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,20 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: woyo-world
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.2
+- !ruby/object:Gem::Dependency
+  name: sinatra-partial
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +188,7 @@ files:
 - public/app/html/.gitkeep
 - public/app/images/.gitkeep
 - public/app/js/.gitkeep
+- public/server/css/server.css
 - public/server/default.html
 - public/server/foundation-5.2.2/css/foundation.css
 - public/server/foundation-5.2.2/css/foundation.min.css
@@ -194,13 +223,17 @@ files:
 - public/server/jquery-2.1.1/jquery.js
 - public/server/jquery-2.1.1/jquery.min.js
 - public/server/jquery-2.1.1/jquery.min.map
+- public/server/js/server.js
 - spec/spec_helper.rb
 - spec/woyo/server/1_server_spec.rb
 - spec/woyo/server/runner_spec.rb
 - tmux
+- todo.txt
 - views/app/.gitkeep
 - views/server/layout.haml
 - views/server/location.haml
+- views/server/way.haml
+- views/server/world.haml
 - world/.gitkeep
 - woyo-server.gemspec
 homepage: ''