mack-distributed 0.8.0.101 → 0.8.1

data/lib/mack-distributed.rb

@@ -9,8 +9,9 @@ configatron.mack.distributed.set_default(:share_routes, false)
 configatron.mack.distributed.set_default(:share_objects, false)
 configatron.mack.distributed.set_default(:share_views, false)
 configatron.mack.distributed.set_default(:app_name, nil)
-configatron.mack.distributed.set_default(:site_domain, 'http://localhost:3000')
+configatron.mack.distributed.set_default(:site_domain, nil)
 configatron.mack.distributed.set_default(:timeout, 0)
+configatron.mack.distributed.set_default(:enable_view_cache, false)
 
 # load *.rb files
 Dir.glob(File.join(base, "**", "*.rb")).each do |f|
@@ -18,3 +19,4 @@ Dir.glob(File.join(base, "**", "*.rb")).each do |f|
 end
 
 Mack::Distributed::View.register
+

data/lib/mack-distributed/views/view_cache.rb

@@ -3,28 +3,38 @@ module Mack
     class ViewCache < Cachetastic::Caches::Base
       
       class << self
-        include Mack::ViewHelpers::LinkHelpers
+        include Mack::ViewHelpers
       
         def get(path)
-          raw = super(path) do
-            raw = ""
-            if File.exists?(path)
-              raw = File.read(path)
-
-              # preprocess the raw content so we can resolve css/javascript/image path
-              arr = raw.scan(/<%=.*?%>/)
-              arr.each do |scriptlet|
-                if scriptlet.match(/stylesheet/) or scriptlet.match(/javascript/) or scriptlet.match(/image/)
-                  res = ERB.new(scriptlet).result(binding)
-                  raw.gsub!(scriptlet, res)
-                end 
-              end # if arr.each
-            end # if File.exists?
-            
-            set(path, raw)
-          end # super(key)
+          if configatron.mack.distributed.enable_view_cache
+            raw = super(path) do
+              get_raw_data(path, true)
+            end 
+          else
+            raw = get_raw_data(path, false)
+          end
+          
           return raw
         end # def get
+        
+        private
+        def get_raw_data(path, cache_data = true)
+          if File.exists?(path)
+            raw = File.read(path)
+
+            # preprocess the raw content so we can resolve css/javascript/image path
+            arr = raw.scan(/<%=.*?%>/)
+            arr.each do |scriptlet|
+              if scriptlet.match(/stylesheet/) or scriptlet.match(/javascript/) or scriptlet.match(/image/)
+                res = ERB.new(scriptlet).result(binding)
+                raw.gsub!(scriptlet, res)
+              end 
+            end # if arr.each
+          end # if File.exists?
+          
+          set(path, raw) if cache_data
+          raw
+        end # get_raw_data
       end # class << self
       
     end # ViewCache

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-distributed
 version: !ruby/object:Gem::Version 
-  version: 0.8.0.101
+  version: 0.8.1
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-11 00:00:00 -04:00
+date: 2008-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.0.101
+        version: 0.8.1
     version: 
 description: Distributed Application Support for Mack Framework
 email: mark@mackframework.com