pakyow 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35ae9d36c47c1b8d13ba46589a5508496c0b09ca
-  data.tar.gz: 3468a1d1e5b3482250e67d0190f1cf3975b76dd9
+  metadata.gz: 199c2331bc67c6b913a5408523fc60019770d551
+  data.tar.gz: b6e2c05f9d55ca795ffb44cf9ed0f7a21c22837a
 SHA512:
-  metadata.gz: 420ab1dd7017d15645a8625e44d0a191b15c0659fb445ece91d95257590c99426e2647bca89b601881e3709c4491d215632620dd3ab173708f4bee7779511c0f
-  data.tar.gz: 7e284f90e783752600a739324d61e082c4438695a25a26b6704ede2f6cc1482a3b835c0be1c6fb2562328c140cbf031d89e77657ceaeb98ceadd86610f891efc
+  metadata.gz: 1f0bfd078e041e64094ecbba209afdf4b761d760afcabe795b0b83363f112edc20ac1af5167ce63ad5bae5ab429f0dc683747d7db843a6e09fc7c4b0b60e2c46
+  data.tar.gz: 8191df207e1ec7e2211dbe8252c714c7b62b7a078b6cefa88c85ed493686030b1720c9d47b9f30f220faa98443afbe8fb2b88638c987f1796b0502a1b3266926

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 0.11.0
+
+  * Generated app updates:
+    * Uses dotenv for config management
+    * Breaks middleware into pluggable pieces
+    * Dynamically sets app name in config
+    * Creates a random session secret
+    * Updates Ring to 0.2.4
+  * Evaluates app template as erb
+  * Improves CLI, including new `version` command
+  * Moves everything into the Pakyow namespace
+  * Adds ASCII art to `server` command \o/
+
 # 0.10.2 / 2015-11-15
 
   * Updates Ring to latest in generator

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2015 Bryan Powell
+Copyright (c) 2011-2016 Bryan Powell
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,6 +1,8 @@
 [gem]: https://rubygems.org/gems/pakyow
 [travis]: https://travis-ci.org/pakyow/pakyow
 [gemnasium]: https://gemnasium.com/pakyow/pakyow
+[inchpages]: http://inch-ci.org/github/pakyow/pakyow
+[codeclimate]: https://codeclimate.com/github/pakyow/pakyow
 
 # Pakyow Framework [![Gitter chat](https://badges.gitter.im/pakyow/chat.svg)](https://gitter.im/pakyow/chat)
 
@@ -46,6 +48,7 @@ implements this protocol on the backend for initial rendering and in
 [![Gem Version](https://badge.fury.io/rb/pakyow.svg)][gem]
 [![Build Status](https://travis-ci.org/pakyow/pakyow.svg?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/pakyow/pakyow.svg)][gemnasium]
+[![Inline docs](http://inch-ci.org/github/pakyow/pakyow.svg?branch=master&style=flat)][inchpages]
 
 ---
 
@@ -61,7 +64,7 @@ implements this protocol on the backend for initial rendering and in
 
 3. Move to the new directory and start the server:
 
-    `cd webapp; pakyow server`
+    `cd webapp; bundle exec pakyow server`
 
 4. You'll find your project running at [http://localhost:3000](http://localhost:3000)!
 

data/bin/pakyow

@@ -1,18 +1,4 @@
 #!/usr/bin/env ruby
 
-PAK_PATH = File.expand_path('../../lib', __FILE__)
-
-case ARGV.first
-when 'new'
-  ARGV.shift
-  require File.join(PAK_PATH, 'generators/pakyow/app/app_generator')
-  Pakyow::Generators::AppGenerator.start
-when 'server', 's'
-  ARGV.shift
-  require File.join(PAK_PATH, 'commands/server')
-when 'console', 'c'
-  ARGV.shift
-  require File.join(PAK_PATH, 'commands/console')
-when '--help', '-h', nil
-  puts File.open(File.join(PAK_PATH, 'commands/USAGE')).read
-end
+require "pakyow/command_line_interface"
+Pakyow::CommandLineInterface.start

data/lib/generators/pakyow/app/app_generator.rb

@@ -1,20 +1,25 @@
+require 'erb'
 require 'fileutils'
+require 'securerandom'
+require 'pakyow/version.rb'
 
 module Pakyow
   module Generators
     class AppGenerator
       class << self
-        def start
-          case ARGV.first
-          when '--help', '-h', nil
-            puts File.open(File.join(PAK_PATH, 'commands/USAGE-NEW')).read
-          else
-            generator = self.new(ARGV.first)
-            generator.build
-          end
+        def start(destination)
+          generator = self.new(destination)
+          generator.build
         end
       end
 
+      FILENAME_TRANSLATIONS = {
+        'rspec' => '.rspec',
+        'gitignore' => '.gitignore',
+        'env' => '.env',
+        'env.example' => '.env.example'
+      }
+
       def initialize(dest)
         @src = "#{File.expand_path('../', __FILE__)}/templates/."
         @dest = dest
@@ -38,23 +43,51 @@ module Pakyow
         end
 
         exec
-        puts "Done! Run `cd #{@dest}; pakyow server` to get started!"
+        puts "Done! Run `cd #{@dest}; bundle exec pakyow server` to get started!"
       end
 
       protected
 
-      # copies src files to dest
       def copy
-        FileUtils.cp_r(@src, @dest)
+        FileUtils.mkdir(@dest) unless File.exists?(@dest)
+
+        Dir.glob(File.join(@src, '**', '*')).each do |path|
+          relative_path = path[@src.length..-1]
+          generated_path = File.join(@dest, File.dirname(relative_path), translated_filename(File.basename(relative_path)))
+
+          if File.directory?(path)
+            FileUtils.mkdir(generated_path)
+            next
+          end
+
+          erb = ERB.new(File.read(path))
+          File.open(generated_path, 'w') { |f| f.write(erb.result(binding)) }
+        end
       end
 
-      # performs and other setup (e.g. bundle install)
       def exec
         FileUtils.cd(@dest) do
           puts "Running `bundle install` in #{Dir.pwd}"
-          system("bundle install")
+          system("bundle install --binstubs")
         end
       end
+
+      def generating_locally?
+        local_pakyow = Gem::Specification.sort_by{ |g| [g.name.downcase, g.version] }.group_by{ |g| g.name }.detect{|k,v| k == 'pakyow'}
+        !local_pakyow || local_pakyow.last.last.version < Gem::Version.new(Pakyow::VERSION)
+      end
+
+      def translated_filename(filename)
+        FILENAME_TRANSLATIONS.fetch(filename, filename)
+      end
+
+      def generate_session_secret
+        SecureRandom.hex(64)
+      end
+
+      def app_name
+        File.basename(@dest)
+      end
     end
   end
 end

data/lib/generators/pakyow/app/templates/Gemfile

@@ -1,15 +1,16 @@
 source 'https://rubygems.org'
-
-# live on the edge and uncomment this line
-# gem 'pakyow', github: 'pakyow/pakyow'
-
-# use the latest released version
-gem 'pakyow', '~> 0.10'
-
+<% if generating_locally? %>
+gem 'pakyow', github: 'pakyow/pakyow'
+<% else %>
+gem 'pakyow', '~> <%= Pakyow::VERSION %>'
+<% end %>
 # app server
 gem 'puma', platforms: :ruby
 gem 'thin', platforms: :mswin
 
+# use dotenv to load environment variables
+gem 'dotenv'
+
 group :test do
   gem 'rspec'
 end

data/lib/generators/pakyow/app/templates/README.md

@@ -4,13 +4,13 @@ This is a Pakyow v0.10 project.
 
 Start the server:
 
-  `pakyow server`
+  `bundle exec pakyow server`
 
 You'll find your app running at [http://localhost:3000](http://localhost:3000)!
 
 Need to interact with your code? Fire up a console:
 
-  `pakyow console`
+  `bundle exec pakyow console`
 
 # Next Steps
 

data/lib/generators/pakyow/app/templates/app/setup.rb

@@ -2,32 +2,23 @@ require 'bundler/setup'
 require 'pakyow'
 
 Pakyow::App.define do
-  configure :global do
+  configure do
     Bundler.require :default, Pakyow::Config.env
 
-    # put global config here and they'll be available across environments
-    app.name = 'Pakyow'
-  end
-
-  configure :development do
-    # put development config here
-  end
+    if defined?(Dotenv)
+      env_path = ".env.#{Pakyow::Config.env}"
+      Dotenv.load env_path if File.exist?(env_path)
+      Dotenv.load
+    end
 
-  configure :prototype do
-    # an environment for running the front-end prototype with no backend
-    app.ignore_routes = true
+    app.name = '<%= app_name %>'
   end
 
-  configure :staging do
-    # put your staging config here
+  configure :development do
+    # development config goes here
   end
 
   configure :production do
-    # put your production config here
-  end
-
-  middleware do |builder|
-    # TODO: you will most definitely want to change this secret
-    builder.use Rack::Session::Cookie, key: "#{Pakyow::Config.app.name}.session", secret: 'sekret'
+    # production config goes here
   end
 end

data/lib/generators/pakyow/app/templates/app/views/_templates/default.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>
-    Pakyow
+    <%= app_name %>
   </title>
 
   <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0" name="viewport">
@@ -13,6 +13,8 @@
   <link rel="stylesheet" type="text/css" href="/styles/pakyow-css/theme.css">
 
   <script src="/scripts/ring/pakyow.js"></script>
+
+  <meta charset="UTF-8">
 </head>
 
 <body>

data/lib/generators/pakyow/app/templates/env

@@ -0,0 +1 @@
+SESSION_SECRET=<%= generate_session_secret %>

data/lib/generators/pakyow/app/templates/env.example

@@ -0,0 +1,3 @@
+# Please place the following environment variables in your local `.env` file.
+
+SESSION_SECRET=sekret

data/lib/generators/pakyow/app/templates/gitignore

@@ -0,0 +1,8 @@
+# ignore bundler config
+.bundle
+
+# ignore environment files
+.env*
+
+# ignore binstubs
+bin

data/lib/generators/pakyow/app/templates/public/scripts/ring/components/fastlink.js

@@ -1,8 +1,9 @@
 pw.component.register('fastlink', function (view, config) {
-  var that = this;
-
   if (window.history) {
     view.node.addEventListener('click', function (evt) {
+      // don't break open in new tab!
+      if (evt.metaKey || evt.ctrlKey) return;
+
       evt.preventDefault();
       window.history.pushState({ uri: this.href }, this.href, this.href);
       return false;

data/lib/generators/pakyow/app/templates/public/scripts/ring/components/fastlink.min.js

@@ -1 +1 @@
-pw.component.register("fastlink",function(t,e){window.history&&t.node.addEventListener("click",function(t){return t.preventDefault(),window.history.pushState({uri:this.href},this.href,this.href),!1})});
+pw.component.register("fastlink",function(t,e){window.history&&t.node.addEventListener("click",function(t){return t.metaKey||t.ctrlKey?void 0:(t.preventDefault(),window.history.pushState({uri:this.href},this.href,this.href),!1)})});

data/lib/generators/pakyow/app/templates/public/scripts/ring/components/ga.js

@@ -0,0 +1,34 @@
+/*
+  Ring.js - Google Analytics Component
+
+  Sets up Google Analytics and tracks the immediate pageview along with any
+  pageviews that occur over a WebSocket connection with Navigator. To use,
+  attach the component to the <body> tag and configure the trackingId:
+
+    <body data-ui="ga" data-config="trackingId: yourTrackingIdHere">
+
+  It will automatically ignore pageviews that occur locally.
+*/
+
+pw.component.register('ga', function (view, config) {
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', config.trackingId, 'auto');
+
+  this.track = function (uri) {
+    if (document.domain.indexOf('local') != -1) {
+      return;
+    }
+
+    ga('send', 'pageview', uri);
+  };
+
+  this.listen('navigator:change', function (payload) {
+    this.track(payload.uri);
+  });
+
+  // track the current pageview
+  this.track(location.pathname);
+});

data/lib/generators/pakyow/app/templates/public/scripts/ring/components/ga.min.js

@@ -0,0 +1 @@
+pw.component.register("ga",function(t,n){!function(t,n,e,a,c,i,o){t.GoogleAnalyticsObject=c,t[c]=t[c]||function(){(t[c].q=t[c].q||[]).push(arguments)},t[c].l=1*new Date,i=n.createElement(e),o=n.getElementsByTagName(e)[0],i.async=1,i.src=a,o.parentNode.insertBefore(i,o)}(window,document,"script","//www.google-analytics.com/analytics.js","ga"),ga("create",n.trackingId,"auto"),this.track=function(t){-1==document.domain.indexOf("local")&&ga("send","pageview",t)},this.listen("navigator:change",function(t){this.track(t.uri)}),this.track(location.pathname)});

data/lib/generators/pakyow/app/templates/public/scripts/ring/components/modal.js

@@ -60,7 +60,7 @@ pw.component.register('modal', function (view, config, name, id) {
 
   view.node.addEventListener('click', function (evt) {
     evt.preventDefault();
-    self.load(this.href);
+    self.load(config.href || this.href);
     return false;
   });
 

data/lib/generators/pakyow/app/templates/public/scripts/ring/components/modal.min.js

@@ -1 +1 @@
-pw.component.register("modal",function(t,e,n,o){var a,i,d,l=this,r="modal:"+o;(d=document.querySelector('*[data-template="ui-modal-blinder"]'))&&(d=d.cloneNode(!0)),this.listen(r+":navigator:enter",function(t){a||(d?(a=d.cloneNode(!0),i=a.querySelector('*[data-template="ui-modal-content"]'),document.body.appendChild(a),a.removeAttribute("data-template"),i.removeAttribute("data-template")):(a=document.createElement("DIV"),a.classList.add("ui-modal-blinder"),i=document.createElement("DIV"),i.classList.add("ui-modal"),a.appendChild(i),document.body.appendChild(a)),a.addEventListener("click",function(t){if(t.target===a){t.preventDefault(),l.close();var e=window.location.pathname,n={uri:e};window.history.pushState(n,e,e)}})),i.innerHTML=t.body,pw.component.findAndInit(a),a.classList.add("ui-appear")}),this.listen(r+":navigator:exit",function(){l.close()}),this.listen(r+":navigator:boot",function(t){l.load(t)}),t.node.addEventListener("click",function(t){return t.preventDefault(),l.load(this.href),!1}),this.load=function(t){if(!window.socket)return void(document.location=t);var n={uri:t,context:"modal:"+o};e.container&&(n.container=e.container),e.partial&&(n.partial=e.partial),window.history.pushState(n,t,t)},this.close=function(){a&&i&&(pw.node.remove(a),a=null,i=null)}});
+pw.component.register("modal",function(t,e,n,o){var a,i,d,l=this,r="modal:"+o;(d=document.querySelector('*[data-template="ui-modal-blinder"]'))&&(d=d.cloneNode(!0)),this.listen(r+":navigator:enter",function(t){a||(d?(a=d.cloneNode(!0),i=a.querySelector('*[data-template="ui-modal-content"]'),document.body.appendChild(a),a.removeAttribute("data-template"),i.removeAttribute("data-template")):(a=document.createElement("DIV"),a.classList.add("ui-modal-blinder"),i=document.createElement("DIV"),i.classList.add("ui-modal"),a.appendChild(i),document.body.appendChild(a)),a.addEventListener("click",function(t){if(t.target===a){t.preventDefault(),l.close();var e=window.location.pathname,n={uri:e};window.history.pushState(n,e,e)}})),i.innerHTML=t.body,pw.component.findAndInit(a),a.classList.add("ui-appear")}),this.listen(r+":navigator:exit",function(){l.close()}),this.listen(r+":navigator:boot",function(t){l.load(t)}),t.node.addEventListener("click",function(t){return t.preventDefault(),l.load(e.href||this.href),!1}),this.load=function(t){if(!window.socket)return void(document.location=t);var n={uri:t,context:"modal:"+o};e.container&&(n.container=e.container),e.partial&&(n.partial=e.partial),window.history.pushState(n,t,t)},this.close=function(){a&&i&&(pw.node.remove(a),a=null,i=null)}});

data/lib/generators/pakyow/app/templates/public/scripts/ring/components/mutable.js

@@ -54,13 +54,17 @@ pw.component.register('mutable', function (view, config) {
         }
       } else if (res.status === 400) {
         // bad request
+        pw.component.broadcast('response:received', { response: res });
         return;
       } else {
         self.state.rollback();
       }
 
       pw.component.broadcast('response:received', { response: res });
-      self.revert();
+
+      if (config.revert !== 'false') {
+        self.revert();
+      }
     });
   }
 });

data/lib/generators/pakyow/app/templates/public/scripts/ring/components/mutable.min.js

@@ -1 +1 @@
-pw.component.register("mutable",function(e,t){this.mutation=function(t){if(!window.socket)return void e.node.submit();var o=pw.util.dup(t);delete o.__nested,delete o.scope,delete o.id;var n={action:"call-route"};if("FORM"===e.node.tagName){if(e.node.querySelector('input[type="file"]'))return void e.node.submit();var i,r=e.node.querySelector('input[name="_method"]');i=r?r.value:e.node.getAttribute("method"),n.method=i,n.uri=e.node.getAttribute("action"),n.input=pw.node.serialize(e.node)}else{var a={};a[t.scope]=o,n.input=a}var d=this;window.socket.send(n,function(e){if(302===e.status){var t=e.headers.Location;t!=window.location.pathname||window.context&&"default"===window.context.name?history.pushState({uri:t},t,t):history.pushState({uri:t},t,t)}else{if(400===e.status)return;d.state.rollback()}pw.component.broadcast("response:received",{response:e}),d.revert()})}});
+pw.component.register("mutable",function(e,t){this.mutation=function(o){if(!window.socket)return void e.node.submit();var n=pw.util.dup(o);delete n.__nested,delete n.scope,delete n.id;var i={action:"call-route"};if("FORM"===e.node.tagName){if(e.node.querySelector('input[type="file"]'))return void e.node.submit();var r,s=e.node.querySelector('input[name="_method"]');r=s?s.value:e.node.getAttribute("method"),i.method=r,i.uri=e.node.getAttribute("action"),i.input=pw.node.serialize(e.node)}else{var a={};a[o.scope]=n,i.input=a}var d=this;window.socket.send(i,function(e){if(302===e.status){var o=e.headers.Location;o!=window.location.pathname||window.context&&"default"===window.context.name?history.pushState({uri:o},o,o):history.pushState({uri:o},o,o)}else{if(400===e.status)return void pw.component.broadcast("response:received",{response:e});d.state.rollback()}pw.component.broadcast("response:received",{response:e}),"false"!==t.revert&&d.revert()})}});

data/lib/generators/pakyow/app/templates/public/scripts/ring/components/navigator.js

@@ -80,6 +80,9 @@ function handleState(state, direction) {
     return;
   }
 
+  uri = uri.replace(document.location.origin, '');
+  pw.component.broadcast('navigator:change', { uri: uri });
+
   if (state.context) {
     state.r_uri = document.location.pathname + '#:' + state.context + '/' + uri;
 
@@ -135,16 +138,17 @@ function handleState(state, direction) {
       var body = payload.body[0];
 
       if (body.match(/<title>/)) {
-        document.title = body.split(/<title>/)[1].split('</title>')[0];
+        var title = body.split(/<title>/)[1].split('</title>')[0];
+        document.querySelector('title').innerHTML = title;
       }
 
-      if (body.match(/<body [^>]*>/)) {
-        document.body.innerHTML = body.split(/<body [^>]*>/)[1].split('</body>')[0];
-      } else {
-        document.body.innerHTML = body;
-      }
+      var doc = document.documentElement.cloneNode();
+      doc.innerHTML = body;
 
+      document.body.innerHTML = doc.querySelector('body').innerHTML;
       pw.component.findAndInit(document.querySelectorAll('body')[0]);
+
+      document.body.scrollTop = document.documentElement.scrollTop = 0;
     }
   });
 }

data/lib/generators/pakyow/app/templates/public/scripts/ring/components/navigator.min.js

@@ -1 +1 @@
-function boot(){if(!window.socket)return void setTimeout(boot,100);if(window.location.hash){var t=window.location.hash.split("#:")[1].split("/"),n=t.shift(),o=t.join("/");pw.component.broadcast(n+":navigator:boot",o)}}function handleState(t,n){var o=t.uri||t.url;if(!window.socket)return void(document.location=o);if(t.context)t.r_uri=document.location.pathname+"#:"+t.context+"/"+o,window.context={_state:t,name:t.context,uri:t.r_uri,container:t.container,partial:t.partial};else if(t.r_uri=o,"default"!==window.context.name){if("back"===n)return pw.component.broadcast(window.context.name+":navigator:exit"),void(window.context={name:"default",uri:t.uri});t.r_uri=document.location.pathname+"#:"+window.context.name+"/"+o,t.context=window.context.name,t.container=window.context.container,t.partial=window.context.partial}var i={uri:o,action:"call-route",method:"get"};t.container&&(i.container=t.container),t.partial&&(i.partial=t.partial),window.socket.send(i,function(n){if(t.context)pw.component.broadcast(t.context+":navigator:enter",n);else{var o=n.body[0];o.match(/<title>/)&&(document.title=o.split(/<title>/)[1].split("</title>")[0]),o.match(/<body [^>]*>/)?document.body.innerHTML=o.split(/<body [^>]*>/)[1].split("</body>")[0]:document.body.innerHTML=o,pw.component.findAndInit(document.querySelectorAll("body")[0])}})}!function(t){if(pw.init.register(boot),t){var n=!1,o=t.pushState;t.pushState=function(i,e,a){return n=!0,"function"==typeof t.onpushstate&&t.onpushstate({state:i}),a==window.location.pathname?(pw.component.broadcast(window.context.name+":navigator:exit"),window.context={_state:i,name:"default",uri:window.location.href},i.r_uri=a):handleState(i,"forward"),o.apply(t,[i,e,i.r_uri])},window.onpopstate=function(t){if(n){var o=t.state;o||(o={}),o.uri||(o.uri=window.context.uri),handleState(o,"back")}}}}(window.history),window.context={name:"default",uri:window.location.href};
+function boot(){if(!window.socket)return void setTimeout(boot,100);if(window.location.hash){var t=window.location.hash.split("#:")[1].split("/"),n=t.shift(),o=t.join("/");pw.component.broadcast(n+":navigator:boot",o)}}function handleState(t,n){var o=t.uri||t.url;if(!window.socket)return void(document.location=o);if(o=o.replace(document.location.origin,""),pw.component.broadcast("navigator:change",{uri:o}),t.context)t.r_uri=document.location.pathname+"#:"+t.context+"/"+o,window.context={_state:t,name:t.context,uri:t.r_uri,container:t.container,partial:t.partial};else if(t.r_uri=o,"default"!==window.context.name){if("back"===n)return pw.component.broadcast(window.context.name+":navigator:exit"),void(window.context={name:"default",uri:t.uri});t.r_uri=document.location.pathname+"#:"+window.context.name+"/"+o,t.context=window.context.name,t.container=window.context.container,t.partial=window.context.partial}var e={uri:o,action:"call-route",method:"get"};t.container&&(e.container=t.container),t.partial&&(e.partial=t.partial),window.socket.send(e,function(n){if(t.context)pw.component.broadcast(t.context+":navigator:enter",n);else{var o=n.body[0];if(o.match(/<title>/)){var e=o.split(/<title>/)[1].split("</title>")[0];document.querySelector("title").innerHTML=e}var i=document.documentElement.cloneNode();i.innerHTML=o,document.body.innerHTML=i.querySelector("body").innerHTML,pw.component.findAndInit(document.querySelectorAll("body")[0]),document.body.scrollTop=document.documentElement.scrollTop=0}})}!function(t){if(pw.init.register(boot),t){var n=!1,o=t.pushState;t.pushState=function(e,i,a){return n=!0,"function"==typeof t.onpushstate&&t.onpushstate({state:e}),a==window.location.pathname?(pw.component.broadcast(window.context.name+":navigator:exit"),window.context={_state:e,name:"default",uri:window.location.href},e.r_uri=a):handleState(e,"forward"),o.apply(t,[e,i,e.r_uri])},window.onpopstate=function(t){if(n){var o=t.state;o||(o={}),o.uri||(o.uri=window.context.uri),handleState(o,"back")}}}}(window.history),window.context={name:"default",uri:window.location.href};

data/lib/generators/pakyow/app/templates/public/scripts/ring/pakyow.js

@@ -1,5 +1,5 @@
 var pw = {
-  version: '0.1.1'
+  version: '0.2.4'
 };
 
 (function() {
@@ -142,7 +142,7 @@ pw.node = {
     }
 
     var next = node.parentNode;
-    if (next !== document) {
+    if (next && next !== document) {
       return pw.node.inForm(next);
     }
   },
@@ -154,7 +154,7 @@ pw.node = {
     }
 
     var next = node.parentNode;
-    if (next !== document) {
+    if (next && next !== document) {
       return pw.node.component(next);
     }
   },
@@ -166,7 +166,7 @@ pw.node = {
     }
 
     var next = node.parentNode;
-    if (next !== document) {
+    if (next && next !== document) {
       return pw.node.scope(next);
     }
   },
@@ -178,7 +178,7 @@ pw.node = {
     }
 
     var next = node.parentNode;
-    if (next !== document) {
+    if (next && next !== document) {
       return pw.node.scopeName(next);
     }
   },
@@ -190,7 +190,7 @@ pw.node = {
     }
 
     var next = node.parentNode;
-    if (next !== document) {
+    if (next && next !== document) {
       return pw.node.prop(next);
     }
   },
@@ -202,7 +202,7 @@ pw.node = {
     }
 
     var next = node.parentNode;
-    if (next !== document) {
+    if (next && next !== document) {
       return pw.node.propName(next);
     }
   },
@@ -215,11 +215,11 @@ pw.node = {
   },
 
   // creates a context in which view manipulations can occur
-  with: function(node, cb) {
+  invoke: function(node, cb) {
     cb.call(node);
   },
 
-  for: function(node, data, cb) {
+  invokeWithData: function(node, data, cb) {
     if (pw.node.isNodeList(node)) {
       node = pw.node.toA(node);
     }
@@ -257,14 +257,14 @@ pw.node = {
   },
 
   repeat: function(node, data, cb) {
-    pw.node.for(pw.node.match(node, data), data, cb);
+    pw.node.invokeWithData(pw.node.match(node, data), data, cb);
   },
 
   // binds an object to a node
   bind: function (data, node, cb) {
     var scope = pw.node.findBindings(node)[0];
 
-    pw.node.for(node, data, function(dm) {
+    pw.node.invokeWithData(node, data, function(dm) {
       if (!dm) {
         return;
       }
@@ -389,7 +389,9 @@ pw.node = {
     } else if (node.tagName === 'TEXTAREA' || pw.node.isSelfClosingTag(node)) {
       node.value = value;
     } else {
-      node.innerHTML = value;
+      if (value) {
+        node.innerHTML = value;
+      }
     }
   },
 
@@ -725,6 +727,12 @@ pw_State.prototype = {
 
   // gets the current represented state from the node and diffs it with the current state
   diffNode: function (node) {
+    if (node.hasAttribute('data-ui')) {
+      return {
+        '__nested': pw.state.build(pw.node.significant(node))
+      };
+    }
+
     return pw.state.build(pw.node.significant(pw.node.scope(node)))[0];
   },
 
@@ -758,7 +766,7 @@ pw_State.prototype = {
     this.snapshots.push(copy);
   },
 
-  delete: function (state) {
+  remove: function (state) {
     var copy = this.copy();
     var match = copy.find(function (s) {
       return s.id === state.id;
@@ -793,8 +801,15 @@ pw.view = {
   },
 
   fromStr: function (str) {
-    var e = document.createElement("div");
+    var nodeType = 'div';
+
+    if (str.match(/^<tr/) || str.match(/^<tbody/)) {
+      nodeType = 'table';
+    }
+
+    var e = document.createElement(nodeType);
     e.innerHTML = str;
+
     return pw.view.init(e.childNodes[0]);
   }
 };
@@ -839,16 +854,16 @@ pw_View.prototype = {
     return pw.attrs.init(this);
   },
 
-  with: function (cb) {
-    pw.node.with(this.node, cb);
+  invoke: function (cb) {
+    pw.node.invoke(this.node, cb);
   },
 
   match: function (data) {
     pw.node.match(this.node, data);
   },
 
-  for: function (data, cb) {
-    pw.node.for(this.node, data, cb);
+  invokeWithData: function (data, cb) {
+    pw.node.invokeWithData(this.node, data, cb);
   },
 
   repeat: function (data, cb) {
@@ -861,6 +876,41 @@ pw_View.prototype = {
 
   apply: function (data, cb) {
     pw.node.apply(data, this.node, cb);
+  },
+
+  use: function (version, cb) {
+    var self = this;
+
+    if (this.node.getAttribute('data-version') != version) {
+      this.node.setAttribute('data-version', version);
+
+      var lookup = {
+        scope: this.node.getAttribute('data-scope'),
+        version: version
+      };
+
+      window.socket.fetchView(lookup, function (view) {
+        view.node.setAttribute('data-channel', self.node.getAttribute('data-channel'));
+        pw.node.replace(self.node, view.node);
+        self.node = view.node;
+        cb();
+      });
+    } else {
+      cb();
+    }
+  },
+
+  setEndpoint: function (endpoint) {
+    this.endpoint = endpoint;
+    return this;
+  },
+
+  first: function () {
+    return this;
+  },
+
+  length: function () {
+    return 1;
   }
 };
 
@@ -875,7 +925,7 @@ pw_View.prototype = {
 });
 
 // pass through functions without view
-['remove', 'clear', 'versionNode'].forEach(function (method) {
+['remove', 'clear', 'versionName'].forEach(function (method) {
   pw_View.prototype[method] = function () {
     return pw.node[method](this.node);
   };
@@ -908,7 +958,7 @@ pw.collection = {
 var pw_Collection = function (views, parent, scope) {
   this.views = views;
   this.parent = parent;
-  this.scope = scope;
+  this._scope = scope;
 };
 
 pw_Collection.prototype = {
@@ -1007,11 +1057,11 @@ pw_Collection.prototype = {
     return pw.collection.init(prependedViews);
   },
 
-  with: function (cb) {
-    pw.node.with(this.views, cb);
+  invoke: function (cb) {
+    pw.node.invoke(this.views, cb);
   },
 
-  for: function(data, fn) {
+  invokeWithData: function(data, fn) {
     data = Array.ensure(data);
 
     this.views.forEach(function (view, i) {
@@ -1037,12 +1087,13 @@ pw_Collection.prototype = {
       this.views.slice(0).forEach(function (view) {
         var id = view.node.getAttribute('data-id');
 
-        if (!id) {
-          return;
-        }
-
-        if (!data.find(function (datum) { return datum.id.toString() === id })) {
+        if (!id && data[0].id) {
           this.removeView(view);
+          return;
+        } else if (id) {
+          if (!data.find(function (datum) { return datum.id && datum.id.toString() === id })) {
+            this.removeView(view);
+          }
         }
       }, this);
 
@@ -1083,12 +1134,12 @@ pw_Collection.prototype = {
 
   repeat: function (data, fn) {
     this.match(data, function () {
-      this.for(data, fn);
+      this.invokeWithData(data, fn);
     });
   },
 
   bind: function (data, fn) {
-    this.for(data, function(datum) {
+    this.invokeWithData(data, function(datum) {
       this.bind(datum);
 
       if(!(typeof fn === 'undefined')) {
@@ -1113,7 +1164,14 @@ pw_Collection.prototype = {
     });
   },
 
-  endpoint: function (endpoint) {
+  version: function (data, fn) {
+    var self = this;
+    this.match(data, function () {
+      this.invokeWithData(data, fn);
+    });
+  },
+
+  setEndpoint: function (endpoint) {
     this.endpoint = endpoint;
     return this;
   }
@@ -1320,11 +1378,10 @@ pw_Component.prototype = {
 
     // make it mutable
     var mutableCb = function (evt) {
-      evt.preventDefault();
-
       var scope = pw.node.scope(evt.target);
 
       if (scope) {
+        evt.preventDefault();
         self.mutated(scope);
       }
     };
@@ -1351,6 +1408,33 @@ pw_Component.prototype = {
     pw.component.deregisterForBroadcast(channel, this);
   },
 
+  // Bubbles an event up to a parent component. Intended to be used
+  // as an alternative to `broadcast` in cases where child components
+  // have an impact on their parents.
+  bubble: function (channel, payload) {
+    var parentComponent = pw.node.component(this.node.parentNode);
+
+    (channelBroadcasts[channel] || []).forEach(function (cbTuple) {
+      if (cbTuple[1].node == parentComponent) {
+        cbTuple[0].call(cbTuple[1], payload);
+      }
+    });
+  },
+
+  // Trickles an event down to child components. Intended to be used
+  // as an alternative to `broadcast` in cases where parent components
+  // have an impact on their children.
+  trickle: function (channel, payload) {
+    var channels = (channelBroadcasts[channel] || []);
+    pw.node.toA(this.node.getElementsByTagName('*')).forEach(function (node) {
+      channels.forEach(function (cbTuple) {
+        if (cbTuple[1].node == node) {
+          cbTuple[0].call(cbTuple[1], payload);
+        }
+      });
+    })
+  },
+
   //TODO this is pretty similary to processing instructions
   // for views in that we also have to handle the empty case
   //
@@ -1407,7 +1491,7 @@ pw_Component.prototype = {
     }
 
     if (state.length > 0) {
-      this.view.scope(state[0].scope).endpoint(this.endpoint || this).apply(state);
+      this.view.scope(state[0].scope).setEndpoint(this.endpoint || this).apply(state);
     } else {
       pw.node.breadthFirst(this.view.node, function () {
         if (this.hasAttribute('data-scope')) {
@@ -1435,8 +1519,8 @@ pw_Component.prototype = {
     }
   },
 
-  delete: function (data) {
-    this.state.delete(data);
+  remove: function (data) {
+    this.state.remove(data);
     this.transform(this.state.current());
   },
 
@@ -1470,6 +1554,7 @@ pw.init.register(function () {
   pw.socket.init({
     cb: function (socket) {
       window.socket = socket;
+      pw.component.broadcast('socket:available');
     }
   });
 });
@@ -1671,7 +1756,9 @@ pw.instruct = {
     });
   },
 
-  // TODO: make this smart and cache results
+  // TODO: make this smart and cache results, invalidating
+  // if the websocket connection reconnects (since that means
+  // the server probably restarted)
   template: function (view, cb) {
     var lookup = {};
 
@@ -1696,23 +1783,46 @@ pw.instruct = {
     });
   },
 
-  perform: function (collection, instructions) {
+  perform: function (collection, instructions, cb) {
     var self = this;
+    instructions = instructions || [];
 
-    (instructions || []).forEach(function (instruction, i) {
+    function instruct (subject, instruction) {
       var method = instruction[0];
       var value = instruction[1];
       var nested = instruction[2];
 
+      // remap instructions to the ring name
+      if (method === 'with') {
+        method = 'invoke';
+      }
+
+      if (method === 'for') {
+        method = 'invokeWithData';
+      }
+
       if (collection[method]) {
-        if (method == 'with' || method == 'for' || method == 'bind' || method == 'repeat' || method == 'apply') {
-          collection.endpoint(self)[method].call(collection, value, function (datum) {
-            pw.instruct.perform(this, nested[value.indexOf(datum)]);
+        if (method == 'invoke' || method == 'invokeWithData' || method == 'bind' || method == 'repeat' || method == 'apply' || method == 'version') {
+          var cbLength = collection.length();
+          var cbCount = 0;
+          var nestedCb = function () {
+            cbCount++;
+
+            if (cbCount == cbLength) {
+              next();
+            }
+          }
+          collection.setEndpoint(self)[method].call(collection, value, function (datum) {
+            pw.instruct.perform(this, nested[value.indexOf(datum)], nestedCb);
           });
           return;
         } else if (method == 'attrs') {
           self.performAttr(collection.attrs(), nested);
           return;
+        } else if (method == 'use') {
+          collection.setEndpoint(self);
+          collection.use(value, next);
+          return;
         } else {
           var mutatedViews = collection[method].call(collection, value);
         }
@@ -1722,13 +1832,33 @@ pw.instruct = {
       }
 
       if (nested instanceof Array) {
-        pw.instruct.perform(mutatedViews, nested);
+        pw.instruct.perform(mutatedViews, nested, next);
+        return;
       } else if (mutatedViews) {
         collection = mutatedViews;
       }
-    });
 
-    pw.component.findAndInit(collection.node);
+      next();
+    };
+
+    var i = 0;
+    function next() {
+      if (i < instructions.length) {
+        instruct(collection, instructions[i++]);
+      } else {
+        done();
+      }
+    };
+
+    function done() {
+      if (cb) {
+        cb();
+      } else {
+        pw.component.findAndInit(collection.node);
+      }
+    };
+
+    next();
   },
 
   performAttr: function (context, attrInstructions) {