lib/hyperloop/application.rb in hyperloop-0.0.3 vs lib/hyperloop/application.rb in hyperloop-0.0.4

@@ -5,12 +5,11 @@
 module Hyperloop
   class Application
     include Rack::Utils
 
     def initialize(root=nil)
-      @root          = root
-      @view_registry = View::Registry.new(@root)
+      @root = root
     end
 
     # Rack call interface.
     def call(env)
       request  = Rack::Request.new(env)
@@ -19,11 +18,11 @@
       if self.class.asset_path?(request.path) && asset = assets[normalized_asset_path(request.path)]
         # If the path is for an asset, find the specified asset and use its data
         # as the response body.
         response["Content-Type"] = asset.content_type
         response.write(asset.source)
-      elsif view = @view_registry.find_template_view(normalized_request_path(request.path))
+      elsif view = view_registry.find_template_view(normalized_request_path(request.path))
         # If there's a view at the path, use its data as the response body.
         data = view.render(request)
         response.write(data)
       else
         # If there's no view at the path, 404.
@@ -46,16 +45,20 @@
 
     # Internal: The sprockets environment for the app.
     #
     # Returns a Sprockets::Environment.
     def assets
-      @assets ||= Sprockets::Environment.new do |env|
-        env.append_path(File.join(@root, "app", "assets"))
-        env.append_path(File.join(@root, "vendor", "assets"))
+      @assets = nil unless production?
 
+      @assets ||= Sprockets::Environment.new(@root) do |env|
+        env.version = ENV["RACK_ENV"]
+
+        env.append_path(File.join("app", "assets"))
+        env.append_path(File.join("vendor", "assets"))
+
         # compress everything in production
-        if ENV["RACK_ENV"] == "production"
+        if production?
           env.js_compressor  = YUI::JavaScriptCompressor.new(:munge => true)
           env.css_compressor = YUI::CssCompressor.new
         end
       end
     end
@@ -78,8 +81,23 @@
       if path == "/"
         path
       else
         path.chomp("/")
       end
+    end
+
+    # Internal: Are we running in production mode?
+    #
+    # Returns a boolean.
+    def production?
+      ENV["RACK_ENV"] == "production"
+    end
+
+    # Internal: The view registry to use for the app.
+    #
+    # Returns a Hyperloop::View::Registry
+    def view_registry
+      @view_registry = nil unless production?
+      @view_registry ||= View::Registry.new(@root)
     end
   end
 end