1
=== modified file '.bzrignore'
2
--- .bzrignore	2012-10-31 09:16:13 +0000
3
+++ .bzrignore	2012-11-09 20:53:21 +0000
4
@@ -20,3 +20,4 @@
5
20
yuidoc
20
yuidoc
6
21
app/assets/manifest.appcache
21
app/assets/manifest.appcache
7
22
app/assets/sprite
22
app/assets/sprite
8
23
app/assets/javascripts/generated/
9
23
24
10
=== modified file 'Makefile'
11
--- Makefile	2012-11-06 13:16:34 +0000
12
+++ Makefile	2012-11-09 20:53:21 +0000
13
@@ -9,10 +9,15 @@
14
9
	node_modules/mocha node_modules/d3 node_modules/graceful-fs \
9
	node_modules/mocha node_modules/d3 node_modules/graceful-fs \
15
10
	node_modules/should node_modules/jshint node_modules/expect.js \
10
	node_modules/should node_modules/jshint node_modules/expect.js \
16
11
	node_modules/express node_modules/yui node_modules/yuidoc \
11
	node_modules/express node_modules/yui node_modules/yuidoc \
18
12
	node_modules/grunt node_modules/node-spritesheet
12
	node_modules/grunt node_modules/node-spritesheet \
19
13
	node_modules/node-minify
20
13
TEMPLATE_TARGETS=$(shell bzr ls -k file app/templates)
14
TEMPLATE_TARGETS=$(shell bzr ls -k file app/templates)
21
14
SPRITE_SOURCE_FILES=$(shell bzr ls -R -k file app/assets/images)
15
SPRITE_SOURCE_FILES=$(shell bzr ls -R -k file app/assets/images)
22
15
SPRITE_GENERATED_FILES=app/assets/sprite/sprite.css app/assets/sprite/sprite.png
16
SPRITE_GENERATED_FILES=app/assets/sprite/sprite.css app/assets/sprite/sprite.png
23
17
COMPRESSED_FILES=app/assets/javascripts/generated/all-app-debug.js \
24
18
	app/assets/javascripts/generated/all-app.js \
25
19
	app/assets/javascripts/generated/all-third.js \
26
20
	app/assets/javascripts/generated/all-yui.js
27
16
DATE=$(shell date -u)
21
DATE=$(shell date -u)
28
17
APPCACHE=app/assets/manifest.appcache
22
APPCACHE=app/assets/manifest.appcache
29
18
23
30
@@ -37,7 +42,7 @@
31
37
	@ln -sf `pwd`/node_modules/yui ./app/assets/javascripts/
42
	@ln -sf `pwd`/node_modules/yui ./app/assets/javascripts/
32
38
	@ln -sf `pwd`/node_modules/d3/d3.v2* ./app/assets/javascripts/
43
	@ln -sf `pwd`/node_modules/d3/d3.v2* ./app/assets/javascripts/
33
39
44
35
40
install: appcache $(NODE_TARGETS) app/templates.js yuidoc spritegen
45
install: appcache $(NODE_TARGETS) app/templates.js yuidoc spritegen combinejs
36
41
46
37
42
gjslint: virtualenv/bin/gjslint
47
gjslint: virtualenv/bin/gjslint
38
43
	@virtualenv/bin/gjslint --strict --nojsdoc --jslint_error=all \
48
	@virtualenv/bin/gjslint --strict --nojsdoc --jslint_error=all \
39
@@ -61,11 +66,22 @@
40
61
66
41
62
spritegen: $(SPRITE_GENERATED_FILES)
67
spritegen: $(SPRITE_GENERATED_FILES)
42
63
68
43
69
$(COMPRESSED_FILES): node_modules/yui node_modules/d3/d3.v2.min.js $(JSFILES)
44
70
	@rm -Rf app/assets/javascripts/generated/
45
71
	@mkdir app/assets/javascripts/generated/
46
72
	@./bin/merge-files
47
73
48
74
combinejs: $(COMPRESSED_FILES)
49
75
50
64
prep: beautify lint
76
prep: beautify lint
51
65
77
52
66
test: install
78
test: install
53
67
	@./test-server.sh
79
	@./test-server.sh
54
68
80
55
81
debug: install
56
82
	@echo "Customize config.js to modify server settings"
57
83
	@node server.js debug
58
84
59
69
server: install
85
server: install
60
70
	@echo "Customize config.js to modify server settings"
86
	@echo "Customize config.js to modify server settings"
61
71
	@node server.js
87
	@node server.js
62
@@ -75,6 +91,7 @@
63
75
	@make -C docs clean
91
	@make -C docs clean
64
76
	@rm -Rf bin/sprite/
92
	@rm -Rf bin/sprite/
65
77
	@rm -Rf app/assets/sprite/
93
	@rm -Rf app/assets/sprite/
66
94
	@rm -Rf app/assets/javascripts/generated/
67
78
95
68
79
$(APPCACHE): manifest.appcache.in
96
$(APPCACHE): manifest.appcache.in
69
80
	@cp manifest.appcache.in $(APPCACHE)
97
	@cp manifest.appcache.in $(APPCACHE)
70
@@ -91,4 +108,5 @@
71
91
appcache-force: appcache-touch appcache
108
appcache-force: appcache-touch appcache
72
92
109
73
93
.PHONY: test lint beautify server install clean prep jshint gjslint \
110
.PHONY: test lint beautify server install clean prep jshint gjslint \
75
94
	appcache appcache-touch appcache-force yuidoc spritegen yuidoc-lint
111
	appcache appcache-touch appcache-force yuidoc spritegen yuidoc-lint \
76
112
	combinejs
77
95
113
78
=== modified file 'app/index.html'
79
--- app/index.html	2012-11-01 13:21:53 +0000
80
+++ app/index.html	2012-11-09 20:53:21 +0000
81
@@ -69,9 +69,9 @@
82
69
        <div id="vp-right-border"></div>
69
        <div id="vp-right-border"></div>
83
70
    </div>
70
    </div>
84
71
    <!-- javascript away -->
71
    <!-- javascript away -->
88
72
    <script src="/juju-ui/assets/javascripts/yui/yui/yui-debug.js"></script>
72
    <script src="/assets/yui.js"></script>
89
73
    <script src="/juju-ui/modules.js"></script>
73
    <script src="/assets/all-third.js"></script>
90
74
    <script src="/config.js"></script>
74
    <script src="/assets/modules.js"></script>
91
75
    <script>
75
    <script>
92
76
      YUI(GlobalConfig).use(["juju-gui"], function(Y) {
76
      YUI(GlobalConfig).use(["juju-gui"], function(Y) {
93
77
        app = new Y.juju.App(juju_config);
77
        app = new Y.juju.App(juju_config);
94
78
78
95
=== added file 'app/modules-debug.js'
96
--- app/modules-debug.js	1970-01-01 00:00:00 +0000
97
+++ app/modules-debug.js	2012-11-09 20:53:21 +0000
98
@@ -0,0 +1,131 @@
99
1
// This file is used for development only. In order to use it you should call
100
2
// the "make debug" command. This command passes the "debug" argument to the
101
3
// "lib/server.js".
102
4
GlobalConfig = {
103
5
  filter: 'debug',
104
6
  // Set "true" for verbose logging of YUI
105
7
  debug: false,
106
8
107
9
  // Use Rollups
108
10
  combine: false,
109
11
110
12
  groups: {
111
13
    d3: {
112
14
      modules: {
113
15
        'd3': {
114
16
          'fullpath': '/juju-ui/assets/javascripts/d3.v2.min.js'
115
17
        }
116
18
      }
117
19
    },
118
20
    juju: {
119
21
      modules: {
120
22
        // Primitives
121
23
122
24
        'svg-layouts': {
123
25
          fullpath: '/juju-ui/assets/javascripts/svg-layouts.js'
124
26
        },
125
27
126
28
        'reconnecting-websocket': {
127
29
          fullpath: '/juju-ui/assets/javascripts/reconnecting-websocket.js'
128
30
        },
129
31
130
32
        // Views
131
33
        'juju-view-utils': {
132
34
          fullpath: '/juju-ui/views/utils.js'
133
35
        },
134
36
135
37
        'juju-charm-panel': {
136
38
          fullpath: '/juju-ui/views/charm-panel.js'
137
39
        },
138
40
139
41
        'juju-notifications': {
140
42
          fullpath: '/juju-ui/views/notifications.js'
141
43
        },
142
44
143
45
        'juju-view-environment': {
144
46
          fullpath: '/juju-ui/views/environment.js'
145
47
        },
146
48
147
49
        'juju-view-service': {
148
50
          fullpath: '/juju-ui/views/service.js'
149
51
        },
150
52
151
53
        'juju-view-unit': {
152
54
          fullpath: '/juju-ui/views/unit.js'
153
55
        },
154
56
155
57
        'juju-view-charm-collection': {
156
58
          fullpath: '/juju-ui/views/charm.js'
157
59
        },
158
60
159
61
        'juju-view-charm': {
160
62
          fullpath: '/juju-ui/views/charm.js'
161
63
        },
162
64
163
65
        'juju-templates': {
164
66
          fullpath: '/juju-ui/templates.js'
165
67
        },
166
68
167
69
        'juju-views': {
168
70
          use: [
169
71
            'juju-templates',
170
72
            'juju-notifications',
171
73
            'juju-view-utils',
172
74
            'juju-view-environment',
173
75
            'juju-view-service',
174
76
            'juju-view-unit',
175
77
            'juju-view-charm',
176
78
            'juju-view-charm-collection'
177
79
          ]
178
80
        },
179
81
180
82
        // Models
181
83
        'juju-endpoints': {
182
84
          fullpath: '/juju-ui/models/endpoints.js'
183
85
        },
184
86
185
87
        'juju-charm-models': {
186
88
          requires: ['juju-charm-id'],
187
89
          fullpath: '/juju-ui/models/charm.js'
188
90
        },
189
91
190
92
        'juju-models': {
191
93
          requires: [
192
94
            'model', 'model-list', 'juju-endpoints', 'juju-charm-models'],
193
95
          fullpath: '/juju-ui/models/models.js'
194
96
        },
195
97
196
98
        // Connectivity
197
99
        'juju-env': {
198
100
          requires: ['reconnecting-websocket'],
199
101
          fullpath: '/juju-ui/store/env.js'
200
102
        },
201
103
202
104
        'juju-notification-controller': {
203
105
          fullpath: '/juju-ui/store/notifications.js'
204
106
        },
205
107
206
108
        'juju-charm-store': {
207
109
          requires: ['juju-charm-id'],
208
110
          fullpath: '/juju-ui/store/charm.js'
209
111
        },
210
112
211
113
        'juju-controllers': {
212
114
          use: ['juju-env', 'juju-charm-store',
213
115
            'juju-notification-controller']
214
116
        },
215
117
216
118
        // App
217
119
        'juju-gui': {
218
120
          fullpath: '/juju-ui/app.js',
219
121
          requires: [
220
122
            'juju-controllers',
221
123
            'juju-views',
222
124
            'juju-models',
223
125
            'juju-view-charm-search'
224
126
          ]
225
127
        }
226
128
      }
227
129
    }
228
130
  }
229
131
};
230
0
132
231
=== modified file 'app/modules.js'
232
--- app/modules.js	2012-11-01 13:30:58 +0000
233
+++ app/modules.js	2012-11-09 20:53:21 +0000
234
@@ -1,69 +1,11 @@
235
1
GlobalConfig = {
1
GlobalConfig = {
236
2
  // Uncomment for debug versions of YUI.
237
3
  filter: 'debug',
238
4
  // Uncomment for verbose logging of YUI
239
5
  debug: false,
2
  debug: false,
243
6
3
  // YUI will not download the modules. They are supposed to be already loaded.
244
7
  // Use Rollups
4
  ignoreRegistered: true,
242
8
  combine: false,
245
9
5
246
10
  groups: {
6
  groups: {
247
11
    d3: {
248
12
      modules: {
249
13
        'd3': {
250
14
          'fullpath': '/juju-ui/assets/javascripts/d3.v2.min.js'
251
15
        }
252
16
      }
253
17
    },
254
18
    juju: {
7
    juju: {
255
19
      modules: {
8
      modules: {
256
20
        // Primitives
257
21
258
22
        'svg-layouts': {
259
23
          fullpath: '/juju-ui/assets/javascripts/svg-layouts.js'
260
24
        },
261
25
262
26
        'reconnecting-websocket': {
263
27
          fullpath: '/juju-ui/assets/javascripts/reconnecting-websocket.js'
264
28
        },
265
29
266
30
        // Views
267
31
        'juju-view-utils': {
268
32
          fullpath: '/juju-ui/views/utils.js'
269
33
        },
270
34
271
35
        'juju-charm-panel': {
272
36
          fullpath: '/juju-ui/views/charm-panel.js'
273
37
        },
274
38
275
39
        'juju-notifications': {
276
40
          fullpath: '/juju-ui/views/notifications.js'
277
41
        },
278
42
279
43
        'juju-view-environment': {
280
44
          fullpath: '/juju-ui/views/environment.js'
281
45
        },
282
46
283
47
        'juju-view-service': {
284
48
          fullpath: '/juju-ui/views/service.js'
285
49
        },
286
50
287
51
        'juju-view-unit': {
288
52
          fullpath: '/juju-ui/views/unit.js'
289
53
        },
290
54
291
55
        'juju-view-charm-collection': {
292
56
          fullpath: '/juju-ui/views/charm.js'
293
57
        },
294
58
295
59
        'juju-view-charm': {
296
60
          fullpath: '/juju-ui/views/charm.js'
297
61
        },
298
62
299
63
        'juju-templates': {
300
64
          fullpath: '/juju-ui/templates.js'
301
65
        },
302
66
303
67
        'juju-views': {
9
        'juju-views': {
304
68
          use: [
10
          use: [
305
69
            'juju-templates',
11
            'juju-templates',
306
@@ -77,51 +19,12 @@
307
77
          ]
19
          ]
308
78
        },
20
        },
309
79
21
341
80
        // Models
22
        // 'juju-controllers' is just an alias for the modules defined by 'use'
342
81
        'juju-endpoints': {
23
        // If we use "requires: ['juju-controllers']" that means
343
82
          fullpath: '/juju-ui/models/endpoints.js'
24
        // "requires: ['juju-env', 'juju-charm-store',
344
83
        },
25
        // 'juju-notification-controller']"
314
84
315
85
        'juju-charm-models': {
316
86
          requires: ['juju-charm-id'],
317
87
          fullpath: '/juju-ui/models/charm.js'
318
88
        },
319
89
320
90
        'juju-models': {
321
91
          requires: [
322
92
            'model', 'model-list', 'juju-endpoints', 'juju-charm-models'],
323
93
          fullpath: '/juju-ui/models/models.js'
324
94
        },
325
95
326
96
        // Connectivity
327
97
        'juju-env': {
328
98
          requires: ['reconnecting-websocket'],
329
99
          fullpath: '/juju-ui/store/env.js'
330
100
        },
331
101
332
102
        'juju-notification-controller': {
333
103
          fullpath: '/juju-ui/store/notifications.js'
334
104
        },
335
105
336
106
        'juju-charm-store': {
337
107
          requires: ['juju-charm-id'],
338
108
          fullpath: '/juju-ui/store/charm.js'
339
109
        },
340
110
345
111
        'juju-controllers': {
26
        'juju-controllers': {
359
112
          use: ['juju-env', 'juju-charm-store',
27
          use: ['juju-env', 'juju-charm-store', 'juju-notification-controller']
347
113
            'juju-notification-controller']
348
114
        },
349
115
350
116
        // App
351
117
        'juju-gui': {
352
118
          fullpath: '/juju-ui/app.js',
353
119
          requires: [
354
120
            'juju-controllers',
355
121
            'juju-views',
356
122
            'juju-models',
357
123
            'juju-view-charm-search'
358
124
          ]
360
125
        }
28
        }
361
126
      }
29
      }
362
127
    }
30
    }
363
128
31
364
=== added file 'bin/merge-files'
365
--- bin/merge-files	1970-01-01 00:00:00 +0000
366
+++ bin/merge-files	2012-11-09 20:53:21 +0000
367
@@ -0,0 +1,75 @@
368
1
#!/usr/bin/env node
369
2
370
3
/**
371
4
 * We aggregate and minimize the js sources in order to improve the load speed
372
5
 * of the application.
373
6
 *
374
7
 * We don't want to use the yui combo loader feature because we want to be able
375
8
 * to run from only static files and we want to be able to run behind a
376
9
 * firewall without access to the internet.
377
10
 *
378
11
 * The final product will provide three js files: one for the YUI dependencies,
379
12
 * one for our custom js code and one for third party js like d3.
380
13
 * 
381
14
 * Known issues:
382
15
 * (1) If we set "bootstrap=false" in the GlobalConfig object, yui disables the
383
16
 *     loader object. It means it wont even try to download modules. We cannot
384
17
 *     do it because the loader also manages the "use" property which defines
385
18
 *     aliases for some of your modules ('juju-views' and 'juju-controllers').
386
19
 * (2) During development, we've noticed that some of the yui modules weren't
387
20
 *     included in the list of yui files (lang/datatype-date-format_en-US,
388
21
 *     parallel, app-transitions-native, gallery-markdown, loader-base). For
389
22
 *     some reason, the loader does not resolve the names of the files for
390
23
 *     these modules. We need to add them manually in this file.
391
24
 */
392
25
393
26
'use strict';
394
27
395
28
require('yui').YUI().use(['yui'], function(Y) {
396
29
  var merge = require('../lib/merge-files.js'),
397
30
      syspath = require('path'),
398
31
      paths,
399
32
      reqs;
400
33
401
34
  // First we find all of the paths to our custom Javascript in the app
402
35
  // directory.  We need to tell the function to ignore the "assets" directory
403
36
  // and the debug version of the modules file. I need to use
404
37
  // "syspath.join(process.cwd(), ...)" or else I have... "Error: Cannot find
405
38
  // module './app/config.js'" from node's internal module.js file.
406
39
  paths = merge.readdir(syspath.join(process.cwd(), './app'),
407
40
    [syspath.join(process.cwd(), './app/assets'), './app/modules-debug.js']);
408
41
409
42
  // Get the name of all the YUI modules that our custom js files use directly.
410
43
  reqs = merge.loadRequires(paths);
411
44
412
45
  // For some reason the loader does not get these requirements.
413
46
  // (Known issue #2)
414
47
  reqs.push('lang/datatype-date-format_en-US');
415
48
  reqs.push('parallel');
416
49
  reqs.push('app-transitions-native');
417
50
  reqs.push('gallery-markdown');
418
51
  reqs.push('loader-base');
419
52
420
53
  // Get all of the YUI files and their dependencies, and combine them.
421
54
  merge.combine(merge.getYUIFiles(reqs),
422
55
      './app/assets/javascripts/generated/all-yui.js', true);
423
56
424
57
  // Combine third party js libraries
425
58
  merge.combine([ './app/assets/javascripts/d3.v2.min.js',
426
59
      './app/assets/javascripts/reconnecting-websocket.js',
427
60
      './app/assets/javascripts/svg-layouts.js' ],
428
61
      './app/assets/javascripts/generated/all-third.js', true);
429
62
430
63
  // Now we only need to generate the file that is used to tell YUI where all
431
64
  // the dependencies are.  We either use a debug version or the production
432
65
  // version.  The debug version is simply pointers to the individual files.
433
66
  // The production version aggregates all of the files together.
434
67
435
68
  // Creating the combined file for the modules-debug.js and config.js files
436
69
  merge.combine([ './app/modules-debug.js', './app/config.js' ],
437
70
      './app/assets/javascripts/generated/all-app-debug.js', false);
438
71
439
72
  // Creating the combined file for all our files.  Note that this includes
440
73
  // app/modules.js in the rollup, which is why that file still needs exist.
441
74
  merge.combine(paths, './app/assets/javascripts/generated/all-app.js', true);
442
75
});
443
0
\ No newline at end of file
76
\ No newline at end of file
444
1
77
445
=== modified file 'grunt.js'
446
--- grunt.js	2012-10-30 11:36:00 +0000
447
+++ grunt.js	2012-11-09 20:53:21 +0000
448
@@ -11,7 +11,7 @@
449
11
11
450
12
        },
12
        },
451
13
        files: {
13
        files: {
453
14
          'bin' : 'app/assets/images/*'
14
          'bin': 'app/assets/images/*'
454
15
        }
15
        }
455
16
      }
16
      }
456
17
    }
17
    }
457
18
18
458
=== added file 'lib/merge-files.js'
459
--- lib/merge-files.js	1970-01-01 00:00:00 +0000
460
+++ lib/merge-files.js	2012-11-09 20:53:21 +0000
461
@@ -0,0 +1,137 @@
462
1
'use strict';
463
2
464
3
// We need the yui name to be available in all modules (as a global variable).
465
4
// This only happens if we remove the 'var' keyword or add it to the "global"
466
5
// variable.
467
6
global.YUI = require('yui').YUI;
468
7
469
8
YUI().use(['yui'], function(Y) {
470
9
  var fs = require('fs'),
471
10
      syspath = require('path'),
472
11
      compressor = require('node-minify');
473
12
474
13
  function minify(file) {
475
14
    var execution = new compressor.minify(
476
15
        { type: 'uglifyjs',
477
16
          fileIn: file,
478
17
          fileOut: file,
479
18
          callback: function(err) {
480
19
            if (err) {
481
20
              console.log(err);
482
21
            }
483
22
          }});
484
23
  }
485
24
  exports.minify = minify;
486
25
487
26
  // It combines the files defined by "files" into a single (compressed or not)
488
27
  // js file.
489
28
  function combine(files, outputFile, shouldMinify) {
490
29
    var str = [];
491
30
    Y.Array.each(files, function(file) {
492
31
      console.log('file -> ' + file);
493
32
      str.push(fs.readFileSync(file, 'utf8'));
494
33
    });
495
34
    fs.writeFileSync(outputFile, str.join('\n'), 'utf8');
496
35
    if (shouldMinify) {
497
36
      minify(outputFile);
498
37
    }
499
38
  }
500
39
  exports.combine = combine;
501
40
502
41
  // It gets the name of all the files under 'path', recursively. It ignores
503
42
  // files and directories included in the "ignore" array. These will
504
43
  // typically be set to ignore our assets and our module file.
505
44
  function readdir(path, ignore) {
506
45
    var result = [], // These are the filenames we will return.
507
46
        dirs = [], // These are the directories into which we will recurse.
508
47
        files = fs.readdirSync(path);
509
48
510
49
    Y.Array.each(files, function(value) {
511
50
      var fileName, file;
512
51
      fileName = path + '/' + value;
513
52
      file = fs.statSync(fileName);
514
53
      if (file.isFile()) {
515
54
        if (syspath.extname(fileName).toLowerCase() === '.js') {
516
55
          if (ignore && ignore.indexOf(fileName) >= 0) {
517
56
            console.log('SKIPPING FILE -> ' + fileName);
518
57
          } else {
519
58
            result.push(fileName);
520
59
          }
521
60
        }
522
61
      } else if (file.isDirectory()) {
523
62
        console.log('DIRECTORY -> ' + fileName);
524
63
        if (ignore && ignore.indexOf(fileName) >= 0) {
525
64
          console.log('SKIPPING DIRECTORY -> ' + fileName);
526
65
        } else {
527
66
          dirs.push(fileName);
528
67
        }
529
68
      }
530
69
    });
531
70
    // We have read all the filenames and all the directory names. Now
532
71
    // it is time to recurse into the directories that we have collected.
533
72
    Y.Array.each(dirs, function(directory) {
534
73
      // This is the best Javascript offers for appending one array to
535
74
      // another.
536
75
      result.push.apply(result, readdir(directory));
537
76
    });
538
77
    return result;
539
78
  }
540
79
  exports.readdir = readdir;
541
80
542
81
  // It reads the YUI 'requires' attribute of all our custom js files
543
82
  // (as assembled by readdir) and returns the YUI modules on which we
544
83
  // directly depend.
545
84
  function loadRequires(paths) {
546
85
    var originalAdd, modules, yuiReqs;
547
86
    modules = {};
548
87
549
88
    originalAdd = YUI.add;
550
89
    // This is a trick to get the 'requires' value from the module
551
90
    // definition.
552
91
    YUI.add = function(name, fn, version, details) {
553
92
      if (details && details.requires) {
554
93
        modules[name] = details.requires;
555
94
      }
556
95
    };
557
96
558
97
    Y.Array.each(paths, function(path) {
559
98
      // It triggers the custom 'add' method above
560
99
      require(path);
561
100
    });
562
101
    YUI.add = originalAdd;
563
102
564
103
    // Getting all the YUI dependencies that we need
565
104
    yuiReqs = [];
566
105
    Y.Object.each(modules, function(requires) {
567
106
      Y.Array.each(requires, function(value) {
568
107
        if (!modules[value]) {
569
108
          // This is not one of our modules but a yui one.
570
109
          if (yuiReqs.indexOf(value) < 0) {
571
110
            // avoid duplicates
572
111
            yuiReqs.push(value);
573
112
          }
574
113
        }
575
114
      });
576
115
    });
577
116
    return yuiReqs;
578
117
  }
579
118
  exports.loadRequires = loadRequires;
580
119
581
120
  // Using the example http://yuilibrary.com/yui/docs/yui/loader-resolve.html
582
121
  // Given a list of direct YUI requirements, return the filenames of these
583
122
  // modules and their dependencies (indirect and direct).
584
123
  function getYUIFiles(reqs) {
585
124
    var loader, out;
586
125
    // The loader automatically handles following our dependencies.
587
126
    loader = new Y.Loader({
588
127
      // The base tells the loader where to look for the YUI files. We
589
128
      // look directly in the npm YUI package, but we could just as well look
590
129
      // in the symbolic link app/assets/javascripts/yui.
591
130
      base: './node_modules/yui/',
592
131
      ignoreRegistered: true,
593
132
      require: reqs});
594
133
    out = loader.resolve(true);
595
134
    return out.js;
596
135
  }
597
136
  exports.getYUIFiles = getYUIFiles;
598
137
});
599
0
138
600
=== modified file 'lib/server.js'
601
--- lib/server.js	2012-10-02 11:29:56 +0000
602
+++ lib/server.js	2012-11-09 20:53:21 +0000
603
@@ -5,6 +5,7 @@
604
5
    fs = require('fs'),
5
    fs = require('fs'),
605
6
    path = require('path'),
6
    path = require('path'),
606
7
    config = require('../config').config.server,
7
    config = require('../config').config.server,
607
8
    debugMode = (String(process.argv[2]).toLowerCase() === 'debug'),
608
8
    public_dir = config.public_dir,
9
    public_dir = config.public_dir,
609
9
    Templates = require('./templates.js'),
10
    Templates = require('./templates.js'),
610
10
    view = require('./view.js');
11
    view = require('./view.js');
611
@@ -46,8 +47,24 @@
612
46
  });
47
  });
613
47
});
48
});
614
48
49
617
49
server.get('/config.js', function(req, res) {
50
server.get('/assets/all-third.js', function(req, res) {
618
50
  res.sendfile('app/config.js');
51
  res.sendfile('app/assets/javascripts/generated/all-third.js');
619
52
});
620
53
621
54
server.get('/assets/modules.js', function(req, res) {
622
55
  if (debugMode) {
623
56
    res.sendfile('app/assets/javascripts/generated/all-app-debug.js');
624
57
  } else {
625
58
    res.sendfile('app/assets/javascripts/generated/all-app.js');
626
59
  }
627
60
});
628
61
629
62
server.get('/assets/yui.js', function(req, res) {
630
63
  if (debugMode) {
631
64
    res.sendfile('app/assets/javascripts/yui/yui/yui-debug.js');
632
65
  } else {
633
66
    res.sendfile('app/assets/javascripts/generated/all-yui.js');
634
67
  }
635
51
});
68
});
636
52
69
637
53
server.get('*', function(req, res) {
70
server.get('*', function(req, res) {
638
54
71
639
=== modified file 'package.json'
640
--- package.json	2012-10-30 11:33:21 +0000
641
+++ package.json	2012-11-09 20:53:21 +0000
642
@@ -30,7 +30,8 @@
643
30
    "graceful-fs": "1.1.x",
30
    "graceful-fs": "1.1.x",
644
31
    "rimraf": "2.0.x",
31
    "rimraf": "2.0.x",
645
32
    "grunt": ">=0.2.0",
32
    "grunt": ">=0.2.0",
647
33
    "node-spritesheet": ">=0.2.3"
33
    "node-spritesheet": ">=0.2.3",
648
34
    "node-minify": "0.5.0"
649
34
  },
35
  },
650
35
  "optionalDependencies": {}
36
  "optionalDependencies": {}
651
36
}
37
}
652
37
38
653
=== modified file 'test/index.html'
654
--- test/index.html	2012-11-01 13:12:28 +0000
655
+++ test/index.html	2012-11-09 20:53:21 +0000
656
@@ -4,7 +4,7 @@
657
4
  <meta charset="utf-8">
4
  <meta charset="utf-8">
658
5
  <link rel="stylesheet" href="assets/mocha.css">
5
  <link rel="stylesheet" href="assets/mocha.css">
659
6
  <script src="../app/assets/javascripts/yui/yui/yui-debug.js"></script>
6
  <script src="../app/assets/javascripts/yui/yui/yui-debug.js"></script>
661
7
  <script src="../app/modules.js"></script>
7
  <script src="../app/modules-debug.js"></script>
662
8
  <script src="assets/chai.js"></script>
8
  <script src="assets/chai.js"></script>
663
9
  <script src="assets/mocha.js"></script>
9
  <script src="assets/mocha.js"></script>
664
10
  <script src="utils.js"></script>
10
  <script src="utils.js"></script>
Reviewer	Review Type	Date Requested	Status
Benji York (community)	code	2012-11-06	Approve on 2012-11-09
Review via email: mp+133116@code.launchpad.net