browserify-rails 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 907912f1aadcbeafc0c4d0a980f519e5c9ca1ba6
-  data.tar.gz: 81dfa83d15625dcbc59c3991dbfd040025213702
+  metadata.gz: a2c2135417c9ff3fde1f33690d28a0e864063fac
+  data.tar.gz: 12f3ee03a61deba05417f0de2d7cf5dae7712500
 SHA512:
-  metadata.gz: be64aec51ab18d1fa128560901a749caff2044419755e38e9eb9092a433e8f63d47fe65f07f514bd31a2f8a826efb48ebab91407ca0e3bddf4b06fa4f8702b32
-  data.tar.gz: ecebfdc971e5617d74278a29dbdaf4d9cd761b5586d517a0cf5ad7faddcf9f79fa2b195ea3c3d4ed1f9fa9042033249cfd776df905f2bdba2980efd87ebc1dfb
+  metadata.gz: cb63140be9731fc9dba6ef7e59913d9304904f6db7b41593d136a07693c27a890b3f8b172a096ebcef777e4d3ebbd8ec949c3cd1cea9f6f51371ce633cdeebbd
+  data.tar.gz: 73687ed29616ca71095e2bbb15ded54b963ea078b1faac79e2adc4045a56ca50091e897e6be831d41d615ab67a1df2426d541580061554ea744cd29c0f585426

data/.gitignore

@@ -24,3 +24,4 @@ test/dummy/db/schema.rb
 tmp
 test/dummy/app/assets/javascripts/*.js
 test/dummy/app/assets/javascripts/**/*.js
+test/dummy/app/assets/javascripts/**/*.js.coffee

data/README.md

@@ -16,7 +16,7 @@ It let's you mix and match  `//= require` directives and `require()` calls for i
 
 Add this line to your application's Gemfile:
 
-    gem "hsume2-browserify-rails", "~> 0.2.0", :require => "browserify-rails"
+    gem "browserify-rails", "~> 0.3"
 
 Create `package.json` in your Rails root:
 
@@ -48,11 +48,28 @@ var foo = require('./foo');
 console.log(foo(12));
 ```
 
-## Coffeescript
+## CoffeeScript
 
-Coffeescript is handled seamlessly, if you name your files `*.js.coffee`. That
-way the coffeescript compiler will already have done it's work, when we are
-putting the javascript tools to work.
+For CoffeeScript support, make sure to follow the standard rails
+`.js.coffee` naming convention.  You'll also need to do the following:
+
+Add `coffeify` as a dependency within `package.json`:
+
+```js
+{
+  // ...
+  "devDependencies" : {
+    // ...
+    "coffeeify": "~> 0.6"
+  }
+}
+```
+
+Add the following command line options within `application.rb`:
+
+```rb
+config.browserify_rails.commandline_options = "-t coffeeify --extension=\".js.coffee\""
+```
 
 ## Configuration
 

data/browserify-rails.gemspec

@@ -23,5 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rails", "~> 3.2"
+  spec.add_development_dependency "coffee-rails"
   spec.add_development_dependency "mocha"
+  spec.add_development_dependency "pry"
 end

data/lib/browserify-rails/browserify_processor.rb

@@ -1,5 +1,4 @@
 require "open3"
-require "json"
 
 module BrowserifyRails
   class BrowserifyProcessor < Tilt::Template
@@ -9,7 +8,7 @@ module BrowserifyRails
     end
 
     def evaluate(context, locals, &block)
-      if should_browserify? && commonjs_module?
+      if should_browserify?
         asset_dependencies(context.environment.paths).each do |path|
           context.depend_on(path)
         end
@@ -23,7 +22,12 @@ module BrowserifyRails
     private
 
     def should_browserify?
-      Rails.application.config.browserify_rails.paths.any? do |path_spec|
+      in_path? && commonjs_module?
+    end
+
+    # Is this file in any of the configured paths?
+    def in_path?
+      config.paths.any? do |path_spec|
         path_spec === file
       end
     end
@@ -47,7 +51,7 @@ module BrowserifyRails
 
     # @return [<String>] Paths of files, that this file depends on
     def dependencies
-      @dependencies ||= run_browserify("--list").lines.map(&:strip).select do |path|
+      @dependencies ||= run_browserify("#{options} --list").lines.map(&:strip).select do |path|
         # Filter the temp file, where browserify caches the input stream
         File.exists?(path)
       end

data/lib/browserify-rails/version.rb

@@ -1,3 +1,3 @@
 module BrowserifyRails
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/compilation_test.rb

@@ -1,13 +1,14 @@
-require 'test_helper'
+require "test_helper"
 
 class BrowserifyTest < ActionController::IntegrationTest
-
   setup do
     Rails.application.assets.cache = nil
 
-    FileUtils.cp(File.join(Rails.root, 'app/assets/javascripts/application.js.example'), File.join(Rails.root, 'app/assets/javascripts/application.js'))
-    FileUtils.cp(File.join(Rails.root, 'app/assets/javascripts/foo.js.example'), File.join(Rails.root, 'app/assets/javascripts/foo.js'))
-    FileUtils.cp(File.join(Rails.root, 'app/assets/javascripts/nested/index.js.example'), File.join(Rails.root, 'app/assets/javascripts/nested/index.js'))
+    FileUtils.cp(File.join(Rails.root, "app/assets/javascripts/application.js.example"), File.join(Rails.root, "app/assets/javascripts/application.js"))
+    FileUtils.cp(File.join(Rails.root, "app/assets/javascripts/foo.js.example"), File.join(Rails.root, "app/assets/javascripts/foo.js"))
+    FileUtils.cp(File.join(Rails.root, "app/assets/javascripts/nested/index.js.example"), File.join(Rails.root, "app/assets/javascripts/nested/index.js"))
+    FileUtils.cp(File.join(Rails.root, "app/assets/javascripts/mocha.js.coffee.example"), File.join(Rails.root, "app/assets/javascripts/mocha.js.coffee"))
+    FileUtils.cp(File.join(Rails.root, "app/assets/javascripts/coffee.js.coffee.example"), File.join(Rails.root, "app/assets/javascripts/coffee.js.coffee"))
   end
 
   test "asset pipeline should serve application.js" do
@@ -36,7 +37,7 @@ class BrowserifyTest < ActionController::IntegrationTest
     # Ensure that Sprockets can detect the change to the file modification time
     sleep 1
 
-    File.open(File.join(Rails.root, 'app/assets/javascripts/foo.js'), 'w+') do |f|
+    File.open(File.join(Rails.root, "app/assets/javascripts/foo.js"), "w+") do |f|
       f.puts "require('./nested');"
       f.puts "module.exports = function (n) { return n * 12 }"
     end
@@ -58,7 +59,7 @@ class BrowserifyTest < ActionController::IntegrationTest
     # Ensure that Sprockets can detect the change to the file modification time
     sleep 1
 
-    File.open(File.join(Rails.root, 'app/assets/javascripts/application.js'), 'w+') do |f|
+    File.open(File.join(Rails.root, "app/assets/javascripts/application.js"), "w+") do |f|
       f.puts "var foo = require('./foo');"
       f.puts "console.log(foo(11));"
     end
@@ -70,8 +71,22 @@ class BrowserifyTest < ActionController::IntegrationTest
     assert_equal expected_output, @response.body.strip
   end
 
+  test "browserifies coffee files after they have been compiled to JS" do
+    expected_output = fixture("mocha.js")
+
+    get "/assets/mocha.js"
+
+    assert_response :success
+    assert_equal expected_output, @response.body.strip
+  end
+
+  test "browserifies files with coffee requires" do
+    get "/assets/coffee.js"
+    assert_no_match /BrowserifyRails::BrowserifyError/, @response.body
+  end
+
   test "throws BrowserifyError if something went wrong while executing browserify" do
-    File.open(File.join(Rails.root, 'app/assets/javascripts/application.js'), 'w+') do |f|
+    File.open(File.join(Rails.root, "app/assets/javascripts/application.js"), "w+") do |f|
       f.puts "var foo = require('./foo');"
       f.puts "var bar = require('./bar');"
     end

data/test/dummy/app/assets/javascripts/coffee.js.coffee.example

@@ -0,0 +1 @@
+require("./mocha")

data/test/dummy/app/assets/javascripts/mocha.js.coffee.example

@@ -0,0 +1,4 @@
+f = require("./foo")
+
+hello = ->
+  alert("Hello browserify #{f 5}")

data/test/dummy/config/application.rb

@@ -39,6 +39,8 @@ module Dummy
 
     # Enable the asset pipeline
     config.assets.enabled = true
+
+    # Add CoffeeScript support
+    config.browserify_rails.commandline_options = "-t coffeeify --extension=\".js.coffee\""
   end
 end
-

data/test/dummy/package.json

@@ -3,7 +3,8 @@
   "author": "Henry Hsu <hhsu@zendesk.com>",
   "description": "a dummy Rails application",
   "devDependencies" : {
-    "browserify": "~> 4.1"
+    "browserify": "~> 4.1",
+    "coffeeify": "~> 0.6"
   },
   "license": "MIT",
   "engines": {

data/test/fixtures/mocha.js

@@ -0,0 +1,20 @@
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function() {
+  var f, hello;
+
+  f = require("./foo");
+
+  hello = function() {
+    return alert("Hello browserify " + (f(5)));
+  };
+
+}).call(this);
+
+},{"./foo":2}],2:[function(require,module,exports){
+require('./nested');
+module.exports = function (n) { return n * 11 }
+
+},{"./nested":3}],3:[function(require,module,exports){
+module.exports.NESTED = true;
+
+},{}]},{},[1])

data/test/test_helper.rb

@@ -15,6 +15,8 @@ FileUtils.rm_rf "#{File.dirname(__FILE__)}/dummy/tmp"
 
 ActiveSupport::TestCase.class_eval do
   def fixture(filename)
-    File.open(File.join(File.dirname(__FILE__), "/fixtures/#{filename}")).read.strip
+    File.open(File.join(File.dirname(__FILE__), "fixtures", filename)) do |f|
+      f.read.strip
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browserify-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Henry Hsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Browserify + Rails = CommonJS Heaven
 email:
 - hhsu@zendesk.com
@@ -104,7 +132,9 @@ files:
 - test/compilation_test.rb
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js.example
+- test/dummy/app/assets/javascripts/coffee.js.coffee.example
 - test/dummy/app/assets/javascripts/foo.js.example
+- test/dummy/app/assets/javascripts/mocha.js.coffee.example
 - test/dummy/app/assets/javascripts/nested/index.js.example
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -142,6 +172,7 @@ files:
 - test/fixtures/application.out.js
 - test/fixtures/empty_module.js
 - test/fixtures/foo.out.js
+- test/fixtures/mocha.js
 - test/test_helper.rb
 homepage: ''
 licenses:
@@ -172,7 +203,9 @@ test_files:
 - test/compilation_test.rb
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js.example
+- test/dummy/app/assets/javascripts/coffee.js.coffee.example
 - test/dummy/app/assets/javascripts/foo.js.example
+- test/dummy/app/assets/javascripts/mocha.js.coffee.example
 - test/dummy/app/assets/javascripts/nested/index.js.example
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -210,4 +243,5 @@ test_files:
 - test/fixtures/application.out.js
 - test/fixtures/empty_module.js
 - test/fixtures/foo.out.js
+- test/fixtures/mocha.js
 - test/test_helper.rb