darkroom 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5162b1e81dd2a8a33dd280928539a3b12d549811dabfb6df542a84bd994c020a
-  data.tar.gz: a780ff9279b4ed705716de0a2112699bb2780df8ec187c704e89ded2fab863a0
+  metadata.gz: 7ff7abd45467a1fd1e3f3ae707ad1ff04ff45c9e0a4f4a512fb24fc6bd794879
+  data.tar.gz: 03f15709d9310d94068f3706e02ac1d4998887cf3c5bb09f3463eb72875a1ae9
 SHA512:
-  metadata.gz: bf8d935a547d44d57ff873bd236f0d719547e28eb481147e474a34b4794f17555b5c3086b8da3cf660a32505f3a736e09c20aee114c8198ca16a99ed68afd209
-  data.tar.gz: 5fecd0018770f57f845dd2376323cd9e9e9f2f8edd5880ce695addbeb2ae685ad32e3f2b7ef526769bdc5ee06e59ee8498d490525ae1895da300a7f04ab94d65
+  metadata.gz: bd87bd335cb7abb1e3bf26365d0dca2247b5d5450c82ded04d16709d97031bdcf2e4e59cf345c2f5a18218be05157ee2dc4c9f1d5ef27ed07ab433bf33a968aa
+  data.tar.gz: d1141e492dcedde15aca909de9354756d95db7ecf4b925421711589eeef96df973126e7d603ccde93ee6d078252ea56eba6d89c9c594eef00c9ff55a3fcb666c

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/darkroom/asset.rb

@@ -61,7 +61,7 @@ class Darkroom
       @extension = File.extname(@path).downcase
       @delegate = Darkroom.delegate(@extension) or raise(UnrecognizedExtensionError.new(@path))
 
-      @keys = {}
+      @ran = Set.new
 
       if @delegate.compile_delegate && !intermediate
         @delegate = @delegate.compile_delegate
@@ -283,13 +283,16 @@ class Darkroom
     # error was recorded during the last processing run.
     #
     def modified?
-      return @modified if ran?(:modified)
+      @modified_key == @darkroom.process_key ? (return @modified) : @modified_key = @darkroom.process_key
 
       begin
         @modified = !!@error
         @modified ||= (@mtime != (@mtime = File.mtime(@file)))
         @modified ||= @intermediate_asset.modified? if @intermediate_asset
-        @modified ||= @dependencies.any? { |d| d.modified? } if @dependencies
+        @modified ||= dependencies.any? { |d| d.modified? }
+
+        @ran.clear if @modified
+
         @modified
       rescue Errno::ENOENT
         @modified = true
@@ -382,7 +385,11 @@ class Darkroom
     # Returns all dependencies (including dependencies of dependencies).
     #
     def dependencies
-      @dependencies = accumulate(:own_dependencies) unless ran?(:dependencies)
+      unless ran?(:dependencies)
+        parse
+        @dependencies = accumulate(:own_dependencies)
+      end
+
       @dependencies
     end
 
@@ -399,7 +406,11 @@ class Darkroom
     # Returns all imports (including imports of imports).
     #
     def imports
-      @imports = accumulate(:own_imports) unless ran?(:imports)
+      unless ran?(:imports)
+        parse
+        @imports = accumulate(:own_imports)
+      end
+
       @imports
     end
 
@@ -502,10 +513,9 @@ class Darkroom
         @own_content = compiled if compiled.kind_of?(String)
       rescue => e
         @errors << e
+      ensure
+        @own_content.freeze
       end
-    ensure
-      @own_content.freeze
-      dependencies # Ensure dependency array gets built.
     end
 
     ##
@@ -551,11 +561,13 @@ class Darkroom
     # [name] Name of the method.
     #
     def ran?(name)
-      if @keys[name] == @darkroom.process_key
+      modified?
+
+      if @ran.member?(name)
         true
       else
-        @keys[name] = @darkroom.process_key
-        name == :modified ? false : !modified?
+        @ran << name
+        false
       end
     end
 

data/lib/darkroom/delegates/javascript.rb

@@ -120,7 +120,7 @@ class Darkroom
     compile do |parse_data:, path:, own_content:|
       next unless Darkroom.javascript_iife
 
-      (parse_data[:imports] || []).each do |import_path, items|
+      (parse_data[:imports] || []).reverse_each do |import_path, items|
         mod_suffix = nil
         prefix = '{ ' if items.size != 1
         suffix = ' }' if items.size != 1

data/lib/darkroom/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Darkroom
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: darkroom
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Nate Pickens
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-15 00:00:00.000000000 Z
+date: 2023-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler