requirejs-rails 0.0.1 → 0.0.2

data/Gemfile

@@ -5,8 +5,13 @@ source "http://rubygems.org"
 # development dependencies will be added by default to the :development group.
 gemspec
 
-# jquery-rails is used by the dummy application
-gem "jquery-rails"
+group :development, :test do
+  # jquery-rails is used by the dummy application
+  gem "jquery-rails"
+
+  # ExecJS is used by our tests
+  gem "execjs"
+end
 
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or

data/Gemfile.lock

@@ -1,46 +1,48 @@
 PATH
   remote: .
   specs:
-    requirejs-rails (0.0.1)
-      rails (~> 3.1.1)
+    requirejs-rails (0.0.2)
+      railties (~> 3.1.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.1)
-      actionpack (= 3.1.1)
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
       mail (~> 2.3.0)
-    actionpack (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.2)
+      rack (~> 1.3.5)
       rack-cache (~> 1.1)
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.2)
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-    activesupport (3.1.1)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
       multi_json (~> 1.0)
     arel (2.2.1)
     builder (3.0.0)
     erubis (2.7.0)
+    execjs (1.2.9)
+      multi_json (~> 1.0)
     hike (1.2.1)
     i18n (0.6.0)
-    jquery-rails (1.0.17)
+    jquery-rails (1.0.18)
       railties (~> 3.0)
       thor (~> 0.14)
     json (1.6.1)
@@ -60,17 +62,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.1)
-      actionmailer (= 3.1.1)
-      actionpack (= 3.1.1)
-      activerecord (= 3.1.1)
-      activeresource (= 3.1.1)
-      activesupport (= 3.1.1)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
       bundler (~> 1.0)
-      railties (= 3.1.1)
-    railties (3.1.1)
-      actionpack (= 3.1.1)
-      activesupport (= 3.1.1)
+      railties (= 3.1.3)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -94,6 +96,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  execjs
   jquery-rails
+  rails (~> 3.1.1)
   requirejs-rails!
   sqlite3

data/README.md

@@ -4,11 +4,15 @@ Integrates [RequireJS](http://requirejs.org/) into the Rails 3 Asset Pipeline.
 
 ## Usage
 
-1. `gem install requirejs-rails`
+1. Add this to your Rails app's `Gemfile`:
+
+    ```
+    gem 'requirejs-rails'
+    ```
 
 2. Your `application.js` file should contain just this snippet. The rest of your JavaScript or CoffeeScript code should be pulled in via RequireJS, including jQuery.
 
-    ```
+    ```javascript
     //= require require
 
     require.config({
@@ -16,7 +20,57 @@ Integrates [RequireJS](http://requirejs.org/) into the Rails 3 Asset Pipeline.
     });
     ```
 
-3. Add any additional config directives you need to the above code, e.g. `paths`.
+3. Add any additional [config options](http://requirejs.org/docs/api.html#config) you need to the above code, e.g. `paths`.
+
+4. Organize your JavaScript or CoffeeScript code into modules using `define()`:
+
+      ```coffeescript
+      # app/assets/javascripts/views/tweet_view.js.coffee
+
+      define ['backbone'], (Backbone) ->
+        class TweetView extends Backbone.View
+          # ...
+      ```
+
+5. Instantiate your app using `require()` from a top-level script such as `application.js` or a controller-specific file ala `mycontroller.js.coffee`:
+
+      ```coffeescript
+      # app/assets/javascripts/mycontroller.js.coffee
+
+      require ['jquery', 'backbone', 'TheApp'], ($, Backbone, TheApp) ->
+
+        # Start up the app once the DOM is ready
+        $ ->
+          window.App = new TheApp()
+          Backbone.history.start
+            pushState: true
+          window.App.start()
+      ```
+
+
+## Using AMD libraries
+
+I currently recommend placing your AMD libraries into `vendor/assets/javascripts`.  The needs of a few specific libraries are discussed below.
+
+### jQuery
+
+jQuery users must use jQuery 1.7 or later (`jquery-rails >= 1.0.17`) to use it as an [AMD module](http://wiki.commonjs.org/wiki/Modules/AsynchronousDefinition) with RequireJS.  The boilerplate in `application.js` remains unchanged.  To use jQuery in a module:
+
+```coffeescript
+# app/assets/javascripts/hello.js
+
+define ['jquery'], ($) ->
+  (id) ->
+    $(id).append('<div>hello!</div>')
+```
+
+### Backbone.js
+
+Backbone AMD support is underway in documentcloud/backbone#710.  In the meantime, you can download [Backbone 0.5.3 with AMD support](https://github.com/jrburke/backbone/raw/optamd3/backbone.js) from [jrburke's optamd3 branch](https://github.com/jrburke/backbone/tree/optamd3).  Backbone's module name is `backbone`.
+
+### Underscore.js
+
+Underscore version 1.2.2 or later has integrated AMD support.  Get it from [Underscore.js' homepage](http://documentcloud.github.com/underscore/). Underscore's module name is `underscore`.
 
 ## Changes
 
@@ -25,7 +79,7 @@ See [the Changelog](CHANGELOG.md) for recent updates
 ## TODOs
 
 - Sample app, including jQuery usage
-- Support RequireJS precompilation via r.js
+- Support RequireJS precompilation via r.js (see issue #1)
 - Generator and/or template support.. ?
 
 ----

data/lib/requirejs-rails.rb

@@ -1,4 +1 @@
-module Requirejs
-  module Rails
-  end
-end
+require 'requirejs/rails'

data/lib/requirejs/rails.rb

@@ -0,0 +1,5 @@
+module Requirejs
+  module Rails
+    require 'requirejs/rails/engine'
+  end
+end

data/lib/requirejs/rails/engine.rb

@@ -0,0 +1,6 @@
+module Requirejs
+  module Rails
+    class Engine < ::Rails::Engine
+    end
+  end
+end

data/lib/requirejs/rails/version.rb

@@ -1,5 +1,5 @@
 module Requirejs
   module Rails
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/requirejs-rails.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |s|
   s.files = git_files
   s.require_path = 'lib'  
 
-  s.add_dependency "rails", "~> 3.1.1"
-  s.requirements << "If needed, jQuery should be v1.7 or greater (jquery-rails >= 1.0.17)."
-
+  s.add_dependency "railties", "~> 3.1.1"
+  s.add_development_dependency "rails", "~> 3.1.1"
   s.add_development_dependency "sqlite3"
+
+  s.requirements << "If needed, jQuery should be v1.7 or greater (jquery-rails >= 1.0.17)."
 end

data/test/dummy/.rvmrc

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+environment_id="ruby-1.9.3-p0@requirejs-rails"
+
+#
+# Uncomment following line if you want options to be set only for given project.
+#
+# PROJECT_JRUBY_OPTS=( --1.9 )
+
+#
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+
+  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
+  then
+    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
+  fi
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  if ! rvm --create use  "$environment_id"
+  then
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  fi
+fi
+
+#
+# If you use an RVM gemset file to install a list of gems (*.gems), you can have
+# it be automatically loaded. Uncomment the following and adjust the filename if
+# necessary.
+#
+# filename=".gems"
+# if [[ -s "$filename" ]]
+# then
+#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
+# fi
+
+# If you use bundler, this might be useful to you:
+# if command -v bundle && [[ -s Gemfile ]]
+# then
+#   bundle install
+# fi
+
+

data/test/requirejs-rails_test.rb

@@ -1,8 +1,18 @@
 require 'test_helper'
 
+require 'execjs'
+require 'pathname'
+
 class RequirejsRailsTest < ActiveSupport::TestCase
   test "truth" do
     assert_kind_of Module, Requirejs
     assert_kind_of Module, Requirejs::Rails
+    assert_kind_of Class, Requirejs::Rails::Engine
+  end
+  
+  test "require.js version" do
+    require_js = Pathname.new(__FILE__+'/../../vendor/assets/javascripts/require.js').cleanpath.read
+    context = ExecJS.compile(require_js)
+    assert_equal "1.0.2", context.eval("require.version")
   end
 end

data/vendor/assets/javascripts/require.js

@@ -1,5 +1,5 @@
 /** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 1.0.1 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 1.0.2 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -11,7 +11,7 @@
 var requirejs, require, define;
 (function () {
     //Change this version number for each release.
-    var version = "1.0.1",
+    var version = "1.0.2",
         commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
         cjsRequireRegExp = /require\(\s*["']([^'"\s]+)["']\s*\)/g,
         currDirRegExp = /^\.\//,
@@ -268,6 +268,10 @@ var requirejs, require, define;
                     if (pkgConfig && name === pkgName + '/' + pkgConfig.main) {
                         name = pkgName;
                     }
+                } else if (name.indexOf("./") === 0) {
+                    // No baseName, so this is ID is resolved relative
+                    // to baseUrl, pull off the leading dot.
+                    name = name.substring(2);
                 }
             }
             return name;
@@ -407,7 +411,8 @@ var requirejs, require, define;
                 map = manager.map,
                 fullName = map.fullName,
                 args = manager.deps,
-                listeners = manager.listeners;
+                listeners = manager.listeners,
+                cjsModule;
 
             //Call the callback to define the module, if necessary.
             if (cb && isFunction(cb)) {
@@ -425,7 +430,11 @@ var requirejs, require, define;
                     //If setting exports via "module" is in play,
                     //favor that over return value and exports. After that,
                     //favor a non-undefined return value over exports use.
-                    if (manager.cjsModule && manager.cjsModule.exports !== undefined) {
+                    cjsModule = manager.cjsModule;
+                    if (cjsModule &&
+                        cjsModule.exports !== undefined &&
+                        //Make sure it is not already the exports value
+                        cjsModule.exports !== defined[fullName]) {
                         ret = defined[fullName] = manager.cjsModule.exports;
                     } else if (ret === undefined && manager.usingExports) {
                         //exports already set the defined value.
@@ -1048,7 +1057,16 @@ var requirejs, require, define;
                             //Regular dependency.
                             if (!urlFetched[url] && !loaded[fullName]) {
                                 req.load(context, fullName, url);
-                                urlFetched[url] = true;
+
+                                //Mark the URL as fetched, but only if it is
+                                //not an empty: URL, used by the optimizer.
+                                //In that case we need to be sure to call
+                                //load() for each module that is mapped to
+                                //empty: so that dependencies are satisfied
+                                //correctly.
+                                if (url.indexOf('empty:') !== 0) {
+                                    urlFetched[url] = true;
+                                }
                             }
                         }
                     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: requirejs-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000 Z
+date: 2011-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70111022200320 !ruby/object:Gem::Requirement
+  name: railties
+  requirement: &70199933410040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70111022200320
+  version_requirements: *70199933410040
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &70199933409200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+  type: :development
+  prerelease: false
+  version_requirements: *70199933409200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70111022199640 !ruby/object:Gem::Requirement
+  requirement: &70199933408160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70111022199640
+  version_requirements: *70199933408160
 description: This gem provides RequireJS support for your Rails 3 application.
 email:
 - whitley@bangpath.org
@@ -49,11 +60,14 @@ files:
 - README.md
 - Rakefile
 - lib/requirejs-rails.rb
+- lib/requirejs/rails.rb
+- lib/requirejs/rails/engine.rb
 - lib/requirejs/rails/version.rb
 - lib/tasks/requirejs-rails_tasks.rake
 - requirejs-rails.gemspec
 - vendor/assets/javascripts/order.js
 - vendor/assets/javascripts/require.js
+- test/dummy/.rvmrc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
@@ -101,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1237549975689155325
+      hash: 2678184901028172103
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1237549975689155325
+      hash: 2678184901028172103
 requirements:
 - If needed, jQuery should be v1.7 or greater (jquery-rails >= 1.0.17).
 rubyforge_project: 
@@ -119,6 +133,7 @@ signing_key:
 specification_version: 3
 summary: Use RequireJS with the Rails 3 Asset Pipeline
 test_files:
+- test/dummy/.rvmrc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css