condenser 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f7cb2dd9c6e43ea920ba29780558c323e19f3ca08bca6f157785a9124b4f748
-  data.tar.gz: 96b7d4a78635364ae9d17b43998730c93d995a073449cc22156e016fbbe1d786
+  metadata.gz: 4e7abbeccce903c2ecbdf3f01c0c8165a3d21f9a38181f65e761a1e80d4dcf04
+  data.tar.gz: 713104a8b2287eb00fc1e468d64febb6186f308bd5fa8b600a1f6cca03f6d23c
 SHA512:
-  metadata.gz: f6fe1d243c00d909e2c6c9eea7882d3b26fd26c60e648462d29b6457fbbc50296bdcf50431c31a60d6db2b950337b6f3dfe14fa47589eca381f19b447bd6e23b
-  data.tar.gz: 210d1b985883ac183f68d3c7bf749c353366c89180032d1b419ce02b0c2f7306637271e630f3d0c843600abde48eb3bc5b34f566caee165c7efff8294d9f6b98
+  metadata.gz: 531495f24e6469440b908b30416b18ac7abad35aaabc1f0a714013879e3b76803ea543120f5d21484498684868e43a740c1f84382e498e45c69891061bbada4b
+  data.tar.gz: 2a2253ef0137a4540c486081f37a5a031f85dc2fa902e8577a68dee2dd824098f87ad51edb3a3a512dd3b6e558755e28652a53f15f6a7741c996db67d91c66b2

data/lib/condenser.rb

@@ -13,25 +13,53 @@ require 'condenser/manifest'
 
 
 class Condenser
-  include Environment, Pipeline, Resolve
   
+  prepend Environment, Pipeline, Resolve
+  
+  autoload :BabelProcessor,   'condenser/processors/rollup_processor'
+  autoload :RollupProcessor,  'condenser/processors/babel_processor'
+  autoload :UglifyMinifier,   'condenser/minifiers/uglify_minifier'
+  autoload :Erubi,            'condenser/templating_engine/erb'
+  autoload :SassMinifier,     'condenser/minifiers/sass_minifier'
+  autoload :SassTransformer,  'condenser/transformers/sass_transformer'
+  autoload :ScssTransformer,  'condenser/transformers/sass_transformer'
+  autoload :EjsTransformer,   'condenser/transformers/ejs'
+  autoload :FileWriter,       'condenser/writers/file_writer'
+  autoload :ZlibWriter,       'condenser/writers/zlib_writer'
+
   def self.configure(&block)
     instance_eval(&block)
   end
   
-  attr_reader :logger
-  attr_accessor :digestor
+  attr_accessor :logger, :digestor
   
-  def initialize(*path, digestor: nil, cache: nil)
-    super()
-    @logger = Logger.new($stderr, level: :warn)
+  def initialize(*path, logger: nil, digestor: nil, cache: nil, pipeline: nil, &block)
+    @logger = logger || Logger.new($stdout, level: :info)
     @path = []
     @npm_path = nil
     append_path(path)
-    append_path(EJS::ASSET_DIR)
     @cache = cache || Cache::MemoryStore.new
     @build_cc = 0
     self.digestor = digestor || Digest::SHA256
+
+    if block
+      configure(&block)
+    elsif pipeline != false
+      self.configure do
+        register_preprocessor 'application/javascript', Condenser::BabelProcessor
+        register_exporter     'application/javascript', Condenser::RollupProcessor
+        register_minifier     'application/javascript', Condenser::UglifyMinifier
+      
+        register_minifier  'text/css', Condenser::SassMinifier
+      
+        register_writer Condenser::FileWriter.new
+        register_writer Condenser::ZlibWriter.new
+      end
+    end
+  end
+  
+  def configure(&block)
+    instance_eval(&block)
   end
 end
 
@@ -55,27 +83,27 @@ Condenser.configure do
   register_mime_type 'image/svg+xml',     extension: '.svg'
 
   # Common audio/video types
-  register_mime_type 'video/webm', extensions: ['.webm']
-  register_mime_type 'audio/basic', extensions: ['.snd', '.au']
-  register_mime_type 'audio/aiff', extensions: ['.aiff']
-  register_mime_type 'audio/mpeg', extensions: ['.mp3', '.mp2', '.m2a', '.m3a']
-  register_mime_type 'application/ogg', extensions: ['.ogx']
-  register_mime_type 'audio/ogg', extensions: ['.ogg', '.oga']
-  register_mime_type 'audio/midi', extensions: ['.midi', '.mid']
-  register_mime_type 'video/avi', extensions: ['.avi']
-  register_mime_type 'audio/wave', extensions: ['.wav', '.wave']
-  register_mime_type 'video/mp4', extensions: ['.mp4', '.m4v']
-  register_mime_type 'audio/aac', extensions: ['.aac']
-  register_mime_type 'audio/mp4', extensions: ['.m4a']
-  register_mime_type 'audio/flac', extensions: ['.flac']
-  register_mime_type 'video/quicktime', extensions: ['.mov']
+  register_mime_type 'video/webm',      extensions: %w(.webm')
+  register_mime_type 'audio/basic',     extensions: %w(.snd .au)
+  register_mime_type 'audio/aiff',      extensions: %w(.aiff)
+  register_mime_type 'audio/mpeg',      extensions: %w(.mp3 .mp2 .m2a .m3a)
+  register_mime_type 'application/ogg', extensions: %w(.ogx)
+  register_mime_type 'audio/ogg',       extensions: %w(.ogg .oga)
+  register_mime_type 'audio/midi',      extensions: %w(.midi .mid)
+  register_mime_type 'video/avi',       extensions: %w(.avi)
+  register_mime_type 'audio/wave',      extensions: %w(.wav .wave)
+  register_mime_type 'video/mp4',       extensions: %w(.mp4 .m4v)
+  register_mime_type 'audio/aac',       extensions: %w(.aac)
+  register_mime_type 'audio/mp4',       extensions: %w(.m4a)
+  register_mime_type 'audio/flac',      extensions: %w(.flac)
+  register_mime_type 'video/quicktime', extensions: %w(.mov)
 
   # Common font types
-  register_mime_type 'application/vnd.ms-fontobject', extensions: ['.eot']
-  register_mime_type 'application/x-font-opentype', extensions: ['.otf']
-  register_mime_type 'application/x-font-ttf', extensions: ['.ttf']
-  register_mime_type 'application/font-woff', extensions: ['.woff']
-  register_mime_type 'application/font-woff2', extensions: ['.woff2']
+  register_mime_type 'application/vnd.ms-fontobject', extension: '.eot'
+  register_mime_type 'application/x-font-opentype',   extension: '.otf'
+  register_mime_type 'application/x-font-ttf',        extension: '.ttf'
+  register_mime_type 'application/font-woff',         extension: '.woff'
+  register_mime_type 'application/font-woff2',        extension: '.woff2'
   
   # Sourmaps
   register_mime_type 'application/sourcemap', extension: '.map', charset: :unicode
@@ -84,18 +112,14 @@ Condenser.configure do
   register_mime_type 'application/manifest+json', extension: '.webmanifest', charset: :unicode
 
   # ERB
-  require 'condenser/templating_engine/erb'
   register_mime_type 'application/erb', extension: '.erb'
   register_template  'application/erb', Condenser::Erubi
   
   # CSS
-  require 'condenser/minifiers/sass_minifier'
-  register_mime_type      'text/css', extension: '.css', charset: :css
-  register_minifier       'text/css', Condenser::SassMinifier
+  register_mime_type 'text/css', extension: '.css', charset: :css
   
   # SASS
-  require 'condenser/transformers/sass_transformer'
-  register_mime_type    'text/sass', extensions: %w(.sass .css.sass)
+  register_mime_type 'text/sass', extensions: %w(.sass .css.sass)
   # register_transformer  'text/sass', 'text/css', SassProcessor
   
   # SCSS
@@ -103,24 +127,13 @@ Condenser.configure do
   register_transformer  'text/scss', 'text/css', Condenser::ScssTransformer
   
   # Javascript
-  require 'condenser/processors/rollup_processor'
-  require 'condenser/processors/babel_processor'
-  require 'condenser/minifiers/uglify_minifier'
   register_mime_type    'application/javascript', extension: '.js', charset: :unicode
-  register_preprocessor 'application/javascript', Condenser::BabelProcessor
-  register_exporter     'application/javascript', Condenser::RollupProcessor
-  register_minifier     'application/javascript', Condenser::UglifyMinifier
-
+  
   # EJS
-  require 'condenser/transformers/ejs'
   register_mime_type    'application/ejs', extensions: %w(.ejs .jst.ejs), charset: :unicode
   register_transformer  'application/ejs', 'application/javascript', Condenser::EjsTransformer
   
   # Writers
-  require 'condenser/writers/file_writer'
-  require 'condenser/writers/zlib_writer'
-  register_mime_type 'application/gzip', extensions: %w(.gz .gzip)
-  # register_compressor 'application/gzip', Condenser::Erubi
-  register_writer '*/*', Condenser::FileWriter.new
-  register_writer Condenser::ZlibWriter::COMPRESSALBE_TYPES, Condenser::ZlibWriter.new, 'application/gzip'
+  register_mime_type 'application/gzip',    extensions: %w(.gz .gzip)
+  register_mime_type 'application/brotli',  extension: %w(.br)
 end

data/lib/condenser/asset.rb

@@ -27,6 +27,8 @@ class Condenser
       
       @linked_assets  = Set.new
       @dependencies   = Set.new
+      @default_export = nil
+      @exports        = nil
       @processed = false
     end
     
@@ -70,6 +72,20 @@ class Condenser
       d
     end
     
+    def has_default_export?
+      @environment.cache.fetch("has_default_export/#{cache_key(false)}") do
+        process
+        @default_export
+      end
+    end
+    
+    def has_exports?
+      @environment.cache.fetch("has_exports/#{cache_key(false)}") do
+        process
+        @exports
+      end
+    end
+    
     def all_dependenies(deps, visited, &block)
       deps.each do |dep|
         if !visited.include?(dep.source_file)
@@ -77,13 +93,12 @@ class Condenser
           block.call(dep)
           all_dependenies(dep.dependencies, visited, &block)
         end
-
       end
     end
     
     def cache_key(include_dependencies=true)
       key = []
-      key << [@source_file, @content_types_digest, stat.ino, stat.mtime.to_f, stat.size]
+      key << [Condenser::VERSION, @source_file, @content_types_digest, stat.ino, stat.mtime.to_f, stat.size]
 
       if include_dependencies
         all_dependenies(dependencies, []) do |dep|
@@ -134,12 +149,15 @@ class Condenser
           
           if @environment.preprocessors.has_key?(data[:content_type].last)
             @environment.preprocessors[data[:content_type].last].each do |processor|
+              @environment.logger.info { "Preprocessing #{self.filename} with #{processor.name}" }
               processor.call(@environment, data)
             end
           end
       
           if data[:content_type].last != @content_types.last && @environment.transformers.has_key?(data[:content_type].last)
-            @environment.transformers[data[:content_type].pop].each do |to_mime_type, processor|
+            from_mime_type = data[:content_type].pop
+            @environment.transformers[from_mime_type].each do |to_mime_type, processor|
+              @environment.logger.info { "Transforming #{self.filename} from #{from_mime_type} to #{to_mime_type} with #{processor.name}" }
               processor.call(@environment, data)
               data[:content_type] << to_mime_type
             end
@@ -162,6 +180,8 @@ class Condenser
           @digest_name = data[:digest_name]
           @linked_assets = data[:linked_assets]
           @dependencies = data[:dependencies]
+          @default_export = data[:default_export]
+          @exports = data[:exports]
           @processed = true
           
           data
@@ -176,6 +196,8 @@ class Condenser
       @digest_name = result[:digest_name]
       @linked_assets = result[:linked_assets]
       @dependencies = result[:dependencies]
+      @default_export = result[:default_export]
+      @exports = result[:exports]
       @processed = true
     end
     
@@ -196,7 +218,7 @@ class Condenser
             dependencies: []
           }
           @environment.exporters[content_type]&.call(@environment, data)
-          @environment.minifiers[content_type]&.call(@environment, data)
+          @environment.minifier_for(content_type)&.call(@environment, data)
           data[:digest] = @environment.digestor.digest(data[:source])
           data[:digest_name] = @environment.digestor.name.sub(/^.*::/, '').downcase
           data
@@ -244,6 +266,7 @@ class Condenser
     alias_method :etag, :hexdigest
     
     def integrity
+      process
       "#{@digest_name}-#{[@digest].pack('m0')}"
     end
     
@@ -253,7 +276,7 @@ class Condenser
     
     def write(output_directory)
       files = @environment.writers_for_mime_type(content_type).map do |writer|
-        writer[0].call(output_directory, self)
+        writer.call(output_directory, self)
       end
       files.flatten.compact
     end

data/lib/condenser/context.rb

@@ -91,8 +91,7 @@ class Condenser
     #
     # Returns an Asset URI String.
     def resolve(path, **kargs)
-      kargs[:base_path] = @dirname
-      uri, deps = environment.resolve!(path, **kargs)
+      uri, deps = environment.resolve!(path, @dirname, **kargs)
       @dependencies.merge(deps)
       uri
     end

data/lib/condenser/environment.rb

@@ -11,7 +11,7 @@ class Condenser
     attr_reader :path, :npm_path
     attr_accessor :cache, :build_cache
     
-    def initialize
+    def initialize(*args)
       @context_class = Class.new(Condenser::Context)
       super
     end

data/lib/condenser/export.rb

@@ -50,12 +50,22 @@ class Condenser
     end
     
     def to_json
-      { path: path, digest: hexdigest, size: size, integrity: integrity }
+      {
+        'path' => path,
+        'size' => size,
+        'digest' => hexdigest,
+        'integrity' => integrity
+      }
     end
     
     def write(output_directory)
       files = @environment.writers_for_mime_type(content_type).map do |writer|
-        writer[0].call(output_directory, self)
+        if writer.exist?(self)
+          @environment.logger.debug "Skipping #{ self.path }, already exists"
+        else
+          @environment.logger.info "Writing #{ self.path }"
+          writer.call(output_directory, self)
+        end
       end
       files.flatten.compact
     end

data/lib/condenser/manifest.rb

@@ -1,33 +1,39 @@
 class Condenser
   class Manifest
     
-    attr_reader :filename, :directory
+    attr_reader :filename, :dir, :environment, :logger
     
     def initialize(*args)
+      args.compact!
+      
       if args.first.is_a?(Condenser)
         @environment = args.shift
+        @logger = @environment.logger
+      else
+        @environment = nil
+        @logger = Logger.new($stdout, level: :info)
       end
       
-      @directory, @filename = args[0], args[1]
+      @dir, @filename = args[0], args[1]
       
       # Expand paths
-      @directory = File.expand_path(@directory) if @directory
+      @dir = File.expand_path(@dir) if @dir
       @filename  = File.expand_path(@filename) if @filename
       
       # If filename is given as the second arg
-      if @directory && File.extname(@directory) != ""
-        @directory, @filename = nil, @directory
+      if @dir && File.extname(@dir) != ""
+        @dir, @filename = nil, @dir
       end
-
+      
       # Default dir to the directory of the filename
-      @directory ||= File.dirname(@filename) if @filename
+      @dir ||= File.dirname(@filename) if @filename
       
       # If directory is given w/o filename, pick a random manifest location
-      if @directory && @filename.nil?
-        @filename = File.join(@directory, 'manifest.json')
+      if @dir && @filename.nil?
+        @filename = File.join(@dir, 'manifest.json')
       end
       
-      unless @directory && @filename
+      unless @dir && @filename
         raise ArgumentError, "manifest requires output filename"
       end
       
@@ -36,8 +42,7 @@ class Condenser
           @data = JSON.parse(File.read(@filename))
         rescue JSON::ParserError => e
           @data = {}
-          # logger.error "#{@filename} is invalid: #{e.class} #{e.message}"
-          puts "#{@filename} is invalid: #{e.class} #{e.message}"
+          logger.error "#{@filename} is invalid: #{e.class} #{e.message}"
         end
       else
         @data = {}
@@ -63,14 +68,18 @@ class Condenser
     
     def add_asset(asset)
       export = asset.export
-      
+
       @data[asset.filename] = export.to_json
-      
-      outputs = export.write(@directory)
+      outputs = export.write(@dir)
       asset.linked_assets.each { |a| outputs += add_asset(a) }
       outputs
     end
     
+    def [](key)
+      add(key) if @environment
+      @data[key]
+    end
+    
     def compile(*args)
       reset
       outputs = add(*args.flatten)
@@ -85,5 +94,41 @@ class Condenser
       Utils.atomic_write(@filename) { |f| f.write(JSON.generate(@data)) }
     end
     
+    def export(*args)
+      add(*args)
+      save
+    end
+    
+    # Cleanup old assets in the compile directory. By default it will keep the
+    # latest version and remove any other files over 4 weeks old.
+    def clean(age = 2419200)
+      clean_dir(@dir, @data.values.map{ |v| v['path'] }, Time.now - age)
+    end
+
+    def clean_dir(dir, assets, age)
+      Dir.each_child(dir) do |child|
+        child = File.join(dir, child)
+        next if assets.find { |x| child.start_with?(x) }
+
+        if File.directory?(child)
+          clean_dir(dir, assets, age)
+        elsif File.file?(child) && File.stat(child).mtime < age
+          File.delete(child)
+        end
+      end
+    end
+
+    # Wipe directive
+    def clobber
+      return if !Dir.exist?(dir)
+      
+      Dir.each_child(dir) do |child|
+        FileUtils.rm_r(File.join(dir, child))
+      end
+      
+      logger.info "Removed contents of #{dir}"
+      nil
+    end
+
   end
 end

data/lib/condenser/minifiers/sass_minifier.rb

@@ -1,30 +1,36 @@
-class Condenser
-  class SassMinifier
+class Condenser::SassMinifier
     
-    def self.instance
-      @instance ||= new
-    end
+  def self.instance
+    @instance ||= new
+  end
 
-    def self.call(environment, input)
-      instance.call(environment, input)
-    end
+  def self.call(environment, input)
+    require "sassc" unless defined?(::SassC::Engine)
     
-    def initialize(options = {})
-      @options = options.merge({
-        syntax: :scss,
-        cache: false,
-        read_cache: false,
-        style: :compressed
-      }).freeze
-    end
+    instance.call(environment, input)
+  end
+  
+  def initialize(options = {})
+    @options = {
+      syntax:     :scss,
+      cache:      false,
+      read_cache: false,
+      style:      :compressed
+    }.merge(options).freeze
+  end
 
-    def call(environment, input)
-      engine = Sass::Engine.new(input[:source], {filename: input[:filename]}.merge(@options))
-      css, map = engine.render_with_sourcemap('')
-      css = css.delete_suffix!("\n/*# sourceMappingURL= */\n")
-      
-      input[:source] = css
-    end
+  def call(environment, input)
+    engine = SassC::Engine.new(input[:source], {
+      filename: input[:filename],
+      source_map_file: "#{input[:filename]}.map",
+      source_map_contents: true
+    }.merge(@options))
     
+    css = engine.render
+    css.delete_suffix!("\n/*# sourceMappingURL=#{File.basename(input[:filename])}.map */")
+    # engine.source_map
+    
+    input[:source] = css
   end
+
 end