Permalink
Browse files

0.3alpha5 release

  • Loading branch information...
1 parent 2e5691c commit 3eeb233562dc3032b082c2405e19dceb91b07412 Owen Barnes committed Mar 11, 2012
Showing with 1,775 additions and 636 deletions.
  1. +46 −0 HISTORY.md
  2. +1 −1 Makefile
  3. +20 −29 README.md
  4. +4 −4 TODO.md
  5. +4 −2 bin/socketstream
  6. +33 −0 check_version.js
  7. +70 −0 doc/guide/en/client_side_code.md
  8. +110 −0 doc/guide/en/defining_multiple_clients.md
  9. +5 −0 doc/guide/en/live_reload.md
  10. +34 −0 doc/guide/en/loading_assets_on_demand.md
  11. +2 −16 index.js
  12. +344 −0 lib/browser_client/browserify.js
  13. +31 −9 lib/browser_client/index.js
  14. +0 −98 lib/browser_client/init.js
  15. 0 lib/browser_client/{libs/event_emitter.js → system_modules/eventemitter2.js}
  16. +72 −0 lib/browser_client/system_modules/socketstream.js
  17. +29 −19 lib/cli/generate.js
  18. +3 −3 lib/cli/index.js
  19. +21 −26 lib/client_asset_manager/asset.js
  20. +21 −15 lib/client_asset_manager/client.js
  21. +0 −13 lib/client_asset_manager/code_wrappers/module.js
  22. +0 −4 lib/client_asset_manager/code_wrappers/safety.js
  23. +25 −16 lib/client_asset_manager/index.js
  24. +1 −0 lib/client_asset_manager/magic_path.js
  25. +14 −5 lib/client_asset_manager/serve_live.js
  26. +1 −1 lib/request/middleware/internal.js
  27. +8 −4 lib/request/responders/events/client.js
  28. +6 −4 lib/request/responders/rpc/client.js
  29. +30 −19 lib/utils/copy.js
  30. +5 −5 lib/websocket/transports/socketio/index.js
  31. +34 −30 lib/websocket/transports/socketio/wrapper.js
  32. +6 −6 new_project/app.js
  33. +47 −0 new_project/client/code/app/demo.coffee
  34. +57 −0 new_project/client/code/app/demo.js
  35. +18 −0 new_project/client/code/app/entry.coffee
  36. +24 −0 new_project/client/code/app/entry.js
  37. +0 −46 new_project/client/code/main/demo.coffee
  38. +0 −14 new_project/client/code/modules/message.coffee
  39. +1 −2 new_project/package.json
  40. +1 −1 new_project/server/middleware/example.coffee
  41. +12 −0 new_project/server/middleware/example.js
  42. +3 −1 new_project/server/rpc/demo.coffee
  43. +22 −0 new_project/server/rpc/demo.js
  44. +2 −2 package.json
  45. +344 −0 src/browser_client/browserify.js
  46. +28 −14 src/browser_client/index.coffee
  47. +0 −80 src/browser_client/init.coffee
  48. 0 src/browser_client/{libs/event_emitter.js → system_modules/eventemitter2.js}
  49. +60 −0 src/browser_client/system_modules/socketstream.coffee
  50. +37 −18 src/cli/generate.coffee
  51. +3 −3 src/cli/index.coffee
  52. +29 −28 src/client_asset_manager/asset.coffee
  53. +24 −15 src/client_asset_manager/client.coffee
  54. +0 −9 src/client_asset_manager/code_wrappers/module.coffee
  55. +0 −4 src/client_asset_manager/code_wrappers/safety.coffee
  56. +19 −18 src/client_asset_manager/index.coffee
  57. +1 −0 src/client_asset_manager/magic_path.coffee
  58. +11 −8 src/client_asset_manager/serve_live.coffee
  59. +1 −1 src/request/middleware/internal.coffee
  60. +6 −4 src/request/responders/events/client.coffee
  61. +5 −3 src/request/responders/rpc/client.coffee
  62. +25 −17 src/utils/copy.coffee
  63. +4 −10 src/websocket/transports/socketio/index.coffee
  64. +11 −9 src/websocket/transports/socketio/wrapper.coffee
View
@@ -1,3 +1,49 @@
+0.3 alpha5 / 2012-03-11
+=======================
+
+##### Major improvements to Client-side Code
+
+Please read new documentation on [Client-side Code](https://github.com/socketstream/socketstream/blob/master/doc/guide/en/client_side_code.md) then create a new project to see the updated file structure. Also see the alpha5 announcement on Google Groups if you want a step-by-step migration guide.
+
+Key changes from previous releases:
+
+* All client code files **not** in a directory called 'libs` are now modules by default
+* You can now `require()` modules in the browser in exactly the same way as on the server (thanks to code from Browserify)
+* Where you currently called `require('mymod')` you will now need to add a leading slash: `require('/mymod')`
+* You can now use relative paths such as `require('../../mymod')` as you would on the server
+* `ss.loadAsync()` is now `ss.load.code()` but essentially works the same way. See new On Demand Loading doc
+* No more mandatory `SocketStream` and `ss` global variables...
+* SocketStream is now a system module - make it any global you want or type `var ss = require('socketstream')` at the top of each file if you prefer
+* `SocketStream.event.on` is now `ss.server.on`. Event names have not changed
+* The `SocketStream` global is no longer needed and has been removed
+* An `/entry.js` (or `.coffee`) module is now created by default and must always be present in your app as this is the new single point of entry
+* The `ss.client.wrapCode()` command and code wrappers concept are now redundant and the code has been removed
+
+Note: The next release will see further improvements to client-side code and a lot of internal refactoring / cleaning up. At this stage no more breaking changes to your client or server-side code are anticipated.
+
+
+##### New project installer
+
+* Now creates example code in JavaScript by default
+* Install example code in CoffeeScript by passing the `-c` option
+* Further enhancements planned here
+
+
+##### New documentation
+
+* [Client-side Code](https://github.com/socketstream/socketstream/blob/master/doc/guide/en/client_side_code.md)
+* [Defining multiple Single-Page Clients](https://github.com/socketstream/socketstream/blob/master/doc/guide/en/defining_multiple_clients.md)
+* [Loading Assets On Demand](https://github.com/socketstream/socketstream/blob/master/doc/guide/en/loading_assets_on_demand.md)
+
+
+##### Other changes
+
+* We are no longer bundling `ss-console` in new apps by default
+* You can now disable Live Reload altogether with `ss.client.set({liveReload: false})` in your `app.js` file
+* Upgraded deps: Socket.IO 0.9 and Connect 2.0.2
+
+
+
0.3 alpha4 / 2012-02-23
=======================
View
@@ -3,7 +3,7 @@
# Compile all CoffeeScript files within /src into /lib and transfer over any pure JS files
# TODO: Find a better way to move .js files over from /src to /lib, maybe using mkdir -p if the dirs don't already exist
build:
- rm -fr lib; node_modules/coffee-script/bin/coffee --bare -o lib -c src; cp src/*.js lib; cp src/utils/*.js lib/utils; cp src/websocket/transports/socketio/*.js lib/websocket/transports/socketio; cp -R src/browser_client/libs lib/browser_client;
+ rm -fr lib; node_modules/coffee-script/bin/coffee --bare -o lib -c src; cp src/*.js lib; cp src/utils/*.js lib/utils; cp src/websocket/transports/socketio/*.js lib/websocket/transports/socketio; cp -R src/browser_client/libs lib/browser_client; cp -R src/browser_client/*.js lib/browser_client; cp -R src/browser_client/system_modules/*.js lib/browser_client/system_modules;
# Ignore files and directories prepended with 'testdata_'
TEST_FILES=`find test/* | grep -v '^test/testdata_*'`
View
@@ -2,7 +2,7 @@
# SocketStream
-Latest release: 0.3.0alpha4 ([view changelog](https://github.com/socketstream/socketstream/blob/master/HISTORY.md))
+Latest release: 0.3.0alpha5 ([view changelog](https://github.com/socketstream/socketstream/blob/master/HISTORY.md))
[![build status](https://secure.travis-ci.org/socketstream/socketstream.png)](http://travis-ci.org/socketstream/socketstream)
Twitter: [@socketstream](http://twitter.com/#!/socketstream)
@@ -46,7 +46,7 @@ SocketStream is continually evolving but you can join a [growing community](http
* Easily share code between the client and server. Ideal for business logic and model validation (see Questions below)
* **NEW** Request Middleware - enabling session access, authentication, logging, distributed requests and more
* Effortless, scalable, pub/sub baked right in - including Private Channels
-* **NEW** Easy authentication - use a backend databases or authenticate against Facebook Connect, Twitter, etc using [Everyauth](https://github.com/bnoguchi/everyauth)
+* **NEW** Easy authentication - use a backend database or authenticate against Facebook Connect, Twitter, etc using [Everyauth](https://github.com/bnoguchi/everyauth)
* **NEW** Share sessions between HTTP and Websocket Requests using Connect Session Stores
* Optionally use [Redis](http://www.redis.io) for fast session retrieval, pub/sub, list of users online, and any other data your app needs instantly
* **NEW** Modular transport design allow alternative websocket or back-end event transports to be used
@@ -58,17 +58,17 @@ SocketStream is continually evolving but you can join a [growing community](http
* Works great with Chrome, Safari __and now Firefox 6__ using native websockets
* Compatible with older versions of Firefox and IE thanks to configurable fallback transports provided by Socket.IO
+* **NEW** Use `require()` and `exports` in your client-side code as you would on the server
* **NEW** Define multiple single-page clients by choosing the CSS, JS and client-side templates you wish to serve
* Integrated asset manager - automatically packages and [minifies](https://github.com/mishoo/UglifyJS) all client-side assets
-* **NEW** Live Reload - automatically reloads the browser when HTML, CSS or JS client files change
+* **NEW** Live Reload - automatically reloads the browser when an HTML, CSS or JS client file changes (in development)
* Works with iPads and iPhones using Mobile Safari (iOS 4.2 and above), even over 3G. Send a smaller, lighter client if desired
* **NEW** Use optional code formatters (e.g. CoffeeScript, Jade, Stylus, Less, etc) by easily installing wrapper modules
* Multiple clients work seamlessly with HTML Push State 'mock routing' so you can use [Backbone Router](http://documentcloud.github.com/backbone/#Router), [Davis JS](http://davisjs.com) and more
* **NEW** Supports many client-side template languages (Hogan/Mustache/CoffeeKup/jQuery), pre-compiling them for speed
* **NEW** Works great with [Ember.js](http://emberjs.com) for 'reactive templates' which automatically update when data changes
* Bundled with jQuery - though not dependent on it. Will work great with Zepto and other libraries
* Easily add additional client libraries such as [Underscore.js](http://documentcloud.github.com/underscore/)
-* Highly Experimental: Designate client-side code files as modules and require() them as you would server-side code
#### Optional Modules (officially maintained and supported)
@@ -80,7 +80,7 @@ SocketStream is continually evolving but you can join a [growing community](http
### How does it work?
-SocketStream automatically compresses and minifies all the static HTML, CSS and client-side code your app needs and sends this through the first time a user visits your site.
+SocketStream automatically compresses and minifies the static HTML, CSS and client-side code your app needs and sends this through the first time a user visits your site.
From then on all application data is sent and received via the websocket (or Socket.IO fallbacks), instantly established when the client connects and automatically re-established if broken. Normally this will be in [JSON RPC](https://github.com/socketstream/socketstream/blob/master/doc/guide/en/rpc_responder.md) format, but SocketStream 0.3 allows you to use different message responders depending upon the task at hand.
@@ -114,13 +114,11 @@ If all goes well you'll see the SocketStream banner coming up, then you're ready
http://localhost:3000
-Note: We are aware there is a strange mix of JavaScript/CoffeeScript created at the moment. This will be fixed shortly. The plan is to create vanilla JS files by default with the ability to type `socketstream new -c <name_of_your_project>` if you prefer to use CoffeeScript.
-
### What can I create with it?
-SocketStream is a perfect fit for all manner of modern applications which require real-time data (chat, stock trading, location monitoring, analytics, etc). It's also a great platform for building real-time HTML5 games. However, right now it would make a poor choice for a blog or other content-rich site which requires unique URLs for search engine optimization.
+SocketStream is a perfect fit for all manner of modern applications which require realtime data (chat, stock trading, location monitoring, analytics, etc). It's also a great platform for building realtime HTML5 games. However, right now it would make a poor choice for a blog or other content-rich site which requires unique URLs for search engine optimization.
### Demo Apps
@@ -132,7 +130,7 @@ SocketStream 0.3 example apps coming soon!
SocketStream 0.3 supports multiple ways to send messages to and from the server. The most common of which, JSON-over-RPC, is included by default. An RPC call can be invoked on the server by calling `ss.rpc()` in the browser.
-For example, let's write a simple server-side function which squares a number. Make a file called `server/rpc/app.js` and put this in it:
+For example, let's write a simple server-side function which squares a number:
``` javascript
// server/rpc/app.js
@@ -157,25 +155,22 @@ ss.rpc('app.square', 25)
You'll see the answer `625` logged to the console by default. The eagle-eyed among you will notice `ss.rpc('app.square', 25)` actually returned `undefined`. That's fine. We're only interested in the asynchronous response sent from the server once it has processed your request.
-Now let's write some code in the client to do more with this response. Make a file called `client/code/main/app.js` and put this in it:
+You may be wondering why `app.square`? Because we're invoking the `square` action/function in the `app.js` file. If you had written a `resize` action in `/server/rpc/image/processor.js` you'd call it with `ss.rpc('image.processor.resize')`. Create as many sub-directories as you wish to organize your code.
+
+Now let's write some code in the client to do more with this response:
``` javascript
-// client/code/main/app.js
+// client/code/app/demo.js
// define the number to square (vars are local to this file by default)
var number = 25;
-// ensure SocketStream has connected to the server
-SocketStream.event.on('ready', function(){
-
- ss.rpc('app.square', number, function(response){
- alert(number + ' squared is ' + response);
- });
-
+ss.rpc('app.square', number, function(response){
+ alert(number + ' squared is ' + response);
});
```
-Refresh the page and you'll see an alert box popup with the following:
+Once you save the file, the browser will automatically reload and you'll see an alert box popup with the following:
25 squared is 625
@@ -186,11 +181,14 @@ More examples coming soon!
Please start with http://www.socketstream.org/tour which walks you through the key features and shows you the code.
-We've made a start on documentation for 0.3. Right now the following sections have been written in /doc/guide/en:
+We've made a start on documentation for 0.3. Right now the following sections have been written in `/doc/guide/en`:
##### Developing (Client-side)
+* [Client-side Code](https://github.com/socketstream/socketstream/blob/master/doc/guide/en/client_side_code.md)
* [Client-side Templates](https://github.com/socketstream/socketstream/blob/master/doc/guide/en/client_side_templates.md)
+* [Defining multiple Single-Page Clients](https://github.com/socketstream/socketstream/blob/master/doc/guide/en/defining_multiple_clients.md)
+* [Loading Assets On Demand](https://github.com/socketstream/socketstream/blob/master/doc/guide/en/loading_assets_on_demand.md)
* [Live Reload](https://github.com/socketstream/socketstream/blob/master/doc/guide/en/live_reload.md)
##### Developing (Server-side)
@@ -235,9 +233,7 @@ Yes. We have several users running SocketStream on Windows without problems. Ple
##### How can I share code between client and server?
-After much thought we decided to abandon the app/shared directory concept in SocketStream 0.2. Thankfully now that we support client-side modules there is a cleaner alternative:
-
-Make the code you wish to share a module (by exporting functions and vars) and save it in `client/code/modules`. You can then `require()` the module in both your client-side and server-side code.
+Simply `require()` one of your client-side modules in your server-side code.
##### Does SocketStream support models?
@@ -268,11 +264,6 @@ Front end scaling can be achieved using a combination of different websocket tra
Back end scaling has yet to be properly documented, but we're keen to continue looking into ways to use ZeroMQ and also Hook IO. We will make sure back end scaling is as easy and flexible as possible, but it will no longer be a feature of the framework itself.
-##### Why not use Require.js, AMD or Browserify?
-
-Right now we're starting off with a much more lightweight solution (about 5 lines of code) which behaves identically to the require() command server-side (at least it will once we implement relative ./ ../ paths). It is not a perfect solution yet but it feels like the right direction to go in given SocketStream already takes care of all the bundling. We will fully document client-side module loading soon.
-
-
### Developing on the SocketStream core
SocketStream is primarily written in CoffeeScript which is 'pre-compiled' into JavaScript using `make build`. If you're actively developing on the code make sure you install the dev dependencies first (just clone the project and type `sudo npm link`).
@@ -281,7 +272,7 @@ To avoid having to continually type `make build` every time you make a change, p
$ SS_DEV=1 node app.js
-Your app will then directly read code from your local SocketStream repository's /src directory. This means when you make changes to the SocketStream core, you only need to restart your app to see them.
+This instructs your app to run the CoffeeScript code in `<socketstream_root>/src` directly, so you only need to restart the server to see your changes.
### Testing
View
@@ -3,10 +3,10 @@ TODO
#### WORK TO DO BEFORE 0.3.0 CAN BE RELEASED
-* Build interactive 'socketstream new' asking if you want to use our recommended stack + demo or a vanilla/minimal install
-* Much more error checking around sending bad RPC calls (e.g if a module or function does not exist)
-* Websocket responders need to take a config object. It should also be able to send config to client-side code (hard)
-* Relook at client-side code / modules. Make require() in client-code take relative paths (./ and ../) like Node's require() can
+* Serious refactoring of internal client_asset_manager code now we know what we're doing here
+* Make 'socketstream new' install recommended stack of optional modules by default, but add a minimal install option
+* More error checking around sending bad RPC calls (e.g if a module or function does not exist)
+* Websocket responders need to take a config object. It should also be able to send config to client-side code (
* Look into using Engine.IO instead of Socket.IO
* SocketStream should pass its version number and other meta info to wrapper modules
* Look into ways we can use multi-core cluster features of Node 0.6, if at all (maybe best at app level?)
View
@@ -4,8 +4,10 @@ var ss = require('../')
, program = require('commander');
program
+ .usage('new <name_of_your_project>')
.version(ss.version)
- //.option('-c, --coffee', 'use CoffeeScript') # coming soon!
+ .option('-j, --javascript', 'use Javascript (default)')
+ .option('-c, --coffee', 'use CoffeeScript')
.parse(process.argv);
-require(__dirname + '/../lib/cli').process(program.args);
+require(__dirname + '/../lib/cli').process(program);
View
@@ -0,0 +1,33 @@
+// Temporary code to update existing 0.3 alpha projects
+// REMOVE_BEFORE_0.3.0
+
+require('colors');
+
+var pathlib = require('path')
+ , bar = "\n\n*************************************************************************\n\n".cyan;
+
+// Upgrade project to new directory format introduced in 0.3 alpha3
+if (pathlib.existsSync('server/rpc/middleware')) {
+ console.log(bar +
+ "Thanks for upgrading to the latest SocketStream 0.3 alpha.\nWe've decided to move the following directories\n\n" +
+ " /server/rpc/middleware to /server/middleware\n\n" +
+ " /server/rpc/actions to /server/rpc\n\n" +
+ "so that websocket middleware can be used by other websocket responders (including forthcoming models).\n" +
+ "Please make this change to your existing project now then restart the server. Pasting this line into a UNIX-based shell should do the trick:\n\n" +
+ " mv server/rpc/middleware server && mv server/rpc/actions/* server/rpc/ && rm -fr server/rpc/actions\n" + bar);
+ throw new Error("Please paste the line above into the shell then restart the server");
+}
+
+// Delete 'console.js' file if it exists (no longer needed from 0.3 alpha4)
+if (pathlib.existsSync('console.js')) require('fs').unlinkSync('console.js');
+
+// Notify of changes to client code when upgrading to 0.3 alpha5
+if (pathlib.existsSync('client/code/modules')) {
+ console.log(bar +
+ "Thanks for upgrading to the latest SocketStream 0.3 alpha.\n\n" +
+ "We've made some major improvements to client-side code which will require\na few changes on your part. Please read:\n\n" +
+ "https://github.com/socketstream/socketstream/blob/master/doc/guide/en/client_side_code.md\n\n".yellow +
+ "then generate a new project to see the new format.\n\n" +
+ "This message will go away when /client/code/modules has been renamed to\nsomething else (we suggest 'app') so we know you've upgraded your code" + bar);
+ throw new Error("Please update your /client/code with the latest changes (see above)");
+}
Oops, something went wrong.

0 comments on commit 3eeb233

Please sign in to comment.