seaweed 0.1.1 → 0.1.2

data/public/jsdiff.js

@@ -0,0 +1,161 @@
+/*
+ * Javascript Diff Algorithm
+ *  By John Resig (http://ejohn.org/)
+ *  Modified by Chu Alan "sprite"
+ *
+ * Released under the MIT license.
+ *
+ * More Info:
+ *  http://ejohn.org/projects/javascript-diff-algorithm/
+ */
+
+function escape(s) {
+    var n = s;
+    n = n.replace(/&/g, "&");
+    n = n.replace(/</g, "&lt;");
+    n = n.replace(/>/g, "&gt;");
+    n = n.replace(/"/g, "&quot;");
+
+    return n;
+}
+
+function diffString( o, n ) {
+  o = o.replace(/\s+$/, '');
+  n = n.replace(/\s+$/, '');
+
+  var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/) );
+  var str = "";
+
+  var oSpace = o.match(/\s+/g);
+  if (oSpace == null) {
+    oSpace = ["\n"];
+  } else {
+    oSpace.push("\n");
+  }
+  var nSpace = n.match(/\s+/g);
+  if (nSpace == null) {
+    nSpace = ["\n"];
+  } else {
+    nSpace.push("\n");
+  }
+
+  if (out.n.length == 0) {
+      for (var i = 0; i < out.o.length; i++) {
+        str += '<del>' + escape(out.o[i]) + oSpace[i] + "</del>";
+      }
+  } else {
+    if (out.n[0].text == null) {
+      for (n = 0; n < out.o.length && out.o[n].text == null; n++) {
+        str += '<del>' + escape(out.o[n]) + oSpace[n] + "</del>";
+      }
+    }
+
+    for ( var i = 0; i < out.n.length; i++ ) {
+      if (out.n[i].text == null) {
+        str += '<ins>' + escape(out.n[i]) + nSpace[i] + "</ins>";
+      } else {
+        var pre = "";
+
+        for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++ ) {
+          pre += '<del>' + escape(out.o[n]) + oSpace[n] + "</del>";
+        }
+        str += " " + out.n[i].text + nSpace[i] + pre;
+      }
+    }
+  }
+  
+  return str;
+}
+
+function randomColor() {
+    return "rgb(" + (Math.random() * 100) + "%, " + 
+                    (Math.random() * 100) + "%, " + 
+                    (Math.random() * 100) + "%)";
+}
+function diffString2( o, n ) {
+  o = o.replace(/\s+$/, '');
+  n = n.replace(/\s+$/, '');
+
+  var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/) );
+
+  var oSpace = o.match(/\s+/g);
+  if (oSpace == null) {
+    oSpace = ["\n"];
+  } else {
+    oSpace.push("\n");
+  }
+  var nSpace = n.match(/\s+/g);
+  if (nSpace == null) {
+    nSpace = ["\n"];
+  } else {
+    nSpace.push("\n");
+  }
+
+  var os = "";
+  var colors = new Array();
+  for (var i = 0; i < out.o.length; i++) {
+      colors[i] = randomColor();
+
+      if (out.o[i].text != null) {
+          os += '<span style="background-color: ' +colors[i]+ '">' + 
+                escape(out.o[i].text) + oSpace[i] + "</span>";
+      } else {
+          os += "<del>" + escape(out.o[i]) + oSpace[i] + "</del>";
+      }
+  }
+
+  var ns = "";
+  for (var i = 0; i < out.n.length; i++) {
+      if (out.n[i].text != null) {
+          ns += '<span style="background-color: ' +colors[out.n[i].row]+ '">' + 
+                escape(out.n[i].text) + nSpace[i] + "</span>";
+      } else {
+          ns += "<ins>" + escape(out.n[i]) + nSpace[i] + "</ins>";
+      }
+  }
+
+  return { o : os , n : ns };
+}
+
+function diff( o, n ) {
+  var ns = new Object();
+  var os = new Object();
+  
+  for ( var i = 0; i < n.length; i++ ) {
+    if ( ns[ n[i] ] == null )
+      ns[ n[i] ] = { rows: new Array(), o: null };
+    ns[ n[i] ].rows.push( i );
+  }
+  
+  for ( var i = 0; i < o.length; i++ ) {
+    if ( os[ o[i] ] == null )
+      os[ o[i] ] = { rows: new Array(), n: null };
+    os[ o[i] ].rows.push( i );
+  }
+  
+  for ( var i in ns ) {
+    if ( ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1 ) {
+      n[ ns[i].rows[0] ] = { text: n[ ns[i].rows[0] ], row: os[i].rows[0] };
+      o[ os[i].rows[0] ] = { text: o[ os[i].rows[0] ], row: ns[i].rows[0] };
+    }
+  }
+  
+  for ( var i = 0; i < n.length - 1; i++ ) {
+    if ( n[i].text != null && n[i+1].text == null && n[i].row + 1 < o.length && o[ n[i].row + 1 ].text == null && 
+         n[i+1] == o[ n[i].row + 1 ] ) {
+      n[i+1] = { text: n[i+1], row: n[i].row + 1 };
+      o[n[i].row+1] = { text: o[n[i].row+1], row: i + 1 };
+    }
+  }
+  
+  for ( var i = n.length - 1; i > 0; i-- ) {
+    if ( n[i].text != null && n[i-1].text == null && n[i].row > 0 && o[ n[i].row - 1 ].text == null && 
+         n[i-1] == o[ n[i].row - 1 ] ) {
+      n[i-1] = { text: n[i-1], row: n[i].row - 1 };
+      o[n[i].row-1] = { text: o[n[i].row-1], row: i - 1 };
+    }
+  }
+  
+  return { o: o, n: n };
+}
+

data/public/spec.css

@@ -0,0 +1,29 @@
+.failed {
+  color: #900;
+}
+.passed {
+  color: #090;
+}
+.pending {
+  color: #990;
+}
+.errors {
+  border-collapse: collapse;
+}
+.errors td, .errors th {
+  padding: 4px;
+}
+.errors th {
+  text-align: left;
+  background: #eee;
+}
+del, ins {
+    margin: 0 0.2em;
+    font-weight: bold;
+}
+del {
+    color: #900;
+}
+ins {
+    color: #090;
+}

data/views/index.slim

@@ -0,0 +1,15 @@
+doctype html
+head
+  script type="text/javascript" src="ie.js"
+  script type="text/javascript" src="jquery-1.5.2.js"
+  script type="text/javascript" src="jsdiff.js"
+  link rel="stylesheet" href="spec.css" type="text/css"
+  script type="text/javascript" src="/assets/Spec.js"
+
+body
+  javascript:
+    Spec.initializeEnvironment();
+  - @scripts.each do |file_name|
+    script type="text/javascript" src="/assets/#{{file_name.sub /\.coffee$/, '.js'}}"
+  javascript:
+    Spec.finalize();

metadata

@@ -1,156 +1,156 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: seaweed
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.1.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Tobias Cohen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-17 00:00:00 +11:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: coffee-script
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: celerity
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: slim
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: slim
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: watchr
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: watchr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-description: Seaweed is Coffeescript behavioral testing framework, with a command line tool that can be used to run specs automatically.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Seaweed is Coffeescript behavioral testing framework, with a command
+  line tool that can be used to run specs automatically.
 email: me@tobiascohen.com
-executables: 
+executables:
 - seaweed
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/seaweed
-- server/public/jquery-1.5.js
-- server/public/spec.css
-- server/server.rb
-- server/views/index.slim
-- lib/required_files.rb
+- lib/seaweed/runner.rb
+- lib/seaweed/server.rb
+- lib/seaweed/version.rb
+- lib/seaweed.rb
+- lib/Spec/ObjectExtensions.coffee
+- lib/Spec/WindowExtensions.coffee
 - lib/Spec.coffee
-has_rdoc: true
+- public/ie.js
+- public/jquery-1.5.2.js
+- public/jsdiff.js
+- public/spec.css
+- views/index.slim
 homepage: https://github.com/tobico/seaweed
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Coffeescript testing framework
 test_files: []
-

data/lib/required_files.rb

