condenser 0.0.10 → 0.0.11

data/lib/condenser/processors/rollup_processor.rb

@@ -4,8 +4,6 @@ require File.expand_path('../node_processor', __FILE__)
 
 class Condenser::RollupProcessor < Condenser::NodeProcessor
 
-  include ActiveSupport::Benchmarkable
-
   ROLLUP_VERSION = '0.56.1'
   
   def self.call(environment, input)
@@ -15,10 +13,6 @@ class Condenser::RollupProcessor < Condenser::NodeProcessor
   def initialize(options = {})
     @options = options.merge({}).freeze
   end
-  
-  def logger
-    @environment.logger
-  end
 
   def call(environment, input)
     @environment = environment
@@ -204,7 +198,6 @@ class Condenser::RollupProcessor < Condenser::NodeProcessor
         messages.each do |message|
           message = JSON.parse(message)
           
-          benchmark "Rollup #{message['method']}(#{message['args'].map(&:inspect).join(', ')})", level: :info do
           ret = case message['method']
           when 'resolve'
             importee, importer = message['args']
@@ -292,7 +285,6 @@ class Condenser::RollupProcessor < Condenser::NodeProcessor
           end
 
           io.write(JSON.generate({rid: message['rid'], return: ret}))
-          end
         end
       end
     rescue Errno::EPIPE, EOFError

data/lib/condenser/resolve.rb

@@ -6,81 +6,92 @@ class Condenser
       super
     end
     
-    def resolve(filename, base=nil, accept: nil, ignore: [])
+    def build_cache
+      return @build_cache if instance_variable_defined?(:@build_cache)
+      @build_cache = BuildCache.new(path)
+    end
+    
+    def resolve(filename, base=nil, accept: nil)
       filename = filename.delete_prefix("/") if path.none? { |p| filename.start_with?(p) }
+      dirname, basename, extensions, mime_types = decompose_path(filename, base)
+      accept ||= mime_types.empty? ? ['*/*'] : mime_types
+      accept = Array(accept)
       
-      build do
-        dirname, basename, extensions, mime_types = decompose_path(filename, base)
-
-        results = []
-      
-        accept ||= mime_types.empty? ? ['*/*'] : mime_types
-        accept = Array(accept)
+      cache_key = [dirname, basename].flatten.join('/')
+      cache_key << "@#{accept.join(',')}" if accept
       
-        paths = if dirname&.start_with?('/')
-          if pat = path.find { |pa| dirname.start_with?(pa) }
-            dirname.delete_prefix!(pat)
-            dirname.delete_prefix!('/')
-            [pat]
+      build_cache.fetch(cache_key) do
+        build do
+          results = []
+
+          paths = if dirname&.start_with?('/')
+            if pat = path.find { |pa| dirname.start_with?(pa) }
+              dirname.delete_prefix!(pat)
+              dirname.delete_prefix!('/')
+              [pat]
+            else
+              []
+            end
           else
-            []
+            path
           end
-        else
-          path
-        end
-
-        paths.each do |path|
-          glob = path
-          glob = File.join(glob, dirname) if dirname
-          glob = File.join(glob, basename)
-          glob << '.*' unless glob.end_with?('*')
+        
+          paths.each do |path|
+            glob = path
+            glob = File.join(glob, dirname) if dirname
+            glob = File.join(glob, basename)
+            glob << '.*' unless glob.end_with?('*')
           
-          Dir.glob(glob).sort.each do |f|
-            next if !File.file?(f) || ignore.include?(f)
+            Dir.glob(glob).sort.each do |f|
+              next if !File.file?(f)
           
-            f_dirname, f_basename, f_extensions, f_mime_types = decompose_path(f)
-            if (basename == '*' || basename == f_basename)
-              if accept == ['*/*'] || mime_type_match_accept?(f_mime_types, accept)
-                asset_dir = f_dirname.delete_prefix(path).delete_prefix('/')
-                asset_basename = f_basename + f_extensions.join('')
-                asset_filename = asset_dir.empty? ? asset_basename : File.join(asset_dir, asset_basename)
-                @build_cache[asset_filename] ||= Asset.new(self, {
-                  filename: asset_filename,
-                  content_types: f_mime_types,
-                  source_file: f,
-                  source_path: path
-                })
-                results << @build_cache[asset_filename]
-              else
-                reverse_mapping[f_mime_types]&.each do |derivative_mime_types|
-                  if accept == ['*/*'] || mime_type_match_accept?(derivative_mime_types, accept)
-                    asset_dir = f_dirname.delete_prefix(path).delete_prefix('/')
-                    asset_basename = f_basename + derivative_mime_types.map { |t| @mime_types[t][:extensions].first }.join('')
-                    asset_filename = asset_dir.empty? ? asset_basename : File.join(asset_dir, asset_basename)
-                    @build_cache[asset_filename] ||= Asset.new(self, {
+              f_dirname, f_basename, f_extensions, f_mime_types = decompose_path(f)
+              if (basename == '*' || basename == f_basename)
+                if accept == ['*/*'] || mime_type_match_accept?(f_mime_types, accept)
+                  asset_dir = f_dirname.delete_prefix(path).delete_prefix('/')
+                  asset_basename = f_basename + f_extensions.join('')
+                  asset_filename = asset_dir.empty? ? asset_basename : File.join(asset_dir, asset_basename)
+                  results << build_cache.map(asset_filename + f_mime_types.join('')) do
+                    Asset.new(self, {
                       filename: asset_filename,
-                      content_types: derivative_mime_types,
+                      content_types: f_mime_types,
                       source_file: f,
                       source_path: path
                     })
-                    results << @build_cache[asset_filename]
+                  end
+                else
+                  reverse_mapping[f_mime_types]&.each do |derivative_mime_types|
+                    if accept == ['*/*'] || mime_type_match_accept?(derivative_mime_types, accept)
+                      asset_dir = f_dirname.delete_prefix(path).delete_prefix('/')
+                      asset_basename = f_basename + derivative_mime_types.map { |t| @mime_types[t][:extensions].first }.join('')
+                      asset_filename = asset_dir.empty? ? asset_basename : File.join(asset_dir, asset_basename)
+                      results << build_cache.map(asset_filename + derivative_mime_types.join('')) do
+                        Asset.new(self, {
+                          filename: asset_filename,
+                          content_types: derivative_mime_types,
+                          source_file: f,
+                          source_path: path
+                        })
+                      end
+                    end
                   end
                 end
-              end
 
+              end
             end
           end
-        end
         
-        results = results.group_by do |a|
-          accept.find_index { |m| match_mime_types?(a.content_types, m) }
-        end
+          results = results.group_by do |a|
+            accept.find_index { |m| match_mime_types?(a.content_types, m) }
+          end
         
-        results = results.keys.sort.reduce([]) do |c, key|
-          c += results[key].sort_by(&:filename)
-        end
+          results = results.keys.sort.reduce([]) do |c, key|
+            c += results[key].sort_by(&:filename)
+          end
 
-        results.sort_by(&:filename)
+          results.sort_by!(&:filename)
+          results
+        end
       end
     end
 
@@ -95,9 +106,9 @@ class Condenser
       end
     end
 
-    def find(filename, base=nil, accept: nil, ignore: [])
+    def find(filename, base=nil, accept: nil)
       build do
-        @build_cache["find/#{[filename, base, accept].join('-')}"] ||= resolve(filename, base, accept: accept, ignore: ignore).first
+        resolve(filename, base, accept: accept).first
       end
     end
     
@@ -123,13 +134,22 @@ class Condenser
     def build
       @build_cc += 1
       if @build_cc == 1
-        @build_cache = {}
+        # if @file_watcher_active
+          # sleep 0.25 #if !@build_cache_polling # Let the Listen gem flush
+          build_cache.semaphore.lock
+        # else
+        #   @build_cache = {}
+        # end
       end
       yield
     ensure
       @build_cc -= 1
       if @build_cc == 0
-        @build_cache = nil
+        # if @file_watcher_active
+          build_cache.semaphore.unlock
+        # else
+        #   @build_cache = nil
+        # end
       end
     end
     

data/lib/condenser/transformers/sass_transformer.rb

@@ -292,7 +292,7 @@ class Condenser
         #
         # Returns a Set.
         def condenser_dependencies
-          options[:condenser][:dependencies]
+          options[:condenser][:process_dependencies]
         end
 
     end

data/lib/condenser/transformers/sass_transformer/importer.rb

@@ -6,7 +6,7 @@ class Condenser::SassTransformer
       env = options[:condenser][:environment]
       accept = extensions.keys.map { |x| options[:condenser][:environment].extensions[x] }
 
-      options[:asset][:dependencies] << [name, accept.map{ |i| [i] }]
+      options[:asset][:process_dependencies] << [name, accept.map{ |i| [i] }]
 
       imports = []
       env.resolve(name, accept: accept).sort_by(&:filename).each do |asset|

data/lib/condenser/version.rb

@@ -1,3 +1,3 @@
 class Condenser
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/test/cache_test.rb

@@ -116,4 +116,76 @@ class CacheTest < ActiveSupport::TestCase
     JS
 
   end
+
+  test 'a dependency is supurceeded by a new file' do
+    Dir.mkdir(File.join(@path, 'a'))
+    Dir.mkdir(File.join(@path, 'b'))
+    @env.clear_path
+    @env.append_path File.join(@path, 'a')
+    @env.append_path File.join(@path, 'b')
+    
+    file 'b/dep.js', <<-JS
+      console.log( 5 );
+    JS
+
+    file 'a/a.js', <<-JS
+      import 'dep';
+    JS
+
+    assert_exported_file 'a.js', 'application/javascript', <<~JS
+      !function(){"use strict";console.log(5)}();
+    JS
+
+    file 'a/dep.js', <<-JS
+      console.log( 10 );
+    JS
+
+    assert_exported_file 'a.js', 'application/javascript', <<~JS
+      !function(){"use strict";console.log(10)}();
+    JS
+  end
+
+  test 'a globed dependency is supurceeded by a new file' do
+    Dir.mkdir(File.join(@path, 'a'))
+    Dir.mkdir(File.join(@path, 'b'))
+    @env.clear_path
+    @env.append_path File.join(@path, 'a')
+    @env.append_path File.join(@path, 'b')
+    
+    file 'b/deps/dep.js', <<-JS
+      console.log( 5 );
+    JS
+
+    file 'a/a.js', <<-JS
+      import 'deps/*';
+    JS
+
+    assert_exported_file 'a.js', 'application/javascript', <<~JS
+      !function(){"use strict";console.log(5)}();
+    JS
+
+    file 'a/deps/dep.js', <<-JS
+      console.log( 10 );
+    JS
+
+    assert_exported_file 'a.js', 'application/javascript', <<~JS
+      !function(){"use strict";console.log(10)}();
+    JS
+  end
+  
+  test 'a new dependency for a glob call is reflected in the next call' do
+    file "dir/a.scss", "body { color: blue; }"
+    file 'test.scss', '@import "dir/*"'
+
+    assert_exported_file 'test.css', 'text/css', <<~CSS
+      body{color:blue}
+    CSS
+
+    file "dir/b.scss", "body { color: green; }"
+
+    assert_exported_file 'test.css', 'text/css', <<~CSS
+      body{color:blue}body{color:green}
+    CSS
+  end
+
 end

data/test/test_helper.rb

@@ -30,7 +30,7 @@ Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 class ActiveSupport::TestCase
 
   def setup
-    @path = Dir.mktmpdir
+    @path = File.realpath(Dir.mktmpdir)
     @env = Condenser.new(@path, logger: Logger.new('/dev/null'))
     @env.context_class.class_eval do
       def asset_path(path, options = {})

data/test/transformers/scss_test.rb

@@ -104,7 +104,8 @@ class CondenserSCSSTest < ActiveSupport::TestCase
     SCSS
     
     asset = @env.find('c.css')
-    assert_equal ["a.scss", "d.scss", "b.scss"], asset.dependencies.map(&:filename)
+    assert_equal ["a.scss", "d.scss", "b.scss"], asset.process_dependencies.map(&:filename)
+    assert_equal ["a.scss", "d.scss", "b.scss"], asset.export_dependencies.map(&:filename)
   end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condenser
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -44,6 +44,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-ejs
   requirement: !ruby/object:Gem::Requirement
@@ -231,6 +245,7 @@ files:
 - README.md
 - lib/condenser.rb
 - lib/condenser/asset.rb
+- lib/condenser/build_cache.rb
 - lib/condenser/cache/file_store.rb
 - lib/condenser/cache/memory_store.rb
 - lib/condenser/cache/null_store.rb