Permalink
Browse files

Added `cake vendor` and updated jquery (1.6.4) and sammy (0.7.0).

Backport of b718272 from 0.2.x.
  • Loading branch information...
1 parent 217fd40 commit 92f6f994e18cf11bd33881c68bbe0f5c846d24b2 @mauricemach committed Sep 15, 2011
Showing with 29 additions and 29 deletions.
  1. +2 −1 .gitignore
  2. +6 −0 Cakefile
  3. +2 −2 docs/reference.md
  4. +11 −12 docs/zappa.html
  5. +1 −2 package.json
  6. +2 −2 src/zappa.coffee
  7. +5 −5 tests/assets.coffee
  8. +0 −5 vendor/sammy-latest.min.js
View
@@ -5,4 +5,5 @@ lib/*.js
benchmarks/out/*.dat
benchmarks/out/*.out
tests/*.js
-_site
+_site
+vendor
View
@@ -12,6 +12,12 @@ task 'bench', ->
task 'docs', ->
run 'docco src/*.coffee'
+
+task 'vendor', ->
+ run 'mkdir -p vendor && cd vendor && curl -OL http://code.jquery.com/jquery-1.6.4.min.js', ->
+ run 'cd vendor && curl -OL http://raw.github.com/quirkey/sammy/v0.7.0/lib/min/sammy-0.7.0.min.js', ->
+ run 'head -n 1 vendor/jquery*', ->
+ run 'head -n 3 vendor/sammy*'
run = (args...) ->
for a in args
View
@@ -479,11 +479,11 @@ Serves `/zappa/zappa.js`, required to use the zappa client API. Automatically en
### serve jquery
-Serves `/zappa/jquery.js` (minified jQuery 1.6.2 from npm).
+Serves `/zappa/jquery.js` (just standard, minified jQuery).
### serve sammy
-Serves `/zappa/sammy.js` (minified Sammy 0.6.3).
+Serves `/zappa/sammy.js` (just standard, minified Sammy).
### minify
View
Oops, something went wrong.
View
@@ -9,7 +9,6 @@
"express": "2.4.6",
"socket.io": "0.8.4",
"jsdom": "0.2.4",
- "jquery": "1.6.2",
"coffeekup": "0.3.0",
"node-uuid": "1.2.0",
"uglify-js": "1.0.7"
@@ -31,7 +30,7 @@
"Yuya Nishiyama <nsy@ulz.nu>",
"Esa-Matti Suuronen <esa-matti@suuronen.org>",
"Isaac Wolkerstorfer <agnoster@gmail.com>",
- "Jason King <jasonk@amcoonline.net>",
+ "Jason King <jk@handle.it>",
"Stéphane Alnet <stephane@shimaore.net>",
"Rachel Carvalho <rachel.carvalho@gmail.com>",
"Tim Shadel <github@timshadel.com>",
View
@@ -11,8 +11,8 @@ uuid = require 'node-uuid'
express = require 'express'
socketio = require 'socket.io'
jsdom = require 'jsdom'
-jquery = fs.readFileSync(__dirname + '/../node_modules/jquery/dist/node-jquery.min.js').toString()
-sammy = fs.readFileSync(__dirname + '/../vendor/sammy-latest.min.js').toString()
+jquery = fs.readFileSync(__dirname + '/../vendor/jquery-1.6.4.min.js').toString()
+sammy = fs.readFileSync(__dirname + '/../vendor/sammy-0.7.0.min.js').toString()
uglify = require 'uglify-js'
# CoffeeScript-generated JavaScript may contain anyone of these; when we "rewrite"
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'], '92334'
+ t.equal 'length', res.headers['content-length'], '91669'
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'], '16854'
+ t.equal 'length', res.headers['content-length'], '18059'
zappa: (t) ->
t.expect 'content-type', 'length'
@@ -123,7 +123,7 @@ port = 15200
c = t.client(zapp.app)
c.get '/zappa/zappa.js', (err, res) ->
t.equal 'content-type', res.headers['content-type'], 'application/javascript'
- t.equal 'length', res.headers['content-length'], '5156'
+ t.equal 'length', res.headers['content-length'], '5160'
'zappa (automatic)': (t) ->
t.expect 'content-type', 'length'
@@ -135,7 +135,7 @@ port = 15200
c = t.client(zapp.app)
c.get '/zappa/zappa.js', (err, res) ->
t.equal 'content-type', res.headers['content-type'], 'application/javascript'
- t.equal 'length', res.headers['content-length'], '5156'
+ t.equal 'length', res.headers['content-length'], '5160'
minify: (t) ->
t.expect 'zappa', 'client', 'shared', 'coffee', 'js'
@@ -150,7 +150,7 @@ port = 15200
c = t.client(zapp.app)
c.get '/zappa/zappa.js', (err, res) ->
- t.equal 'zappa', res.headers['content-length'], '2663'
+ t.equal 'zappa', res.headers['content-length'], '2667'
c.get '/client.js', (err, res) ->
t.equal 'client', res.headers['content-length'], '42'
c.get '/shared.js', (err, res) ->
Oops, something went wrong.

0 comments on commit 92f6f99

Please sign in to comment.