requirejs-rails 0.9.6 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 492050b5ccb2552d21298f462a44623ab109ab30
-  data.tar.gz: a1151c9fd7f11dbae4dbcc3ef741984370374cd5
+  metadata.gz: 215e666fcb80a992bf5aab5f0204e8758caf9fd5
+  data.tar.gz: a0cc4708683e1133a861904043e0021778782e63
 SHA512:
-  metadata.gz: 685e71f5c4fe66604d6a783ff6a4c7882b7890e573c04bd9ad680a9e4c812c52a35f1273554a5209ef903e56fa581bbf58f15a25693da6d4fd035b8d3e196067
-  data.tar.gz: d4496398fce37c514fd05e4e97ee165b17c1a246118e7d6565bbd91e79c686c63bcbc440566c93b4e25f964942b142540b8e491906ae1d901209000518fc87e8
+  metadata.gz: c40c97f588521948cf3142518d752094bd94f07acab7f4945a05c932427ae2c5cf7bb9fcafa8d8222a8d72a3466ff7305b705c7a84672a8585800a7cc6677443
+  data.tar.gz: 9fb4030834836dfb4a31b25090f884ac904c42a79fe39c88d75af77b1350b722096db894377a0569b2d5d6f63801877b1730ae328f6daedfcab5832be51fe319

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## requirejs-rails changelog
 
+### v0.9.8
+
+- Fix a bad regression and yank v0.9.7.
+
+### v0.9.7
+
+- Fix a corner case where modules could appear in the build config's `paths`.
+- Fix regressions introduced in v0.9.6.
+- Allow protocol relative urls for CDNs in the build config's `paths` (credit @remybach).
+
 ### v0.9.6
 
 - Update `require.js` and `r.js` to `2.1.17`, and `almond.js` to `0.3.1`.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    requirejs-rails (0.9.6)
+    requirejs-rails (0.9.7)
       railties (>= 3.1.1)
 
 GEM

data/app/helpers/requirejs_helper.rb

@@ -49,7 +49,8 @@ module RequirejsHelper
           if run_config.has_key? 'paths'
             # Add paths for assets specified by full URL (on a CDN)
             run_config['paths'].each do |k, v|
-              paths[k] = v if v.is_a?(Array) || v =~ /^https?:/
+              paths[k] = v if v.is_a?(Array) || v =~ /^(https?:)?\/\//
+
             end
           end
 

data/lib/requirejs/rails/config.rb

@@ -158,12 +158,6 @@ module Requirejs
       def get_binding
         return binding()
       end
-
-      def asset_allowed?(logical_path)
-        logical_path_patterns.reduce(false) do |accum, pattern|
-          accum || !!(pattern.match(logical_path))
-        end
-      end
     end
   end
 end

data/lib/requirejs/rails/version.rb

@@ -1,6 +1,6 @@
 module Requirejs
   module Rails
-    Version = "0.9.6"
+    Version = "0.9.8"
     LibVersion = "2.1.17"
   end
 end

data/lib/requirejs/rails/view_proxy.rb

@@ -2,8 +2,13 @@ module Requirejs
   module Rails
     class ViewProxy
       include ActionView::Context
-      include ActionView::Helpers::AssetUrlHelper
-      include ActionView::Helpers::TagHelper
+
+      if ::Rails::VERSION::MAJOR >= 4
+        include ActionView::Helpers::AssetUrlHelper
+        include ActionView::Helpers::TagHelper
+      else
+        include ActionView::Helpers::AssetTagHelper
+      end
     end
   end
 end

data/lib/tasks/requirejs-rails_tasks.rake

@@ -98,12 +98,7 @@ OS X Homebrew users can use 'brew install node'.
       original_cache = requirejs.env.cache
       requirejs.env.cache = nil
 
-      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)
-
+      requirejs.env.each_logical_path(requirejs.config.logical_path_patterns) do |logical_path|
         m = ::Requirejs::Rails::Config::BOWER_PATH_PATTERN.match(logical_path)
 
         if !m
@@ -115,7 +110,7 @@ OS X Homebrew users can use 'brew install node'.
             asset.write_to(file)
           end
         else
-          bower_logical_path = Pathname.new(logical_path).dirname.sub_ext(js_ext).to_s
+          bower_logical_path = Pathname.new(logical_path).dirname.sub_ext(".js").to_s
           asset = requirejs.env.find_asset(bower_logical_path)
 
           if asset
@@ -150,8 +145,17 @@ OS X Homebrew users can use 'brew install node'.
     # Copy each built asset, identified by a named module in the
     # build config, to its Sprockets digestified name.
     task digestify_and_compress: ["requirejs:setup"] do
-      requirejs.config.build_config['modules'].each do |m|
-        asset_name = "#{requirejs.config.module_name_for(m)}.js"
+      requirejs.config.build_config["modules"].each do |m|
+        module_name = requirejs.config.module_name_for(m)
+        paths = requirejs.config.build_config["paths"] || {}
+
+        # Is there a `paths` entry for the module?
+        if !paths[module_name]
+          asset_name = Pathname.new(module_name).sub_ext(".js").to_s
+        else
+          asset_name = Pathname.new(paths[module_name]).sub_ext(".js").to_s
+        end
+
         asset = requirejs.env.find_asset(asset_name)
 
         built_asset_path = requirejs.config.build_dir.join(asset_name)

data/test/requirejs-rails_test.rb

@@ -27,6 +27,12 @@ class RequirejsRailsConfigTest < ActiveSupport::TestCase
     @cfg = Requirejs::Rails::Config.new(Rails.application)
   end
 
+  def asset_allowed?(asset_path)
+    !!@cfg.logical_path_patterns.find do |logical_path_pattern|
+      logical_path_pattern.match(asset_path)
+    end
+  end
+
   test "config accepts known loaders" do
     @cfg.loader = :almond
     assert_equal :almond, @cfg.loader
@@ -39,10 +45,10 @@ class RequirejsRailsConfigTest < ActiveSupport::TestCase
   end
 
   test "matches configured logical assets" do
-    assert_equal true, @cfg.asset_allowed?('foo.js')
-    assert_equal false, @cfg.asset_allowed?('bar.frobnitz')
-    @cfg.logical_path_patterns += [/\.frobnitz$/]
-    assert_equal true, @cfg.asset_allowed?('bar.frobnitz')
+    assert_equal true, asset_allowed?("foo.js")
+    assert_equal false, asset_allowed?("bar.frobnitz")
+    @cfg.logical_path_patterns.push(Regexp.new("\\.frobnitz\\z"))
+    assert_equal true, asset_allowed?("bar.frobnitz")
   end
 
   test "should have a default empty user_config" do
@@ -110,10 +116,10 @@ class RequirejsHelperTest < ActionView::TestCase
     Rails.application.config.requirejs.delete(:build_config)
   end
 
-  def with_cdn
+  def with_cdn(protocol_relative = false)
     Rails.application.config.requirejs.user_config = {
         "paths" => {
-            "jquery" => "http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"
+            "jquery" => "#{ protocol_relative ? '' : 'http:' }//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"
         }
     }
   end
@@ -199,4 +205,13 @@ class RequirejsHelperTest < ActionView::TestCase
       Rails.application.config.assets.digest = saved_digest
     end
   end
+
+  test "requirejs_include_tag with protocol relative CDN asset in paths" do
+    with_cdn(true)
+
+    render text: wrap(requirejs_include_tag)
+
+    assert_select "script:last-of-type",
+                  text: Regexp.new("\\Arequire\\.config\\({.*\"paths\":{.*\"//ajax\\..*\".*}.*}\\);\\z")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: requirejs-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.8
 platform: ruby
 authors:
 - John Whitley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties