pie 0.2.1 → 0.2.2

data/README.md

@@ -1,43 +1,52 @@
 # Pie
 
-A game development DSL, inspired by Yasuko Ohba's Ruby Kaigi talk and a late night coversaton with @knowtheory, @wycats, @sarahmei and @ultrasaurus.
-
-This is very experimental and marginally useful. Spec works, but coverage is meager. 
+A game development DSL, inspired by Yasuko Ohba's Ruby Kaigi talk and a late night conversation with @knowtheory, @wycats, @sarahmei and @ultrasaurus. 
 
 Pie requires Ruby 1.9, because it is so cool.
 
 ## Examples
 
-### Book
 
-There is a sample in book.rb.  To use it:
 
-    ruby book.rb
+### Game
+
+    pie game.pie
 
 then go to:
-    http://localhost:4567/ship
-    http://localhost:4567/building
-    http://localhost:4567/tower
+    http://localhost:31415/park
 
-Someday there will be UI to change pages.
+Follow links to wander around the game world.  Yes, that is all there is right now.
 
-### Game
+### Book -- NOT WORKING YET
+
+There is a sample in book.rb.  To use it:
 
-    ruby game.rb
+    pie book.pie
 
 then go to:
-    http://localhost:4567/park
+    http://localhost:31415/ship
+    http://localhost:31415/building
+    http://localhost:31415/tower
 
-Follow links to wander around the game world.  Yes, that is all there is right now.
+Someday there will be UI to change pages.
+
+## Issues?
+
+Bugs and features are tracked here: http://www.pivotaltracker.com/projects/115060
+
+I want to try to resist adding any new features until we have no bugs and kid-friendly error messages.  Help is welcome.  Feel free to fork and submit pull requests or just tweet or email ideas.
 
 
 ## Pie Contributors
 
-Core team
+Core team (in order of appearance)
+
 * Sarah Allen 
 * Sarah Mei
+* Rich Kilmer
 
 Contributors
+
+* Dan Steinicke
 * Akira Matsuda
 * Chad Fowler
-

data/lib/direction.rb

@@ -1,55 +1,57 @@
 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
+    
+    def opposite(opposite_name = nil)
+      if opposite_name
+        @opposite_name = opposite_name
       else 
-        @display_name
+        @opposite_name
       end
     end
     def dead_end?
-      false
+      @opposite_name.nil?
     end
   end
   
-  def direction(forward, back)
+  def direction(forward, back = nil)
     dir = Direction.new(forward)
-    dir.opposite(back)
+    dir.opposite(back) if back
     dir
   end
   
+  def dead_end(name)
+    direction(name)
+  end
+  
   def north
-    @north ||= direction('Go North', 'Go South')
+    @north ||= direction(Pie.localized(:go_north), Pie.localized(:go_south))
   end
   
   def south
-    @south ||= direction('Go South', 'Go North')
+    @south ||= direction(Pie.localized(:go_south), Pie.localized(:go_north))
   end
+  
   def east
-    @east ||= direction('Go East', 'Go West')
+    @east ||= direction(Pie.localized(:go_east), Pie.localized(:go_west))
   end
+  
   def west
-    @west ||= direction('Go West', 'Go East')
-  end
-  def dead_end(name)
-    DeadEnd.new(name)
+    @west ||= direction(Pie.localized(:go_west), Pie.localized(:go_east))
   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

data/lib/pie.rb

@@ -7,6 +7,28 @@ module Pie
   def self.[]=(key, value)
     (@map ||= {})[key] = value
   end
+
+  def self.language=(language)
+    @language = language
+  end
+  
+  def self.localized(id)
+    @values ||= {
+      :japanese => {
+        :go_north => "Go North (in jp!)",
+        :go_south => "Go South (in jp!)",
+        :go_east => "Go East (in jp!)",
+        :go_west => "Go West (in jp!)"
+      },
+      :english => {
+        :go_north => "Go North",
+        :go_south => "Go South",
+        :go_east => "Go East",
+        :go_west => "Go West"
+      }
+    }
+    @values[@language || :english][id]
+  end
   
   def template(name = nil)
     if name
@@ -46,6 +68,10 @@ module Pie
     Pie[:places] ||= {}
   end
   
+  def language(language)
+    Pie.language = language
+  end
+  
 end
 
 require 'place'

data/views/full_screen.erb

@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-	<title><%= $current %></title>
+	<title><%= current_place.name %></title>
 	<style type="text/css" media="screen">
 		
 		
@@ -49,12 +49,12 @@
 </head>
 
 <body>
-<img src="<%= $pie.current_image %>" class="bg" />
+<img src="<%= current_image %>" class="bg" />
 <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>

data/views/image_page.erb

@@ -48,9 +48,9 @@
 </head>
 
 <body>
-<img src="<%= $pie.current_image %>" class="bg" />
+<img src="<%= current_image %>" class="bg" />
 <div id="content">
-  <p><%= $pie.current_description %></p>
+  <p><%= current_place.description %></p>
 </div>
 </body>
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Sarah Allen, Sarah Mei, Rich Kilmer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-19 00:00:00 -07:00
+date: 2010-09-30 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -28,20 +28,15 @@ extra_rdoc_files: []
 
 files: 
 - lib/direction.rb
-- lib/direction.rb~
 - lib/pie.rb
-- lib/pie.rb~
 - lib/pie_server.rb
-- lib/pie_server.rb~
 - lib/place.rb
-- lib/place.rb~
-- bin/pie
-- bin/pie~
 - views/full_screen.erb
 - views/game_screen.erb
 - views/image_page.erb
 - README.md
 - MIT-LICENSE.txt
+- bin/pie
 has_rdoc: true
 homepage: http://github.com/blazingcloud/pie
 licenses: []

data/bin/pie~

@@ -1,31 +0,0 @@
-#!/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~

@@ -1,61 +0,0 @@
-module Pie
-  class String
-    def dead_end?
-      true
-    end
-  end
-
-  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,50 +0,0 @@
-module Pie
-  
-  def self.[](key)
-    (@map ||= {})[key]
-  end
-
-  def self.[]=(key, value)
-    (@map ||= {})[key] = value
-  end
-  
-  def template(name = nil)
-    if name
-      Pie[:template] = name.to_sym
-    else
-      Pie[:template] || :image_page
-    end
-  end
-  
-  def images
-    Pie[:images] ||= {}
-  end
-  
-  def image(image_maps)
-    images.merge!(image_maps)
-  end
-
-  def place(options)
-    Place.new(options)
-  end
-  
-  def current_place(name=nil)
-    if name
-      Pie[:current_place] = places[name.to_sym]
-    else
-      Pie[:current_place]
-    end
-  end
-  
-  def current_image
-    images[current_place.name] if current_place
-  end
-  
-  def places
-    Pie[:places] ||= {}
-  end
-  
-end
-
-require 'place'
-require 'direction'

data/lib/pie_server.rb~

@@ -1,21 +0,0 @@
-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~

@@ -1,47 +0,0 @@
-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? || !direction.respond_to?(: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