condenser 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9be510da13d18c20e5422d21a17bbce10ac106411d8e0748a897bf485ad78cc1
-  data.tar.gz: 93c51021f99f6572f47992882906e9af0e913dd5023c3d1fb0406fa1eb074d79
+  metadata.gz: 9f7cb2dd9c6e43ea920ba29780558c323e19f3ca08bca6f157785a9124b4f748
+  data.tar.gz: 96b7d4a78635364ae9d17b43998730c93d995a073449cc22156e016fbbe1d786
 SHA512:
-  metadata.gz: f8747cb712a5debe29168b9b6a8a9f3a995e997676755d3ffb1a544d7a0a5563082cd857edccfafa45445ed36214fc1e34a9775a98e560518233c968600d2325
-  data.tar.gz: 58dcb5e01ca75410329a2941752031cdd5265af2cbc10ad8235a1a538cad1ea7ca00766dba3ecd15ff0a406aaddf032375069c3029732b8fa85d7900922d97fe
+  metadata.gz: f6fe1d243c00d909e2c6c9eea7882d3b26fd26c60e648462d29b6457fbbc50296bdcf50431c31a60d6db2b950337b6f3dfe14fa47589eca381f19b447bd6e23b
+  data.tar.gz: 210d1b985883ac183f68d3c7bf749c353366c89180032d1b419ce02b0c2f7306637271e630f3d0c843600abde48eb3bc5b34f566caee165c7efff8294d9f6b98

data/lib/condenser.rb

@@ -30,6 +30,7 @@ class Condenser
     append_path(path)
     append_path(EJS::ASSET_DIR)
     @cache = cache || Cache::MemoryStore.new
+    @build_cc = 0
     self.digestor = digestor || Digest::SHA256
   end
 end
@@ -67,6 +68,7 @@ Condenser.configure do
   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']
 
   # Common font types
   register_mime_type 'application/vnd.ms-fontobject', extensions: ['.eot']
@@ -78,6 +80,9 @@ Condenser.configure do
   # Sourmaps
   register_mime_type 'application/sourcemap', extension: '.map', charset: :unicode
   
+  # Web Manifest
+  register_mime_type 'application/manifest+json', extension: '.webmanifest', charset: :unicode
+
   # ERB
   require 'condenser/templating_engine/erb'
   register_mime_type 'application/erb', extension: '.erb'
@@ -89,31 +94,26 @@ Condenser.configure do
   register_minifier       'text/css', Condenser::SassMinifier
   
   # SASS
-  require 'condenser/analyzers/sass_analyzer'
   require 'condenser/transformers/sass_transformer'
   register_mime_type    'text/sass', extensions: %w(.sass .css.sass)
-  register_analyzer     'text/sass', Condenser::SassAnalyzer
   # register_transformer  'text/sass', 'text/css', SassProcessor
   
   # SCSS
   register_mime_type    'text/scss', extensions: %w(.scss .css.scss)
-  register_analyzer     'text/scss', Condenser::ScssAnalyzer
   register_transformer  'text/scss', 'text/css', Condenser::ScssTransformer
   
   # Javascript
-  require 'condenser/analyzers/javascript_analyzer'
   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_analyzer     'application/javascript', Condenser::JavascriptAnalyzer
   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)
+  register_mime_type    'application/ejs', extensions: %w(.ejs .jst.ejs), charset: :unicode
   register_transformer  'application/ejs', 'application/javascript', Condenser::EjsTransformer
   
   # Writers

data/lib/condenser/asset.rb

@@ -10,7 +10,7 @@ class Condenser
     include EncodingUtils
     
     attr_reader :environment, :filename, :content_types, :source_file, :source_path
-    attr_reader :linked_assets, :dependencies
+    attr_reader :linked_assets, :content_types_digest
     attr_writer :source, :sourcemap
 
     attr_accessor :imports
@@ -20,16 +20,14 @@ class Condenser
       
       @filename       = attributes[:filename]
       @content_types  = Array(attributes[:content_types] || attributes[:content_type])
+      @content_types_digest = Digest::SHA1.base64digest(@content_types.join(':'))
 
       @source_file    = attributes[:source_file]
       @source_path    = attributes[:source_path]
       
       @linked_assets  = Set.new
       @dependencies   = Set.new
-
-      @analyzed       = false
-      @processed      = false
-      @exported       = false
+      @processed = false
     end
     
     def path
@@ -40,169 +38,172 @@ class Condenser
       @content_types.last
     end
     
-    def process
-      process! if @processed == false
-    end
-    
     def basepath
       dirname, basename, extensions, mime_types = @environment.decompose_path(filename)
       [dirname, basename].compact.join('/')
     end
     
-    def analyze
-      analyze! if !@analyzed
+    def stat
+      @stat ||= File.stat(@source_file)
     end
     
-    def analyze!
-      @source = File.binread(@source_file)
-      @digest = @environment.digestor.digest(@source)
-      @digest_name = @environment.digestor.name.sub(/^.*::/, '').downcase
-      content_digest ||= Digest::SHA1.base64digest(@content_types.join(':'))
-
-      result = @environment.cache.fetch("analyze/#{[@digest].pack('m0')}:#{content_digest}") do
-        dirname, basename, extensions, mime_types = @environment.decompose_path(@source_file)
-        data = {
-          source: @source,
-          source_file: @source_file,
-          filename: @filename.dup,
-          content_type: mime_types,
-          linked_assets: [],
-          dependencies: []
-        }
-
-        while @environment.templates.has_key?(data[:content_type].last)
-          templator = @environment.templates[data[:content_type].pop]
-          templator.call(@environment, data)
-          data[:filename] = data[:filename].gsub(/\.#{extensions.last}$/, '')
-        end
+    def inspect
+      dirname, basename, extensions, mime_types = @environment.decompose_path(@filename)
+      <<-TEXT
+        #<#{self.class.name} @filename=#{@filename} @content_types=#{@content_types.inspect} @source_file=#{@source_file} @source_mime_types=#{mime_types.inspect}>
+      TEXT
+    end
+    
+    def dependencies
+      deps = @environment.cache.fetch("dependencies/#{cache_key(false)}") do
+        process
+        @dependencies
+      end
       
-        case @environment.mime_types[data[:content_type].last][:charset]
-        when :unicode
-          detect_unicode(data[:source])
-        when :css
-          detect_css(data[:source])
-        when :html
-          detect_html(data[:source])
-        else
-          detect(data[:source]) if mime_types.last.start_with?('text/')
+      d = []
+      deps.each do |i|
+        i = [i, nil] if i.is_a?(String)
+        @environment.resolve(i[0], File.dirname(@source_file), accept: i[1]).each do |asset|
+          d << asset
         end
-        
-        @environment.analyzers_for(data[:content_type].last).each do |analyzer|
-          analyzer.call(@environment, data)
-        end
-        
-        data
       end
-      
-      @analyzed = true
-      @linked_assets = result[:linked_assets]
-      @dependencies = result[:dependencies]
+      d
     end
+    
+    def all_dependenies(deps, visited, &block)
+      deps.each do |dep|
+        if !visited.include?(dep.source_file)
+          visited << dep.source_file
+          block.call(dep)
+          all_dependenies(dep.dependencies, visited, &block)
+        end
 
+      end
+    end
+    
     def cache_key(include_dependencies=true)
-      analyze
-      key = [[@digest].pack('m0'), @content_types.join(':')]
+      key = []
+      key << [@source_file, @content_types_digest, stat.ino, stat.mtime.to_f, stat.size]
 
       if include_dependencies
-        @dependencies.each do |i|
-          @environment.resolve(i, File.dirname(@source_file), accept: @content_types).each do |asset|
-            key << asset.cache_key
-          end
+        all_dependenies(dependencies, []) do |dep|
+          key << [dep.source_file, dep.content_types_digest, dep.stat.ino, dep.stat.mtime.to_f, dep.stat.size]
         end
       end
 
       Digest::SHA1.base64digest(JSON.generate(key))
     end
     
-    def process!(source=nil, source_digest=nil, content_digest=nil)
-      analyze
-      content_digest ||= Digest::SHA1.base64digest(@content_types.join(':'))
+    def process
+      return if @processed
       
-      result = @environment.cache.fetch("process/#{cache_key}/#{content_digest}") do
-        dirname, basename, extensions, mime_types = @environment.decompose_path(@source_file)
-        data = {
-          source: @source,
-          source_file: @source_file,
+      result = @environment.cache.fetch_if(Proc.new { "process/#{cache_key}" }, "dependencies/#{cache_key(false)}") do
+        @environment.build do
+          
+          @source = File.binread(@source_file)
+          dirname, basename, extensions, mime_types = @environment.decompose_path(@source_file)
+          
+          data = {
+            source: @source,
+            source_file: @source_file,
         
-          filename: @filename.dup,
-          content_type: mime_types,
+            filename: @filename.dup,
+            content_type: mime_types,
 
-          map: nil,
-          linked_assets: [],
-          dependencies: []
-        }
+            map: nil,
+            linked_assets: [],
+            dependencies: []
+          }
         
-        while @environment.templates.has_key?(data[:content_type].last)
-          templator = @environment.templates[data[:content_type].pop]
-          templator.call(@environment, data)
-          data[:filename] = data[:filename].gsub(/\.#{extensions.last}$/, '')
-        end
+          while @environment.templates.has_key?(data[:content_type].last)
+            templator = @environment.templates[data[:content_type].pop]
+            templator.call(@environment, data)
+            data[:filename] = data[:filename].gsub(/\.#{extensions.last}$/, '')
+          end
+          
+          case @environment.mime_types[data[:content_type].last][:charset]
+          when :unicode
+            detect_unicode(data[:source])
+          when :css
+            detect_css(data[:source])
+          when :html
+            detect_html(data[:source])
+          else
+            detect(data[:source]) if mime_types.last.start_with?('text/')
+          end
+          
+          if @environment.preprocessors.has_key?(data[:content_type].last)
+            @environment.preprocessors[data[:content_type].last].each do |processor|
+              processor.call(@environment, data)
+            end
+          end
       
-        case @environment.mime_types[data[:content_type].last][:charset]
-        when :unicode
-          detect_unicode(data[:source])
-        when :css
-          detect_css(data[:source])
-        when :html
-          detect_html(data[:source])
-        else
-          detect(data[:source]) if mime_types.last.start_with?('text/')
-        end
-        
-        if @environment.preprocessors.has_key?(data[:content_type].last)
-          @environment.preprocessors[data[:content_type].last].each do |processor|
-            processor.call(@environment, data)
+          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|
+              processor.call(@environment, data)
+              data[:content_type] << to_mime_type
+            end
           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|
-            processor.call(@environment, data)
-            data[:content_type] << to_mime_type
+          if mime_types != @content_types
+            raise ContentTypeMismatch, "mime type(s) \"#{@content_types.join(', ')}\" does not match requested mime type(s) \"#{data[:mime_types].join(', ')}\""
           end
-        end
       
-        if mime_types != @content_types
-          raise ContentTypeMismatch, "mime type(s) \"#{@content_types.join(', ')}\" does not match requested mime type(s) \"#{data[:mime_types].join(', ')}\""
+          data[:digest] = @environment.digestor.digest(data[:source])
+          data[:digest_name] = @environment.digestor.name.sub(/^.*::/, '').downcase
+
+          # Do this here and at the end so cache_key can be calculated if we
+          # run this block
+          @source = data[:source]
+          @sourcemap = data[:map]
+          @filename = data[:filename]
+          @content_types = data[:content_type]
+          @digest = data[:digest]
+          @digest_name = data[:digest_name]
+          @linked_assets = data[:linked_assets]
+          @dependencies = data[:dependencies]
+          @processed = true
+          
+          data
         end
-      
-        data[:digest] = @environment.digestor.digest(data[:source])
-        data[:digest_name] = @environment.digestor.name.sub(/^.*::/, '').downcase
-        data
       end
-      @processed = true
-
+      
       @source = result[:source]
       @sourcemap = result[:map]
       @filename = result[:filename]
       @content_types = result[:content_type]
       @digest = result[:digest]
       @digest_name = result[:digest_name]
+      @linked_assets = result[:linked_assets]
+      @dependencies = result[:dependencies]
+      @processed = true
     end
     
     def export
-      result = @environment.cache.fetch("export/#{cache_key}") do
-        process
-        dirname, basename, extensions, mime_types = @environment.decompose_path(@filename)
-        data = {
-          source: @source,
-          source_file: @source_file,
+      @environment.build do
+        result = @environment.cache.fetch("export/#{cache_key}") do
+          process
+          dirname, basename, extensions, mime_types = @environment.decompose_path(@filename)
+          data = {
+            source: @source.dup,
+            source_file: @source_file,
         
-          filename: @filename.dup,
-          content_types: @content_types,
+            filename: @filename.dup,
+            content_types: @content_types,
 
-          sourcemap: nil,
-          linked_assets: [],
-          dependencies: []
-        }
-        @environment.exporters[content_type]&.call(@environment, data)
-        @environment.minifiers[content_type]&.call(@environment, data)
-        data[:digest] = @environment.digestor.digest(data[:source])
-        data[:digest_name] = @environment.digestor.name.sub(/^.*::/, '').downcase
-        data
-      end
+            sourcemap: nil,
+            linked_assets: [],
+            dependencies: []
+          }
+          @environment.exporters[content_type]&.call(@environment, data)
+          @environment.minifiers[content_type]&.call(@environment, data)
+          data[:digest] = @environment.digestor.digest(data[:source])
+          data[:digest_name] = @environment.digestor.name.sub(/^.*::/, '').downcase
+          data
+        end
       
-      Export.new(@environment, result)
+        Export.new(@environment, result)
+      end
     end
     
     def to_s

data/lib/condenser/cache/memory_store.rb

@@ -10,7 +10,7 @@ class Condenser::Cache
   #
   #   ActiveSupport::Cache::MemoryStore
   #
-  class MemoryStore
+  class MemoryStore < Condenser::CacheStore
     # Internal: Default key limit for store.
     DEFAULT_MAX_SIZE = 33_554_432 # 32 Megabytes
     PER_ENTRY_OVERHEAD = 240
@@ -28,18 +28,6 @@ class Condenser::Cache
       @cache_size = 0
     end
     
-    def fetch(key)
-      value = get(key)
-      
-      if value.nil?
-        value = yield
-        set(key, Marshal.dump(value))
-      else
-        value = Marshal.load(value)
-      end
-      value
-    end
-    
     def get(key)
       value = @cache[key]
       @key_access[key] = Time.now.to_f if value
@@ -62,16 +50,6 @@ class Condenser::Cache
       value
     end
     
-    def delete(key)
-      @key_access.delete(key)
-      if value = @cache.delete(key)
-        @cache_size -= cached_size(key, value)
-        true
-      else
-        false
-      end
-    end
-    
     def prune
       keys = @key_access.keys.sort { |a, b| @key_access[a].to_f <=> @key_access[b].to_f }
       keys.each do |key|

data/lib/condenser/cache_store.rb

@@ -13,6 +13,22 @@ class Condenser::CacheStore
     value
   end
   
+  # Try to fetch key_or_proc if key exists.
+  #
+  # If the key exist it will fetch key_or_proc from the cache
+  #
+  # If key does not exists run the block and store results under key_or_proc.
+  def fetch_if(key_or_proc, key, &block)
+    if get(key)
+      key_or_proc = key_or_proc.call if key_or_proc.is_a?(Proc)
+      value = fetch(key_or_proc, &block)
+    else
+      value = block.call
+      key_or_proc = key_or_proc.call if key_or_proc.is_a?(Proc)
+      set(key_or_proc, Marshal.dump(value))
+    end
+    value
+  end
   
   def delete(key)
     @key_access.delete(key)