browserify-rails 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03dee0ab64b022c7c21938b5395c4a4efd1f978c
-  data.tar.gz: b0d940256f3465da6913eb074d1d4a38d6358b16
+  metadata.gz: c4dcf3eb3bc52f7b2cd40c8c6acddc9a0553d6dc
+  data.tar.gz: 2f58e322cc3574fc3f2b3940353d7345016d4dff
 SHA512:
-  metadata.gz: 6d3aa93d859df015c8d6eafb532424df35fc9d141cae557f5f4a7a601ee2423e4c9f250f16e229dd7851070f2d0f50515deb3f81761daa604774da9165a982b0
-  data.tar.gz: abd38d359a96caa8b5bb559031742c22f58b007f122daf0480bce7becf16364a413cdad5c414c171d3c31b3a2fca02753e57ba8e52d651124c4d390f668601fa
+  metadata.gz: 05ee233810dbc83ed84e4d4c1045f7ff80aaba4cc0e618477639bcd3fdeb79c0773f286317b1af1eee79b43c84f8a8fee6a442b74669384192c1d318a1fcef10
+  data.tar.gz: ef402cd88e6f4d4ab40f212a1fe28a924badca4d2a518e64f93b2626e6920f53642c942bf55bddf7cf7808dc1842dc2030ae66613ff5102c81f6ce1d20782637

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 All notable changes to this project will be documented in this file going forward.
 
+## [1.5.0] - 2015-10-07
+- add jruby support for file name resolution (thanks to jmagoon)
+- make config.force more flexible by allowing it to be a proc (thanks to rosendi)
+- fix browserify-rails to work with new sprockets 3 interface (thanks to hajpoj)
+- fix broken test with current `npm install` in dummy test app
+
 ## [1.4.0] - 2015-08-12
 - modify tilt allowed version to be ">= 1.1", "< 3" to be compatible with sass-rails
 

data/README.md

@@ -5,7 +5,7 @@
 
 This library adds CommonJS module support to Sprockets (via Browserify).
 
-It lets you mix and match  `//= require` directives and `require()` calls for including plain javascript files as well as modules.
+It lets you mix and match  `//= require` directives and `require()` calls for including plain javascript files as well as modules. However, it is important to remember that once you are into code that is being browserified you can no longer use sprockets-style require (so no `//= require`). In many cases, it makes sense to put all your sprockets-required code in a separate file or at the very least at the top of your main JavaScript file. Then use `require()` to pull in the CommonJS code.
 
 1. Manage JS modules with `npm`
 2. Serve assets with Sprockets
@@ -109,10 +109,11 @@ class My::Application < Rails::Application
   # The default is `false`
   config.browserify_rails.evaluate_node_modules = true
 
-  # Force browserify on every found JavaScript asset
+  # Force browserify on every found JavaScript asset if true.
+  # Can be a proc.
   #
   # The default is `false`
-  config.browserify_rails.force = true
+  config.browserify_rails.force = ->(file) { File.extname(file) == ".ts" }
 
   # Command line options used when running browserify
   #
@@ -221,6 +222,15 @@ The second method is definitely brute force but if you experience issues,
 it is definitely worth trying before spending too much time debugging
 why something that is browserified appears to not match the sources files.
 
+## Acceptance Test Failures
+
+If you have Sprockets precompile multiple JS files, each of which include
+certain browserified files, your acceptance tests may timeout before some
+of the assets have finished compiling.
+
+To avoid this problem, run `rake assets:precompile` before running your
+acceptance tests.
+
 ## Contributing
 
 Pull requests appreciated. Pull requests will not be rejected based on

data/lib/browserify-rails/browserify_processor.rb

@@ -67,7 +67,15 @@ module BrowserifyRails
     end
 
     def should_browserify?
-      config.force || (in_path? && !browserified? && commonjs_module?)
+      force_browserify? || (in_path? && !browserified? && commonjs_module?)
+    end
+
+    def force_browserify?
+      if config.force.is_a? Proc
+        config.force.call file
+      else
+        config.force
+      end
     end
 
     # Is this file in any of the configured paths?
@@ -171,7 +179,15 @@ module BrowserifyRails
       base_directory = File.dirname(file)
 
       Logger::log "Browserify: #{command}"
-      stdout, stderr, status = Open3.capture3(env, command, stdin_data: data, chdir: base_directory)
+
+      # If we are on JRuby 1.x, capture3 does not support chdir option
+      stdout, stderr, status = if RUBY_PLATFORM == "java" && JRUBY_VERSION =~ /^1/
+        Dir.chdir(base_directory) {
+          Open3.capture3(env, command, stdin_data: data)
+        }
+      else
+        Open3.capture3(env, command, stdin_data: data, chdir: base_directory)
+      end
 
       if !status.success?
         raise BrowserifyRails::BrowserifyError.new("Error while running `#{command}`:\n\n#{stderr}")

data/lib/browserify-rails/railtie.rb

@@ -4,7 +4,7 @@ module BrowserifyRails
   class Railtie < Rails::Engine
     config.browserify_rails = ActiveSupport::OrderedOptions.new
 
-    # Always browserify every file
+    # Browserify every file if true. Can be a proc.
     config.browserify_rails.force = false
 
     # Which paths should be browserified?
@@ -24,17 +24,27 @@ module BrowserifyRails
     # until then, disable in staging and production
     config.browserify_rails.use_browserifyinc = !["staging", "production"].include?(Rails.env)
 
-    initializer :setup_browserify do |app|
-      # Load granular configuration
-      filename = File.join(Rails.root, 'config', 'browserify.yml')
-      configuration = YAML::load(File.read(filename)) if File.exist? filename
-      config.browserify_rails.granular = configuration || {}
-
-      app.assets.register_postprocessor "application/javascript", BrowserifyRails::BrowserifyProcessor
+    if config.respond_to?(:assets)
+      config.assets.configure do |env|
+        load_granular_configuration
+        env.register_postprocessor "application/javascript", BrowserifyRails::BrowserifyProcessor
+      end
+    else
+      initializer :setup_browserify do |app|
+        load_granular_configuration
+        app.assets.register_postprocessor "application/javascript", BrowserifyRails::BrowserifyProcessor
+      end
     end
 
+
     rake_tasks do
       Dir[File.join(File.dirname(__FILE__), "tasks/*.rake")].each { |f| load f }
     end
+
+    def load_granular_configuration
+      filename = File.join(Rails.root, 'config', 'browserify.yml')
+      configuration = YAML::load(File.read(filename)) if File.exist? filename
+      config.browserify_rails.granular = configuration || {}
+    end
   end
 end

data/lib/browserify-rails/version.rb

@@ -1,3 +1,3 @@
 module BrowserifyRails
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/test/fixtures/main.out.js

@@ -5,7 +5,7 @@ module.exports = function() {
   console.log('library', library);
 };
 
-},{"./a_huge_library":"__RAILS_ROOT__/app/assets/javascripts/a_huge_library.js"}],"__RAILS_ROOT__/app/assets/javascripts/a_huge_library.js":[function(require,module,exports){
+},{"./a_huge_library":"__RAILS_ROOT__/app/assets/javascripts/a_huge_library.js"}],"a_huge_library":[function(require,module,exports){
 // pretend this file is 1 MB
 //
 // app_main.js is going to require() it and browserify.yml is going to tell it to use --require on it

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browserify-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Henry Hsu, Cymen Vig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties