lux_assets 0.2.15 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a981569c1fe2a2bf9f9fb8caf7a73a5987af1e21d06f5ba9e5b29ad27f8931f
-  data.tar.gz: 6cf4469a3657a33b722248803a46ef1e0ab224ca34db7bd45ddfcd6c60534b81
+  metadata.gz: 26be1a6eda380c7ac142aa001e3075dd57379f1d63e2e121fdddc074e7669a6d
+  data.tar.gz: c45fb60c37bfc1495c346235f2ee04d3c0d32219ebd208708bc2b271fff32b3c
 SHA512:
-  metadata.gz: c0b1dd8f817de916961284e73021e610904a3fda24cf5286d58c2723ac7f1ab347442f5e2362971b1ae4baf296a8ef64310065b19711ba374ce8abb60d8c58dd
-  data.tar.gz: d01039bc7edcd6f038ac6fbd4f9d98fbe9fdc73c16470edd00cd2633dedec96e4372b91da1dd3b3d9b16e350841b3d7fb2e97292f70d6f49a3e18059c8cb4f35
+  metadata.gz: bb6c626705f2df785dc82f515eba8468dbf5f8fce1393079e7da2b070b643d6e4ae3dfe4910b2eaa43f6d952e67ed2fad9cd81dc1ad253ed9066157627b91724
+  data.tar.gz: 11eaa505bbcd8eece08353e8f0b7efbcc916dc8ef0eeeed7c0d62b6bb0462d03b8b1a571e520704ebeb324f64bd183df7864d761c87612d955cb933566cb256c

data/.version

@@ -1 +1 @@
-0.2.15
+0.2.19

data/lib/lux_assets/asset.rb

@@ -81,7 +81,7 @@ class LuxAssets::Asset
   def compile_js
     save_data @data.join(";\n") do
       # babel fix and minify
-      command = 'node_modules/babel-cli/.bin/babel --minified --no-comments --compact true -o "%{file}" "%{file}"' % { file: @asset_path }
+      command = './node_modules/babel-cli/.bin/babel --minified --no-comments --compact true -o "%{file}" "%{file}"' % { file: @asset_path }
       LuxAssets::Cli.run command, message: "Babel filter and minify: #{@asset_path}"
     end
   end

data/lib/lux_assets/base.rb

@@ -104,6 +104,9 @@ module LuxAssets
     # touch all files and reset the timestamp
     Dir['./public/assets/*']
       .each { |file| system 'touch -t 201001010101 %s' % file }
+
+    # add integirty checks
+    LuxAssets::Manifest.update_integrity
   end
 
   # get all files as a hash

data/lib/lux_assets/element.rb

@@ -76,7 +76,7 @@ class LuxAssets::Element
   end
 
   def compile_ts
-    LuxAssets::Cli.run "node_modules/typescript/.bin/tsc --outFile '#{@cache}' '#{@source}'", cache_file: @cache, message: "Compile TypeScript: #{@source}"
+    LuxAssets::Cli.run "./node_modules/typescript/.bin/tsc --outFile '#{@cache}' '#{@source}'", cache_file: @cache, message: "Compile TypeScript: #{@source}"
   end
 
 end

data/lib/lux_assets/manifest.rb

@@ -1,25 +1,37 @@
 # manifest file
 
 module LuxAssets::Manifest
-  MANIFEST = Pathname.new(ENV.fetch('ASSETS_MANIFEST') { './public/manifest.json' })
-  MANIFEST.write '{"files":{}}' unless MANIFEST.exist?
+  INTEGRITY = 'sha512'
+  MANIFEST  = Pathname.new(ENV.fetch('ASSETS_MANIFEST') { './public/manifest.json' })
+  MANIFEST.write '{"files":{},"integrity":{}}' unless MANIFEST.exist?
 
   extend self
 
   def add name, path
-    json = JSON.load MANIFEST.read
-
     unless json['files'][name] == path
-      json['files'][name] = path
-      MANIFEST.write JSON.pretty_generate(json)
+      json['files'][name]     = path
+      write
     end
 
     !File.exist?('./public'+path)
   end
 
-  def get name
-    json = JSON.load MANIFEST.read
-    json['files'][name]
+  def update_integrity
+    for name, path in json['files']
+      json['integrity'][name] = '%s-%s' % [INTEGRITY, `openssl dgst -#{INTEGRITY} -binary ./public#{path} | openssl base64 -A`.chomp]
+    end
+
+    write
+  end
+
+  private
+
+  def json
+    @json ||= JSON.load MANIFEST.read
+  end
+
+  def write
+    MANIFEST.write JSON.pretty_generate(@json)
   end
 end
 

data/lib/vendor/lux/assets_helper.rb

@@ -5,16 +5,25 @@ module HtmlHelper
   def asset_include path, opts={}
     raise ArgumentError.new("Asset path can't be empty") if path.empty?
 
-    ext  = path.split('?').first.split('.').last
-    type = ['css', 'sass', 'scss'].include?(ext) ? :style : :script
-    type = :style if path.include?('fonts.googleapis.com')
+    ext   = path.split('?').first.split('.').last
+    type  = ['css', 'sass', 'scss'].include?(ext) ? :style : :script
+    type  = :style if path.include?('fonts.googleapis.com')
 
     current.response.early_hints path, type
 
+    data = {}
+
+    data[:crossorigin] = opts[:crossorigin] || :anonymous
+    data[:integrity]   = opts[:integrity] if opts[:integrity]
+
     if type == :style
-      %[<link rel="stylesheet" href="#{path}" />]
+      data[:media] = opts[:media] || :all
+      data[:rel]   = :stylesheet
+      data[:href]  = path
+      data.tag :link
     else
-      %[<script src="#{path}"></script>]
+      data[:src] = path
+      data.tag :script
     end
   end
 
@@ -55,6 +64,7 @@ module HtmlHelper
 
         nil
       else
+        opts[:integrity] = manifest['integrity'][file]
         return asset_include(Lux.config.assets_root.to_s + mfile, opts)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lux_assets
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.19
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize