newjs 1.0.4 → 1.1.0

data/History.txt

@@ -1,3 +1,19 @@
+== 1.1.0 2008-02-17
+
+MAJOR CHANGE - test files in test/unit
+HOWTO UPGRADE:
+  * Run 'newjs .' within your project
+  * Take note of differences and apply them to your files
+  * Move all tests to test/unit and add '../' to all <script> + <link> in test HTML
+  * Use 'script/generate unit_test' instead of 'script/generate javascript_test'
+CHANGES
+  * unit_test: Added specific unit_test generator placing tests in test/unit folder
+  * functional_test: Added specific functional_test generator for tests of dist/xxx.js
+  * javascript_test: REMOVED - replaced by unit_test + functional_test
+  * install_website: index.txt has Git repo instructions too - just delete svn/git if unnecessary
+  * rake dist: distribution files stored to website/dist (if folder website exists)
+  * newjs: url option now works
+
 == 1.0.4 2008-02-16
 
 * newjs - added missing newjs/rubyforge.rb file

data/Manifest.txt

@@ -7,7 +7,7 @@ app_generators/newjs/USAGE
 app_generators/newjs/newjs_generator.rb
 app_generators/newjs/templates/History.txt.erb
 app_generators/newjs/templates/License.txt.erb
-app_generators/newjs/templates/README.txt
+app_generators/newjs/templates/README.txt.erb
 app_generators/newjs/templates/Rakefile.erb
 app_generators/newjs/templates/config/javascript_test_autotest.yml.sample
 app_generators/newjs/templates/lib/jstest.rb
@@ -25,9 +25,12 @@ app_generators/newjs/templates/test/assets/unittest.js
 bin/newjs
 config/hoe.rb
 config/requirements.rb
-javascript_test_generators/javascript_test/USAGE
-javascript_test_generators/javascript_test/javascript_test_generator.rb
-javascript_test_generators/javascript_test/templates/test/test.html.erb
+javascript_test_generators/functional_test/USAGE
+javascript_test_generators/functional_test/functional_test_generator.rb
+javascript_test_generators/functional_test/templates/test/test.html.erb
+javascript_test_generators/unit_test/USAGE
+javascript_test_generators/unit_test/templates/test/test.html.erb
+javascript_test_generators/unit_test/unit_test_generator.rb
 lib/newjs.rb
 lib/newjs/autotest.rb
 lib/newjs/autotest/javascript_test_autotest.rb
@@ -57,12 +60,13 @@ setup.rb
 tasks/deployment.rake
 tasks/environment.rake
 tasks/website.rake
+test/test_functional_test_generator.rb
 test/test_generator_helper.rb
 test/test_helper.rb
 test/test_install_website_generator.rb
-test/test_javascript_test_generator.rb
 test/test_newjs_generator.rb
 test/test_plain_theme_generator.rb
+test/test_unit_test_generator.rb
 website/images/example-unittest-log.jpg
 website/index.html
 website/index.txt

data/README.txt

@@ -7,3 +7,9 @@ Example:
 
     This generates a skeletal JavaScript project/application
     installation in path/to/my-app-name
+
+More information:
+    http://newjs.rubyforge.org
+    
+Author:
+    Dr Nic Williams, http://drnicwilliams.com, drnicwilliams@gmail.com 

data/app_generators/newjs/newjs_generator.rb

@@ -40,8 +40,7 @@ class NewjsGenerator < RubiGen::Base
       m.file_copy_each %w[javascript_test_autotest_tasks.rake environment.rake deploy.rake], "tasks"
       m.file_copy_each %w[javascript_test_autotest.yml.sample], "config"
       m.file_copy_each %w[protodoc.rb jstest.rb], "lib"
-      m.file_copy_each %w[README.txt]
-      m.template_copy_each %w[Rakefile.erb History.txt.erb License.txt.erb]
+      m.template_copy_each %w[Rakefile.erb README.txt.erb History.txt.erb License.txt.erb]
       m.template_copy_each %w[HEADER.erb], "src"
       m.template "src/library.js.erb", "src/#{name}.js"
       
@@ -98,6 +97,7 @@ EOS
         @author ||= rubyforge_config.full_name
         @email  ||= rubyforge_config.email
       end
+      @url               = options[:url]
     end
 
     # Installation skeleton.  Intermediate directories are automatically
@@ -109,5 +109,7 @@ EOS
       script
       tasks
       test/assets
+      test/unit
+      test/functional
     )
 end

data/app_generators/newjs/templates/README.txt.erb

@@ -0,0 +1,13 @@
+<%= title %>
+
+Description:
+    This JavaScript project ...
+
+Example:
+    ...
+
+More information:
+    <%= url %>
+    
+Author:
+    <%= author %>, <%= email %>

data/app_generators/newjs/templates/Rakefile.erb

@@ -42,6 +42,11 @@ task :dist do
   Dir.chdir(APP_DIST_DIR) do
     FileUtils.copy_file APP_FILE_NAME, "#{APP_NAME}-#{APP_VERSION}.js"
   end
+  if File.directory?("website")
+    FileUtils.mkdir_p "website/dist"
+    FileUtils.copy_file "dist/#{APP_FILE_NAME}",       "website/dist/#{APP_FILE_NAME}"
+    FileUtils.copy_file "dist/#{APP_FILE_NAME}",       "website/dist/#{APP_NAME}-#{APP_VERSION}.js"
+  end
 end
 
 Rake::PackageTask.new(APP_NAME, APP_VERSION) do |package|
@@ -60,12 +65,33 @@ Rake::PackageTask.new(APP_NAME, APP_VERSION) do |package|
   )
 end
 
-desc "Builds the distribution, runs the JavaScript unit tests and collects their results."
-task :test => [:dist, :test_units]
+desc "Builds the distribution, runs the JavaScript unit + functional tests and collects their results."
+task :test => [:dist, :test_units, :test_functionals]
 
 require 'jstest'
 desc "Runs all the JavaScript unit tests and collects the results"
-JavaScriptTestTask.new(:test_units) do |t|
+JavaScriptTestTask.new(:test_units, 4711) do |t|
+  testcases        = ENV['TESTCASES']
+  tests_to_run     = ENV['TESTS']    && ENV['TESTS'].split(',')
+  browsers_to_test = ENV['BROWSERS'] && ENV['BROWSERS'].split(',')
+
+  t.mount("/dist")
+  t.mount("/src")
+  t.mount("/test")
+
+  Dir["test/unit/*_test.html"].sort.each do |test_file|
+    tests = testcases ? { :url => "/#{test_file}", :testcases => testcases } : "/#{test_file}"
+    test_filename = test_file[/.*\/(.+?)\.html/, 1]
+    t.run(tests) unless tests_to_run && !tests_to_run.include?(test_filename)
+  end
+
+  %w( safari firefox ie konqueror opera ).each do |browser|
+    t.browser(browser.to_sym) unless browsers_to_test && !browsers_to_test.include?(browser)
+  end
+end
+
+desc "Runs all the JavaScript functional tests and collects the results"
+JavaScriptTestTask.new(:test_functionals, 4712) do |t|
   testcases        = ENV['TESTCASES']
   tests_to_run     = ENV['TESTS']    && ENV['TESTS'].split(',')
   browsers_to_test = ENV['BROWSERS'] && ENV['BROWSERS'].split(',')
@@ -74,7 +100,7 @@ JavaScriptTestTask.new(:test_units) do |t|
   t.mount("/src")
   t.mount("/test")
 
-  Dir["test/*_test.html"].sort.each do |test_file|
+  Dir["test/functional/*_test.html"].sort.each do |test_file|
     tests = testcases ? { :url => "/#{test_file}", :testcases => testcases } : "/#{test_file}"
     test_filename = test_file[/.*\/(.+?)\.html/, 1]
     t.run(tests) unless tests_to_run && !tests_to_run.include?(test_filename)
@@ -85,6 +111,7 @@ JavaScriptTestTask.new(:test_units) do |t|
   end
 end
 
+
 task :clean_package_source do
   rm_rf File.join(APP_PKG_DIR, "#{APP_NAME}-#{APP_VERSION}")
 end

data/app_generators/newjs/templates/lib/jstest.rb

@@ -268,14 +268,14 @@ end
 
 class JavaScriptTestTask < ::Rake::TaskLib
 
-  def initialize(name=:test)
+  def initialize(name=:test, port=4711)
     @name = name
     @tests = []
     @browsers = []
-
+    @port = port
     @queue = Queue.new
 
-    @server = WEBrick::HTTPServer.new(:Port => 4711) # TODO: make port configurable
+    @server = WEBrick::HTTPServer.new(:Port => @port) # TODO: make port configurable
     @server.mount_proc("/results") do |req, res|
       @queue.push({
         :tests => req.query['tests'].to_i,
@@ -308,12 +308,12 @@ class JavaScriptTestTask < ::Rake::TaskLib
           browser.setup
           puts "\nStarted tests in #{browser}"
           @tests.each do |test|
-            params = "resultsURL=http://localhost:4711/results&t=" + ("%.6f" % Time.now.to_f)
+            params = "resultsURL=http://localhost:#{@port}/results&t=" + ("%.6f" % Time.now.to_f)
             if test.is_a?(Hash)
               params << "&tests=#{test[:testcases]}" if test[:testcases]
               test = test[:url]
             end
-            browser.visit("http://localhost:4711#{test}?#{params}")
+            browser.visit("http://localhost:#{@port}#{test}?#{params}")
  
             result = @queue.pop
             result.each { |k, v| results[k] += v }

data/app_generators/newjs/templates/script/js_autotest

@@ -1 +1 @@
-script/rstakeout "rake test:recent:javascript" test/*_test.html src/*.js
+script/rstakeout "rake test:recent:javascript" test/unit/*_test.html src/*.js

data/app_generators/newjs/templates/tasks/javascript_test_autotest_tasks.rake

@@ -10,7 +10,7 @@ namespace :test do
 
       since = TEST_CHANGES_SINCE
       touched = FileList[
-        'test/*_test.html', 
+        'test/unit/*_test.html', 
         'src/*.js'].select { |path| File.mtime(path) > since }
       next if touched.blank?
       
@@ -20,7 +20,7 @@ namespace :test do
       
       touched.each do |file|
         if file =~ /\/([^\/]+)\.js$/
-          file = "test/#{$1}_test.html"
+          file = "test/unit/#{$1}_test.html"
         end
         file = "#{APP_ROOT}/#{file}"
         unless File.exists?(file)

data/javascript_test_generators/functional_test/USAGE

@@ -0,0 +1,2 @@
+Description:
+  Creates a functional test file for the final distribution JavaScript file(s).

data/javascript_test_generators/functional_test/functional_test_generator.rb

@@ -0,0 +1,55 @@
+class FunctionalTestGenerator < RubiGen::Base
+  
+  attr_reader :name, :dist_name
+  
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    @destination_root = File.expand_path(".")
+    @name = args.shift
+    @dist_name = args.shift || base_name
+    extract_options
+  end
+
+  def manifest
+    record do |m|
+      # Ensure appropriate folder(s) exists
+      m.directory 'test/functional'
+
+      # Create stubs
+      m.template "test/test.html.erb",  "test/functional/#{name}_test.html"
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Creates a functional test file for the final distribution JavaScript file(s).
+
+USAGE: #{$0} #{spec.name} name [dist_name]"
+
+NOTES:
+* name - creates a file test/functional/name_test.html
+* dist_name - is for a file dist/base_name.js or dist/dist_name.js
+
+EOS
+    end
+
+    def add_options!(opts)
+      # opts.separator ''
+      # opts.separator 'Options:'
+      # For each option below, place the default
+      # at the top of the file next to "default_options"
+      # opts.on("-a", "--author=\"Your Name\"", String,
+      #         "Some comment about this option",
+      #         "Default: none") { |options[:author]| }
+      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+    end
+    
+    def extract_options
+      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
+      # Templates can access these value via the attr_reader-generated methods, but not the
+      # raw instance variable value.
+      # @author = options[:author]
+    end
+end

data/javascript_test_generators/functional_test/templates/test/test.html.erb

@@ -0,0 +1,58 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>JavaScript unit test file</title>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  <script src="../assets/prototype.js" type="text/javascript"></script>
+  <script src="../assets/unittest.js" type="text/javascript"></script>
+  
+  <script src="../../dist/<%= dist_name %>.js" type="text/javascript"></script>
+  
+  <link rel="stylesheet" href="../assets/unittest.css" type="text/css" />
+</head>
+<body>
+
+<div id="content">
+
+  <div id="header">
+    <h1>JavaScript unit test file</h1>
+    <p>
+      Functional tests for <strong>dist/<%= name %>.js</strong>.
+    </p>
+  </div>
+
+  <!-- Log output (one per Runner, via {testLog: "testlog"} option)-->
+  <div id="testlog"></div>
+  
+  <!-- Put sample/test html here -->
+  <div id="sample"></div>
+</div>
+
+<script type="text/javascript">
+// <![CDATA[
+
+  new Test.Unit.Runner({
+    // replace this with your real tests
+    setup: function() {
+      
+    },
+    
+    teardown: function() {
+      
+    },
+    
+    testTruth: function() { with(this) {
+      assert(true);
+    }}
+      
+  }, {testLog: "testlog"}); 
+  // For each Test.UnitRunner instance, specify the element id where results will be
+  // published; e.g. <div id="testlog"/> above.
+  // That is, you can have multiple "new Test.Unit.Runner() { ... }" on this page, just
+  // create more <div id="testlog2"></div> etc, and pass the element id to the hash above:
+  // e.g. {testLog: "testlog2"}
+// ]]>
+</script>
+</body>
+</html>

data/javascript_test_generators/{javascript_test → unit_test}/templates/test/test.html.erb

@@ -4,12 +4,12 @@
 <head>
   <title>JavaScript unit test file</title>
   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-  <script src="assets/prototype.js" type="text/javascript"></script>
-  <script src="assets/unittest.js" type="text/javascript"></script>
+  <script src="../assets/prototype.js" type="text/javascript"></script>
+  <script src="../assets/unittest.js" type="text/javascript"></script>
   
-  <script src="../src/<%= library_name %>.js" type="text/javascript"></script>
+  <script src="../../src/<%= library_name %>.js" type="text/javascript"></script>
   
-  <link rel="stylesheet" href="assets/unittest.css" type="text/css" />
+  <link rel="stylesheet" href="../assets/unittest.css" type="text/css" />
 </head>
 <body>
 

data/javascript_test_generators/{javascript_test/javascript_test_generator.rb → unit_test/unit_test_generator.rb}

@@ -1,4 +1,4 @@
-class JavascriptTestGenerator < RubiGen::Base
+class UnitTestGenerator < RubiGen::Base
   
   attr_reader :name, :library_name
   
@@ -13,22 +13,22 @@ class JavascriptTestGenerator < RubiGen::Base
   def manifest
     record do |m|
       # Ensure appropriate folder(s) exists
-      m.directory 'test'
+      m.directory 'test/unit'
 
       # Create stubs
-      m.template "test/test.html.erb",  "test/#{name}_test.html"
+      m.template "test/test.html.erb",  "test/unit/#{name}_test.html"
     end
   end
 
   protected
     def banner
       <<-EOS
-Creates an HTML test file for a JavaScript library.
+Creates an HTML unit test file for a JavaScript library.
 
 USAGE: #{$0} #{spec.name} name [library_name]"
 
 NOTES:
-* name - creates a file test/name_test.html
+* name - creates a file test/unit/name_test.html
 * library_name - is for a file src/library_name.js
 
 EOS

data/lib/newjs/jstest.rb

@@ -268,14 +268,14 @@ end
 
 class JavaScriptTestTask < ::Rake::TaskLib
 
-  def initialize(name=:test)
+  def initialize(name=:test, port=4711)
     @name = name
     @tests = []
     @browsers = []
-
+    @port = port
     @queue = Queue.new
 
-    @server = WEBrick::HTTPServer.new(:Port => 4711) # TODO: make port configurable
+    @server = WEBrick::HTTPServer.new(:Port => @port) # TODO: make port configurable
     @server.mount_proc("/results") do |req, res|
       @queue.push({
         :tests => req.query['tests'].to_i,
@@ -308,12 +308,12 @@ class JavaScriptTestTask < ::Rake::TaskLib
           browser.setup
           puts "\nStarted tests in #{browser}"
           @tests.each do |test|
-            params = "resultsURL=http://localhost:4711/results&t=" + ("%.6f" % Time.now.to_f)
+            params = "resultsURL=http://localhost:#{@port}/results&t=" + ("%.6f" % Time.now.to_f)
             if test.is_a?(Hash)
               params << "&tests=#{test[:testcases]}" if test[:testcases]
               test = test[:url]
             end
-            browser.visit("http://localhost:4711#{test}?#{params}")
+            browser.visit("http://localhost:#{@port}#{test}?#{params}")
  
             result = @queue.pop
             result.each { |k, v| results[k] += v }

data/lib/newjs/version.rb

@@ -1,8 +1,8 @@
 module Newjs #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 0
-    TINY  = 4
+    MINOR = 1
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/newjs_generators/install_website/templates/tasks/website.rake

@@ -17,7 +17,7 @@ EOS
 end
 
 desc 'Generate website files'
-task :website_generate => :ruby_env do
+task :website_generate => [:ruby_env, :dist] do
   (Dir['website/**/*.txt'] - Dir['website/version*.txt']).each do |txt|
     sh %{ #{RUBY_APP} script/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} }
   end

data/newjs_generators/install_website/templates/website/index.txt

@@ -6,7 +6,8 @@ This JavaScript project ...
 
 h2. Downloading
 
-TODO - where to download the library file?
+<a href="dist/<%= name %>.js"><%= name %>.js</a>
+
 
 h2. The basics
 
@@ -27,6 +28,11 @@ Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/
 
 The trunk repository is <code>svn://rubyforge.org/var/svn/<%= name %>/trunk</code> for anonymous access.
 
+OR
+
+The source project is a "Git":http://git.or.cz/ repository. See <%= author %>'s "master branch":http://github.com/<%= username %>/<%= name %>/tree/master for clone/checkout details.
+
+
 h2. License
 
 This code is free to use under the terms of the MIT license. 

data/newjs_theme_generators/plain_theme/templates/website/stylesheets/screen.css

@@ -1,5 +1,5 @@
 body {
-  background-color: #8DBD82;
+  background-color: #E9C000;
   font-family: "Georgia", sans-serif;
   font-size: 16px;
   line-height: 1.6em;
@@ -24,7 +24,7 @@ li {
 }
 a {
   color: #5E5AFF;
-	background-color: #A1DDB1;
+	background-color: #DDDA89;
   font-weight: normal;
   text-decoration: underline;
 }
@@ -39,7 +39,7 @@ blockquote {
 }
 
 #main {
-  width: 50em;
+  width: 45em;
   padding: 0;
   margin: 0 auto;
 }

data/newjs_theme_generators/plain_theme/templates/website/template.html.erb

@@ -8,9 +8,7 @@
       <%%= title %>
   </title>
   <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
-<style>
 
-</style>
   <script type="text/javascript">
     window.onload = function() {
       settings = {

data/test/test_functional_test_generator.rb

@@ -0,0 +1,56 @@
+require File.join(File.dirname(__FILE__), "test_generator_helper.rb")
+
+class TestFunctionalTestGenerator < Test::Unit::TestCase
+  include RubiGen::GeneratorTestHelper
+
+  def setup
+    bare_setup
+  end
+  
+  def teardown
+    bare_teardown
+  end
+  
+  # Some generator-related assertions:
+  #   assert_generated_file(name, &block) # block passed the file contents
+  #   assert_directory_exists(name)
+  #   assert_generated_class(name, &block)
+  #   assert_generated_module(name, &block)
+  #   assert_generated_test_for(name, &block)
+  # The assert_generated_(class|module|test_for) &block is passed the body of the class/module within the file
+  #   assert_has_method(body, *methods) # check that the body has a list of methods (methods with parentheses not supported yet)
+  #
+  # Other helper methods are:
+  #   app_root_files - put this in teardown to show files generated by the test method (e.g. p app_root_files)
+  #   bare_setup - place this in setup method to create the APP_ROOT folder for each test
+  #   bare_teardown - place this in teardown method to destroy the TMP_ROOT or APP_ROOT folder after each test
+  
+  def test_generator_without_arguments
+    name = "library"
+    run_generator('functional_test', [name], sources)
+    assert_generated_file("test/functional/library_test.html") do |body|
+      expected = %Q{src="../../dist/myproject.js"}
+      assert_match(expected, body)
+    end
+  end
+  
+  def test_generator_with_dist_name_argument
+    name = "library"
+    dist_name = "foobar"
+    run_generator('functional_test', [name, dist_name], sources)
+    assert_generated_file("test/functional/library_test.html") do |body|
+      expected = %Q{src="../../dist/foobar.js"}
+      assert_match(expected, body)
+    end
+  end
+  
+  private
+  def sources
+    [RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", generator_path))
+    ]
+  end
+  
+  def generator_path
+    "javascript_test_generators"
+  end
+end

data/test/{test_javascript_test_generator.rb → test_unit_test_generator.rb}

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), "test_generator_helper.rb")
 
-class TestJavascriptTestGenerator < Test::Unit::TestCase
+class TestUnitTestGenerator < Test::Unit::TestCase
   include RubiGen::GeneratorTestHelper
 
   def setup
@@ -25,10 +25,23 @@ class TestJavascriptTestGenerator < Test::Unit::TestCase
   #   bare_setup - place this in setup method to create the APP_ROOT folder for each test
   #   bare_teardown - place this in teardown method to destroy the TMP_ROOT or APP_ROOT folder after each test
   
-  def test_generator_without_options
+  def test_generator_without_arguments
     name = "library"
-    run_generator('javascript_test', [name], sources)
-    assert_generated_file("test/library_test.html")
+    run_generator('unit_test', [name], sources)
+    assert_generated_file("test/unit/library_test.html") do |body|
+      expected = %Q{src="../../src/library.js"}
+      assert_match(expected, body)
+    end
+  end
+  
+  def test_generator_with_library
+    name = "default_library"
+    library = "library"
+    run_generator('unit_test', [name, library], sources)
+    assert_generated_file("test/unit/default_library_test.html") do |body|
+      expected = %Q{src="../../src/library.js"}
+      assert_match(expected, body)
+    end
   end
   
   private

data/website/index.html

@@ -8,9 +8,7 @@
       JavaScript Project Generator
   </title>
   <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
-<style>
 
-</style>
   <script type="text/javascript">
     window.onload = function() {
       settings = {
@@ -146,11 +144,11 @@ here. That is, your JavaScript project comes with a generator to create new
 test <span class="caps">HTML</span> files, ready to rock and roll.</p>
 
 
-<pre>$ script/generate javascript_test some_lib
+<pre>$ script/generate unit_test some_lib
   exists  test
-  create  test/some_lib_test.html</pre>
+  create  test/unit/some_lib_test.html</pre>
 
-	<p>Now edit <code>test/some_lib_test.html</code> and follow the comments
+	<p>Now edit <code>test/unit/some_lib_test.html</code> and follow the comments
 that tell you what to do to write your unit tests.</p>
 
 
@@ -158,9 +156,9 @@ that tell you what to do to write your unit tests.</p>
 library as an additional parameter.</p>
 
 
-<pre>$ script/generate javascript_test my_library_tests some_lib
+<pre>$ script/generate unit_test my_library_tests some_lib
   exists  test
-  create  test/my_library_tests_test.html</pre>
+  create  test/unit/my_library_tests_test.html</pre>
 
 	<h2>Running unit tests</h2>
 
@@ -378,7 +376,7 @@ and you&#8217;ll love every minute of it.</p>
 
 	<p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a> via the <a href="http://groups.google.com/group/javascript-project-generator">forum</a></p>
     <p class="coda">
-      <a href="drnicwilliams@gmail.com">Dr Nic Williams</a>, 15th February 2008<br>
+      <a href="drnicwilliams@gmail.com">Dr Nic Williams</a>, 17th February 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -37,32 +37,34 @@ h2. Getting started
 
 To kick-off your new project/library, run the command-line app <code>newjs</code>:
 
-<pre>$ newjs mylib
-        create  config
-        create  lib
-        create  src
-        create  script
-        create  tasks
-        create  test/assets
-        create  test/assets/unittest.css
-        create  test/assets/unittest.js
-        create  test/assets/prototype.js
-        create  tasks/javascript_test_autotest_tasks.rake
-        create  tasks/environment.rake
-        create  config/javascript_test_autotest.yml.sample
-        create  lib/protodoc.rb
-        create  README.txt
-        create  Rakefile
-        create  History.txt
-        create  License.txt
-        create  src/HEADER
-        create  src/mylib.js
-        create  script/rstakeout
-        create  script/js_autotest
-    dependency  install_rubigen_scripts
-        exists    script
-        create    script/generate
-        create    script/destroy
+<pre>$ newjs mylib -a "Dr Nic" -e "drnicwilliams@gmail.com" -u "http://mylib.rubyforge.org"
+      create  config
+      create  lib
+      create  src
+      create  script
+      create  tasks
+      create  test/assets
+      create  test/assets/unittest.css
+      create  test/assets/unittest.js
+      create  test/assets/prototype.js
+      create  tasks/javascript_test_autotest_tasks.rake
+      create  tasks/environment.rake
+      create  tasks/deploy.rake
+      create  config/javascript_test_autotest.yml.sample
+      create  lib/protodoc.rb
+      create  lib/jstest.rb
+      create  Rakefile
+      create  README.txt
+      create  History.txt
+      create  License.txt
+      create  src/HEADER
+      create  src/mylib.js
+      create  script/rstakeout
+      create  script/js_autotest
+  dependency  install_rubigen_scripts
+      exists    script
+      create    script/generate
+      create    script/destroy
 </pre>
 
 Look at all that!
@@ -80,11 +82,13 @@ When you've got a new version to release, edit <code>Rakefile</code> and modify
 
 To merge your <code>src/</code> files into a distribution file, see below.
 
-h2. Generating test HTML files
+h2. Unit testing
 
 If you are going to have a <code>src/some_lib.js</code> file, then you'll want a unit
 test file(s). By default you'd call it <code>test/some_lib_test.html</code>.
 
+h3. Generating test HTML files
+
 And then what? Personally, I can never remember what basic HTML + JavaScript
 goes in the test HTML files. I quite like the "javascript_test plugin":http://drnicwilliams.com/2008/01/04/autotesting-javascript-in-rails/ for "Ruby 
 on Rails":http://www.rubyonrails.org/, which allows you to generate a
@@ -92,21 +96,21 @@ test HTML stub. So I've included a version of it
 here. That is, your JavaScript project comes with a generator to create new
 test HTML files, ready to rock and roll.
 
-<pre>$ script/generate javascript_test some_lib
-  exists  test
-  create  test/some_lib_test.html</pre>
+<pre>$ script/generate unit_test some_lib
+  create  test/unit
+  create  test/unit/some_lib_test.html</pre>
   
-Now edit <code>test/some_lib_test.html</code> and follow the comments
+Now edit <code>test/unit/some_lib_test.html</code> and follow the comments
 that tell you what to do to write your unit tests.
 
 Want to name your test file something different? Specify the target
 library as an additional parameter.
 
-<pre>$ script/generate javascript_test my_library_tests some_lib
-  exists  test
-  create  test/my_library_tests_test.html</pre>
+<pre>$ script/generate unit_test my_library_tests some_lib
+  exists  test/unit
+  create  test/unit/my_library_tests_test.html</pre>
 
-h2. Running unit tests
+h3. Running unit tests
 
 Each test HTML file should be self-executable: just open it in a target
 browser. That is, to run the <code>test/some_lib_test.html</code> tests
@@ -116,6 +120,30 @@ It will print out a beautiful log success/error messages for each test.
 
 <img src="images/example-unittest-log.jpg" width="647" height="427" alt="Example Unittest Log">
 
+h2. Functional tests
+
+End-to-end functional tests will test the final distribution file(s), rather than
+the <code>src/</code> files.
+
+As shown below, your <code>src/</code> files will be merged into (commonly) one 
+distribution file - a merging of your source files.
+
+h3. Generating test HTML files
+
+To create functional tests, there is another generator:
+
+<pre>$ script/generate functional_test basic_usage
+  create  test/functional
+  create  test/functional/basic_usage_test.html</pre>
+
+h3. Running functional tests
+
+<pre>rake test_functionals</pre>
+
+The generated HTML file uses the <code>dist/mylib.js</code> file. So, if
+you are running these tests it is best to use the <code>rake test_functionals</code>
+as it pre-builds the distribution files first.
+
 h2. Distribution of library
 
 Your project comes with the ability to concatenate all your <code>src/*.js</code>

data/website/template.html.erb

@@ -8,9 +8,7 @@
       <%= title %>
   </title>
   <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
-<style>
 
-</style>
   <script type="text/javascript">
     window.onload = function() {
       settings = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newjs
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-16 00:00:00 +10:00
+date: 2008-02-17 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,7 +60,6 @@ extra_rdoc_files:
 - License.txt
 - Manifest.txt
 - README.txt
-- app_generators/newjs/templates/README.txt
 - newjs_generators/install_website/templates/website/index.txt
 - website/index.txt
 files: 
@@ -73,7 +72,7 @@ files:
 - app_generators/newjs/newjs_generator.rb
 - app_generators/newjs/templates/History.txt.erb
 - app_generators/newjs/templates/License.txt.erb
-- app_generators/newjs/templates/README.txt
+- app_generators/newjs/templates/README.txt.erb
 - app_generators/newjs/templates/Rakefile.erb
 - app_generators/newjs/templates/config/javascript_test_autotest.yml.sample
 - app_generators/newjs/templates/lib/jstest.rb
@@ -91,9 +90,12 @@ files:
 - bin/newjs
 - config/hoe.rb
 - config/requirements.rb
-- javascript_test_generators/javascript_test/USAGE
-- javascript_test_generators/javascript_test/javascript_test_generator.rb
-- javascript_test_generators/javascript_test/templates/test/test.html.erb
+- javascript_test_generators/functional_test/USAGE
+- javascript_test_generators/functional_test/functional_test_generator.rb
+- javascript_test_generators/functional_test/templates/test/test.html.erb
+- javascript_test_generators/unit_test/USAGE
+- javascript_test_generators/unit_test/templates/test/test.html.erb
+- javascript_test_generators/unit_test/unit_test_generator.rb
 - lib/newjs.rb
 - lib/newjs/autotest.rb
 - lib/newjs/autotest/javascript_test_autotest.rb
@@ -123,12 +125,13 @@ files:
 - tasks/deployment.rake
 - tasks/environment.rake
 - tasks/website.rake
+- test/test_functional_test_generator.rb
 - test/test_generator_helper.rb
 - test/test_helper.rb
 - test/test_install_website_generator.rb
-- test/test_javascript_test_generator.rb
 - test/test_newjs_generator.rb
 - test/test_plain_theme_generator.rb
+- test/test_unit_test_generator.rb
 - website/images/example-unittest-log.jpg
 - website/index.html
 - website/index.txt
@@ -163,9 +166,10 @@ signing_key:
 specification_version: 2
 summary: "Description: The +newjs+ command creates a new JavaScript project/application with a default directory structure and configuration at the path you specify."
 test_files: 
+- test/test_functional_test_generator.rb
 - test/test_generator_helper.rb
 - test/test_helper.rb
 - test/test_install_website_generator.rb
-- test/test_javascript_test_generator.rb
 - test/test_newjs_generator.rb
 - test/test_plain_theme_generator.rb
+- test/test_unit_test_generator.rb

data/app_generators/newjs/templates/README.txt

@@ -1 +0,0 @@
-README