Improve handling of Bower packages

Author: carsomyr

lib/requirejs/rails/config.rb

@@ -11,11 +11,21 @@ module Rails
     class Config < ::ActiveSupport::OrderedOptions
       LOADERS = [:requirejs, :almond]
 
+      BOWER_PATH_PATTERN = Regexp.new("\\A(.*)/(?:\\.bower|bower|component)\\.json\\z")
+
+      LOGICAL_PATH_PATTERNS = [
+          Regexp.new("\\.html\\z"),
+          Regexp.new("\\.js\\z"),
+          Regexp.new("\\.txt\\z"),
+          BOWER_PATH_PATTERN
+      ]
+
       def initialize(application)
         super
+
         self.manifest = nil
+        self.logical_path_patterns = LOGICAL_PATH_PATTERNS
 
-        self.logical_asset_filter = [/\.js$/, /\.html$/, /\.txt$/]
         self.tmp_dir = application.root + 'tmp'
         self.bin_dir = Pathname.new(__FILE__+'/../../../../bin').cleanpath
 
@@ -149,10 +159,10 @@ def get_binding
         return binding()
       end
 
-      def asset_allowed?(asset)
-        self.logical_asset_filter.reduce(false) do |accum, matcher|
-          accum || (matcher =~ asset)
-        end ? true : false
+      def asset_allowed?(logical_path)
+        logical_path_patterns.reduce(false) do |accum, pattern|
+          accum || !!(pattern.match(logical_path))
+        end
       end
     end
   end

lib/requirejs/rails/engine.rb

@@ -54,7 +54,7 @@ class Engine < ::Rails::Engine
         config.after_initialize do |app|
           config = app.config
           rails_manifest_path = File.join(app.root, 'public', config.assets.prefix)
-          rails_manifest = Sprockets::Manifest.new(app.assets, rails_manifest_path)
+          rails_manifest = ::Sprockets::Manifest.new(app.assets, rails_manifest_path)
           if config.requirejs.manifest_path.exist? && rails_manifest
             rjs_digests = YAML.load(ERB.new(File.new(config.requirejs.manifest_path).read).result)
             rails_manifest.assets.merge!(rjs_digests)

lib/tasks/requirejs-rails_tasks.rake

@@ -39,7 +39,7 @@ namespace :requirejs do
   end
 
   task setup: ["assets:environment"] do
-    unless defined?(Sprockets)
+    unless defined?(::Sprockets)
       warn "Cannot precompile assets if sprockets is disabled. Please set config.assets.enabled to true"
       exit
     end
@@ -88,14 +88,6 @@ OS X Homebrew users can use 'brew install node'.
     # Copy all assets to the temporary staging directory.
     task prepare_source: ["requirejs:setup",
                           "requirejs:clean"] do
-      bower_json_pattern = Regexp.new("\\A(.*)/bower\\.json\\z")
-
-      js_ext = if requirejs.env.respond_to?(:extension_for_mime_type)
-        requirejs.env.extension_for_mime_type("application/javascript")
-      else
-        requirejs.env.mime_types["application/javascript"][:extensions].first
-      end
-
       requirejs.config.source_dir.mkpath
 
       # Save the original JS compressor and cache, which will be restored later.
@@ -106,16 +98,31 @@ OS X Homebrew users can use 'brew install node'.
       original_cache = requirejs.env.cache
       requirejs.env.cache = nil
 
-      requirejs.env.logical_paths do |logical_path|
+      js_ext = requirejs.env.mime_types["application/javascript"][:extensions].first
+
+      requirejs.env.logical_paths do |logical_path, physical_path|
+        next \
+          if !requirejs.config.asset_allowed?(logical_path)
+
+        m = ::Requirejs::Rails::Config::BOWER_PATH_PATTERN.match(logical_path)
 
-        next if ! requirejs.config.asset_allowed?(logical_path)
+        if !m
+          asset = requirejs.env.find_asset(logical_path)
 
-        asset = requirejs.env.find_asset(logical_path)
+          if asset
+            file = requirejs.config.source_dir.join(asset.logical_path)
+            file.dirname.mkpath
+            asset.write_to(file)
+          end
+        else
+          bower_logical_path = Pathname.new(logical_path).dirname.sub_ext(js_ext).to_s
+          asset = requirejs.env.find_asset(bower_logical_path)
 
-        if asset
-          filename = requirejs.config.source_dir.join(asset.logical_path)
-          filename.dirname.mkpath
-          asset.write_to(filename)
+          if asset
+            file = requirejs.config.source_dir.join(bower_logical_path)
+            file.dirname.mkpath
+            asset.write_to(file)
+          end
         end
       end
 

test/requirejs-rails_test.rb

@@ -41,7 +41,7 @@ def setup
   test "matches configured logical assets" do
     assert_equal true, @cfg.asset_allowed?('foo.js')
     assert_equal false, @cfg.asset_allowed?('bar.frobnitz')
-    @cfg.logical_asset_filter += [/\.frobnitz$/]
+    @cfg.logical_path_patterns += [/\.frobnitz$/]
     assert_equal true, @cfg.asset_allowed?('bar.frobnitz')
   end
 
@@ -136,9 +136,13 @@ def wrap(tag)
   end
 
   test "requirejs_include_tag_with_block" do
-    render text: wrap(requirejs_include_tag("application") do
-      {"class" => controller.class.name.demodulize}
-    end)
+    result = wrap(
+        requirejs_include_tag("application") do
+          {"class" => controller.class.name.demodulize}
+        end
+    )
+
+    render text: result
 
     assert_select "script:first-of-type[src=\"/javascripts/require.js\"]" \
       "[data-class=\"TestController\"]", count: 1