sprockets-commonjs 0.0.5 → 0.0.6.pre

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in sprockets-commonjs.gemspec
-gemspec
+gemspec

data/Rakefile

@@ -2,7 +2,6 @@ require 'bundler/gem_tasks'
 require 'sprockets'
 require 'sprockets/commonjs'
 require 'rake/testtask'
-require 'appraisal'
 
 task :example do
   env = Sprockets::Environment.new(File.expand_path('..', __FILE__))
@@ -16,7 +15,6 @@ end
 task :default => :test
 
 Rake::TestTask.new do |t|
-  t.test_files = FileList['test/**/*_test.rb']
-  t.libs << 'lib' << 'test'
+  t.libs << "test"
   t.warning = true
 end

data/examples/example.js

@@ -1,11 +1,73 @@
-module.exports = function(){
+(function() {
+  if (!this.require) {
+    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.require = function(name) {
+      return require(name, '');
+    };
+
+    this.require.define = function(bundle) {
+      for (var key in bundle) {
+        modules[key] = bundle[key];
+      }
+    };
+
+    this.require.modules = modules;
+    this.require.cache   = cache;
+  }
+
+  return this.require;
+}).call(this);
+this.require.define({"modules/program":function(exports, require, module){module.exports = function(){
   alert('Long live the Programs!');
 };
-var Program = require('modules/program');
+;}});
+this.require.define({"modules/user":function(exports, require, module){var Program = require('modules/program');
 
 module.exports = function(){
   alert('Long live the Users');
   Program();
 };
+;}});
 
 var self = 'application.js';

data/lib/sprockets/commonjs.rb

@@ -3,47 +3,38 @@ require 'tilt'
 
 module Sprockets
   class CommonJS < Tilt::Template
-
-    WRAPPER = '%s.define({"%s":' +
-              'function(exports, require, module){' +
-              '%s' +
-              ";}});\n"
-
-    class << self
-      attr_accessor :default_namespace
-    end
-
     self.default_mime_type = 'application/javascript'
-    self.default_namespace = 'this.require'
 
-    protected
+    def self.default_namespace
+      'this.require'
+    end
 
     def prepare
       @namespace = self.class.default_namespace
     end
 
+    attr_reader :namespace
+
     def evaluate(scope, locals, &block)
-      if commonjs_module?(scope)
+      if File.extname(scope.logical_path) == '.module'
+        path = scope.logical_path
+        path = path.gsub(/^\.?\//, '') # Remove relative paths
+        path = path.chomp('.module')   # Remove module ext
+
         scope.require_asset 'sprockets/commonjs'
-        WRAPPER % [ namespace, commonjs_module_name(scope), data ]
+
+        code = ''
+        code << "#{namespace}.define({#{path.inspect}:"
+        code << 'function(exports, require, module){'
+        code << data
+        code << ";}});\n"
+        code
       else
         data
       end
     end
-
-    private
-
-    attr_reader :namespace
-
-    def commonjs_module?(scope)
-      scope.pathname.basename.to_s.include?('.module')
-    end
-
-    def commonjs_module_name(scope)
-      scope.logical_path.sub(/\.module$/, '')
-    end
-
   end
-end
 
-require 'sprockets/commonjs/engine'
+  register_postprocessor 'application/javascript', CommonJS
+  append_path File.expand_path('../../../assets', __FILE__)
+end

data/sprockets-commonjs.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "sprockets-commonjs"
-  s.version     = '0.0.5'
+  s.version     = '0.0.6.pre'
   s.authors     = ["Alex MacCaw"]
   s.email       = ["info@eribium.org"]
   s.homepage    = ""
@@ -19,6 +19,5 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
-  s.add_runtime_dependency "sprockets",     "~> 2.1"
-  s.add_development_dependency 'appraisal', '~> 0.5.1'
+  s.add_runtime_dependency "sprockets", "~>2.4.0"
 end

metadata

@@ -1,48 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-commonjs
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Alex MacCaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2012-06-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70323409247920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+  version_requirements: *70323409247920
 description: Adds CommonJS support to Sprockets
 email:
 - info@eribium.org
@@ -51,40 +30,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- Appraisals
 - Gemfile
 - README.md
 - Rakefile
+- assets/sprockets/commonjs.js
 - examples/application.js
 - examples/example.js
 - examples/index.html
 - examples/modules/program.module.js
 - examples/modules/user.module.js
-- gemfiles/sprockets_2_1.gemfile
-- gemfiles/sprockets_2_1.gemfile.lock
-- gemfiles/sprockets_2_2.gemfile
-- gemfiles/sprockets_2_2.gemfile.lock
-- gemfiles/sprockets_2_3.gemfile
-- gemfiles/sprockets_2_3.gemfile.lock
-- gemfiles/sprockets_2_4.gemfile
-- gemfiles/sprockets_2_4.gemfile.lock
-- gemfiles/sprockets_2_5.gemfile
-- gemfiles/sprockets_2_5.gemfile.lock
-- gemfiles/sprockets_2_6.gemfile
-- gemfiles/sprockets_2_6.gemfile.lock
-- gemfiles/sprockets_2_7.gemfile
-- gemfiles/sprockets_2_7.gemfile.lock
-- gemfiles/sprockets_2_8.gemfile
-- gemfiles/sprockets_2_8.gemfile.lock
-- lib/assets/javascripts/sprockets/commonjs.js
-- lib/sprockets-commonjs.rb
 - lib/sprockets/commonjs.rb
-- lib/sprockets/commonjs/engine.rb
 - sprockets-commonjs.gemspec
-- test/bar.js
-- test/foo.module.js
-- test/source.js
-- test/sprockets_commonjs_test.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -97,26 +53,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 26412344906566093
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 26412344906566093
+      version: 1.3.1
 requirements: []
 rubyforge_project: sprockets-commonjs
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Adds CommonJS support to Sprockets
-test_files:
-- test/bar.js
-- test/foo.module.js
-- test/source.js
-- test/sprockets_commonjs_test.rb
+test_files: []

data/Appraisals

@@ -1,31 +0,0 @@
-appraise "sprockets-2-1" do
-  gem 'sprockets', '~> 2.1.3'
-end
-
-appraise "sprockets-2-2" do
-  gem 'sprockets', '~> 2.2.2'
-end
-
-appraise "sprockets-2-3" do
-  gem 'sprockets', '~> 2.3.2'
-end
-
-appraise "sprockets-2-4" do
-  gem 'sprockets', '~> 2.4.5'
-end
-
-appraise "sprockets-2-5" do
-  gem 'sprockets', '~> 2.5.0'
-end
-
-appraise "sprockets-2-6" do
-  gem 'sprockets', '~> 2.6.0'
-end
-
-appraise "sprockets-2-7" do
-  gem 'sprockets', '~> 2.7.0'
-end
-
-appraise "sprockets-2-8" do
-  gem 'sprockets', '~> 2.8.2'
-end

data/gemfiles/sprockets_2_1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "sprockets", "~> 2.1.3"
-
-gemspec :path=>"../"

data/gemfiles/sprockets_2_1.gemfile.lock

@@ -1,28 +0,0 @@
-PATH
-  remote: /Users/jamesarosen/Projects/sprockets-commonjs
-  specs:
-    sprockets-commonjs (0.0.4)
-      sprockets (~> 2.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    appraisal (0.5.1)
-      bundler
-      rake
-    hike (1.2.1)
-    rack (1.4.1)
-    rake (10.0.3)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 0.5.1)
-  sprockets (~> 2.1.3)
-  sprockets-commonjs!

data/gemfiles/sprockets_2_2.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "sprockets", "~> 2.2.2"
-
-gemspec :path=>"../"

data/gemfiles/sprockets_2_2.gemfile.lock

@@ -1,30 +0,0 @@
-PATH
-  remote: /Users/jamesarosen/Projects/sprockets-commonjs
-  specs:
-    sprockets-commonjs (0.0.4)
-      sprockets (~> 2.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    appraisal (0.5.1)
-      bundler
-      rake
-    hike (1.2.1)
-    multi_json (1.5.0)
-    rack (1.4.1)
-    rake (10.0.3)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 0.5.1)
-  sprockets (~> 2.2.2)
-  sprockets-commonjs!

data/gemfiles/sprockets_2_3.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "sprockets", "~> 2.3.2"
-
-gemspec :path=>"../"

data/gemfiles/sprockets_2_3.gemfile.lock

@@ -1,30 +0,0 @@
-PATH
-  remote: /Users/jamesarosen/Projects/sprockets-commonjs
-  specs:
-    sprockets-commonjs (0.0.4)
-      sprockets (~> 2.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    appraisal (0.5.1)
-      bundler
-      rake
-    hike (1.2.1)
-    multi_json (1.5.0)
-    rack (1.4.1)
-    rake (10.0.3)
-    sprockets (2.3.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 0.5.1)
-  sprockets (~> 2.3.2)
-  sprockets-commonjs!

data/gemfiles/sprockets_2_4.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "sprockets", "~> 2.4.5"
-
-gemspec :path=>"../"

data/gemfiles/sprockets_2_4.gemfile.lock

@@ -1,30 +0,0 @@
-PATH
-  remote: /Users/jamesarosen/Projects/sprockets-commonjs
-  specs:
-    sprockets-commonjs (0.0.4)
-      sprockets (~> 2.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    appraisal (0.5.1)
-      bundler
-      rake
-    hike (1.2.1)
-    multi_json (1.5.0)
-    rack (1.4.1)
-    rake (10.0.3)
-    sprockets (2.4.5)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 0.5.1)
-  sprockets (~> 2.4.5)
-  sprockets-commonjs!

data/gemfiles/sprockets_2_5.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "sprockets", "~> 2.5.0"
-
-gemspec :path=>"../"

data/gemfiles/sprockets_2_5.gemfile.lock

@@ -1,30 +0,0 @@
-PATH
-  remote: /Users/jamesarosen/Projects/sprockets-commonjs
-  specs:
-    sprockets-commonjs (0.0.4)
-      sprockets (~> 2.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    appraisal (0.5.1)
-      bundler
-      rake
-    hike (1.2.1)
-    multi_json (1.5.0)
-    rack (1.4.1)
-    rake (10.0.3)
-    sprockets (2.5.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 0.5.1)
-  sprockets (~> 2.5.0)
-  sprockets-commonjs!

data/gemfiles/sprockets_2_6.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "sprockets", "~> 2.6.0"
-
-gemspec :path=>"../"

data/gemfiles/sprockets_2_6.gemfile.lock

@@ -1,30 +0,0 @@
-PATH
-  remote: /Users/jamesarosen/Projects/sprockets-commonjs
-  specs:
-    sprockets-commonjs (0.0.4)
-      sprockets (~> 2.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    appraisal (0.5.1)
-      bundler
-      rake
-    hike (1.2.1)
-    multi_json (1.5.0)
-    rack (1.4.1)
-    rake (10.0.3)
-    sprockets (2.6.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 0.5.1)
-  sprockets (~> 2.6.0)
-  sprockets-commonjs!

data/gemfiles/sprockets_2_7.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "sprockets", "~> 2.7.0"
-
-gemspec :path=>"../"

data/gemfiles/sprockets_2_7.gemfile.lock

@@ -1,30 +0,0 @@
-PATH
-  remote: /Users/jamesarosen/Projects/sprockets-commonjs
-  specs:
-    sprockets-commonjs (0.0.4)
-      sprockets (~> 2.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    appraisal (0.5.1)
-      bundler
-      rake
-    hike (1.2.1)
-    multi_json (1.5.0)
-    rack (1.4.1)
-    rake (10.0.3)
-    sprockets (2.7.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 0.5.1)
-  sprockets (~> 2.7.0)
-  sprockets-commonjs!

data/gemfiles/sprockets_2_8.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "sprockets", "~> 2.8.2"
-
-gemspec :path=>"../"

data/gemfiles/sprockets_2_8.gemfile.lock

@@ -1,30 +0,0 @@
-PATH
-  remote: /Users/jamesarosen/Projects/sprockets-commonjs
-  specs:
-    sprockets-commonjs (0.0.4)
-      sprockets (~> 2.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    appraisal (0.5.1)
-      bundler
-      rake
-    hike (1.2.1)
-    multi_json (1.5.0)
-    rack (1.4.1)
-    rake (10.0.3)
-    sprockets (2.8.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal (~> 0.5.1)
-  sprockets (~> 2.8.2)
-  sprockets-commonjs!

data/lib/sprockets/commonjs/engine.rb

@@ -1,15 +0,0 @@
-require 'sprockets/commonjs'
-
-if defined?(Rails)
-  module Sprockets
-    class CommonJS
-
-      class Engine < Rails::Engine
-        initializer :setup_commonjs, :after => "sprockets.environment", :group => :all do |app|
-          app.assets.register_postprocessor 'application/javascript', CommonJS
-        end
-      end
-
-    end
-  end
-end

data/lib/sprockets-commonjs.rb

@@ -1,2 +0,0 @@
-require 'sprockets/commonjs'
-require 'sprockets/commonjs/engine'

data/test/bar.js

@@ -1 +0,0 @@
-window.bar = "Bar!"

data/test/foo.module.js

@@ -1 +0,0 @@
-module.exports = "Foo!";

data/test/source.js

@@ -1,2 +0,0 @@
-//= require foo.module.js
-//= require bar.js

data/test/sprockets_commonjs_test.rb

@@ -1,35 +0,0 @@
-require 'test/unit'
-require 'tempfile'
-require 'sprockets-commonjs'
-
-class SprocketsCommonjsTest < Test::Unit::TestCase
-
-  TEST_DIR = File.expand_path('..', __FILE__)
-  LIB_DIR  = File.expand_path('../lib/assets/javascripts', TEST_DIR)
-
-  attr_reader :output
-
-  def setup
-    env = Sprockets::Environment.new
-    env.register_postprocessor 'application/javascript', Sprockets::CommonJS
-    env.append_path TEST_DIR
-    env.append_path LIB_DIR
-    outfile = Tempfile.new('sprockets-output')
-    env['source.js'].write_to outfile.path
-    @output = File.read outfile.path
-  end
-
-  def test_adds_commonjs_require
-    assert_match %r[var require = function\(name, root\) {], @output
-  end
-
-  def test_modularizes_modules
-    assert_match %r[require.define\({\"foo\":function], @output
-    assert_match %r["Foo!"], @output
-  end
-
-  def test_does_not_modularize_non_modules
-    assert_no_match %r[require.define\({\"bar\":function], @output
-  end
-
-end