condenser 0.0.12 → 0.1

data/lib/condenser/resolve.rb

@@ -9,7 +9,7 @@ class Condenser
     
     def build_cache
       return @build_cache if instance_variable_defined?(:@build_cache)
-      @build_cache = BuildCache.new(path)
+      @build_cache = BuildCache.new(path, logger: logger)
     end
     
     def resolve(filename, base=nil, accept: nil)
@@ -20,7 +20,6 @@ class Condenser
       
       cache_key = [dirname, basename].flatten.join('/')
       cache_key << "@#{accept.join(',')}" if accept
-      
       build_cache.fetch(cache_key) do
         build do
           results = []
@@ -52,7 +51,7 @@ class Condenser
                   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
+                  results << build_cache.map("#{asset_filename}@#{f_mime_types.join('')}") do
                     Asset.new(self, {
                       filename: asset_filename,
                       content_types: f_mime_types,
@@ -66,7 +65,7 @@ class Condenser
                       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
+                      results << build_cache.map("#{asset_filename}@#{derivative_mime_types.join('')}") do
                         Asset.new(self, {
                           filename: asset_filename,
                           content_types: derivative_mime_types,
@@ -133,15 +132,20 @@ class Condenser
     end
     
     def build
-      @build_cc += 1
-      if @build_cc == 1
-        build_cache.semaphore.lock if build_cache.listening
+      if build_cache.listening && !build_cache.semaphore.owned?
+        build_cache.semaphore.lock 
+        logger.debug { "build cache semaphore locked by #{Thread.current.object_id}" }
       end
+      
+      @build_cc += 1
       yield
     ensure
       @build_cc -= 1
       if @build_cc == 0
-        build_cache.semaphore.unlock if build_cache.listening
+        if build_cache.listening && build_cache.semaphore.owned?
+          logger.debug { "build cache semaphore unlocked by #{Thread.current.object_id}" }
+          build_cache.semaphore.unlock
+        end
       end
     end
     

data/lib/condenser/version.rb

@@ -1,3 +1,3 @@
 class Condenser
-  VERSION = '0.0.12'
+  VERSION = '0.1'
 end

data/test/cache_test.rb

@@ -188,4 +188,20 @@ class CacheTest < ActiveSupport::TestCase
     CSS
   end
 
+  test 'a dependency is removed for a glob call when one of it dependencies is delted' do
+    file "css/a.scss", "body { color: blue; }"
+    file "css/b.scss", "body { color: green; }"
+    file 'test.scss', '@import "css/*"'
+
+    assert_exported_file 'test.css', 'text/css', <<~CSS
+      body{color:blue}body{color:green}
+    CSS
+
+    rm "css/b.scss"
+
+    assert_exported_file 'test.css', 'text/css', <<~CSS
+      body{color:blue}
+    CSS
+  end
+
 end

data/test/test_helper.rb

@@ -31,7 +31,7 @@ class ActiveSupport::TestCase
 
   def setup
     @path = File.realpath(Dir.mktmpdir)
-    @env = Condenser.new(@path, logger: Logger.new('/dev/null'))
+    @env = Condenser.new(@path, logger: Logger.new('/dev/null', level: :debug))
     @env.context_class.class_eval do
       def asset_path(path, options = {})
         "/assets/#{path}"
@@ -59,6 +59,10 @@ class ActiveSupport::TestCase
     File.write(path, source)
   end
   
+  def rm(name)
+    File.delete(File.join(@path, name))
+  end
+  
   def assert_file(path, mime_types, source=nil)
     sleep 0.25 if @env.build_cache.listening
     asset = @env.find(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condenser
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: '0.1'
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi