lux_assets 0.2.4 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ba2b3c00e281b88fce7778d3625bfb78039d023ad288945a5835b0878721e40
-  data.tar.gz: ca4bf2c15022da0ed16e3662aeb0a6509ff9d76e6d64941a9788f3c51e9e7297
+  metadata.gz: c75902022d21e66908e7e48471de558834e110f4626f9354bc273bd803eddbf0
+  data.tar.gz: ff67b5d01baa0da7d1483aa7d1c03d0257f6e76ec1c99c21fed7c622f3a375ea
 SHA512:
-  metadata.gz: 8bddce098f693c140b676bfaf4d276758ee2d1d90819be1f3ef64d61596336b56390ade0def18cd4c68a5ac465fe84516de66e5d5f8738dc8f343f632c04e0ed
-  data.tar.gz: 628c3d656ac78aae471a951d9ea338bedf7c5b48a697280e1a56929375ab44d9c8221f1eb8d2242365f1774deee63bdec9326af8e4e85c2af538d06aae83ee6b
+  metadata.gz: 89954e9a9b594a6a11ae234b163a01222be0d7f9344d1cbe3ec1d87c801be5b17539ba618d15dcf6f1c2918047a22f4d51ef7f6285ed5164b7bb978e50451ad4
+  data.tar.gz: da9b2a0ca0c94bc94131a24f9075698507ca766fa3cd6f4b4663faec33b20a74d27857c7e9e3ae90859779215bb5e212384fe08abddb886e03b37307f1c1c7ef

data/README.md

@@ -128,15 +128,16 @@ LuxAssets.files(:js, :main)
 LuxAssets.files('js/main')
 LuxAssets.js(:main).files
 
-# compile single asset
+# compile single asset with debug info for dev
 LuxAssets.compile('js/main/index.coffee')
 LuxAssets.compile('css/main/index.scss')
 
-# compile file group
+# compile file group for production
 LuxAssets.js(:main).compile
 LuxAssets.css(:main).compile
+LuxAssets.css(:main).compile
 
-# compile all assets
+# compile all assets for production
 LuxAssets.compile_all do |name, path|
   puts "Compile #{name.green} -> #{path}"
 end

data/lib/lux_assets/asset.rb

@@ -3,9 +3,10 @@
 class LuxAssets::Asset
 
   def initialize ext, name
-    @ext    = ext == :js ? :js : :css
+    raise ArgumentError.new('name not deinfed') if name.empty?
+    @ext    = ext.to_sym == :js ? :js : :css
     @name   = name.to_s
-    @files  = LuxAssets.to_h[ext][@name]
+    @files  = LuxAssets.to_h[@ext][@name]
     @target = "#{@ext}/#{@name}"
   end
 
@@ -26,7 +27,7 @@ class LuxAssets::Asset
       if file.is_a?(Proc)
         @data.push file.call
       else
-        @data.push LuxAssets::Element.new(file).compile
+        @data.push LuxAssets.compile file, production: true
       end
     end
 
@@ -78,7 +79,8 @@ class LuxAssets::Asset
   def compile_js
     save_data @data.join(";\n") do
       # babel fix and minify
-      LuxAssets::Cli.run '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
 
@@ -87,7 +89,7 @@ class LuxAssets::Asset
       tag_public_assets
 
       #autoprefixer
-      LuxAssets::Cli.run './node_modules/.bin/autoprefixer-cli %s' % @asset_path
+      LuxAssets::Cli.run './node_modules/.bin/autoprefixer-cli %s' % @asset_path, message: "Autoprefixer: #{@asset_path}"
     end
   end
 end

data/lib/lux_assets/base.rb

@@ -3,7 +3,7 @@
 module LuxAssets
   extend self
 
-  CONFIG_PATH = Pathname.new ENV.fetch('ASSETS_CONFIG') { './config/assets.rb' }
+  CONFIG_PATH ||= Pathname.new ENV.fetch('ASSETS_CONFIG') { './config/assets.rb' }
 
   ASSET_TYPES ||= {
     js:  ['js', 'coffee', 'ts'],
@@ -76,16 +76,13 @@ module LuxAssets
   # get list of files in the resource
   def files ext, name=nil
     ext, name = ext.split('/', 2) unless name
-    ext = ext.to_sym
-
-    raise ArgumentError.new('name not deinfed') if name.empty?
-
-    to_h[ext][name.to_s]
+    Asset.new(ext, name).files
   end
 
   # compile single asset
-  def compile path
-    LuxAssets::Element.new(path).compile
+  def compile path, opts={}
+    opts[:production] = false if opts[:production].nil?
+    LuxAssets::Element.new(path).send :compile, opts
   end
 
   # compile all assets
@@ -101,7 +98,7 @@ module LuxAssets
     # gzip if needed
     files = Dir['./public/assets/*.css'] + Dir['./public/assets/*.js']
     files.each do |file|
-      LuxAssets::Cli.run 'gzip -k %s' % file unless File.exist?('%s.gz' % file)
+      LuxAssets::Cli.run('gzip -k %s' % file, message: "Gzip: #{file}") unless File.exist?('%s.gz' % file)
     end
 
     # touch all files and reset the timestamp

data/lib/lux_assets/cli.rb

@@ -15,8 +15,8 @@ module LuxAssets::Cli
     puts text
   end
 
-  def run what, cache_file=nil
-    puts what.yellow
+  def run what, opts={}
+    puts (opts[:message] || what).yellow
 
     stdin, stdout, stderr, wait_thread = Open3.popen3(what)
 
@@ -29,8 +29,15 @@ module LuxAssets::Cli
     error = nil if error && error.include?('Rendering Complete, saving .css file...')
 
     if error
-      cache_file.unlink if cache_file && cache_file.exist?
+      puts '--- command '
+      puts what.yellow
+      puts '--- error response'
+      opts[:cache_file].unlink if opts[:cache_file] && opts[:cache_file].exist?
       warn error
+      puts '--- end'
+      false
+    else
+      true
     end
   end
 
@@ -38,17 +45,44 @@ module LuxAssets::Cli
   def monitor
     puts 'Lux assets - looking for file changes'
 
-    files       = LuxAssets.to_h.values.map(&:values).flatten.map { |it| Pathname.new it }
+    list = LuxAssets
+      .to_h
+      .values
+      .map(&:values)
+      .flatten
+      .map { |it| Pathname.new it }
+
+    files = list.inject({}) do |h, file|
+      if file.to_s.end_with?('.scss')
+        # if target file is scss, monitor all child css and scss files
+        h[file.to_s] = Dir['%s/**/*' % file.dirname]
+          .select { |file| file.end_with?('.scss') || file.end_with?('.css') }
+          .map { |it| Pathname.new it }
+
+      else
+        # othervise monitor only target file
+        h[file.to_s] = [file]
+      end
+
+      h
+    end
+
     last_change = Time.now
 
     while true
-      for file in files
-        if file.mtime > last_change
-          last_change = Time.now
-          LuxAssets.compile file.to_s
+      changed = false
+
+      for key, values in files
+        for file in values
+          if file.mtime > last_change
+            changed = true
+            LuxAssets.compile key, force: true
+          end
         end
       end
 
+      last_change = Time.now if changed
+
       sleep 2
     end
   end

data/lib/lux_assets/element.rb

@@ -1,24 +1,17 @@
 # One file that can be scss, js, coffee, ts, etc...
 
 class LuxAssets::Element
+
   def initialize source
     @source = Pathname.new source
-    @cache = Pathname.new './tmp/assets/%s' % source.gsub('/','-')
-  end
 
-  def compile
-    method_name = 'compile_%s' % @source.to_s.split('.').last.downcase
-
-    if respond_to?(method_name, true)
-      cached || send(method_name)
-    else
-      @source.read
-    end
+    source  = source.sub(/^\.\//, '').sub(/^\//, '').gsub('/', '-')
+    source  = '%s-%s' % [@production ? :p : :d, source] if content_type == 'text/css'
+    @cache  = Pathname.new './tmp/assets/%s' % source
   end
 
   def content_type
     @ext ||= @source.to_s.split('.').last.to_sym
-
     [:css, :scss].include?(@ext) ? 'text/css' : 'text/javascript'
   end
 
@@ -26,9 +19,16 @@ class LuxAssets::Element
 
   private
 
-  def production?
-    # if building from Rake then we are compiling for production
-    defined?(Rake) || $0.include?('/lux_assets')
+  # use LuxAsset.compile
+  def compile force:nil, production:nil
+    @production = production || false
+    method_name = 'compile_%s' % @source.to_s.split('.').last.downcase
+
+    if respond_to?(method_name, true)
+      (!force && cached) || send(method_name)
+    else
+      @source.read
+    end
   end
 
   def cached
@@ -37,22 +37,24 @@ class LuxAssets::Element
 
   def compile_coffee
     coffee_path = './node_modules/coffee-script/bin/coffee'
-    coffee_opts = production? ? '-cp' : '-Mcp --no-header'
-
-    LuxAssets::Cli.run "#{coffee_path} #{coffee_opts} '#{@source}' > '#{@cache}'", @cache
+    coffee_opts = @production ? '-cp' : '-Mcp --no-header'
 
-    data = @cache.read
-    data = data.gsub(%r{//#\ssourceURL=[\w\-\.\/]+/app/assets/}, '//# sourceURL=/raw_asset/')
+    if LuxAssets::Cli.run("#{coffee_path} #{coffee_opts} '#{@source}' > '#{@cache}'", cache_file: @cache, message: "Compile Coffee: #{@source}")
+      data = @cache.read
+      data = data.gsub(%r{//#\ssourceURL=[\w\-\.\/]+/app/assets/}, '//# sourceURL=/raw_asset/')
 
-    @cache.write data
+      @cache.write data
 
-    data
+      data
+    else
+      nil
+    end
   end
 
   def compile_scss
     node_sass = './node_modules/node-sass/bin/node-sass'
-    node_opts = production? ? '--output-style compressed' : '--source-comments'
-    LuxAssets::Cli.run "#{node_sass} #{node_opts} '#{@source}' '#{@cache}'", @cache
+    node_opts = @production ? '--output-style compressed' : '--source-comments'
+    LuxAssets::Cli.run "#{node_sass} #{node_opts} '#{@source}' '#{@cache}'", cache_file: @cache, message: "Compile SCSS: #{@source}"
     @cache.read
   end
   alias :compile_sass :compile_scss
@@ -63,7 +65,7 @@ class LuxAssets::Element
   end
 
   def compile_ts
-    LuxAssets::Cli.run "node_modules/typescript/.bin/tsc --outFile '#{@cache}' '#{@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.rb

@@ -13,9 +13,8 @@ require_relative './lux_assets/manifest'
 
 # lux framework bindings
 if defined?(Lux)
+  require_relative './vendor/lux/misc'
   require_relative './vendor/lux/assets_helper'
-  require_relative './vendor/lux/assets_plugin'
-  require_relative './vendor/lux/assets_routes'
 end
 
 # rake bindings

data/lib/vendor/lux/{assets_routes.rb → misc.rb}

@@ -31,3 +31,28 @@ Lux.app.before do
     body file.exist? ? file.read : "error: File not found"
   end
 end
+
+# additional info for "lux config" cli
+Lux::Config.info do
+  puts
+  puts 'assets:'
+  for ext in LuxAssets.to_h.keys
+    for key, value in LuxAssets.to_h[ext]
+      name = '  LuxAsset.%s(:%s)' % [ext, key]
+      print name.ljust(35)
+      puts ' - %s' % value.length.pluralize(:file)
+    end
+  end
+end
+
+# include files from a plugin
+module LuxAssets
+  def plugin name
+    # load pluigin if needed
+    Lux.plugin name
+
+    plugin = Lux.plugin.get name
+    add '%s/**' % plugin[:folder]
+  end
+end
+

data/tmp/assets/d-spec-assets-css-test.css

@@ -0,0 +1 @@
+body p{color:blue}

data/tmp/assets/d-spec-assets-css-test.scss

@@ -0,0 +1,10 @@
+/* line 2, spec/assets/css/test.scss */
+body p {
+  color: red; }
+
+/* line 3, spec/assets/css/test.scss */
+body div {
+  display: grid;
+  transition: all .5s;
+  user-select: none;
+  background: linear-gradient(to bottom, white, black); }

data/tmp/assets/spec-assets-js-test.coffee

@@ -0,0 +1,7 @@
+(function() {
+  alert(123);
+
+}).call(this);
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIuLi8uLi8uLiIsInNvdXJjZXMiOlsic3BlYy9hc3NldHMvanMvdGVzdC5jb2ZmZWUiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7RUFBQSxLQUFBLENBQU0sR0FBTjtBQUFBIiwic291cmNlc0NvbnRlbnQiOlsiYWxlcnQgMTIzXG5cbiJdfQ==
+//# sourceURL=/Users/dux/dev/apps/my/gems/lux_assets/spec/assets/js/test.coffee

data/tmp/assets/spec-assets-js-test.ts

@@ -0,0 +1,5 @@
+function greeter(person) {
+    return "Hello, " + person.firstName + " " + person.lastName;
+}
+var user = { firstName: "Jane", lastName: "User" };
+document.body.innerHTML = greeter(user);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lux_assets
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.9
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-03 00:00:00.000000000 Z
+date: 2018-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -70,8 +70,7 @@ files:
 - "./lib/lux_assets/element.rb"
 - "./lib/lux_assets/manifest.rb"
 - "./lib/vendor/lux/assets_helper.rb"
-- "./lib/vendor/lux/assets_plugin.rb"
-- "./lib/vendor/lux/assets_routes.rb"
+- "./lib/vendor/lux/misc.rb"
 - "./lib/vendor/tasks.rb"
 - "./misc/assets.rb"
 - "./node_modules/abbrev/LICENSE"
@@ -7356,7 +7355,6 @@ files:
 - "./node_modules/yargs/package.json"
 - "./node_modules/yargs/yargs.js"
 - "./package.json"
-- "./public/manifest.json"
 - "./spec/assets/assets.rb"
 - "./spec/assets/css/test.css"
 - "./spec/assets/css/test.scss"
@@ -7365,6 +7363,10 @@ files:
 - "./spec/assets/js/test.ts"
 - "./spec/spec_helper.rb"
 - "./spec/tests/common_spec.rb"
+- "./tmp/assets/d-spec-assets-css-test.css"
+- "./tmp/assets/d-spec-assets-css-test.scss"
+- "./tmp/assets/spec-assets-js-test.coffee"
+- "./tmp/assets/spec-assets-js-test.ts"
 - "./yarn.lock"
 - bin/lux_assets
 homepage: https://github.com/dux/lux_assets

data/lib/vendor/lux/assets_plugin.rb

@@ -1,13 +0,0 @@
-module LuxAssets
-
-  # include files from a plugin
-  def plugin name
-    # load pluigin if needed
-    Lux.plugin name
-
-    plugin = Lux.plugin.get name
-    add '%s/**' % plugin[:folder]
-  end
-
-end
-

data/public/manifest.json

@@ -1 +0,0 @@
-{"files":{}}