pie 0.1.3 → 0.2

data/README.md

@@ -38,6 +38,6 @@ Core team
 * Sarah Mei
 
 Contributors
-* Dan Steinicke
 * Akira Matsuda
 * Chad Fowler
+

data/bin/pie

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+if RUBY_VERSION < "1.9.0"
+  puts "Error: pie requires Ruby 1.9, please use RVM."
+  exit
+end
+
+if ARGV.size == 0
+  puts "Usage: pie myfile"
+  exit
+end
+
+pie_file = ARGV.first
+pie_file = "#{pie_file}.pie" unless File.exist?(pie_file)
+
+unless File.exist?(pie_file)
+  puts "Unknown file #{ARGV.first}, please try again."
+  exit
+end
+
+begin
+  require 'pie'
+rescue LoadError
+  $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+  require 'pie'
+end
+
+include Pie
+load pie_file
+
+require 'pie_server'
+WebApp.run! :port => 31415 

data/bin/pie~

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+if RUBY_VERSION < "1.9.0"
+  puts "Error: pie requires Ruby 1.9, please use RVM."
+  exit
+end
+
+if ARGV.size == 0
+  puts "Usage: pie myfile"
+  exit
+end
+
+pie_file = ARGV.first
+pie_file = "#{pie_file}.pie" unless File.exist?(pie_file)
+
+unless File.exist?(pie_file)
+  puts "Unknown file #{ARGV.first}, please try again."
+  exit
+end
+
+begin
+  require 'pie'
+rescue LoadError
+  $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+  require 'pie'
+end
+
+include Pie
+load pie_file
+
+require 'pie_server'
+WebApp.run!

data/lib/direction.rb

@@ -0,0 +1,56 @@
+module Pie
+
+  class DeadEnd < String
+    def dead_end?
+      true
+    end
+  end
+  
+  class Direction < String
+    def opposite(display_name = nil)
+      if display_name
+        @display_name = display_name
+      else 
+        @display_name
+      end
+    end
+    def dead_end?
+      false
+    end
+  end
+  
+  def direction(forward, back)
+    dir = Direction.new(forward)
+    dir.opposite(back)
+    dir
+  end
+  
+  def north
+    @north ||= direction('Go North', 'Go South')
+  end
+  
+  def south
+    @south ||= direction('Go South', 'Go North')
+  end
+  def east
+    @east ||= direction('Go East', 'Go West')
+  end
+  def west
+    @west ||= direction('Go West', 'Go East')
+  end
+  def dead_end(name)
+    DeadEnd.new(name)
+  end
+  def north!
+    dead_end(north)
+  end
+  def south!
+    dead_end(south)
+  end
+  def east!
+    dead_end(east)
+  end
+  def west!
+    dead_end(west)
+  end
+end

data/lib/pie.rb

@@ -1,171 +1,52 @@
-require 'sinatra/base'
-require 'player'
-
-#puts "----------------- Ruby version = #{RUBY_VERSION}"
-#raise ScriptError, "Pie requires Ruby 1.9 or higher" if RUBY_VERSION < "1.9.0"
-NO_WAY_BACK = ""
-class Pie 
+module Pie
   
-
-  attr_accessor :places
-  attr_accessor :images
-  attr_accessor :default_template
-
-  def initialize
-    @default_template = :image_page
-    @places = Places.new
-    @map = Map.new(@places)
-    @images = {}
-  end
-
-  class WebApp < Sinatra::Base
-    set :root, File.join(File.expand_path(File.dirname(__FILE__)), "..")
-
-    get '/' do
-      "hello"
-    end
-
-    get '/:place_name' do
-      name = params[:place_name].to_sym
-      $current = name unless name.nil?
-      puts "current place name is #{$current}"
-      puts "current place is #{$pie.places[$current]}"
-      puts "--- skip out"; return if $pie.places[$current].nil?
-      puts "current links are #{$pie.places[$current].links.inspect}"
-      puts "displaying template: #{$pie.default_template.inspect}"
-      erb $pie.default_template
-    end
-  end
-
-  at_exit { WebApp.run! if !$0.include?("spec")}
-
-  class Map
-
-    def initialize places
-      @places = places
-    end
-
-    def path endpoints
-      puts "---> path #{endpoints.inspect}"
-      puts @places.inspect
-      #if h.size != 2
-      #  return puts "path must have two and only two endpoints."
-      #end
-      start_place_key, end_place_key = endpoints.keys
-      label_for_end, label_for_start = endpoints.values
-
-      start_place =  @places[start_place_key]
-      end_place =  @places[end_place_key]
-      raise ArgumentError, "there is no place named '#{start_place_key}'" if start_place.nil?
-      raise ArgumentError, "there is no place named '#{end_place_key}'" if end_place.nil?
-
-      start_place[:links][end_place_key] = label_for_end unless label_for_end.empty?
-      end_place[:links][start_place_key] = label_for_start unless label_for_start.empty?
-    end
+  def self.[](key)
+    (@map ||= {})[key]
   end
 
-  class Place < Hash
-    def initialize
-      self[:links] = {}
-    end
-    def links
-      result = self[:links]
-    end
-
+  def self.[]=(key, value)
+    (@map ||= {})[key] = value
   end
-
-  class Places < Hash
-    def method_missing name, options = {}
-      unless options.is_a? Hash
-        puts "options for creating a place must have key and value"
-        return
-      end
-      puts "making a #{name} with #{options.inspect}"
-      place = Place.new
-      place.merge! options
-      self[name.to_sym] = place
-    end
-
-    def [] string_or_symbol
-      super string_or_symbol.to_sym
-    end
-
-    def after(place_name)
-      index = keys.index(place_name.to_sym)
-      next_place_name = keys[index + 1]
-      self[next_place_name] unless next_place_name.nil?
-    end
-
-    def before(place_name)
-      index = keys.index(place_name.to_sym)
-      index = index - 1
-      if index < 0
-        nil
-      else
-        prev_place_name = keys[index]
-        self[prev_place_name]
-      end
+  
+  def template(name = nil)
+    if name
+      Pie[:template] = name.to_sym
+    else
+      Pie[:template] || :image_page
     end
   end
-
-  def template(template_name)
-    puts "--> set default template #{template_name.to_sym}"
-    @default_template = template_name.to_sym
-  end
-
-  def create_places(&block)
-    @places.instance_eval(&block)
-  end
-
-  def map(&block)
-    puts "-------- creating map --------"
-    @map.instance_eval(&block)
+  
+  def images
+    Pie[:images] ||= {}
   end
-
-  def image(image_hash)
-    puts "--- set image"
-    puts image_hash.inspect
-    @images.merge!(image_hash)
+  
+  def image(image_maps)
+    images.merge!(image_maps)
   end
 
-  def current
-    @current ||= @places.keys.first
+  def place(options)
+    Place.new(options)
   end
-
-  def move_to(new_place_key)
-    @current = new_place_key
+  
+  def current_place(name=nil)
+    puts "current_place"
+    puts places.inspect
+    if name
+      Pie[:current_place] = places[name.to_sym]
+    else
+      Pie[:current_place]
+    end
   end
   
- def current_image
-    puts "------- current_image"
-    puts $current.inspect
-    puts @images.inspect
-    @images[$current.to_sym]
+  def current_image
+    images[current_place.name] if current_place
   end
-
-  def current_description
-    puts "------- current_description"
-    puts $current.inspect
-    place = @places[$current.to_sym]
-    puts @place.inspect
-    place[:description] unless place.nil?
+  
+  def places
+    Pie[:places] ||= {}
   end
+  
 end
 
-def make_pie(&block)
-  foo = 1
-  puts "-------------------------- making pie ---------------------------- "
-  $pie = Pie.new
-  $pie.instance_eval(&block)  
-  puts "-------------------------- pie complete ---------------------------- "
-end
-
-def more_pie(&block)
-  puts "-------------------------- more pie ---------------------------- "
-  if $pie.nil?
-    puts "How can you make more pie when you haven't made any pie yet?"
-    return
-  end
-  $pie.instance_eval(&block)
-  puts "-------------------------- pie complete ---------------------------- "
-end
+require 'place'
+require 'direction'

data/lib/pie.rb~

@@ -1,171 +1,50 @@
-require 'sinatra/base'
-require 'player'
-
-#puts "----------------- Ruby version = #{RUBY_VERSION}"
-#raise ScriptError, "Pie requires Ruby 1.9 or higher" if RUBY_VERSION < "1.9.0"
-NO_WAY_BACK = ""
-class Pie 
+module Pie
   
-
-  attr_accessor :places
-  attr_accessor :images
-  attr_accessor :default_template
-
-  def initialize
-    @default_template = :image_page
-    @places = Places.new
-    @map = Map.new(@places)
-  end
-
-  class WebApp < Sinatra::Base
-    set :root, File.join(File.expand_path(File.dirname(__FILE__)), "..")
-
-    get '/' do
-      "hello"
-    end
-
-    get '/:place_name' do
-      name = params[:place_name].to_sym
-      $current = name unless name.nil?
-      puts "current place name is #{$current}"
-      puts "current place is #{$pie.places[$current]}"
-      puts "--- skip out"; return if $pie.places[$current].nil?
-      puts "current links are #{$pie.places[$current].links.inspect}"
-      puts "displaying template: #{$pie.default_template.inspect}"
-      erb $pie.default_template
-    end
-  end
-
-  at_exit { WebApp.run! if !$0.include?("spec")}
-
-  class Map
-
-    def initialize places
-      @places = places
-    end
-
-    def path endpoints
-      puts "---> path #{endpoints.inspect}"
-      puts @places.inspect
-      #if h.size != 2
-      #  return puts "path must have two and only two endpoints."
-      #end
-      start_place_key, end_place_key = endpoints.keys
-      label_for_end, label_for_start = endpoints.values
-
-      start_place =  @places[start_place_key]
-      end_place =  @places[end_place_key]
-      raise ArgumentError, "there is no place named '#{start_place_key}'" if start_place.nil?
-      raise ArgumentError, "there is no place named '#{end_place_key}'" if end_place.nil?
-
-      start_place[:links][end_place_key] = label_for_end unless label_for_end.empty?
-      end_place[:links][start_place_key] = label_for_start unless label_for_start.empty?
-    end
+  def self.[](key)
+    (@map ||= {})[key]
   end
 
-  class Place < Hash
-    def initialize
-      self[:links] = {}
-    end
-    def links
-      result = self[:links]
-    end
-
+  def self.[]=(key, value)
+    (@map ||= {})[key] = value
   end
-
-  class Places < Hash
-    def method_missing name, options = {}
-      unless options.is_a? Hash
-        puts "options for creating a place must have key and value"
-        return
-      end
-      puts "making a #{name} with #{options.inspect}"
-      place = Place.new
-      place.merge! options
-      self[name.to_sym] = place
-    end
-
-    def [] string_or_symbol
-      super string_or_symbol.to_sym
-    end
-
-    def after(place_name)
-      index = keys.index(place_name.to_sym)
-      next_place_name = keys[index + 1]
-      self[next_place_name] unless next_place_name.nil?
-    end
-
-    def before(place_name)
-      index = keys.index(place_name.to_sym)
-      index = index - 1
-      if index < 0
-        nil
-      else
-        prev_place_name = keys[index]
-        self[prev_place_name]
-      end
+  
+  def template(name = nil)
+    if name
+      Pie[:template] = name.to_sym
+    else
+      Pie[:template] || :image_page
     end
   end
-
-  def template(template_name)
-    puts "--> set default template #{template_name.to_sym}"
-    @default_template = template_name.to_sym
-  end
-
-  def create_places(&block)
-    @places.instance_eval(&block)
-  end
-
-  def map(&block)
-    puts "-------- creating map --------"
-    @map.instance_eval(&block)
+  
+  def images
+    Pie[:images] ||= {}
   end
-
-  def image(image_hash)
-    @images ||= {}
-    puts "--- set image"
-    puts image_hash.inspect
-    @images.merge!(image_hash)
+  
+  def image(image_maps)
+    images.merge!(image_maps)
   end
 
-  def current
-    @current ||= @places.keys.first
+  def place(options)
+    Place.new(options)
   end
-
-  def move_to(new_place_key)
-    @current = new_place_key
+  
+  def current_place(name=nil)
+    if name
+      Pie[:current_place] = places[name.to_sym]
+    else
+      Pie[:current_place]
+    end
   end
   
- def current_image
-    puts "------- current_image"
-    puts $current.inspect
-    puts @images.inspect
-    @images[$current.to_sym]
+  def current_image
+    images[current_place.name] if current_place
   end
-
-  def current_description
-    puts "------- current_description"
-    puts $current.inspect
-    place = @places[$current.to_sym]
-    puts @place.inspect
-    place[:description] unless place.nil?
+  
+  def places
+    Pie[:places] ||= {}
   end
+  
 end
 
-def make_pie(&block)
-  foo = 1
-  puts "-------------------------- making pie ---------------------------- "
-  $pie = Pie.new
-  $pie.instance_eval(&block)  
-  puts "-------------------------- pie complete ---------------------------- "
-end
-
-def more_pie(&block)
-  puts "-------------------------- more pie ---------------------------- "
-  if $pie.nil?
-    puts "How can you make more pie when you haven't made any pie yet?"
-    return
-  end
-  $pie.instance_eval(&block)
-  puts "-------------------------- pie complete ---------------------------- "
-end
+require 'place'
+require 'direction'

data/lib/pie_server.rb

@@ -0,0 +1,20 @@
+require 'sinatra/base'
+
+class WebApp < Sinatra::Base
+  set :root, File.join(File.expand_path(File.dirname(__FILE__)), "..")
+
+  get '/' do
+    "hello"
+  end
+
+  get '/:place_name' do
+    name = params[:place_name].to_sym
+    current_place(name) unless name.nil?
+    puts "current place name is #{current_place.name}"
+    puts "current place is #{current_place.description}"
+    puts "--- skip out"; return if current_place.nil?
+    puts "current links are #{current_place.paths.inspect}"
+    puts "displaying template: #{template.inspect}"
+    erb template
+  end
+end

data/lib/pie_server.rb~

@@ -0,0 +1,21 @@
+require 'sinatra/base'
+
+class WebApp < Sinatra::Base
+  set :root, File.join(File.expand_path(File.dirname(__FILE__)), "..")
+
+  get '/' do
+    "hello"
+  end
+
+  get '/:place_name' do
+    name = params[:place_name].to_sym
+    puts "going to place with name #{name}"
+    current_place(name) unless name.nil?
+    puts "current place name is #{current_place.name}"
+    puts "current place is #{current_place.description}"
+    puts "--- skip out"; return if current_place.nil?
+    puts "current links are #{current_place.paths.inspect}"
+    puts "displaying template: #{template.inspect}"
+    erb template
+  end
+end

data/lib/place.rb

@@ -0,0 +1,47 @@
+class Pie::Place
+  
+  attr_reader :name, :description, :paths
+  
+  def initialize(options)
+    @paths = {}
+    extract_standard_options(options)
+    extract_name_and_description(options)
+    build_place_method
+    register_place
+  end
+  
+  def to_s
+    @name
+  end
+
+  def path(nodes)
+    nodes.each do |place_name, direction|
+      paths[place_name] = direction
+      places[place_name].paths[name] = direction.opposite unless direction.dead_end?
+    end
+  end
+  
+  private
+  
+  def extract_name_and_description(options)
+    raise "You seem to have extras option in this place!" unless options.length == 1
+    @name = options.keys.first
+    @description = options.values.first
+  end
+  
+  def extract_standard_options(options)
+  end
+  
+  def build_place_method
+    Pie.module_eval %{
+      def #{name}
+        places[:#{name}]
+      end
+    }
+  end
+  
+  def register_place
+    places[name] = self
+  end
+
+end

data/views/game_screen.erb

@@ -52,13 +52,15 @@
 
 <body>
 <div id="background">
-  <img src="<%= $pie.current_image %>" />
+  <% if current_image %>
+    <img src="<%= current_image %>" />
+  <% end %>
 </div>
 <div id="content">
-  <p><%= $pie.current_description %></p>
+  <p><%= current_place.description %></p>
   <p>
-  <% $pie.places[$current].links.each do |place_name, label| %>
-    <%= "  <a href='#{place_name}'>#{label.to_s}</a>  "  %>
+  <% current_place.paths.each do |place_name, label| %>
+    <%= "  <a href='#{place_name}'>#{label}</a>  "  %>
   <% end %>
   </p>
 </div>

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Sarah Allen, Sarah Mei
@@ -14,27 +13,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 -07:00
+date: 2010-09-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: 
 email: 
-executables: []
-
+executables: 
+- pie
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
+- lib/direction.rb
 - lib/pie.rb
 - lib/pie.rb~
-- lib/player.rb
+- lib/pie_server.rb
+- lib/pie_server.rb~
+- lib/place.rb
+- bin/pie
+- bin/pie~
 - views/full_screen.erb
 - views/game_screen.erb
-- views/game_screen.erb~
 - views/image_page.erb
-- views/image_page.erb~
 - README.md
 - MIT-LICENSE.txt
 has_rdoc: true

data/lib/player.rb

@@ -1,13 +0,0 @@
-class Pie
-  class Player
-    def description
-      "You are an egg."
-    end
-  end
-
-  def player
-    @player ||= Player.new
-
-  end
-    
-end

data/views/game_screen.erb~

@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-	<title><%= $current %></title>
-	<style type="text/css" media="screen">
-		
-		body {
-			background: #000;
-    }
-    
-    div#background {
-			position: fixed;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%
-    }
-
-		div#background img {
-		  	
-			/* Set up proportionate scaling */
-			width: auto;
-			height: 100%;
-			
-			/* Set up positioning */
-      margin-left: auto;
-      margin-right: auto;
-      display: block;
-    }
-		
-		div#content {
-			/* This is the only important rule */
-			/* We need our content to show up on top of the background */
-			position: relative; 
-			
-			/* These have no effect on the functionality */
-			width: 80%;
-			margin: 0 auto;
-			background: #fff;
-			padding: 20px;
-			font-family: helvetica, arial, sans-serif;
-			font-size: 12pt;
-			line-height: 14pt;
-			-moz-box-shadow: #000 4px 4px 10px;
-			-webkit-box-shadow: #000 4px 4px 10px;	
-    }
-		
-	</style>
-</head>
-
-<body>
-<div id="background">
-  <img src="<%= $pie.current_image %>" />
-</div>
-<div id="content">
-  <p><%= $pie.current_description %></p>
-  <p>
-  <% $pie.places[$current].links.each do |place_name, label| %>
-    <%= "  <a href='#{place_name}'>#{label.to_s}</a>  "  %>
-  <% end %>
-  </p>
-</div>
-</body>
-
-</html>

data/views/image_page.erb~

@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-	<title><%= $current %></title>
-	<style type="text/css" media="screen">
-		
-		
-		img.bg {
-			/* Set rules to fill background */
-			min-height: 100%;
-			min-width: 1024px;
-			
-			/* Set up proportionate scaling */
-			width: 100%;
-			height: auto;
-			
-			/* Set up positioning */
-			position: fixed;
-			top: 0;
-			left: 0;
-		}
-		
-		@media screen and (max-width: 1024px){
-			img.bg {
-				left: 50%;
-				margin-left: -512px; }
-		}
-		
-		div#content {
-			/* This is the only important rule */
-			/* We need our content to show up on top of the background */
-			position: relative; 
-			
-			/* These have no effect on the functionality */
-			width: 100%;
-			margin: 0 auto;
-			padding: 20px;
-			font-family: helvetica, arial, sans-serif;
-			font-size: 32pt;
-			line-height: 40pt;
-      text-align: center;
-      text-shadow: 1px 1px #fff
-		}
-		
-	</style>
-</head>
-
-<body>
-<img src="<%= $pie.current_image %>" class="bg" />
-<div id="content">
-  <p><%= $pie.current_description %></p>
-</div>
-</body>
-
-</html>