WIP

adambeynon · adambeynon · commit d5c94ec18f70 · 2014-11-22T20:56:48.000Z
diff --git a/lib/opal/builder.rb b/lib/opal/builder.rb
@@ -61,15 +61,62 @@ def initialize(options = nil)
       @path_reader ||= PathReader.new
 
       @processed = []
+
+      @assets = []
     end
 
     def self.build(*args, &block)
       new.build(*args, &block)
     end
 
     def build(path, options = {})
-      source = read(path)
-      build_str(source, path, options)
+      source = read path
+      process_string source, path, options
+      self
+    end
+
+    def process_string(source, filename, options)
+      fname = path_reader.expand(filename).to_s
+      asset = processor_for(source, filename, fname, requirable: false)
+
+      process_requires asset, fname, options
+      @assets << asset
+    end
+
+    def process_require(filename, options)
+      return if processed.include? filename
+      processed << filename
+
+      path  = path_reader.expand(filename).to_s
+      asset = find_asset filename
+
+      process_requires asset, path, options
+
+      @assets << asset
+    end
+
+    def process_requires(asset, path, options)
+      (asset.requires + tree_requires(asset, path)).each do |require_path|
+        process_require require_path, options
+      end
+    end
+
+    def find_asset(path)
+      if asset = cached_asset(path)
+        asset
+      else
+        source = read path
+        fname  = path_reader.expand(path).to_s
+        asset  = processor_for(source, path, fname, requirable: true)
+      end
+    end
+
+    def cached_asset(path)
+      return nil if true # remove cache, for now
+
+      if data = cache_store.retrieve(path)
+        CachedAsset.new(data)
+      end
     end
 
     def build_str source, filename, options = {}
@@ -94,11 +141,11 @@ def build_require(path, options = {})
     end
 
     def to_s
-      processed.map(&:to_s).join("\n")
+      assets.map(&:to_s).join("\n")
     end
 
     def source_map
-      processed.map(&:source_map).reduce(:+).as_json.to_json
+      assets.map(&:source_map).reduce(:+).as_json.to_json
     end
 
     attr_reader :processed
@@ -109,8 +156,6 @@ def source_map
 
 
 
-    private
-
     def tree_requires(asset, path)
       if path.nil? or path.empty?
         dirname = Dir.pwd
@@ -144,7 +189,7 @@ def read(path)
         raise ArgumentError, "can't find file: #{path.inspect} in #{path_reader.paths.inspect}"
     end
 
-    def process_require(filename, options)
+    def process_require_OLD(filename, options)
       return if prerequired.include?(filename)
       return if already_processed.include?(filename)
       already_processed << filename
@@ -176,12 +221,10 @@ def process_require(filename, options)
       cache_store.store filename, asset.to_s, asset.requires
     end
 
-    def process_requires(requires, options)
-      requires.map { |r| process_require(r, options) }
-    end
-
-    def already_processed
-      @already_processed ||= Set.new
+    # A set of paths which have already been processed (so we do not need
+    # to process them again).
+    def processed
+      @processed ||= Set.new
     end
 
     def stub? filename
diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -70,14 +70,15 @@ def evaluate(context, locals, &block)
       path = context.logical_path
       prerequired = []
 
+      puts "here"
       builder = self.class.new_builder(context)
-      result = builder.build_str(data, path, :prerequired => prerequired)
+      builder.build(path)
 
       if self.class.source_map_enabled and false
         register_source_map(context.logical_path, result.source_map.to_s)
         "#{result.to_s}\n//# sourceMappingURL=#{File.basename(context.logical_path)}.map\n"
       else
-        result.to_s
+        builder.to_s
       end
     end
 
@@ -109,6 +110,7 @@ def self.new_builder(context)
 
       path_reader = ::Opal::Sprockets::PathReader.new(context.environment, context)
       cache_store = ::Opal::Builder::CacheStore.new(context.environment)
+
       return Builder.new(
         compiler_options: compiler_options,
         stubs:            stubbed_files,
