Initial cache store

adambeynon · adambeynon · commit 2373a56fcfaf · 2014-11-22T14:40:49.000Z
diff --git a/examples/rack/app/application.rb b/examples/rack/app/application.rb
@@ -2,6 +2,7 @@
 require 'user'
 
 module MyApp
+
   class Application
     def initialize
       @user = User.new('Bill')
diff --git a/examples/rack/config.ru b/examples/rack/config.ru
@@ -4,4 +4,6 @@ Bundler.require
 run Opal::Server.new { |s|
   s.main = 'application'
   s.append_path 'app'
+
+  s.sprockets.cache = Sprockets::Cache::FileStore.new("tmp/cache/assets")
 }
diff --git a/lib/opal/builder.rb b/lib/opal/builder.rb
@@ -4,8 +4,49 @@
 
 module Opal
   class Builder
+    class CachedAsset
+      def initialize(data)
+        @data = data
+      end
+
+      def requires
+        @data[:requires]
+      end
+
+      def to_s
+        @data[:contents]
+      end
+
+      def source_map
+        ""
+      end
+    end
+
+    class CacheStore
+      attr_reader :environment
+
+      def initialize(environment)
+        @environment = environment
+      end
+
+      def store(key, contents, requires)
+        environment.cache_set("opal/#{key}.cache", {
+          :contents => contents, :requires => requires})
+      end
+
+      def retrieve(key)
+        if obj = environment.cache_get("opal/#{key}.cache")
+          return CachedAsset.new(obj)
+        else
+          nil
+        end
+      end
+    end
+
     include BuilderProcessors
 
+    attr_accessor :cache_store
+
     def initialize(options = nil)
       (options || {}).each_pair do |k,v|
         public_send("#{k}=", v)
@@ -32,6 +73,14 @@ def build(path, options = {})
     end
 
     def build_str source, filename, options = {}
+      #if cached = cache_store.retrieve(filename) and
+      #  puts "CACHED: #{filename}"
+      #  process_requires cached.requires, options
+      #  processed << cached
+
+      #  return self
+      #end
+
       path = path_reader.expand(filename).to_s unless stub?(filename)
       asset = processor_for(source, filename, path, options)
       requires = preload + asset.requires + tree_requires(asset, path)
@@ -110,10 +159,21 @@ def process_require(filename, options)
         end
       end
 
+      if cached = cache_store.retrieve(filename)
+        puts "CACHED: #{filename}"
+        process_requires cached.requires, options
+        processed << cached
+
+        return
+      end
+
+      puts ">>>> COMPILE #{filename}"
       path = path_reader.expand(filename).to_s unless stub?(filename)
       asset = processor_for(source, filename, path, options.merge(requirable: true))
       process_requires(asset.requires+tree_requires(asset, path), options)
       processed << asset
+
+      cache_store.store filename, asset.to_s, asset.requires
     end
 
     def process_requires(requires, options)
diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -73,7 +73,7 @@ def evaluate(context, locals, &block)
       builder = self.class.new_builder(context)
       result = builder.build_str(data, path, :prerequired => prerequired)
 
-      if self.class.source_map_enabled
+      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
@@ -108,10 +108,12 @@ 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,
-        path_reader:      path_reader
+        path_reader:      path_reader,
+        cache_store:      cache_store
       )
     end
   end

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,6 @@ Bundler.require`
`4`	`4`	`run Opal::Server.new { \|s\|`
`5`	`5`	`s.main = 'application'`
`6`	`6`	`s.append_path 'app'`
	`7`	`+`
	`8`	`+ s.sprockets.cache = Sprockets::Cache::FileStore.new("tmp/cache/assets")`
`7`	`9`	`}`