woyo-server 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfa37213238187a3f86e96fbfc729b52cdf3570d
-  data.tar.gz: 8103df5e8c3917375468aebacea6e73c58fefb33
+  metadata.gz: cfd63e05b76ab53afdae372cc7e3551ff8d71521
+  data.tar.gz: 9112b14b7d522244cf950e119d605d1e5f383a99
 SHA512:
-  metadata.gz: f92db08cbf485b5422d0d09863cfba099046a006eb336b49ef6ce6ed3154739e4aab9c6599230a83e0b32e96cdc9e0b90b61b20a10b0d1fe5cfc2460f73b205f
-  data.tar.gz: 6cea759a5e366bd90c5f3b5936695bd35f9a90678e55e671d48fa08c90c1749ceb5c33760d5f3156f204b1a8d21e62318591931fc562d43842d010d292e5ed78
+  metadata.gz: 304f8ee49402ddfe3fc72784e63e2157b1234c700d3c8a24a8448cc90ea205c145155be2487071dd4f7c0bc08acf1c685b4e04a215c40d262677ac87e6cae5c1
+  data.tar.gz: bed395bc349ec2b81e5f16003147215491247754220a97fa09b3262041f0b3d36b977ebb64019e9a83be313a4e896d34e860cf22d97fbd58c0c72df7c3a8c98d

data/lib/woyo/server/server.rb

@@ -1,6 +1,8 @@
 require 'sinatra/base'
 require 'sinatra/partial'
-require 'haml'
+require 'sinatra/json'
+require 'sinatra/reloader'
+require 'erb'
 require 'json'
 require 'woyo/world'
 
@@ -8,7 +10,9 @@ module Woyo
 
 class Server < Sinatra::Application
 
-  def self.load_world glob = 'world/*.rb' 
+  WORLD_FILES = 'world/**/*.rb' 
+
+  def self.load_world glob = WORLD_FILES
     world = Woyo::World.new
     Dir[glob].each do |filename|
       eval_world File.read( filename ), filename, world
@@ -22,57 +26,179 @@ class Server < Sinatra::Application
   end
 
   configure do
+    # todo: sessions with server-side store instead of cookie
     enable :sessions
-    set :session_secret, SecureRandom.hex(16) 
+    set session_secret: SecureRandom.hex(16) 
     set root: '.'
     set views: Proc.new { File.join(root, "views/server") }
     set public_folder: Proc.new { File.join(root, "public/server") }
     set world: self.load_world
   end
 
+  configure :development do
+   register Sinatra::Reloader
+   require 'pry'
+  end
+
+  def reload_world_changes
+    # todo: get and track file adds, deletes, mtimes in WORLD_FILES 
+  end
+
+  before do
+    if settings.development?
+      reload_world_changes
+    end
+  end
+
   def world
-    settings.world
+    @world = settings.world
+  end
+
+  def location
+    @location = world.locations[session[:location_id]]
+  end
+
+  def set_location id
+    session[:location_id] = id
+    location 
   end
 
   get '/' do
     redirect to 'default.html' if world.description.nil? && world.start.nil? # && world.name.nil? 
-    @world = world
-    session[:location_id] = world.start
-    haml :world
+    set_location world.start
+    erb :start
   end
 
-  get '/location' do
-    @location = world.locations[session[:location_id]]
-    haml :location
+  get '/play' do
+    location
+    erb :play
   end
 
-  get '/go/*' do |way_id|
-    content_type :json
-    way = world.locations[session[:location_id]].ways[way_id.to_sym]
-    session[:location_id] = way.to.id if way.open?
-    way.go.to_json
+  get '/locations/?:id?' do |id|
+    ids = id ? [ id.to_sym ] : params[:ids] 
+    ids = [ location.id ] unless false  # unless admin? a player can access current location only
+    ids = ids.collect { |id| id.to_sym }
+    locations = world.locations.select { |_,loc| ids.include? loc.id }     # old - id.nil? || ( loc.id == id ) }
+    json(
+      {
+        locations: locations.collect do |_,loc|
+          {
+            id:           loc.id,
+            name:         loc.name,
+            description:  loc.description,
+            ways:         loc.ways.keys,
+            items:        loc.items.keys
+          }
+        end
+      }
+    )
+  end
+
+  get '/items/?:id?' do |id|
+    ids = id ? [ id.to_sym ] : params[:ids] 
+    if ids && ! ids.empty?
+      ids = ids.collect { |id| id.to_sym }
+      items = location.items.select { |_,item| ids.include? item.id }
+      json(
+        {
+          items: items.collect do |_,item|
+            {
+              location:     location.id,
+              id:           item.id,
+              name:         item.name,
+              description:  item.description,
+              actions:      item.actions.collect { |_,action| "#{item.id}-#{action.id}" }
+            }
+          end.compact.uniq,
+          actions: items.collect do |_,item|
+            item.actions.collect do |_,action|
+              {
+                item:        item.id,
+                id:          "#{item.id}-#{action.id}",
+                name:        action.name,
+                description: action.description,
+                execution:   "item/#{item.id}/#{action.id}"
+              }
+            end
+          end.flatten.compact.uniq,
+          executions: items.collect do |_,item|
+            item.actions.collect do |_,action|
+              {
+                action:      "#{item.id}-#{action.id}",
+                id:          "item/#{item.id}/#{action.id}"
+              }
+            end   # empty execution so action will not be executed until clicked
+          end.flatten.compact.uniq
+        }
+      )
+    end
   end
 
-  get '/do/*/*/*' do |owner_type,owner_id,action_id|
+  get '/ways/?:id?' do |id|
+    ids = id ? [ id.to_sym ] : params[:ids] 
+    if ids && ! ids.empty?
+      ids = ids.collect { |id| id.to_sym }
+      ways = location.ways.select { |_,way| ids.include? way.id }
+      json(
+        {
+          ways: ways.collect do |_,way|
+            {
+              location:     location.id,
+              id:           way.id,
+              name:         way.name,
+              description:  way.description,
+              actions:      way.actions.collect { |_,action| "#{way.id}-#{action.id}" }
+            }
+          end.compact.uniq,
+          actions: ways.collect do |_,way|
+            way.actions.collect do |_,action|
+              {
+                way:         way.id,
+                id:          "#{way.id}-#{action.id}",
+                name:        action.name,
+                description: action.description,
+                execution:   "way/#{way.id}/#{action.id}"
+              }
+            end
+          end.flatten.compact.uniq,
+          executions: ways.collect do |_,way|
+            way.actions.collect do |_,action|
+              {
+                action:      "#{way.id}-#{action.id}",
+                id:          "way/#{way.id}/#{action.id}"
+              }
+            end   # empty execution so action will not be executed until clicked
+          end.flatten.compact.uniq
+        }
+      )
+    end
+  end
+
+  get '/executions/*/*/*' do |owner_type,owner_id,action_id|
     content_type :json
-    initial_location_id = session[:location_id]
-    location = world.locations[initial_location_id]
     if location.children.include? owner_type.to_sym
       owner = location.send( owner_type, owner_id.to_sym )
-      result = owner.action( action_id.to_sym ).execute
-      # extract client-related info from execution hash
-      if result[:execution].kind_of?( Hash )
-        result[:changes] = result[:execution][:changes] ? Array(result[:execution][:changes]) : []
-        if result[:execution][:location]
-          session[:location_id] = result[:execution][:location]
-          result[:changes] << :location
-        end
+      execution = owner.action( action_id.to_sym ).execute
+      if execution[:result][:location]
+        session[:location_id] = execution[:result][:location]
       end
-      result.delete :execution # execution info is for server only, do not pass to client
-      result.to_json  
+      execution[:id] = "#{owner_type}/#{owner_id}/#{action_id}" 
+      execution[:action] = "#{owner_id}-#{action_id}"
+      json(
+        {
+          executions: execution
+        }
+      )
     end
   end
-  
+
+  # get '/go/*' do |way_id|
+  #   content_type :json
+  #   way = world.locations[session[:location_id]].ways[way_id.to_sym]
+  #   session[:location_id] = way.to.id if way.open?
+  #   way.go.to_json
+  # end
+
 end
 
 end

data/lib/woyo/server/version.rb

@@ -1,3 +1,3 @@
 module Woyo
-  SERVER_VERSION = "0.0.8"
+  SERVER_VERSION = "0.0.9"
 end

data/public/server/css/server.css

@@ -1,17 +1,17 @@
 
 body {
-  display:none;
+  /* display:none; */
 }
 
-p.describe-actions {
-  display:none;
-  opacity:0;
+p.describe-action {
+  /* display:none; */
+  /* opacity:0; */
   padding-left:1em;
 }
 
 p.going {
-  display:none;
-  opacity:0;
+  /* display:none; */
+  /* opacity:0; */
   padding-left:1em;
 }
 

data/public/server/ember-1.6.1-kit/README.md

@@ -0,0 +1,36 @@
+starter-kit
+===========
+
+A starter kit for Ember
+
+Your Ember.js project is almost ready! Here's how to get started:
+
+- Start writing your app in `js/app.js`.
+
+- Describe your application HTML in `index.html`.
+
+- During development, you can link to `js/libs/ember-*.js` to get the
+  unminified version of Ember.js.
+
+- Add CSS to `css/style.css`.
+
+- Open `index.html` in your browser.
+
+Tests
+=====
+
+This starter kit comes with an integration test sample, written for QUnit runner. 
+
+You can run the tests by opening the `index.html?test` page in your browser.
+
+The test is located in the `tests/tests.js` file. You can see how such an 
+integration test should be written, using QUnit assertions and ember-testing helpers.
+
+For more information about ember-testing package see [ember-testing](http://emberjs.com/guides/testing/integration/).
+
+For more information about the QUnit testing framework, see [QUnit](http://qunitjs.com/).
+
+Contact
+====
+
+[www.emberjs.com](http://www.emberjs.com)

data/public/server/ember-1.6.1-kit/css/normalize.css

@@ -0,0 +1,406 @@
+/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
+
+/* ==========================================================================
+   HTML5 display definitions
+   ========================================================================== */
+
+/**
+ * Correct `block` display not defined in IE 8/9.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+nav,
+section,
+summary {
+    display: block;
+}
+
+/**
+ * Correct `inline-block` display not defined in IE 8/9.
+ */
+
+audio,
+canvas,
+video {
+    display: inline-block;
+}
+
+/**
+ * Prevent modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+    display: none;
+    height: 0;
+}
+
+/**
+ * Address `[hidden]` styling not present in IE 8/9.
+ * Hide the `template` element in IE, Safari, and Firefox < 22.
+ */
+
+[hidden],
+template {
+    display: none;
+}
+
+/* ==========================================================================
+   Base
+   ========================================================================== */
+
+/**
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS text size adjust after orientation change, without disabling
+ *    user zoom.
+ */
+
+html {
+    font-family: sans-serif; /* 1 */
+    -ms-text-size-adjust: 100%; /* 2 */
+    -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/**
+ * Remove default margin.
+ */
+
+body {
+    margin: 0;
+}
+
+/* ==========================================================================
+   Links
+   ========================================================================== */
+
+/**
+ * Remove the gray background color from active links in IE 10.
+ */
+
+a {
+    background: transparent;
+}
+
+/**
+ * Address `outline` inconsistency between Chrome and other browsers.
+ */
+
+a:focus {
+    outline: thin dotted;
+}
+
+/**
+ * Improve readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+    outline: 0;
+}
+
+/* ==========================================================================
+   Typography
+   ========================================================================== */
+
+/**
+ * Address variable `h1` font-size and margin within `section` and `article`
+ * contexts in Firefox 4+, Safari 5, and Chrome.
+ */
+
+h1 {
+    font-size: 2em;
+    margin: 0.67em 0;
+}
+
+/**
+ * Address styling not present in IE 8/9, Safari 5, and Chrome.
+ */
+
+abbr[title] {
+    border-bottom: 1px dotted;
+}
+
+/**
+ * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
+ */
+
+b,
+strong {
+    font-weight: bold;
+}
+
+/**
+ * Address styling not present in Safari 5 and Chrome.
+ */
+
+dfn {
+    font-style: italic;
+}
+
+/**
+ * Address differences between Firefox and other browsers.
+ */
+
+hr {
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+    height: 0;
+}
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+
+mark {
+    background: #ff0;
+    color: #000;
+}
+
+/**
+ * Correct font family set oddly in Safari 5 and Chrome.
+ */
+
+code,
+kbd,
+pre,
+samp {
+    font-family: monospace, serif;
+    font-size: 1em;
+}
+
+/**
+ * Improve readability of pre-formatted text in all browsers.
+ */
+
+pre {
+    white-space: pre-wrap;
+}
+
+/**
+ * Set consistent quote types.
+ */
+
+q {
+    quotes: "\201C" "\201D" "\2018" "\2019";
+}
+
+/**
+ * Address inconsistent and variable font size in all browsers.
+ */
+
+small {
+    font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+}
+
+sup {
+    top: -0.5em;
+}
+
+sub {
+    bottom: -0.25em;
+}
+
+/* ==========================================================================
+   Embedded content
+   ========================================================================== */
+
+/**
+ * Remove border when inside `a` element in IE 8/9.
+ */
+
+img {
+    border: 0;
+}
+
+/**
+ * Correct overflow displayed oddly in IE 9.
+ */
+
+svg:not(:root) {
+    overflow: hidden;
+}
+
+/* ==========================================================================
+   Figures
+   ========================================================================== */
+
+/**
+ * Address margin not present in IE 8/9 and Safari 5.
+ */
+
+figure {
+    margin: 0;
+}
+
+/* ==========================================================================
+   Forms
+   ========================================================================== */
+
+/**
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+    border: 1px solid #c0c0c0;
+    margin: 0 2px;
+    padding: 0.35em 0.625em 0.75em;
+}
+
+/**
+ * 1. Correct `color` not being inherited in IE 8/9.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+    border: 0; /* 1 */
+    padding: 0; /* 2 */
+}
+
+/**
+ * 1. Correct font family not being inherited in all browsers.
+ * 2. Correct font size not being inherited in all browsers.
+ * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
+ */
+
+button,
+input,
+select,
+textarea {
+    font-family: inherit; /* 1 */
+    font-size: 100%; /* 2 */
+    margin: 0; /* 3 */
+}
+
+/**
+ * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+button,
+input {
+    line-height: normal;
+}
+
+/**
+ * Address inconsistent `text-transform` inheritance for `button` and `select`.
+ * All other form control elements do not inherit `text-transform` values.
+ * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
+ * Correct `select` style inheritance in Firefox 4+ and Opera.
+ */
+
+button,
+select {
+    text-transform: none;
+}
+
+/**
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ *    and `video` controls.
+ * 2. Correct inability to style clickable `input` types in iOS.
+ * 3. Improve usability and consistency of cursor style between image-type
+ *    `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+    -webkit-appearance: button; /* 2 */
+    cursor: pointer; /* 3 */
+}
+
+/**
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+html input[disabled] {
+    cursor: default;
+}
+
+/**
+ * 1. Address box sizing set to `content-box` in IE 8/9/10.
+ * 2. Remove excess padding in IE 8/9/10.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+    box-sizing: border-box; /* 1 */
+    padding: 0; /* 2 */
+}
+
+/**
+ * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
+ * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
+ *    (include `-moz` to future-proof).
+ */
+
+input[type="search"] {
+    -webkit-appearance: textfield; /* 1 */
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box; /* 2 */
+    box-sizing: content-box;
+}
+
+/**
+ * Remove inner padding and search cancel button in Safari 5 and Chrome
+ * on OS X.
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+    -webkit-appearance: none;
+}
+
+/**
+ * Remove inner padding and border in Firefox 4+.
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+    border: 0;
+    padding: 0;
+}
+
+/**
+ * 1. Remove default vertical scrollbar in IE 8/9.
+ * 2. Improve readability and alignment in all browsers.
+ */
+
+textarea {
+    overflow: auto; /* 1 */
+    vertical-align: top; /* 2 */
+}
+
+/* ==========================================================================
+   Tables
+   ========================================================================== */
+
+/**
+ * Remove most spacing between table cells.
+ */
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}