opal · Nov 23, 2014 · Nov 23, 2014
Showing with 7 additions and 6 deletions.

+2 −2 bin/opal-repl

+2 −1 lib/opal/builder.rb

+1 −2 lib/opal/sprockets/cache_store.rb

+2 −1 lib/opal/sprockets/processor.rb
diff --git a/bin/opal-repl b/bin/opal-repl
@@ -57,8 +57,8 @@ module Opal
 
     def eval_ruby(str)
       code = Opal::Builder.new.build_str(str, '(irb)', :irb => true, :const_missing => true)
-      code.processed[0...-1].each{ |c| @v8.eval(c.to_s) }
-      @v8.eval "var $_result = #{code.processed.last.to_s} ($_result == null ? 'nil' : $_result.$inspect());"
+      code.assets[0...-1].each{ |c| @v8.eval(c.to_s) }
+      @v8.eval "var $_result = #{code.assets.last.to_s} ($_result == null ? 'nil' : $_result.$inspect());"
     rescue => e
       puts "#{e.message}\n\t#{e.backtrace.join("\n\t")}"
     end

diff --git a/lib/opal/builder.rb b/lib/opal/builder.rb
@@ -53,6 +53,7 @@ def build_str(source, filename, options = {})
 
       process_requires asset, fname, options
       @assets << asset
+      self
     end
 
     def build_require(path, options = {})
@@ -105,7 +106,7 @@ def cached_asset(path)
         asset = yield
 
         # TODO: cache asset (should check for cache_store first)
-        # cache_store[path] = asset
+        cache_store[path] = asset
 
         asset
       end

diff --git a/lib/opal/sprockets/cache_store.rb b/lib/opal/sprockets/cache_store.rb
@@ -9,8 +9,7 @@ def initialize(environment)
       end
 
       def []=(key, asset)
-        environment.cache_set("opal/#{key}.cache", {
-          :contents => contents, :requires => requires})
+        environment.cache_set("opal/#{key}.cache", asset.encode)
       end
 
       def [](key)

diff --git a/lib/opal/sprockets/processor.rb b/lib/opal/sprockets/processor.rb
@@ -108,7 +108,8 @@ def self.new_builder(context)
       }
 
       path_reader = ::Opal::Sprockets::PathReader.new(context.environment, context)
-      cache_store = ::Opal::Sprockets::CacheStore.new(context.environment)
+      # cache_store = ::Opal::Sprockets::CacheStore.new(context.environment)
+      cache_store = nil
 
       return Builder.new(
         compiler_options: compiler_options,