newjs 1.5.1 → 1.7.0

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

@@ -5,6 +5,9 @@
   <title>JavaScript unit test file</title>
   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
   <script src="../assets/jsunittest.js" type="text/javascript"></script>
+  <% if testing_lib == 'jshoulda' %>
+  <script src="../assets/jshoulda.js" type="text/javascript"></script>
+  <% end %>
   
   <script src="../../dist/<%= dist_name %>.js" type="text/javascript"></script>
   
@@ -30,7 +33,7 @@
 
 <script type="text/javascript">
 // <![CDATA[
-
+<% if testing_lib.nil? %>
   new Test.Unit.Runner({
     // replace this with your real tests
     setup: function() {
@@ -51,6 +54,17 @@
   // 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"}
+<% elsif testing_lib == 'jshoulda' %>
+context("A context", {
+  setup: function() {
+
+  }
+  },
+  should("run tests", function() {
+    this.assert(true);
+  })
+)();
+<% end %>
 // ]]>
 </script>
 </body>

data/javascript_test_generators/unit_test/templates/test/assets/jshoulda.js

@@ -0,0 +1,186 @@
+/*  jShoulda, version 1.2.1
+ *  (c) 2008 Choan Galvez
+ *
+ *  jShoulda is freely distributable under
+ *  the terms of an MIT-style license.
+ *  For details, see the web site: http://jshoulda.scriptia.net
+ *
+ *--------------------------------------------------------------------------*/
+
+var jShoulda = function() {
+  // the test runner
+  var tr,
+  // handle all testcases with the same testrunner
+  unique = false,
+  // styles definitions
+  styles = {};
+
+  function dummy() {
+  };
+
+  function runQueue(queue, name, before, after, ext) {
+    var i, tests;
+    for (i = 0; i < queue.length; i += 1) {
+      tests = queue[i](name, before, after, ext);
+      if (tests)
+        tr.tests.push(tests);
+    }
+    before.pop();
+    after.pop();
+  }
+
+  function makeBatch(fn_a) {
+    var copy = fn_a.slice(0);
+    return function() {
+      for (var i = 0; i < copy.length; i += 1) {
+        copy[i].call(this);
+      }
+    };
+  }
+
+  function getContextAlias(prefix) {
+    if (prefix) prefix += ' ';
+    return function (name, config, args) {
+      var queue = Array.prototype.slice.call(arguments, 0);
+      var cName = '';
+      var obj = {};
+      // shift arguments if the first one is a string
+      if (typeof queue[0] == 'string') {
+        if (name) { cName += prefix; }
+        cName += queue.shift();
+      }
+      if (typeof queue[0] === 'object') {
+        obj = queue.shift();
+      }
+
+      obj.before = obj.setup || obj.before || dummy;
+      obj.after = obj.teardown || obj.after || dummy;
+      var beforeQueue;
+      var afterQueue;
+      var extensions = merge({}, obj || {});
+
+      return function(outerName, before, after, ext) {
+        // the root context gets no outerName or a configuration object
+        // as its first argument
+        var prefix = outerName;
+        var is_root = !!(outerName == undefined || typeof outerName == 'object');
+        if (is_root) {
+          tr = (tr && unique) ? tr : new Test.Unit.Runner({}, outerName || {});
+          prefix = '';
+        }
+        // shift arguments if the second one is a
+        // configuration object
+        beforeQueue = before ? before.push(obj.before) && before : [obj.before];
+        afterQueue = after ? after.push(obj.after) && after : [obj.after];
+        runQueue(queue, [prefix, cName].join(' ').replace(/^\s+/, ''), beforeQueue, afterQueue, merge(extensions, ext));
+        if (is_root) {
+          return tr;
+        }
+        return false; // do not add to the tests queue
+      };
+    };
+  };
+
+  function merge(sub, sup) {
+    for (var i in sup) {
+      if (i.search(/^(before|after|setup|teardown)$/) != -1) continue;
+      if (sup.hasOwnProperty(i)) {
+        sub[i] = sup[i];
+      }
+    }
+    return sub;
+  }
+
+
+  function getShouldAlias(connector) {
+    return function (name, fn) {
+      return function(prefix, before, after, extensions) {
+        var beforeBatch = makeBatch(before);
+        var afterBatch = makeBatch(after);
+        var unit = new Test.Unit.Testcase([prefix, name].join(' ' + connector + ' '), fn, beforeBatch, afterBatch);
+        merge(unit, extensions);
+        return unit;
+      };
+    };
+  }
+
+  function setShouldAlias(name, host) {
+    var connector = name;
+    if (typeof host == 'string') {
+      connector = host;
+      host = arguments[2];
+    }
+    host = host || window;
+    host[name] = getShouldAlias(connector);
+    return jShoulda;
+  }
+
+  function setContextAlias(name, host) {
+    var prefix = '';
+    if (typeof host == 'string') {
+      prefix = host;
+      host = arguments[2];
+    }
+    host = host || window;
+    host[name] = getContextAlias(prefix);
+    return jShoulda;
+  }
+
+  function useStyle(name) {
+    var style, i;
+    if (name in styles) {
+      style = styles[name];
+      if ('context' in style) {
+        for (i = 0; i < style.context.length; i += 2) {
+          setContextAlias(style.context[i], style.context[i+1]);
+        }
+      }
+      if ('should' in style) {
+        for (i = 0; i < style.should.length; i += 2) {
+          setShouldAlias(style.should[i], style.should[i+1]);
+        }
+      }
+      if (style.unify) unifyRunners();
+    }
+    else throw { name: 'UndefinedStyle', message: 'There is not "'+name+'" style defined' };
+    return jShoulda;
+  }
+
+  function defineStyle(name, opts, aliases) {
+    styles[name] = opts;
+    for (var i = 2; i < arguments.length; i += 1) {
+      styles[arguments[i]] = opts;
+    }
+    return jShoulda;
+  }
+
+  function unifyRunners (options) {
+    if (options) {
+      tr = options instanceof Test.Unit.Runner ? options : new Test.Unit.Runner({}, options || {});
+    }
+    unique = true;
+    return jShoulda;
+  }
+
+  return {
+    setShouldAlias : setShouldAlias,
+    setContextAlias : setContextAlias,
+    unifyRunners : unifyRunners,
+    useStyle : useStyle,
+    defineStyle: defineStyle
+  };
+
+}();
+
+jShoulda
+  .defineStyle('describe', {
+    context: [ 'describe', '' ],
+    should: [ 'it', '' ],
+    unify: false
+  }, 'it')
+  .defineStyle('context', {
+    context : [ 'context', '' ],
+    should : [ 'should', 'should' ],
+    unify : false
+  }, 'should')
+  .useStyle('should');

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

@@ -5,7 +5,6 @@
   <title>JavaScript unit test file</title>
   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
   <script src="../assets/jsunittest.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" />
@@ -30,27 +29,26 @@
 
 <script type="text/javascript">
 // <![CDATA[
-
-  new Test.Unit.Runner({
-    // replace this with your real tests
-    setup: function() {
-      
-    },
+new Test.Unit.Runner({
+  // replace this with your real tests
+  setup: function() {
     
-    teardown: function() {
-      
-    },
+  },
+  
+  teardown: function() {
+    
+  },
+  
+  testTruth: function() { with(this) {
+    assert(true);
+  }}
     
-    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"}
+}, {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>

data/javascript_test_generators/unit_test/templates/test/test_jshoulda.html.erb

@@ -0,0 +1,45 @@
+<!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/jsunittest.js" type="text/javascript"></script>
+  <script src="../assets/jshoulda.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" />
+</head>
+<body>
+
+<div id="content">
+
+  <div id="header">
+    <h1>JavaScript unit test file</h1>
+    <p>
+      This file tests <strong><%= library_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[
+context("<%= module_name %>", {
+  setup: function() {
+    
+  }
+  },
+  should("run tests", function() {
+    this.assert(true);
+  })
+)();
+// ]]>
+</script>
+</body>
+</html>

data/javascript_test_generators/unit_test/unit_test_generator.rb

@@ -1,12 +1,13 @@
 class UnitTestGenerator < RubiGen::Base
   
-  attr_reader :name, :library_name
+  attr_reader :name, :library_name, :module_name, :test_framework
   
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
     @name = args.shift
     @library_name = args.shift || name
+    @module_name = library_name.camelcase
     extract_options
   end
 
@@ -15,8 +16,13 @@ class UnitTestGenerator < RubiGen::Base
       # Ensure appropriate folder(s) exists
       m.directory 'test/unit'
 
-      # Create stubs
-      m.template "test/test.html.erb",  "test/unit/#{name}_test.html"
+      if test_framework
+        m.directory 'test/assets'
+        m.file "test/assets/#{test_framework}.js", "test/assets/#{test_framework}.js", :collision => :skip
+        m.template "test/test_#{test_framework}.html.erb",  "test/unit/#{name}_test.html"
+      else
+        m.template "test/test.html.erb",  "test/unit/#{name}_test.html"
+      end
     end
   end
 
@@ -43,6 +49,7 @@ EOS
       #         "Some comment about this option",
       #         "Default: none") { |options[:author]| }
       # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+      opts.on("-j", "--jshoulda", "Use jshoulda test framework") { |v| options[:test_framework] = 'jshoulda'}
     end
     
     def extract_options
@@ -50,5 +57,6 @@ EOS
       # Templates can access these value via the attr_reader-generated methods, but not the
       # raw instance variable value.
       # @author = options[:author]
+      @test_framework = options[:test_framework]
     end
 end

data/lib/newjs.rb

@@ -1,7 +1,8 @@
-$:.unshift File.dirname(__FILE__)
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Newjs
-  
+  VERSION = '1.7.0'
 end
 
 require 'newjs/jstest'

data/newjs_iphone_generators/page/USAGE

@@ -0,0 +1,5 @@
+Description:
+  
+  
+Usage:
+  

data/newjs_iphone_generators/page/page_generator.rb

@@ -0,0 +1,36 @@
+class PageGenerator < RubiGen::Base
+
+  attr_reader :name, :module_name
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    @name        = args.shift
+    @module_name = @name.camelcase
+  end
+
+  def manifest
+    record do |m|
+      m.directory 'src'
+      m.directory 'test/unit'
+      m.directory 'test/fixtures'
+
+      ["src/name.css.erb", "src/name.html.erb", "src/name.js.erb",
+        "test/unit/name_test.html.erb", "test/fixtures/name.js.erb"].each do |file|
+        target_name = file.gsub(/name/, name).gsub(/.erb/,'')
+        m.template file, target_name
+      end
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Creates a page with a loadData() JavaScript method
+to load data from Objective-C. This page would be
+used in a WebKit view to show some static data.
+
+USAGE: #{$0} #{spec.name} name
+EOS
+    end
+end

data/newjs_iphone_generators/page/templates/src/name.html.erb

@@ -0,0 +1,13 @@
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <title><%= module_name %></title>
+    <script src="<%= name %>.js"></script>
+    <link rel="stylesheet" href="<%= name %>.css" />
+  </head>
+  <body>
+    <div id="<%= name %>">
+      
+    </div>
+  </body>
+</html>

data/newjs_iphone_generators/page/templates/src/name.js.erb

@@ -0,0 +1,4 @@
+var <%= module_name %> = <%= module_name %> || {};
+<%= module_name %>.loadData = function(data) {
+  
+};

data/newjs_iphone_generators/page/templates/test/fixtures/name.js.erb

@@ -0,0 +1,5 @@
+function initialFixtureData() {
+  return {
+    
+  };
+};