newjs 1.5.0 → 1.5.1

data/History.txt

@@ -1,3 +1,7 @@
+== 1.5.1 2008-10-09
+
+* Added newsjs_iphone to Manifest for distribution
+
 == 1.5.0 2008-10-05
 
 * newjs_iphone: installs variant of newjs in Html/ subfolder of an Xcode project

data/Manifest.txt

@@ -24,7 +24,23 @@ app_generators/newjs/templates/test/assets/jsunittest.js
 app_generators/newjs/templates/test/assets/prototype.js
 app_generators/newjs/templates/test/assets/unittest.css
 app_generators/newjs/templates/test/assets/unittest.js
+app_generators/newjs_iphone/USAGE
+app_generators/newjs_iphone/newjs_iphone_generator.rb
+app_generators/newjs_iphone/templates/Html/Rakefile.erb
+app_generators/newjs_iphone/templates/Html/config/javascript_test_autotest.yml.sample
+app_generators/newjs_iphone/templates/Html/lib/jstest.rb
+app_generators/newjs_iphone/templates/Html/lib/protodoc.rb
+app_generators/newjs_iphone/templates/Html/script/js_autotest
+app_generators/newjs_iphone/templates/Html/script/rstakeout
+app_generators/newjs_iphone/templates/Html/script/win_script.cmd
+app_generators/newjs_iphone/templates/Html/src/library.js.erb
+app_generators/newjs_iphone/templates/Html/tasks/javascript_test_autotest_tasks.rake
+app_generators/newjs_iphone/templates/Html/test/assets/jsunittest.js
+app_generators/newjs_iphone/templates/Html/test/assets/prototype.js
+app_generators/newjs_iphone/templates/Html/test/assets/unittest.css
+app_generators/newjs_iphone/templates/Html/test/assets/unittest.js
 bin/newjs
+bin/newjs_iphone
 config/hoe.rb
 config/requirements.rb
 javascript_test_generators/functional_test/USAGE
@@ -79,6 +95,7 @@ script/txt2html
 setup.rb
 tasks/deployment.rake
 tasks/environment.rake
+tasks/jsunittest/update.rake
 tasks/website.rake
 test/test_functional_test_generator.rb
 test/test_generator_helper.rb
@@ -86,6 +103,7 @@ test/test_helper.rb
 test/test_install_website_generator.rb
 test/test_javascript_test_generator.rb
 test/test_newjs_generator.rb
+test/test_newjs_iphone_generator.rb
 test/test_plain_theme_generator.rb
 test/test_unit_test_generator.rb
 website/images/example-unittest-log.jpg

data/app_generators/newjs_iphone/USAGE

@@ -0,0 +1,8 @@
+Description:
+    The 'newjs_iphone' should only be executed in the root of an Xcode project for an iPhone app that contains a WebKit view.
+    
+    All assets must be in the Html/src file, and not use sub-folders as Xcode doesn't like them in its Targets.
+
+Example:
+    cd my_iphone_project
+    newjs_iphone .

data/app_generators/newjs_iphone/newjs_iphone_generator.rb

@@ -0,0 +1,111 @@
+class NewjsIphoneGenerator < RubiGen::Base
+  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
+                              Config::CONFIG['ruby_install_name'])
+
+  default_options :shebang => DEFAULT_SHEBANG,
+                  :author => nil,
+                  :email       => nil,
+                  :version     => '0.0.1'
+
+
+  attr_reader :name, :module_name
+  attr_reader :version, :version_str, :author, :email
+  attr_reader :title, :url
+
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    @destination_root = File.expand_path(args.shift)
+    @name = base_name
+    @module_name = name.camelize
+    extract_options
+    @title ||= @name.titleize
+    @url   ||= "http://NOTE-ENTER-URL.com"
+  end
+
+  def manifest
+    script_options = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
+    windows        = (RUBY_PLATFORM =~ /dos|win32|cygwin/i) || (RUBY_PLATFORM =~ /(:?mswin|mingw)/)
+
+    record do |m|
+      # Ensure appropriate folder(s) exists
+      m.directory ''
+      BASEDIRS.each { |path| m.directory path }
+
+      m.file_copy_each %w[unittest.css jsunittest.js], "Html/test/assets"
+      m.file_copy_each %w[javascript_test_autotest_tasks.rake], "Html/tasks"
+      m.file_copy_each %w[javascript_test_autotest.yml.sample], "Html/config"
+      m.file_copy_each %w[protodoc.rb jstest.rb], "Html/lib"
+      m.template_copy_each %w[Rakefile.erb], "Html"
+      m.template "Html/src/library.js.erb", "Html/src/#{name}.js.erb"
+
+      %w[rstakeout js_autotest].each do |file|
+        m.template "Html/script/#{file}",        "Html/script/#{file}", script_options
+        m.template "Html/script/win_script.cmd", "Html/script/#{file}.cmd",
+          :assigns => { :filename => file } if windows
+      end
+
+      m.dependency "install_rubigen_scripts",
+        [File.join(destination_root, "Html"), 
+          'javascript', 'javascript_test', 'newjs_iphone', 'newjs_theme'],
+          :shebang => options[:shebang], :collision => :force
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Creates a JavaScript project.
+
+USAGE: #{spec.name} name"
+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,
+              "Default: none") { |x| options[:author] = x }
+      opts.on("-e", "--email=\"your@email.com\"", String,
+              "Your email to be inserted into generated files.",
+              "Default: ~/.rubyforge/user-config.yml[email]") { |x| options[:email] = x }
+      opts.on("-t", "--title=\"Project Title\"", String,
+              "Human-readable/marketing name for project.",
+              "Default: Project Name") { |x| options[:title] = x }
+      opts.on("-u", "--url=\"http://url-to-project.com\"", String,
+              "Default: http://NOTE-ENTER-URL.com") { |x| options[:url] = x }
+      opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+      opts.on("-V", "--set-version=X.Y.Z", String,
+              "Initial version of the project you are creating.",
+              "Default: 0.0.1") { |x| options[:version] = x }
+    end
+
+    def extract_options
+      @version           = options[:version].to_s.split(/\./)
+      @version_str       = @version.join('.')
+      @author            = options[:author]
+      @email             = options[:email]
+      unless @author && @email
+        require 'newjs/rubyforge'
+        rubyforge_config = Newjs::Rubyforge.new
+        @author ||= rubyforge_config.full_name
+        @email  ||= rubyforge_config.email
+      end
+      @url               = options[:url]
+    end
+
+    # Installation skeleton.  Intermediate directories are automatically
+    # created so don't sweat their absence here.
+    BASEDIRS = %w(
+      Html/config
+      Html/lib
+      Html/src
+      Html/script
+      Html/tasks
+      Html/test/assets
+      Html/test/unit
+    )
+end

data/app_generators/newjs_iphone/templates/Html/Rakefile.erb

@@ -0,0 +1,69 @@
+require 'rubygems'
+begin
+  require 'rake'
+rescue LoadError
+  puts 'This script should only be accessed via the "rake" command.'
+  puts 'Installation: gem install rake'
+  exit
+end
+require 'rake'
+require 'rake/clean'
+require 'rake/packagetask'
+
+$:.unshift File.dirname(__FILE__) + "/lib"
+
+unless ENV['rakefile_just_config']
+
+task :default => :test_units
+
+
+desc "Builds the distribution, runs the JavaScript unit + functional tests and collects their results."
+task :test => [:test_units, :test_functionals]
+
+require 'jstest'
+desc "Runs all the JavaScript unit tests and collects the results"
+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(',')
+
+  t.mount("/dist")
+  t.mount("/src")
+  t.mount("/test")
+
+  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)
+  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
+
+
+Dir['tasks/**/*.rake'].each { |rake| load rake }
+
+end

data/app_generators/newjs_iphone/templates/Html/config/javascript_test_autotest.yml.sample

@@ -0,0 +1,15 @@
+# This file has been copied here by the javascript_test_autotest plugin.
+# Comment/uncomment the browsers you wish to autotest with.
+# Same schema as per selenium-on-rails plugin, which is nice.
+browsers:
+  # Windows
+  # firefox: 'c:\Program Files\Mozilla Firefox\firefox.exe'
+  # ie: 'c:\Program Files\Internet Explorer\iexplore.exe'
+
+  # Mac OS X
+  # firefox: '/Applications/Firefox.app/Contents/MacOS/firefox-bin'
+  safari: '/Applications/Safari.app/Contents/MacOS/Safari'
+
+  # Unix
+  # ?
+  # ?

data/app_generators/newjs_iphone/templates/Html/lib/jstest.rb

@@ -0,0 +1,382 @@
+require 'rake/tasklib'
+require 'thread'
+require 'webrick'
+require 'fileutils'
+include FileUtils
+
+class Browser
+  def supported?; true; end
+  def setup ; end
+  def open(url) ; end
+  def teardown ; end
+
+  def host
+    require 'rbconfig'
+    Config::CONFIG['host']
+  end
+  
+  def macos?
+    host.include?('darwin')
+  end
+  
+  def windows?
+    host.include?('mswin')
+  end
+  
+  def linux?
+    host.include?('linux')
+  end
+  
+  def applescript(script)
+    raise "Can't run AppleScript on #{host}" unless macos?
+    system "osascript -e '#{script}' 2>&1 >/dev/null"
+  end
+end
+
+class FirefoxBrowser < Browser
+  def initialize(path=File.join(ENV['ProgramFiles'] || 'c:\Program Files', '\Mozilla Firefox\firefox.exe'))
+    @path = path
+  end
+
+  def visit(url)
+    system("open -a Firefox '#{url}'") if macos?
+    system("#{@path} #{url}") if windows? 
+    system("firefox #{url}") if linux?
+  end
+
+  def to_s
+    "Firefox"
+  end
+end
+
+class SafariBrowser < Browser
+  def supported?
+    macos?
+  end
+  
+  def setup
+    applescript('tell application "Safari" to make new document')
+  end
+  
+  def visit(url)
+    applescript('tell application "Safari" to set URL of front document to "' + url + '"')
+  end
+
+  def teardown
+    #applescript('tell application "Safari" to close front document')
+  end
+
+  def to_s
+    "Safari"
+  end
+end
+
+class IEBrowser < Browser
+  def setup
+    require 'win32ole' if windows?
+  end
+
+  def supported?
+    windows?
+  end
+  
+  def visit(url)
+    if windows?
+      ie = WIN32OLE.new('InternetExplorer.Application')
+      ie.visible = true
+      ie.Navigate(url)
+      while ie.ReadyState != 4 do
+        sleep(1)
+      end
+    end
+  end
+
+  def to_s
+    "Internet Explorer"
+  end
+end
+
+class KonquerorBrowser < Browser
+  @@configDir = File.join((ENV['HOME'] || ''), '.kde', 'share', 'config')
+  @@globalConfig = File.join(@@configDir, 'kdeglobals')
+  @@konquerorConfig = File.join(@@configDir, 'konquerorrc')
+
+  def supported?
+    linux?
+  end
+
+  # Forces KDE's default browser to be Konqueror during the tests, and forces
+  # Konqueror to open external URL requests in new tabs instead of a new
+  # window.
+  def setup
+    cd @@configDir, :verbose => false do
+      copy @@globalConfig, "#{@@globalConfig}.bak", :preserve => true, :verbose => false
+      copy @@konquerorConfig, "#{@@konquerorConfig}.bak", :preserve => true, :verbose => false
+      # Too lazy to write it in Ruby...  Is sed dependency so bad?
+      system "sed -ri /^BrowserApplication=/d  '#{@@globalConfig}'"
+      system "sed -ri /^KonquerorTabforExternalURL=/s:false:true: '#{@@konquerorConfig}'"
+    end
+  end
+
+  def teardown
+    cd @@configDir, :verbose => false do
+      copy "#{@@globalConfig}.bak", @@globalConfig, :preserve => true, :verbose => false
+      copy "#{@@konquerorConfig}.bak", @@konquerorConfig, :preserve => true, :verbose => false
+    end
+  end
+  
+  def visit(url)
+    system("kfmclient openURL #{url}")
+  end
+  
+  def to_s
+    "Konqueror"
+  end
+end
+
+class OperaBrowser < Browser
+  def initialize(path='c:\Program Files\Opera\Opera.exe')
+    @path = path
+  end
+  
+  def setup
+    if windows?
+      puts %{
+        MAJOR ANNOYANCE on Windows.
+        You have to shut down Opera manually after each test
+        for the script to proceed.
+        Any suggestions on fixing this is GREATLY appreciated!
+        Thank you for your understanding.
+      }
+    end
+  end
+  
+  def visit(url)
+    applescript('tell application "Opera" to GetURL "' + url + '"') if macos? 
+    system("#{@path} #{url}") if windows? 
+    system("opera #{url}")  if linux?
+  end
+
+  def to_s
+    "Opera"
+  end
+end
+
+# shut up, webrick :-)
+class ::WEBrick::HTTPServer
+  def access_log(config, req, res)
+    # nop
+  end
+end
+
+class ::WEBrick::BasicLog
+  def log(level, data)
+    # nop
+  end
+end
+
+class WEBrick::HTTPResponse
+  alias send send_response
+  def send_response(socket)
+    send(socket) unless fail_silently?
+  end
+  
+  def fail_silently?
+    @fail_silently
+  end
+  
+  def fail_silently
+    @fail_silently = true
+  end
+end
+
+class WEBrick::HTTPRequest
+  def to_json
+    headers = []
+    each { |k, v| headers.push "#{k.inspect}: #{v.inspect}" }
+    headers = "{" << headers.join(', ') << "}"
+    %({ "headers": #{headers}, "body": #{body.inspect}, "method": #{request_method.inspect} })
+  end
+end
+
+class WEBrick::HTTPServlet::AbstractServlet
+  def prevent_caching(res)
+    res['ETag'] = nil
+    res['Last-Modified'] = Time.now + 100**4
+    res['Cache-Control'] = 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0'
+    res['Pragma'] = 'no-cache'
+    res['Expires'] = Time.now - 100**4
+  end
+end
+
+class BasicServlet < WEBrick::HTTPServlet::AbstractServlet
+  def do_GET(req, res)
+    prevent_caching(res)
+    res['Content-Type'] = "text/plain"
+    
+    req.query.each do |k, v|
+      res[k] = v unless k == 'responseBody'
+    end
+    res.body = req.query["responseBody"]
+    
+    raise WEBrick::HTTPStatus::OK
+  end
+  
+  def do_POST(req, res)
+    do_GET(req, res)
+  end
+end
+
+class SlowServlet < BasicServlet
+  def do_GET(req, res)
+    sleep(2)
+    super
+  end
+end
+
+class DownServlet < BasicServlet
+  def do_GET(req, res)
+    res.fail_silently
+  end
+end
+
+class InspectionServlet < BasicServlet
+  def do_GET(req, res)
+    prevent_caching(res)
+    res['Content-Type'] = "application/json"
+    res.body = req.to_json
+    raise WEBrick::HTTPStatus::OK
+  end
+end
+
+class NonCachingFileHandler < WEBrick::HTTPServlet::FileHandler
+  def do_GET(req, res)
+    super
+    set_default_content_type(res, req.path)
+    prevent_caching(res)
+  end
+  
+  def set_default_content_type(res, path)
+    res['Content-Type'] = case path
+      when /\.js$/   then 'text/javascript'
+      when /\.html$/ then 'text/html'
+      when /\.css$/  then 'text/css'
+      else 'text/plain'
+    end
+  end
+end
+
+class JavaScriptTestTask < ::Rake::TaskLib
+
+  def initialize(name=:test, port=4711)
+    @name = name
+    @tests = []
+    @browsers = []
+    @port = port
+    @queue = Queue.new
+
+    @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,
+        :assertions => req.query['assertions'].to_i,
+        :failures => req.query['failures'].to_i,
+        :errors => req.query['errors'].to_i
+      })
+      res.body = "OK"
+    end
+    @server.mount("/response", BasicServlet)
+    @server.mount("/slow", SlowServlet)
+    @server.mount("/down", DownServlet)
+    @server.mount("/inspect", InspectionServlet)
+    yield self if block_given?
+    define
+  end
+
+  def define
+    task @name do
+      trap("INT") { @server.shutdown }
+      t = Thread.new { @server.start }
+      
+      # run all combinations of browsers and tests
+      @browsers.each do |browser|
+        if browser.supported?
+          t0 = Time.now
+          results = {:tests => 0, :assertions => 0, :failures => 0, :errors => 0}
+          errors = []
+          failures = []
+          browser.setup
+          puts "\nStarted tests in #{browser}"
+          @tests.each do |test|
+            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:#{@port}#{test}?#{params}")
+ 
+            result = @queue.pop
+            result.each { |k, v| results[k] += v }
+            value = "."
+            
+            if result[:failures] > 0
+              value = "F"
+              failures.push(test)
+            end
+            
+            if result[:errors] > 0
+              value = "E"
+              errors.push(test)
+            end
+            
+            print value
+          end
+          
+          puts "\nFinished in #{(Time.now - t0).round.to_s} seconds."
+          puts "  Failures: #{failures.join(', ')}" unless failures.empty?
+          puts "  Errors:   #{errors.join(', ')}" unless errors.empty?
+          puts "#{results[:tests]} tests, #{results[:assertions]} assertions, #{results[:failures]} failures, #{results[:errors]} errors"
+          browser.teardown
+        else
+          puts "\nSkipping #{browser}, not supported on this OS"
+        end
+      end
+
+      @server.shutdown
+      t.join
+    end
+  end
+
+  def mount(path, dir=nil)
+    dir = Dir.pwd + path unless dir
+
+    # don't cache anything in our tests
+    @server.mount(path, NonCachingFileHandler, dir)
+  end
+
+  # test should be specified as a url or as a hash of the form
+  # {:url => "url", :testcases => "testFoo,testBar"}
+  def run(test)
+    @tests<<test
+  end
+
+  def browser(browser)
+    browser =
+      case(browser)
+        when :firefox
+          FirefoxBrowser.new
+        when :safari
+          SafariBrowser.new
+        when :ie
+          IEBrowser.new
+        when :konqueror
+          KonquerorBrowser.new
+        when :opera
+          OperaBrowser.new
+        else
+          browser
+      end
+
+    @browsers<<browser
+  end
+end