stitch-rb 0.0.6 → 0.0.7

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 .DS_Store
+test/jasmine/index.js

data/Gemfile

@@ -2,3 +2,9 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in stitch.gemspec
 gemspec
+
+group :test do
+  gem 'rake'
+  gem 'json'
+  gem 'coffee-script'
+end

data/README.md

@@ -1,6 +1,6 @@
 # Stitch
 
-This is a port of Sam Stephenson's [Stich](https://github.com/sstephenson/stitch) to Ruby. Stitch allows you to:
+This is a port of Sam Stephenson's [Stitch](https://github.com/sstephenson/stitch) to Ruby. Stitch allows you to:
 
 > Develop and test your JavaScript applications as CommonJS modules in Node.js. Then __Stitch__ them together to run in the browser.
 
@@ -9,16 +9,16 @@ In other words, this is a [CommonJS](http://dailyjs.com/2010/10/18/modules/) Jav
 ##Usage
 
 Install the gem, or add it to your Gemfile:
-  
+
     gem 'stitch-rb'
 
 You can compile your application like this:
 
     Stitch::Package.new(:paths => ["app"], :dependencies => ["lib/jquery.js"]).compile
-    
+
 It returns a JavaScript file that you can serve to your users, or write to disk and cache.
 
-You should give `Stitch::Package` an array of `:paths`, the relative directories your JavaScript application is served from. You can also specify an array of `:dependencies`, JavaScript files which will be concatenated without being wrapped in CommonJS modules. 
+You should give `Stitch::Package` an array of `:paths`, the relative directories your JavaScript application is served from. You can also specify an array of `:dependencies`, JavaScript files which will be concatenated without being wrapped in CommonJS modules.
 
 ##Rails & Rack
 
@@ -33,8 +33,8 @@ Compilers need to inherit from `Stitch::Compiler`. They're very simple, for exam
     class TmplCompiler < Stitch::Compiler
       # List of supported extensions
       extensions :tmpl
-    
-      # A compile method which takes a file path, 
+
+      # A compile method which takes a file path,
       # and returns a compiled string
       def compile(path)
         content = File.read(path)

data/Rakefile

@@ -1 +1,9 @@
 require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/test_helper.rb', 'test/test_*.rb']
+  t.libs << "."
+end
+
+task :default => :test

data/lib/stitch/compilers/tmpl.rb

@@ -1,7 +1,7 @@
 module Stitch
   class TmplCompiler < Compiler
     extensions :tmpl
-    
+
     def compile(path)
       content = File.read(path)
       %{var template = jQuery.template(#{content.to_json});

data/lib/stitch/package.rb

@@ -1,3 +1,5 @@
+require "erb"
+
 module Stitch
   class Package
     DEFAULTS = {
@@ -39,71 +41,21 @@ module Stitch
           Source.from_file(@root, file)
         }.flatten
 
+        sources.uniq!
+
         if sources.any?
           stitch(sources)
         end
       end
 
-      def stitch(sources)
-        result = <<-EOF
-(function(/*! Stitch !*/) {
-  if (!this.#{@identifier}) {
-    var modules = {}, cache = {}, require = function(name, root) {
-      var module = cache[name], path = expand(root, name), fn;
-      if (module) {
-        return module;
-      } else if (fn = modules[path] || modules[path = expand(path, './index')]) {
-        module = {id: name, exports: {}};
-        try {
-          cache[name] = module.exports;
-          fn(module.exports, function(name) {
-            return require(name, dirname(path));
-          }, module);
-          return cache[name] = module.exports;
-        } catch (err) {
-          delete cache[name];
-          throw err;
-        }
-      } else {
-        throw 'module \\'' + name + '\\' not found';
-      }
-    }, expand = function(root, name) {
-      var results = [], parts, part;
-      if (/^\\.\\.?(\\/|$)/.test(name)) {
-        parts = [root, name].join('/').split('/');
-      } else {
-        parts = name.split('/');
-      }
-      for (var i = 0, length = parts.length; i < length; i++) {
-        part = parts[i];
-        if (part == '..') {
-          results.pop();
-        } else if (part != '.' && part != '') {
-          results.push(part);
-        }
-      }
-      return results.join('/');
-    }, dirname = function(path) {
-      return path.split('/').slice(0, -1).join('/');
-    };
-    this.#{@identifier} = function(name) {
-      return require(name, '');
-    }
-    this.#{@identifier}.define = function(bundle) {
-      for (var key in bundle)
-        modules[key] = bundle[key];
-    };
-  }
-  return this.#{@identifier}.define;
-}).call(this)({
-        EOF
-        sources.each_with_index do |source, i|
-          result += i == 0 ? "" : ", "
-          result += source.name.to_json
-          result += ": function(exports, require, module) {\n#{source.compile}\n}"
-        end
+      def stitch(modules)
+        # ERB binding variables
+        identifier = @identifier
+        modules    = modules
 
-        result += "});\n"
+        template = File.read(File.join(File.dirname(__FILE__), "stitch.js.erb"))
+        template = ERB.new(template)
+        template.result(binding)
       end
   end
 end

data/lib/stitch/server.rb

@@ -3,7 +3,7 @@ module Stitch
     def initialize(options = {})
       @package = Package.new(options)
     end
-    
+
     def call(env)
       [200, {"Content-Type" => "text/javascript"}, [@package.compile]]
     end

data/lib/stitch/source.rb

@@ -3,6 +3,10 @@ require "pathname"
 module Stitch
   class Source
     class << self
+      # Recursively load all the sources from a given directory
+      # Usage:
+      #   sources = Source.from_path("./app")
+      #
       def from_path(root, path = nil, result = [])
         path ||= root
         path = Pathname.new(path)
@@ -18,7 +22,14 @@ module Stitch
         result
       end
 
+      # Recursively resolve sources from a given file,
+      # dynamically resolving its dependencies
+      # Usage:
+      #   sources = Source.from_file("./app/index.js")
+      #
       def from_file(root, path = nil, result = [])
+        root = Pathname.new(root)
+
         unless path
           path = root
           root = root.dirname
@@ -29,10 +40,13 @@ module Stitch
           from_file(root, child, result)
         end
 
-        raise "Recursive" if result.include?(source)
         result << source
       end
 
+      # Resolve a require call to an absolute path
+      # Usage:
+      #   path = Source.resolve("../index.js", "/my/file.js")
+      #
       def resolve(path, relative_to)
         path        = Pathname.new(path)
         relative_to = Pathname.new(relative_to)
@@ -77,12 +91,23 @@ module Stitch
       !!compiler
     end
 
+    # Return an array of resolved paths
+    # specifying this source's dependencies
     def requires
       return [] unless source?
       requires = path.read.scan(/require\(("|')(.+)\1\)/)
       requires.map {|(_, pn)| self.class.resolve(pn, root) }
     end
 
+    def hash
+      self.path.hash
+    end
+
+    def eql?(source)
+      source.is_a?(Source) &&
+        source.path.to_s == self.path.to_s
+    end
+
     protected
       def source?
         valid? && compiler.source?

data/lib/stitch/stitch.js.erb

@@ -0,0 +1,59 @@
+(function(/*! Stitch !*/) {
+  if (!this.<%= identifier %>) {
+    var modules = {}, cache = {};
+    var require = function(name, root) {
+      var path = expand(root, name), indexPath = expand(path, './index'), module, fn;
+      module   = cache[path] || cache[indexPath];
+      if (module) {
+        return module;
+      } else if (fn = modules[path] || modules[path = indexPath]) {
+        module = {id: path, exports: {}};
+        cache[path] = module.exports;
+        fn(module.exports, function(name) {
+          return require(name, dirname(path));
+        }, module);
+        return cache[path] = module.exports;
+      } else {
+        throw 'module ' + name + ' not found';
+      }
+    };
+    var expand = function(root, name) {
+      var results = [], parts, part;
+      // If path is relative
+      if (/^\.\.?(\/|$)/.test(name)) {
+        parts = [root, name].join('/').split('/');
+      } else {
+        parts = name.split('/');
+      }
+      for (var i = 0, length = parts.length; i < length; i++) {
+        part = parts[i];
+        if (part == '..') {
+          results.pop();
+        } else if (part != '.' && part != '') {
+          results.push(part);
+        }
+      }
+      return results.join('/');
+    };
+    var dirname = function(path) {
+      return path.split('/').slice(0, -1).join('/');
+    };
+    this.<%= identifier %> = function(name) {
+      return require(name, '');
+    };
+    this.<%= identifier %>.define = function(bundle) {
+      for (var key in bundle) {
+        modules[key] = bundle[key];
+      }
+    };
+    this.<%= identifier %>.modules = modules;
+    this.<%= identifier %>.cache   = cache;
+  }
+  return this.<%= identifier %>.define;
+}).call(this)({
+  <%=
+    modules.map do |mod|
+      "#{mod.name.to_json}: function(exports, require, module) {\n#{mod.compile}\n}"
+    end.join(', ')
+  %>
+});

data/lib/stitch/version.rb

@@ -1,3 +1,3 @@
 module Stitch
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/fixtures/app/controllers/users.coffee

@@ -0,0 +1 @@
+someCoffeeScript = true

data/test/fixtures/app/index.js

@@ -0,0 +1,4 @@
+require('models/user');
+require('models/person');
+
+// Do some stuff

data/test/fixtures/app/models/orm.js

@@ -0,0 +1,4 @@
+module.exports = {orm: true};
+
+window.ormCount = window.ormCount || 0;
+window.ormCount += 1;

data/test/fixtures/app/models/person.js

@@ -0,0 +1 @@
+var ORM = require('models/orm');

data/test/fixtures/app/models/user.js

@@ -0,0 +1,9 @@
+var ORM = require('models/orm');
+
+var User = function(name){
+  this.name = name;
+};
+
+User.ORM = ORM;
+
+module.exports = User;

data/test/fixtures/lib/jquery.js

@@ -0,0 +1 @@
+// A dependency - jquery.js

data/test/fixtures/lib/lib.coffee

@@ -0,0 +1,3 @@
+# Another dependency
+
+window.test = -> alert("test")

data/test/jasmine/index.html

@@ -0,0 +1,186 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Jasmine Test Runner</title>
+  <script type="text/javascript" src="https://raw.github.com/pivotal/jasmine/v1.1.0.rc4/lib/jasmine-core/jasmine.js"></script>
+  <script type="text/javascript" src="https://raw.github.com/pivotal/jasmine/v1.1.0.rc4/lib/jasmine-core/jasmine-html.js"></script>
+
+  <script src="index.js" type="text/javascript" charset="utf-8"></script>
+  <script src="specs.js" type="text/javascript" charset="utf-8"></script>
+
+  <style type="text/css" media="screen">
+    body {
+      font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif;
+    }
+
+
+    .jasmine_reporter a:visited, .jasmine_reporter a {
+      color: #303;
+    }
+
+    .jasmine_reporter a:hover, .jasmine_reporter a:active {
+      color: blue;
+    }
+
+    .run_spec {
+      float:right;
+      padding-right: 5px;
+      font-size: .8em;
+      text-decoration: none;
+    }
+
+    .jasmine_reporter {
+      margin: 0 5px;
+    }
+
+    .banner {
+      color: #303;
+      background-color: #fef;
+      padding: 5px;
+    }
+
+    .logo {
+      float: left;
+      font-size: 1.1em;
+      padding-left: 5px;
+    }
+
+    .logo .version {
+      font-size: .6em;
+      padding-left: 1em;
+    }
+
+    .runner.running {
+      background-color: yellow;
+    }
+
+
+    .options {
+      text-align: right;
+      font-size: .8em;
+    }
+
+
+
+
+    .suite {
+      border: 1px outset gray;
+      margin: 5px 0;
+      padding-left: 1em;
+    }
+
+    .suite .suite {
+      margin: 5px;
+    }
+
+    .suite.passed {
+      background-color: #dfd;
+    }
+
+    .suite.failed {
+      background-color: #fdd;
+    }
+
+    .spec {
+      margin: 5px;
+      padding-left: 1em;
+      clear: both;
+    }
+
+    .spec.failed, .spec.passed, .spec.skipped {
+      padding-bottom: 5px;
+      border: 1px solid gray;
+    }
+
+    .spec.failed {
+      background-color: #fbb;
+      border-color: red;
+    }
+
+    .spec.passed {
+      background-color: #bfb;
+      border-color: green;
+    }
+
+    .spec.skipped {
+      background-color: #bbb;
+    }
+
+    .messages {
+      border-left: 1px dashed gray;
+      padding-left: 1em;
+      padding-right: 1em;
+    }
+
+    .passed {
+      background-color: #cfc;
+      display: none;
+    }
+
+    .failed {
+      background-color: #fbb;
+    }
+
+    .skipped {
+      color: #777;
+      background-color: #eee;
+      display: none;
+    }
+
+
+    /*.resultMessage {*/
+      /*white-space: pre;*/
+    /*}*/
+
+    .resultMessage span.result {
+      display: block;
+      line-height: 2em;
+      color: black;
+    }
+
+    .resultMessage .mismatch {
+      color: black;
+    }
+
+    .stackTrace {
+      white-space: pre;
+      font-size: .8em;
+      margin-left: 10px;
+      max-height: 5em;
+      overflow: auto;
+      border: 1px inset red;
+      padding: 1em;
+      background: #eef;
+    }
+
+    .finished-at {
+      padding-left: 1em;
+      font-size: .6em;
+    }
+
+    .show-passed .passed,
+    .show-skipped .skipped {
+      display: block;
+    }
+
+
+    #jasmine_content {
+      position:fixed;
+      right: 100%;
+    }
+
+    .runner {
+      border: 1px solid gray;
+      display: block;
+      margin: 5px 0;
+      padding: 2px 0 2px 10px;
+    }
+  </style>
+</head>
+<body>
+  <script type="text/javascript">
+    jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
+    jasmine.getEnv().execute();
+  </script>
+</body>
+</html>

data/test/jasmine/specs.js

@@ -0,0 +1,27 @@
+describe("Stitch", function(){
+  it("should have require function", function(){
+    expect(typeof require).toBe("function");
+  });
+
+  it("should be able to require modules", function(){
+    expect(typeof require("models/user")).toBe("function");
+  });
+
+  it("should recursively find modules", function(){
+    var obj = require("models/orm");
+
+    expect(obj).toEqual({orm: true});
+    expect(obj).toBe(require("models/orm"));
+  });
+
+  it("should transitively require dependencies", function(){
+    expect(require("models/user").ORM).toEqual({orm: true});
+  });
+
+  it("should not load the same module twice", function(){
+    require("models/user");
+    require("models/person");
+
+    expect(window.ormCount).toBe(1);
+  });
+});

data/test/test_helper.rb

@@ -0,0 +1,2 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/stitch'

data/test/test_source.rb

@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + "/test_helper.rb"
+
+class TestSource < Test::Unit::TestCase
+  FIXTURES = Pathname.new(File.join(File.dirname(__FILE__), "fixtures"))
+
+  def setup
+  end
+
+  def test_from_file
+    sources = Stitch::Source.from_file(FIXTURES + "app" + "index.js")
+    sources = sources.map {|s| s.path.relative_path_from(FIXTURES).to_s }
+    assert_equal [
+      "app/models/orm.js",
+      "app/models/user.js",
+      "app/models/orm.js",
+      "app/models/person.js",
+      "app/index.js"
+    ], sources
+  end
+
+  def test_from_path
+    sources = Stitch::Source.from_path(FIXTURES + "app")
+    sources = sources.map {|s| s.path.relative_path_from(FIXTURES).to_s }
+    assert_equal [
+      "app/controllers/users.coffee",
+      "app/index.js",
+      "app/models/orm.js",
+      "app/models/person.js",
+      "app/models/user.js"
+    ], sources
+  end
+
+  def test_resolve
+    path = Stitch::Source.resolve("index.js", FIXTURES + "app")
+    assert_equal path.relative_path_from(FIXTURES).to_s, "app/index.js"
+
+    path = Stitch::Source.resolve("index", FIXTURES + "app")
+    assert_equal path.relative_path_from(FIXTURES).to_s, "app/index.js"
+  end
+
+  def test_require
+    source  = Stitch::Source.new(FIXTURES + "app", FIXTURES + "app" + "index.js")
+    sources = source.requires.map {|s| s.relative_path_from(FIXTURES).to_s }
+    assert_equal ["app/models/user.js", "app/models/person.js"], sources
+  end
+end

data/test/test_stitch.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestJasmine < Test::Unit::TestCase
+  def setup
+  end
+
+  def test_stitch
+    root = File.dirname(__FILE__)
+    File.open(root + '/jasmine/index.js', 'w+') do |f|
+      f.write Stitch::Package.new(
+        :files => [root + '/fixtures/app/index.js'],
+        :root  =>  root + '/fixtures/app'
+      ).compile
+    end
+    system 'open', root + '/jasmine/index.html'
+  end
+end

metadata

@@ -1,29 +1,39 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: stitch-rb
-version: !ruby/object:Gem::Version
-  version: 0.0.6
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 7
+  version: 0.0.7
 platform: ruby
-authors:
+authors: 
 - Alex MacCaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-03 00:00:00.000000000Z
+
+date: 2011-12-07 00:00:00 -08:00
+default_executable: 
 dependencies: []
+
 description: A JavaScript package manager
-email:
+email: 
 - maccman@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- examples/.DS_Store
 - examples/app/controllers/users.coffee
 - examples/app/index.js
 - examples/app/models/orm.js
@@ -41,30 +51,67 @@ files:
 - lib/stitch/package.rb
 - lib/stitch/server.rb
 - lib/stitch/source.rb
+- lib/stitch/stitch.js.erb
 - lib/stitch/version.rb
 - stitch.gemspec
-homepage: ''
+- test/fixtures/app/controllers/users.coffee
+- test/fixtures/app/index.js
+- test/fixtures/app/models/orm.js
+- test/fixtures/app/models/person.js
+- test/fixtures/app/models/user.js
+- test/fixtures/lib/jquery.js
+- test/fixtures/lib/lib.coffee
+- test/jasmine/index.html
+- test/jasmine/index.js
+- test/jasmine/specs.js
+- test/test_helper.rb
+- test/test_source.rb
+- test/test_stitch.rb
+has_rdoc: true
+homepage: ""
 licenses: []
+
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Stitch ported to Ruby
-test_files: []
+test_files: 
+- test/fixtures/app/controllers/users.coffee
+- test/fixtures/app/index.js
+- test/fixtures/app/models/orm.js
+- test/fixtures/app/models/person.js
+- test/fixtures/app/models/user.js
+- test/fixtures/lib/jquery.js
+- test/fixtures/lib/lib.coffee
+- test/jasmine/index.html
+- test/jasmine/index.js
+- test/jasmine/specs.js
+- test/test_helper.rb
+- test/test_source.rb
+- test/test_stitch.rb