Permalink
Browse files

Getting ready to publish v0.3.5

  • Loading branch information...
1 parent fe3b52a commit edfe0252a4ed3de1b80d75d6777538d9c3ece7fd @shimaore shimaore committed Apr 17, 2012
Showing with 32 additions and 5 deletions.
  1. +9 −1 CHANGELOG.md
  2. +19 −0 docs/zappa.html
  3. +1 −1 package.json
  4. +3 −3 tests/assets.coffee
View
@@ -1,3 +1,11 @@
+**v0.3.5** (2012-04-17):
+
+ - Updated documentation
+ - Updated to jquery 1.7.2 and sammy 0.7.1
+ - Closed mauricemach/zappa#116 [jacobrask]
+ - Closed mauricemach/zappa#123 [imzshh]
+ - Closed mauricemach/zappa#117 [scien]
+
**v0.3.4** (2012-04-16):
- Publishing as `zappajs`.
@@ -13,7 +21,7 @@
- Updated to work with express 2.5.x and node 0.6.x.
**v0.3.1** (2011-10-06):
-
+)
- Changed dependency minors to ".x". Closes #98.
**v0.3.0 "The Gumbo Variations"** (2011-09-29):
View
@@ -203,6 +203,7 @@
<span class="nv">response: </span><span class="nx">res</span>
<span class="nv">next: </span><span class="nx">next</span>
<span class="nv">send: </span><span class="o">-&gt;</span> <span class="nx">res</span><span class="p">.</span><span class="nx">send</span><span class="p">.</span><span class="nx">apply</span> <span class="nx">res</span><span class="p">,</span> <span class="nx">arguments</span>
+ <span class="nv">json: </span><span class="o">-&gt;</span> <span class="nx">res</span><span class="p">.</span><span class="nx">json</span><span class="p">.</span><span class="nx">apply</span> <span class="nx">res</span><span class="p">,</span> <span class="nx">arguments</span>
<span class="nv">redirect: </span><span class="o">-&gt;</span> <span class="nx">res</span><span class="p">.</span><span class="nx">redirect</span><span class="p">.</span><span class="nx">apply</span> <span class="nx">res</span><span class="p">,</span> <span class="nx">arguments</span>
<span class="nv">render: </span><span class="o">-&gt;</span>
<span class="k">if</span> <span class="k">typeof</span> <span class="nx">arguments</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">isnt</span> <span class="s">&#39;object&#39;</span>
@@ -256,6 +257,10 @@
<span class="nv">socket: </span><span class="nx">socket</span>
<span class="nv">id: </span><span class="nx">socket</span><span class="p">.</span><span class="nx">id</span>
<span class="nv">client: </span><span class="nx">c</span>
+ <span class="nv">join: </span><span class="nf">(room) -&gt;</span>
+ <span class="nx">socket</span><span class="p">.</span><span class="nx">join</span> <span class="nx">room</span>
+ <span class="nv">leave: </span><span class="nf">(room) -&gt;</span>
+ <span class="nx">socket</span><span class="p">.</span><span class="nx">leave</span> <span class="nx">room</span>
<span class="nv">emit: </span><span class="o">-&gt;</span>
<span class="k">if</span> <span class="k">typeof</span> <span class="nx">arguments</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">isnt</span> <span class="s">&#39;object&#39;</span>
<span class="nx">socket</span><span class="p">.</span><span class="nx">emit</span><span class="p">.</span><span class="nx">apply</span> <span class="nx">socket</span><span class="p">,</span> <span class="nx">arguments</span>
@@ -268,6 +273,20 @@
<span class="k">else</span>
<span class="k">for</span> <span class="nx">k</span><span class="p">,</span> <span class="nx">v</span> <span class="k">of</span> <span class="nx">arguments</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
<span class="nx">socket</span><span class="p">.</span><span class="nx">broadcast</span><span class="p">.</span><span class="nx">emit</span><span class="p">.</span><span class="nx">apply</span> <span class="nx">socket</span><span class="p">.</span><span class="nx">broadcast</span><span class="p">,</span> <span class="p">[</span><span class="nx">k</span><span class="p">,</span> <span class="nx">v</span><span class="p">]</span>
+ <span class="nv">broadcast_to: </span><span class="nf">(room, args...) -&gt;</span>
+ <span class="k">if</span> <span class="k">typeof</span> <span class="nx">args</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">isnt</span> <span class="s">&#39;object&#39;</span>
+ <span class="nx">socket</span><span class="p">.</span><span class="nx">broadcast</span><span class="p">.</span><span class="nx">to</span><span class="p">(</span><span class="nx">room</span><span class="p">).</span><span class="nx">emit</span><span class="p">.</span><span class="nx">apply</span> <span class="nx">socket</span><span class="p">.</span><span class="nx">broadcast</span><span class="p">,</span> <span class="nx">args</span>
+ <span class="k">else</span>
+ <span class="k">for</span> <span class="nx">k</span><span class="p">,</span> <span class="nx">v</span> <span class="k">of</span> <span class="nx">args</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
+ <span class="nx">socket</span><span class="p">.</span><span class="nx">broadcast</span><span class="p">.</span><span class="nx">to</span><span class="p">(</span><span class="nx">room</span><span class="p">).</span><span class="nx">emit</span><span class="p">.</span><span class="nx">apply</span> <span class="nx">socket</span><span class="p">.</span><span class="nx">broadcast</span><span class="p">,</span> <span class="p">[</span><span class="nx">k</span><span class="p">,</span> <span class="nx">v</span><span class="p">]</span>
+ <span class="nv">broadcast_to_all: </span><span class="nf">(room, args...) -&gt;</span>
+ <span class="k">if</span> <span class="k">typeof</span> <span class="nx">args</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">isnt</span> <span class="s">&#39;object&#39;</span>
+ <span class="nx">socket</span><span class="p">.</span><span class="nx">broadcast</span><span class="p">.</span><span class="nx">to</span><span class="p">(</span><span class="nx">room</span><span class="p">).</span><span class="nx">emit</span><span class="p">.</span><span class="nx">apply</span> <span class="nx">socket</span><span class="p">.</span><span class="nx">broadcast</span><span class="p">,</span> <span class="nx">args</span>
+ <span class="nx">socket</span><span class="p">.</span><span class="nx">emit</span><span class="p">.</span><span class="nx">apply</span> <span class="nx">socket</span><span class="p">,</span> <span class="nx">args</span>
+ <span class="k">else</span>
+ <span class="k">for</span> <span class="nx">k</span><span class="p">,</span> <span class="nx">v</span> <span class="k">of</span> <span class="nx">args</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
+ <span class="nx">socket</span><span class="p">.</span><span class="nx">broadcast</span><span class="p">.</span><span class="nx">to</span><span class="p">(</span><span class="nx">room</span><span class="p">).</span><span class="nx">emit</span><span class="p">.</span><span class="nx">apply</span> <span class="nx">socket</span><span class="p">.</span><span class="nx">broadcast</span><span class="p">,</span> <span class="p">[</span><span class="nx">k</span><span class="p">,</span> <span class="nx">v</span><span class="p">]</span>
+ <span class="nx">socket</span><span class="p">.</span><span class="nx">emit</span><span class="p">.</span><span class="nx">apply</span> <span class="nx">socket</span><span class="p">,</span> <span class="p">[</span><span class="nx">k</span><span class="p">,</span> <span class="nx">v</span><span class="p">]</span>
<span class="k">for</span> <span class="nx">name</span><span class="p">,</span> <span class="nx">helper</span> <span class="k">of</span> <span class="nx">helpers</span>
<span class="nx">do</span> <span class="nf">(name, helper) -&gt;</span>
View
@@ -1,7 +1,7 @@
{
"name": "zappajs",
"description": "CoffeeScript minimalist interface to express, socket.io and others",
- "version": "0.3.4",
+ "version": "0.3.5",
"author": "Stephane Alnet <stephane@shimaore.net>",
"homepage": "http://zappajs.org",
"repository": {"type": "git", "url": "git://github.com/shimaore/zappajs.git"},
View
@@ -99,7 +99,7 @@ port = 15200
c = t.client(zapp.app)
c.get '/zappa/jquery.js', (err, res) ->
t.equal 'content-type', res.headers['content-type'], 'application/javascript'
- t.equal 'length', res.headers['content-length'], '91669'
+ t.equal 'length', res.headers['content-length'], '94840'
sammy: (t) ->
t.expect 'content-type', 'length'
@@ -111,7 +111,7 @@ port = 15200
c = t.client(zapp.app)
c.get '/zappa/sammy.js', (err, res) ->
t.equal 'content-type', res.headers['content-type'], 'application/javascript'
- t.equal 'length', res.headers['content-length'], '18059'
+ t.equal 'length', res.headers['content-length'], '18585'
zappa: (t) ->
t.expect 'content-type', 'snippet'
@@ -158,4 +158,4 @@ port = 15200
c.get '/coffee.js', (err, res) ->
t.equal 'coffee', res.headers['content-length'], '475'
c.get '/js.js', (err, res) ->
- t.equal 'js', res.headers['content-length'], '12'
+ t.equal 'js', res.headers['content-length'], '12'

0 comments on commit edfe025

Please sign in to comment.