opal · Nov 23, 2014 · Nov 23, 2014
Showing with 34 additions and 19 deletions.

+16 −12 lib/opal/builder.rb

+4 −3 lib/opal/builder/cache_store.rb

+12 −2 lib/opal/builder/cached_asset.rb

+2 −2 lib/opal/sprockets/cache_store.rb
diff --git a/lib/opal/builder.rb b/lib/opal/builder.rb
@@ -13,6 +13,9 @@ class Builder
     # A set of paths which have been processed already.
     attr_reader :processed
 
+    # Array of compiled assets (either cached, or re-processed).
+    attr_reader :assets
+
     def initialize(options = nil)
       (options || {}).each_pair do |k,v|
         public_send("#{k}=", v)
@@ -67,9 +70,6 @@ def process_require(filename, options)
       process_requires asset, path, options
 
       @assets << asset
-
-      # TODO: cache asset (should check for cache_store first)
-      # cache_store.store filename, asset.to_s, asset.requires
     end
 
     def process_requires(asset, path, options)
@@ -79,9 +79,7 @@ def process_requires(asset, path, options)
     end
 
     def find_asset(path)
-      if asset = cached_asset(path)
-        asset
-      else
+      cached_asset(path) do
         source = stub?(path) ? '' : read(path)
 
         if source.nil?
@@ -93,15 +91,23 @@ def find_asset(path)
         end
 
         fname  = path_reader.expand(path).to_s
-        asset  = processor_for(source, path, fname, requirable: true)
+
+        processor_for(source, path, fname, requirable: true)
       end
     end
 
     def cached_asset(path)
-      asset = cache_store.retrieve(path)
+      asset = cache_store[path]
 
-      if asset and asset.fresh?
-        return asset
+      if asset && asset.fresh?(self)
+        asset
+      else
+        asset = yield
+
+        # TODO: cache asset (should check for cache_store first)
+        # cache_store[path] = asset
+
+        asset
       end
     end
 
@@ -113,8 +119,6 @@ def source_map
       assets.map(&:source_map).reduce(:+).as_json.to_json
     end
 
-    attr_reader :assets
-
     attr_accessor :processors, :default_processor, :path_reader,
                   :compiler_options, :stubs, :prerequired, :preload
 

diff --git a/lib/opal/builder/cache_store.rb b/lib/opal/builder/cache_store.rb
@@ -3,16 +3,17 @@ class Builder
     # Simple Memory based cache store. This is used generally in
     # non-sprockets environments, or in a sprocket environment which does
     # not have a cache predefined.
+    #
     class CacheStore
       def initialize
         @cache = {}
       end
 
-      def store(key, contents, requires)
-        @cache[key] = {:contents => contents, :requires => requires}
+      def []=(key, asset)
+        @cache[key] = asset.encode
       end
 
-      def retrieve(key)
+      def [](key)
         if hash = @cache[key]
           return CachedAsset.new(hash)
         else

diff --git a/lib/opal/builder/cached_asset.rb b/lib/opal/builder/cached_asset.rb
@@ -16,12 +16,21 @@ def initialize(data)
         @data = data
       end
 
+      # When re-encoding a cached asset, we just pass back the initial data.
+      # A cached asset doesn't usually need to be re-encoded back to the
+      # cache, as it is already in the cache.
+      #
+      def encode
+        puts "warning: trying to re-encode a cached asset"
+        @data.dup
+      end
+
       def requires
-        @data[:requires]
+        @data['requires']
       end
 
       def to_s
-        @data[:contents]
+        @data['source']
       end
 
       def source_map
@@ -42,6 +51,7 @@ def fresh?(builder)
         # TODO: for now, always assume stale assets
         false
       end
+
     end
   end
 end
diff --git a/lib/opal/sprockets/cache_store.rb b/lib/opal/sprockets/cache_store.rb
@@ -8,12 +8,12 @@ def initialize(environment)
         @environment = environment
       end
 
-      def store(key, contents, requires)
+      def []=(key, asset)
         environment.cache_set("opal/#{key}.cache", {
           :contents => contents, :requires => requires})
       end
 
-      def retrieve(key)
+      def [](key)
         if obj = environment.cache_get("opal/#{key}.cache")
           return CachedAsset.new(obj)
         else