lux_assets 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 326121204a7766f50347a2c3845f5b98139654e10832a7419dafa302692c3517
-  data.tar.gz: f6a7777517af7ae4f45402b229de989d092cd7b473add2d85cc1449662b76234
+  metadata.gz: 881393b401a0889dc9f796b8188981bd46a32fdeecd24331b1968d7b800e73d4
+  data.tar.gz: af21cd349f444ecac98faf88ed2bba53a9a20bd80c3292093ee7828d07dd84b0
 SHA512:
-  metadata.gz: 4220d292427da679d9072f46794b5dba50b4df8f8ff682e684e19de27e8992524472fb6f0abefcbb30f7a44f9a1a889f5053493d5e0fe067d058941e489fa18f
-  data.tar.gz: b1e8fdfe12465a654325fd2dc31615ab11188543a52c02963bdd0dc562753b1a6bc4a4d2025378593b9a4dcc0e2c24b0de765fb35eecfbb81379d395382bd610
+  metadata.gz: c0215e85dc0f841a4598ab95ab76f159a39c2a34a0fdbca5e97891b9bec3c9c245d7dbd40e507f5019ae16d2a6f84e4b38dbec91a3d3bbf3fbc80fee81531e62
+  data.tar.gz: 5895c5a63c3a2b6f9ab556c3d1345983a7bfb05aa4dfbe0b98d67d64d67c3729af3b481a26b5402bd122f93b7c59c8b84c06874f99a12ec55bea394cd94afd1b

data/README.md

@@ -10,6 +10,19 @@ Lightweight web assets packer that loves simplicity.
 * autoprefixer, minify, gzip the output
 * add rake tasks
 
+Assets pipeline
+
+* get list of files or data
+* compile every file individually and join the result to single file
+* css specific
+  * scan css source and put sh1 data stamp to files found in ./public dir
+  * autoprefixer
+* js specific
+  * babel
+* minify
+* sha1 prefix, gzip, add to manifest
+
+
 ## Instalation
 
 Add `lux_assets` gem to `Gemfile` and then `bundle install`

data/bin/lux_assets

@@ -4,11 +4,25 @@ require 'thor'
 require 'colorize'
 require 'awesome_print'
 
-require_relative '../lib/lux_assets'
+###
+
+if ARGV[0]
+  if File.exist?('./config/application.rb')
+    require './config/application.rb'
+  end
+
+  if !defined?(LuxAssets) && File.exist?('./config/environment.rb')
+    require './config/environment.rb'
+  end
+
+  if !defined?(LuxAssets)
+    require_relative '../lib/lux_assets'
+  end
+end
 
 ###
 
-module Cli
+module ::Cli
   extend self
 
   def run what

data/lib/lux_assets/asset.rb

@@ -1,7 +1,6 @@
 # Asset group, single asset that produces target css or js
 
 class LuxAssets::Asset
-  PUBLIC_ASSETS = './public/assets'
 
   def initialize ext, name
     @ext    = ext == :js ? :js : :css
@@ -44,12 +43,31 @@ class LuxAssets::Asset
 
   private
 
+  # add sha1 tag to referenced files in css
+  def tag_public_assets
+    data = @asset_path.read
+    data = data.gsub(/url\(([^\)]+)\)/) do
+      if $1.include?('data:') || $1.include?('#') || $1.include?('?')
+        'url(%s)' % $1
+      else
+        path = $1.gsub(/^['"]|['"]$/, '')
+        path = path[0,1] == '/' ? Pathname.new('./public%s' % path) : Pathname.new('./public/assets').join(path)
+
+        LuxAssets.die 'Resource "%s" referenced in "%s/%s" but not found' % [path, @ext, @name] unless path.exist?
+
+        'url("%s?%s")' % [path.to_s.sub('./public', ''), Digest::SHA1.hexdigest(path.read)[0, 6]]
+      end
+    end
+
+    @asset_path.write data
+  end
+
   def save_data data
     @asset_file = '/assets/%s' % (@target.sub('/', '-') + '-' + Digest::SHA1.hexdigest(data) + '.' + @ext.to_s)
-    @asset_path = "./public#{@asset_file}"
+    @asset_path = Pathname.new "./public#{@asset_file}"
 
     if LuxAssets::Manifest.add(@target, @asset_file)
-      File.write(@asset_path, data)
+      @asset_path.write data
       yield
     end
   end
@@ -63,6 +81,8 @@ class LuxAssets::Asset
 
   def compile_css
     save_data @data.join($/) do
+      tag_public_assets
+
       #autoprefixer
       LuxAssets.run './node_modules/.bin/autoprefixer-cli %s' % @asset_path
     end

data/lib/lux_assets/base.rb

@@ -1,24 +1,4 @@
-# LuxAssets.configure do
-#   asset :admin do
-#     js do
-#       add 'js/admin/js_vendor/*'
-#       add 'js/admin/js/*'
-#       add 'js/shared/*'
-#       add 'js/admin/index.coffee'
-#     end
-#     css do
-#       add 'css/admin/index.scss'
-#     end
-#   end
-# end
-# ...
-
-# LuxAssets.css('admin').files
-# LuxAssets.css(:admin).compile
-
-# LuxAssets.css(:admin).compile_all do |name, path|
-#   puts "Compile #{name} -> #{path}"
-# end
+# Main assets module
 
 module LuxAssets
   extend self
@@ -39,7 +19,7 @@ module LuxAssets
   end
 
   def die text
-    puts text
+    puts text.try(:red)
     exit
   end
 
@@ -108,10 +88,12 @@ module LuxAssets
     to_h[ext][name.to_s]
   end
 
+  # compile single asset
   def compile path
     LuxAssets::Element.new(path).compile
   end
 
+  # compile all assets
   def compile_all
     # generate master file for every resource
     for ext in [:js, :css]
@@ -127,11 +109,12 @@ module LuxAssets
       LuxAssets.run 'gzip -k %s' % file unless File.exist?('%s.gz' % file)
     end
 
-    # touch all files reset timestamp
+    # touch all files and reset the timestamp
     Dir['./public/assets/*']
       .each { |file| system 'touch -t 201001010101 %s' % file }
   end
 
+  # get all files as a hash
   def to_h
     unless @assets_loaded
       die 'Assets file not found in %s' % CONFIG_PATH unless CONFIG_PATH.exist?
@@ -149,13 +132,21 @@ module LuxAssets
       puts ext.to_s.upcase.green
       value_hash.each do |key, files|
         puts '  %s' % key.green
+
+        total = 0
+
         files.each_with_index do |file, i|
           if File.exist?(file)
-            puts '  %s kb - %s' % [(File.size(file)/1024.to_f).round(1).to_s.rjust(6), file]
+            size  = File.size(file)
+            total += size
+            puts '  %s kB - %s' % [(size/1024.to_f).round(1).to_s.rjust(6), file]
           else
             puts '  %s' % file
           end
         end
+
+        total = '%s kB in total' % (total/1024.to_f).round(1).to_s
+        puts total.rjust(20)
       end
     end
   end

data/lib/lux_assets/element.rb

@@ -27,7 +27,7 @@ class LuxAssets::Element
 
   def production?
     # if building from Rake then we are compiling for production
-    ENV['LUX_ASSETS_ENV'] == 'production' || defined?(Rake)
+    defined?(Rake) || $0.include?('/lux_assets')
   end
 
   def cached
@@ -55,6 +55,7 @@ class LuxAssets::Element
     @cache.read
   end
   alias :compile_sass :compile_scss
+  alias :compile_css :compile_sass
 
   def compile_js
     ";\n%s\n;" % @source.read

data/lib/vendor/lux/assets_helper.rb

@@ -24,38 +24,52 @@ module HtmlHelper
   def asset file, opts={}
     opts = { dev_file: opts } unless opts.class == Hash
 
-    # return joined assets if symbol given
-    # = asset :main -> asset("css/main") + asset("js/main")
-    return [asset("css/#{file}"), asset("js/#{file}")].join($/) if
-      file.is_a?(Symbol)
+    if Lux.config(:compile_assets)
+      # return second link if it is defined and we are in dev mode
+      return asset_include opts[:dev_file] if opts[:dev_file]
 
-    # return second link if it is defined and we are in dev mode
-    return asset_include opts[:dev_file] if opts[:dev_file] && Lux.config(:compile_assets)
+      # return internet links
+      return asset_include file if file.starts_with?('/') || file.starts_with?('http')
 
-    # return internet links
-    return asset_include file if file.starts_with?('/') || file.starts_with?('http')
+      # try to create list of incuded files and show every one of them
+      files = LuxAssets.files(file) || []
+      data = files.inject([]) do |total, asset|
+        if asset.is_a?(Proc)
+          tag_name = file.include?('css') ? :style : :script
+          total.push({}.tag tag_name, asset.call)
+        else
+          total.push asset_include '/compiled_asset/' + asset
+        end
+      end
 
-    # return asset link in production or fail unless able
-    unless Lux.config(:compile_assets)
+      data.map{ |it| it.sub(/^\s\s/,'') }.join("\n")
+    else
+      # return asset link in production or fail unless able
       manifest = Lux.ram_cache('asset-manifest') { JSON.load Lux.root.join('public/manifest.json').read }
       mfile    = manifest['files'][file]
 
-      raise 'Compiled asset link for "%s" not found in manifest.json' % file if mfile.empty?
-
-      return asset_include(Lux.config.assets_root.to_s + mfile, opts)
-    end
+      if mfile.empty?
+        unless opts[:raise].is_a?(FalseClass)
+          raise 'Compiled asset link for "%s" not found in manifest.json' % file
+        end
 
-    # try to create list of incuded files and show every one of them
-    data = LuxAssets.files(file).inject([]) do |total, asset|
-      if asset.is_a?(Proc)
-        tag_name = file.include?('css') ? :style : :script
-        total.push({}.tag tag_name, asset.call)
+        nil
       else
-        total.push asset_include '/compiled_asset/' + asset
+        return asset_include(Lux.config.assets_root.to_s + mfile, opts)
       end
     end
+  end
 
-    data.map{ |it| it.sub(/^\s\s/,'') }.join("\n")
+  # assets :vendor, :main
+  def assets *args
+    total = []
+    [:css, :js].each do |ext|
+      args.map do |group|
+        data = asset("#{ext}/#{group}", raise: false)
+        total.push data if data.present?
+      end
+    end
+    total.join($/)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lux_assets
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -7361,7 +7361,6 @@ files:
 - "./spec/assets/js/test.coffee"
 - "./spec/assets/js/test.js"
 - "./spec/assets/js/test.ts"
-- "./spec/assets/manifest.json"
 - "./spec/spec_helper.rb"
 - "./spec/tests/common_spec.rb"
 - "./yarn.lock"

data/spec/assets/manifest.json

@@ -1,8 +0,0 @@
-{
-  "files": {
-    "js/single": "/assets/js-single-ea42d35142da2d7b861554a0c5d5d64df3cf6b93.js",
-    "js/group": "/assets/js-group-ac69fcfec4e7bc02358a6f955a84ebaa26ed6f78.js",
-    "css/single": "/assets/css-single-59df6f7bb525125eabc5cda767393b6ce09ea1bc.css",
-    "css/group": "/assets/css-group-59df6f7bb525125eabc5cda767393b6ce09ea1bc.css"
-  }
-}