woyo-server 0.0.8 → 0.0.9

data/public/server/js/play.js

@@ -0,0 +1,246 @@
+
+App = Ember.Application.create({
+  LOG_TRANSITIONS: true
+});
+
+App.IndexRoute = Ember.Route.extend({
+  beforeModel: function() {
+    this.transitionTo('location', initial_location_id);
+  }
+});
+
+App.Router.map(function() {
+  this.resource('location', { path: '/location/:location_id' }); //, function() {
+});
+
+// location
+
+App.LocationRoute = Ember.Route.extend({
+  model: function(params) {
+    return this.store.find('location', params.location_id);
+  }
+});
+
+App.LocationController = Ember.ObjectController.extend({
+});
+
+App.LocationView = Ember.View.extend({
+  willAnimateIn : function () {
+    console.log('location willAnimateIn');
+    this.$().css("opacity", 0);
+  },
+  animateIn : function (done) {
+    console.log('location animateIn');
+    this.$().fadeTo(woyo.time.page_in, 1, done);
+  },
+  animateOut : function (done) {
+    console.log('location animateIn');
+    this.$().fadeTo(woyo.time.page_out, 0, done);
+  }
+})
+
+App.Location = DS.Model.extend({
+  name:         DS.attr(),
+  description:  DS.attr(),
+  items:        DS.hasMany('item', {async:true}),
+  ways:         DS.hasMany('way',  {async:true})
+});
+
+// way
+
+App.WayController = Ember.ObjectController.extend({
+});
+
+App.WayView = Ember.View.extend({
+  willAnimateIn: function () {
+    console.log('way willAnimateIn');
+    this.$().css("opacity", 0);
+  },
+  animateIn: function (done) {
+    console.log('way animateIn');
+    this.$().fadeTo(woyo.time.page_in, 1, done);
+  },
+  animateOut: function (done) {
+    console.log('way animateOut');
+    this.$().fadeTo(woyo.time.page_out, 0, done);
+  }
+});
+
+App.Way = DS.Model.extend({
+  location:     DS.belongsTo('location'),
+  name:         DS.attr(),
+  description:  DS.attr(),
+  actions:      DS.hasMany('action', {async:false}),
+  div_id:       function() { return 'way-' + this.get('id'); }.property('id')
+});
+
+// item
+
+App.ItemRoute = Ember.Route.extend({
+  beforeModel: function() {
+    console.log("item beforeModel");
+  },
+  // model: function(params) {
+  //   return this.store.find('item', params.item_id);
+  // },
+  afterModel: function() {
+    console.log("item afterModel");
+  }
+});
+
+App.ItemController = Ember.ObjectController.extend({
+});
+
+App.ItemView = Ember.View.extend({
+  willAnimateIn: function () {
+    console.log('item willAnimateIn');
+    this.$().css("opacity", 0);
+  },
+  animateIn: function (done) {
+    console.log('item animateIn');
+    this.$().fadeTo(woyo.time.page_in, 1, done);
+  },
+  animateOut: function (done) {
+    console.log('item animateOut');
+    this.$().fadeTo(woyo.time.page_out, 0, done);
+  }
+});
+
+App.Item = DS.Model.extend({
+  location:     DS.belongsTo('location'),
+  name:         DS.attr(),
+  description:  DS.attr(),
+  actions:      DS.hasMany('action', {async:false}),
+  div_id:       function() { return 'item-' + this.get('id'); }.property('id'),
+  didLoad: function() {
+    console.log('item didLoad');
+  }
+});
+
+// action
+
+App.ActionController = Ember.ObjectController.extend({
+  actions: {
+    execute: function() {
+      this.get( 'execution' ).reload().then( function( execution ) {
+        var changes   = execution.get('changes');
+        var result    = execution.get('result')
+        var action    = execution.get('action');
+        var owner     = action.get('owner');
+        var location  = owner.get('location');
+        // todo: make this work for all changes...
+        // todo: transitions for changes to ember bound fields ?
+        for ( change in changes ) {
+          if ( change == "description" || change == "name" ) {
+            location.set( change, changes[change] );
+          }
+          if ( change == "item" ) {
+            var items_changed = changes.item;
+            for ( item_id in items_changed ) {
+              var item = location.get( 'items' ).findProperty( 'id', item_id );
+              if ( item ) {
+                attrs_changed = items_changed[item_id];
+                for ( attr_id in attrs_changed ) {
+                  var attr = item.get(attr_id);
+                  if ( attr ) {
+                    item.set( attr_id, attrs_changed[attr_id] );
+                  };
+                };
+              };
+            };
+          };
+          if ( change == "way" ) {
+            var ways_changed = changes.way;
+            for ( way_id in ways_changed ) {
+              var way = location.get( 'ways' ).findProperty( 'id', way_id );
+              if ( way ) {
+                attrs_changed = ways_changed[way_id];
+                for ( attr_id in attrs_changed ) {
+                  var attr = way.get(attr_id);
+                  if ( attr ) {
+                    way.set( attr_id, attrs_changed[attr_id] );
+                  };
+                };
+              };
+            };
+          };
+        };
+        if ( result.location ) {
+          setTimeout(function(){ window.location.assign("/play"); }, woyo.time.go_delay);
+        } else { 
+          setTimeout(function(){ execution.set( 'display_describe', null ); }, woyo.time.action_delay);
+        };
+      }); 
+    }
+  }  
+});
+
+App.ActionView = Ember.View.extend({
+  willAnimateIn: function () {
+    console.log('action willAnimateIn');
+    this.$().css("opacity", 0);
+  },
+  animateIn: function (done) {
+    console.log('action animateIn');
+    this.$().fadeTo(woyo.time.page_in, 1, done);
+  },
+  animateOut: function (done) {
+    console.log('action animateOut');
+    this.$().fadeTo(woyo.time.page_out, 0, done);
+  }
+});
+
+App.Action = DS.Model.extend({
+  item:         DS.belongsTo('item'),
+  way:          DS.belongsTo('way'),
+  name:         DS.attr(),
+  description:  DS.attr(),
+  execution:    DS.belongsTo('execution', {async:false}),
+  owner: function() { return this.get('item') || this.get('way'); }.property('item','way'),
+  display_description: function() { return this.get('description') || this.get('name'); }.property('description','way')
+});
+
+// execution
+
+App.ExecutionController = Ember.ObjectController.extend({
+});
+
+App.ExecutionView = Ember.View.extend({
+  willAnimateIn: function () {
+    console.log('execution willAnimateIn');
+    this.$().css("opacity", 0);
+  },
+  animateIn: function (done) {
+    console.log('execution animateIn');
+    this.$().fadeTo(woyo.time.page_in, 1, done);
+  },
+  animateOut: function (done) {
+    console.log('execution animateOut');
+    this.$().fadeTo(woyo.time.page_out, 0, done);
+  }
+});
+
+App.Execution = DS.Model.extend({
+  action:       DS.belongsTo('action'),
+  result:       DS.attr(),
+  describe:     DS.attr(),
+  changes:      DS.attr(),
+  display_describe: function(key, value, old) {
+    // computed property to display describe lets me erase the displayed value without making the record dirty
+    // a clean record permits reload from the server for subsequent action executions
+    if ( arguments.length == 1 ) {
+      return this.get('describe');
+    } else {
+      return value;
+    }
+  }.property('describe')
+});
+
+// functions
+
+function hold(delay_time){
+  var dfd = $.Deferred();
+  setTimeout(function(){ dfd.resolve(); }, delay_time);
+  return dfd.promise();
+}
+

data/public/server/js/server.js

@@ -3,78 +3,18 @@ $(document).foundation();
 
 $(document).ready( function() {
 
-  var woyo = {
+  woyo = {
     time: {
       page_in:  1000,
       page_out: 1000,
       go_slide: 1000,
       go_fade:  1000,
-      go_delay: 2000
+      go_delay: 2000,
+      action_slide: 1000,
+      action_fade:  1000,
+      action_delay: 2000
     }
   };
   
-  $("body").fadeIn(woyo.time.page_in);
-
-  $(".way .go").click( function() {
-    $go_link = $(this);
-    go_url = $go_link.attr("href");
-    $.get( go_url, function(json) {
-      if ( json.going.length > 0 ) {
-        $go_link
-        .siblings(".going")
-        .text(json.going)
-        .slideDown(woyo.time.go_slide)
-        .animate({opacity: 1}, woyo.time.go_fade)
-        .delay(woyo.time.go_delay)
-        .queue( function(next) {
-          if ( json.go == true ) {
-            $("body").fadeOut(woyo.time.page_out, function() {
-              window.location.reload(true);
-            });
-          };
-          next();
-        });
-      } else {
-        if ( json.go == true ) {
-          $("body").fadeOut(woyo.time.page_out, function() {
-            window.location.reload(true);
-          });
-        };
-      };
-    });
-    return false;
-  });
-
-  $("a.do").click( function() {
-    owner = $("#" + $(this).parent().attr("owner_element"));
-    do_url = $(this).attr("href");
-    $.get( do_url, function(json) {
-      // todo: handle multiple texts in describe array not just a string
-      if ( json.describe.length > 0 ) {
-        owner
-        .children(".describe-actions")
-        .text(json.describe)
-        .slideDown(woyo.time.go_slide)
-        .animate({opacity: 1}, woyo.time.go_fade)
-        .delay(woyo.time.go_delay)
-        .queue( function(next) {
-        if ( json.changes.length > 0 ) {
-            $("body").fadeOut(woyo.time.page_out, function() {
-              window.location.reload(true);
-            });
-          };
-          next();
-        });
-      } else {
-        if ( json.changes.length > 0 ) {
-          $("body").fadeOut(woyo.time.page_out, function() {
-            window.location.reload(true);
-          });
-        };
-      };
-    });
-    return false;
-  });
-
 });
  

data/todo.txt

@@ -1,5 +1,21 @@
 
-! Smooth transitions for going ways
+
+/ loads page
+  locations                           [ :id1, :id2, ... ]
+  location/:id                                              { id: :id, name: 'name' description: [ 'text1', 'text2', ... ] }
+  location/:id/ways                   [ :id1, :id2, ... ]
+  location/:id/way/:id                                      { id: :id, name: 'name', description: [ 'text1', 'text2', ... ], to: :to_id }
+  location/:id/items                  [ :id1, :id2, ... ]
+  location/:id/item/:id                                     { id: :id, name: 'name', description: [ 'text1', 'text2', ... ] }
+  location/:id/item/:id/actions       [ :id1, :id2, ... ]
+  location/:id/item/:id/actions/:id                         { id: :id, name: 'name', description: [ 'text1', 'text2', ... ] }
+    
+
+
+
+
+
+
 ! Multiline descriptions
     <br/>   => <br/>        # html in text    
     <br>    => <br/>        # html in text + fixup tag ?
@@ -8,13 +24,4 @@
     \n      => <br/>        # convert
     \n\n    => </p><p ... > # convert - set params for new paragraph
 
-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.erb

@@ -0,0 +1,37 @@
+<html>
+
+  <head>
+
+    <meta charset="utf-8"></meta> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"></meta> 
+    <link rel="stylesheet" href="/foundation-5.2.2/css/foundation.css"></link>
+    <link rel="stylesheet" href="/css/server.css"></link>
+    <script src="/foundation-5.2.2/js/vendor/modernizr.js"></script>
+
+    <title>
+      <%= case  
+          when @world 
+            @world.name
+          when @location
+            @location.name
+          end %>
+    </title>
+
+  </head>
+
+  <body>
+
+    <script src="/foundation-5.2.2/js/vendor/jquery.js"/></script>
+    <script src="/foundation-5.2.2/js/foundation.min.js"></script>
+    <script src="/handlebars-1.1.2/handlebars.js"></script>
+    <script src="/ember-1.7.0/ember.js"></script>
+    <script src="/ember-data-1.0.0-beta.9/ember-data.js"></script>
+    <script src="/ember-animate-0.3.5/ember-animate.js"></script>
+    <script src="/js/server.js"></script>
+
+    <%= yield %>
+
+  </body>
+
+</html>
+

data/views/server/play.erb

@@ -0,0 +1,74 @@
+
+<script type="text/x-handlebars">
+  <div class="row">
+    <div class="large-12 columns">
+      {{outlet}}
+    </div>
+  </div>
+</script>
+
+<script type="text/x-handlebars" data-template-name="location">
+  <div class="row">
+    <div class="large-12 columns">
+      <h1>{{name}}</h1>
+      <p>{{description}}</p>
+      {{#each item in items}}
+        {{render "item" item}}
+      {{/each}}
+      {{#each way in ways}}
+        {{render "way" way}}
+      {{/each}}
+    </div>
+  </div>
+</script>
+
+<script type="text/x-handlebars" data-template-name="item">
+  <div class="row">
+    <div class="large-12 columns">
+      <div {{bind-attr id=item.div_id}}>
+        <p class="description">{{description}}</p>
+        {{#each action in actions}}
+          {{render "execution" action.execution}}
+        {{/each}}
+        <ul>
+          {{#each action in actions}}
+            {{render "action" action}}
+          {{/each}}
+        </ul>
+      </div>
+    </div>
+  </div>
+</script>
+
+<script type="text/x-handlebars" data-template-name="way">
+  <div class="row">
+    <div class="large-12 columns">
+      <div {{bind-attr id=way.div_id}}>
+        <p class="description">{{description}}</p>
+        {{#each action in actions}}
+          {{render "execution" action.execution}}
+        {{/each}}
+        <ul>
+          {{#each action in actions}}
+            {{render "action" action}}
+          {{/each}}
+        </ul>
+      </div>
+    </div>
+  </div>
+</script>
+
+<script type="text/x-handlebars" data-template-name="action">
+  <li class="action"><a {{action 'execute'}}>{{display_description}}</a></li>
+</script>
+
+<script type="text/x-handlebars" data-template-name="execution">
+  <p class="describe-execution">{{display_describe}}</p>
+</script>
+
+<script type="text/javascript">
+  <%= "var initial_location_id = '#{@location.id}';" %>
+</script>
+
+<script src="/js/play.js"></script>
+