sprockets-helpers 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb9ec997921585c4bd0ef6818de7e925be9495dafbcfd10a199bee5475801a32
-  data.tar.gz: 9a48688a2b80d12d47f5a5f8940b513bd542d0a218472bd4f9741104560e2392
+  metadata.gz: 91a536e9415ef30fb8bc7e40401a72d0874b9a7df7bbc377934f1a69459860d7
+  data.tar.gz: 15ef2327c79b8bb7e8e92fd1a31516c2fa94c58d2918bc7459dab0351e11b158
 SHA512:
-  metadata.gz: fb10f54a0d1905245a75687838d827784cb5804b6579d30007e03851d06c6821e2c87c274b019a1cffe8ad29e862bd42a9a642d665cd991c78bbe293c4a1bc7e
-  data.tar.gz: fbd9955d3e219fcda0d213957591bf39cf7c6f8da05e5d25e523cbcee60f41b5efcb000c13d0a69bd03ff1f7b71f7b1a68b342db098c88b091bfdbcb641a5731
+  metadata.gz: f345f8b35a2251db14f02f0c1fc6e1bafc9eace650761b80a675374810f65a697db7ef710b1a129422df9a0c1fe22b78685c810b44119953543be50b39f186ba
+  data.tar.gz: a8cc249ea9d27ac7160c73d07ad8f39fcad25a66a2f8cb1187d39a2898dde5a7c1a8205cff4050369014d9e9064d076c21fc8d7b47f9ae97ab8431f4ac0d825b

data/Appraisals

@@ -40,4 +40,8 @@ end
 
 appraise 'sprockets-3.2' do
   gem 'sprockets', '~> 3.2.0'
-end
+end
+
+appraise 'sprockets-4.0' do
+  gem 'sprockets', '~> 4.0.0'
+end

data/gemfiles/sprockets_2.2.gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "sprockets", "~> 2.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/sprockets_2.3.gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "sprockets", "~> 2.3.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/sprockets_2.4.gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "sprockets", "~> 2.4.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/sprockets_2.5.gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "sprockets", "~> 2.5.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/sprockets_2.6.gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "sprockets", "~> 2.6.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/sprockets_2.7.gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "sprockets", "~> 2.7.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/sprockets_2.8.gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "sprockets", "~> 2.8.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/sprockets_2.9.gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "sprockets", "~> 2.9.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/sprockets_3.0.gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "sprockets", "~> 3.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/sprockets_3.1.gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "sprockets", "~> 3.1.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/sprockets_3.2.gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 
 gem "sprockets", "~> 3.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/sprockets_4.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "sprockets", "~> 4.0.0"
+
+gemspec path: "../"

data/lib/sprockets/helpers.rb

@@ -345,16 +345,16 @@ module Sprockets
       end
 
       if Sprockets::Helpers.are_using_sprockets_3
-        resolved = assets_environment.resolve(uri.path)
+        resolved, _ = assets_environment.resolve(uri.path)
 
         if resolved
-          return Helpers::AssetPath.new(uri, assets_environment[uri.path], options)
+          return Helpers::AssetPath.new(uri, assets_environment[uri.path], assets_environment, options)
         else
           return Helpers::FilePath.new(uri, options)
         end
       else
         assets_environment.resolve(uri.path) do |path|
-          return Helpers::AssetPath.new(uri, assets_environment[path], options)
+          return Helpers::AssetPath.new(uri, assets_environment[path], assets_environment, options)
         end
 
         return Helpers::FilePath.new(uri, options)

data/lib/sprockets/helpers/asset_path.rb

@@ -3,9 +3,10 @@ module Sprockets
     # `AssetPath` generates a full path for an asset
     # that exists in Sprockets environment.
     class AssetPath < BasePath
-      def initialize(uri, asset, options = {})
+      def initialize(uri, asset, environment, options = {})
         @uri = uri
         @asset = asset
+        @environment = environment
         @options = {
           :body => false,
           :digest => Helpers.digest,
@@ -16,8 +17,16 @@ module Sprockets
       end
 
       def to_a
-        @asset.to_a.map do |dependency|
-          AssetPath.new(@uri.clone, dependency, @options.merge(:body => true)).to_s
+        if @asset.respond_to?(:to_a)
+          @asset.to_a.map do |dependency|
+            AssetPath.new(@uri.clone, dependency, @environment, @options.merge(:body => true)).to_s
+          end
+        elsif @asset.metadata[:included]
+          @asset.metadata[:included].map do |uri|
+            AssetPath.new(@uri.clone, @environment.load(uri), @environment, @options.merge(:body => true)).to_s
+          end
+        else
+          AssetPath.new(@uri.clone, @asset, @environment, @options.merge(:body => true)).to_s
         end
       end
 

data/lib/sprockets/helpers/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Sprockets
   module Helpers
-    VERSION = '1.2.3'.freeze
+    VERSION = '1.3.0'
   end
 end

data/spec/sprockets-helpers_spec.rb

@@ -536,15 +536,15 @@ describe Sprockets::Helpers do
 
   describe '#javascript_tag' do
     it 'generates script tag' do
-      expect(context.javascript_tag('/main.js')).to eq('<script src="/main.js"></script>')
+      expect(context.javascript_tag('/main.js')).to eq('<script src="/main.js" type="text/javascript"></script>')
     end
 
     it 'appends extension' do
-      expect(context.javascript_tag('/main')).to eq('<script src="/main.js"></script>')
+      expect(context.javascript_tag('/main')).to eq('<script src="/main.js" type="text/javascript"></script>')
     end
 
     it 'prepends the javascript dir' do
-      expect(context.javascript_tag('main')).to eq('<script src="/javascripts/main.js"></script>')
+      expect(context.javascript_tag('main')).to eq('<script src="/javascripts/main.js" type="text/javascript"></script>')
     end
 
     describe 'when expanding' do
@@ -554,9 +554,9 @@ describe Sprockets::Helpers do
           within_construct do |construct|
             assets_layout(construct)
             tags = context.javascript_tag('main.js', :expand => true)
-            expect(tags).to include('<script src="/assets/main.self.js?body=1"></script>')
-            expect(tags).to include('<script src="/assets/a.self.js?body=1"></script>')
-            expect(tags).to include('<script src="/assets/b.self.js?body=1"></script>')
+            expect(tags).to include('<script src="/assets/main.self.js?body=1" type="text/javascript"></script>')
+            expect(tags).to include('<script src="/assets/a.self.js?body=1" type="text/javascript"></script>')
+            expect(tags).to include('<script src="/assets/b.self.js?body=1" type="text/javascript"></script>')
           end
         end
       end
@@ -568,9 +568,9 @@ describe Sprockets::Helpers do
             assets_layout(construct)
             tags = context.javascript_tag('main.js', :expand => true)
 
-            expect(tags).to include('<script src="/assets/main.js?body=1"></script>')
-            expect(tags).to include('<script src="/assets/a.js?body=1"></script>')
-            expect(tags).to include('<script src="/assets/b.js?body=1"></script>')
+            expect(tags).to include('<script src="/assets/main.js?body=1" type="text/javascript"></script>')
+            expect(tags).to include('<script src="/assets/a.js?body=1" type="text/javascript"></script>')
+            expect(tags).to include('<script src="/assets/b.js?body=1" type="text/javascript"></script>')
           end
         end
       end
@@ -579,19 +579,19 @@ describe Sprockets::Helpers do
 
   describe '#stylesheet_tag' do
     it 'generates stylesheet tag' do
-      expect(context.stylesheet_tag('/main.css')).to eq('<link rel="stylesheet" href="/main.css">')
+      expect(context.stylesheet_tag('/main.css')).to eq('<link rel="stylesheet" type="text/css" href="/main.css">')
     end
 
     it 'appends extension' do
-      expect(context.stylesheet_tag('/main')).to eq('<link rel="stylesheet" href="/main.css">')
+      expect(context.stylesheet_tag('/main')).to eq('<link rel="stylesheet" type="text/css" href="/main.css">')
     end
 
     it 'prepends the stylesheets dir' do
-      expect(context.stylesheet_tag('main')).to eq('<link rel="stylesheet" href="/stylesheets/main.css">')
+      expect(context.stylesheet_tag('main')).to eq('<link rel="stylesheet" type="text/css" href="/stylesheets/main.css">')
     end
 
     it 'uses media attribute when provided' do
-      expect(context.stylesheet_tag('main', :media => "print")).to eq('<link rel="stylesheet" href="/stylesheets/main.css" media="print">')
+      expect(context.stylesheet_tag('main', :media => "print")).to eq('<link rel="stylesheet" type="text/css" href="/stylesheets/main.css" media="print">')
     end
 
     describe 'when expanding' do
@@ -601,9 +601,9 @@ describe Sprockets::Helpers do
           within_construct do |construct|
             assets_layout(construct)
             tags = context.stylesheet_tag('main.css', :expand => true)
-            expect(tags).to include('<link rel="stylesheet" href="/assets/main.self.css?body=1">')
-            expect(tags).to include('<link rel="stylesheet" href="/assets/a.self.css?body=1">')
-            expect(tags).to include('<link rel="stylesheet" href="/assets/b.self.css?body=1">')
+            expect(tags).to include('<link rel="stylesheet" type="text/css" href="/assets/main.self.css?body=1">')
+            expect(tags).to include('<link rel="stylesheet" type="text/css" href="/assets/a.self.css?body=1">')
+            expect(tags).to include('<link rel="stylesheet" type="text/css" href="/assets/b.self.css?body=1">')
           end
         end
       end
@@ -614,9 +614,9 @@ describe Sprockets::Helpers do
           within_construct do |construct|
             assets_layout(construct)
             tags = context.stylesheet_tag('main.css', :expand => true)
-            expect(tags).to include('<link rel="stylesheet" href="/assets/main.css?body=1">')
-            expect(tags).to include('<link rel="stylesheet" href="/assets/a.css?body=1">')
-            expect(tags).to include('<link rel="stylesheet" href="/assets/b.css?body=1">')
+            expect(tags).to include('<link rel="stylesheet" type="text/css" href="/assets/main.css?body=1">')
+            expect(tags).to include('<link rel="stylesheet" type="text/css" href="/assets/a.css?body=1">')
+            expect(tags).to include('<link rel="stylesheet" type="text/css" href="/assets/b.css?body=1">')
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-helpers
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Pete Browne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -120,6 +120,7 @@ files:
 - gemfiles/sprockets_3.0.gemfile
 - gemfiles/sprockets_3.1.gemfile
 - gemfiles/sprockets_3.2.gemfile
+- gemfiles/sprockets_4.0.gemfile
 - lib/sinatra/sprockets-helpers.rb
 - lib/sinatra/sprockets/helpers.rb
 - lib/sprockets-helpers.rb