@@ -1,62 +0,0 @@
-require 'tsort'
-
-class RequiredFiles < Hash
-  include TSort
-  
-  attr_accessor :paths
-  
-  # Adds a file to required list, and recursively scans and adds all other
-  # files required by this file
-  def add name
-    file_name = full_path name
-    if file_name && !self[name.to_sym]
-      directives = parse_directives file_name
-      self[name.to_sym] = {
-        :file_name  => file_name,
-        :requires   => directives['require']
-      }
-      requested = (directives['require'] | directives['request'])
-      requested.each{ |file| add file }
-    end
-  end
-
-  # Gets an array of file paths sorted in dependency order
-  def sorted_files
-    tsort.map{ |key| self[key][:file_name] }
-  end
-  
-  private
-    # Searches for file in path with given name and returns full file path,
-    # or nil if not found
-    def full_path name
-      file_path = @paths.find { |path| File.exists? "#{path}/#{name}.coffee" }
-      raise "File not found: #{name}" unless file_path
-      file_path && "#{file_path}/#{name}.coffee"
-    end
-  
-    # Scans a coffeescript file for #require and #request directives.
-    #
-    # Example requirement directives:
-    #   #require ST
-    #   #require ST/Model/Index
-    def parse_directives name
-      directives = {
-        'require' => [],
-        'request' => []
-      }
-      File.open name do |file|
-        file.each do |line|
-          if line.match /^#(require|request)\s+(\S+)\s*$/
-            directives[$1] << $2
-          end
-        end
-      end
-      directives
-    end
-  
-    # Callback functions for tsort
-    alias tsort_each_node each_key
-    def tsort_each_child node
-      self[node][:requires].each{ |name| yield name.to_sym }
-    end
-end

data/server/public/spec.css

@@ -1,9 +0,0 @@
-.failed {
-  color: #900;
-}
-.passed {
-  color: #090;
-}
-.pending {
-  color: #990;
-}

data/server/server.rb

@@ -1,88 +0,0 @@
-require 'rubygems'
-require 'sinatra'
-require 'slim'
-require 'coffee-script'
-
-# Patch in Sinatra support for Slim
-module Sinatra
-  module Templates
-    def slim(template, options={}, locals={})
-      render :slim, template, options, locals
-    end 
-  end
-end
-
-# Configure slim for prettier code formatting
-Slim::Engine.set_default_options :pretty => true
-
-# Hide redundant log messages
-disable :logging
-
-# Dynamically compiles coffeescript, first checking to see if it has changed
-def compile source, target
-  begin
-    # Get modified time of source file
-    mtime = File.mtime source
-    
-    # If compled JavaScript file already exists and is up to date, return the
-    # existing file instead of compiling again
-    return File.read target if File.exists?(target) && File.mtime(target) == mtime
-    
-    # Create base dir for compiled file
-    dir = target.sub /\/[^\/]+$/, ''
-    Dir.mkdir dir unless File.exists? dir
-    
-    # Compile CoffeeScript to JavaScript file
-    File.open target, 'w' do |f|
-      f.write CoffeeScript.compile(File.read source)
-    end
-    
-    # Mark compiled file with same modified date as source
-    File.utime mtime, mtime, target
-    
-    # Return our newly compiled JavaScript
-    File.read target
-  rescue CoffeeScript::CompilationError => e
-    # Display CoffeeScript compilation error in a prettier format
-    message = if e.message.match /^SyntaxError: (.*) on line (\d+)\D*$/
-      "#{source}:#{$2}".ljust(40) + " #{$1}"
-    elsif e.message.match /^Parse error on line (\d+): (.*)$/
-      "#{source}:#{$1}".ljust(40) + " #{$2}"
-    else
-      "#{source} - #{e.message}"
-    end
-    puts "\e[31m#{message}\e[0m"
-    
-    # Generate JS to display compilation error on HTML page
-    html = "<pre class=\"failed\">#{message}</pre>"
-    "$(function(){$(document.body).prepend(#{html.to_json});});"
-  end
-end
-
-# Processes request for seaweed Spec library
-get "/Spec.js" do
-  compile File.expand_path('../../lib/Spec.coffee', __FILE__), "compiled/spec.js"
-end
-
-# Processes request for project lib files
-get %r{^/lib/(.+)\.js$} do |file|
-  compile "lib/#{file}.coffee", "compiled/#{file}.js"
-end
-
-# Processes request for project spec files
-get %r{^/spec/(.+)\.js$} do |file|
-  compile "spec/#{file}.coffee", "compiled/#{file}.js"
-end
-
-# Processes request for page index
-get "/" do
-  # Build ordered list of required files to run all specs
-  requirements = RequiredFiles.new
-  requirements.paths = ['spec', 'lib']
-  Dir['spec/**/*.spec.coffee'].each do |file|
-    requirements.add $1 if file.match /^spec\/(.*).coffee$/
-  end
-  @scripts = requirements.sorted_files
-  
-  slim :index
-end

data/server/views/index.slim

@@ -1,11 +0,0 @@
-doctype html
-head
-  script src="jquery-1.5.js"
-  link rel="stylesheet" href="spec.css" type="text/css"
-  script src="Spec.js"
-  - @scripts.each do |file_name|
-    script src="#{{file_name.sub /\.coffee$/, '.js'}}"
-
-body
-  coffee:
-    $ -> Spec.finalize()