lib/spiderfw/cache/template_cache.rb in spiderfw-0.6.21 vs lib/spiderfw/cache/template_cache.rb in spiderfw-0.6.22

@@ -18,11 +18,11 @@
             return load_cache(path)
         end
         
         def get_location(path, &block)
             refresh(path, &block) if (block && !fresh?(path))
-            return @path+'/'+path
+            return File.join(@path, path)
         end
         
         def fresh?(path)
             full_path = get_location(path)
             if Spider.config.get('template.cache.disable')
@@ -30,27 +30,25 @@
                 return true if Spider::Request.current[:compiled_templates][full_path]
                 #debug("Cache disabled, recreating #{full_path}")
                 return false
             end
             exists = File.exist?(full_path)
-            if (Spider.config.get('template.cache.no_check') && exists)
-                return true
-            end
+            return true if Spider.config.get('template.cache.no_check') && exists
             return false if @invalid[path]
-            global_reload_file = "#{Spider.paths[:tmp]}/templates_reload.txt"
-            check_file = "#{full_path}/check"
+            global_reload_file = File.join(Spider.paths[:tmp], 'templates_reload.txt')
+            check_file = File.join(full_path, 'check')
             return false unless File.exist?(check_file)
-            if (File.exist?("#{Spider.paths[:tmp]}/templates_reload.txt"))
+            if File.exist?(global_reload_file)
                 return false if (File.mtime(global_reload_file) > File.mtime(check))
             end
             return true unless Spider.conf.get('template.cache.check_files')
-            lock_file = File.new(full_path)
+            lock_file = File.new(File.join(full_path, 'lock'))
             lock_file.flock(File::LOCK_SH)
             File.new(full_path).flock(File::LOCK_SH)
             # TODO: maybe insert here an (optional) tamper check 
             # that looks if the cache mtime is later then the saved time
-            Marshal.load(IO.read(check_file)).each do |check, time|
+            Marshal.load(IO.binread(check_file)).each do |check, time|
                 #debug("Template file #{check} changed, refreshing cache")
                 return false if File.mtime(check) > time
             end
             lock_file.flock(File::LOCK_UN)
             return true
@@ -68,54 +66,55 @@
         end
         
         def get_compiled_template(path)
             compiled = Spider::CompiledTemplate.new
             compiled.cache_path = path
-            init_code = IO.read(path+'/init.rb')
-            run_code = IO.read(path+'/run.rb')
-            compiled.assets = Marshal.load(IO.read(path+'/assets'))
+            init_code = IO.read(File.join(path, 'init.rb'))
+            run_code = IO.read(File.join(path, 'run.rb'))
+            compiled.assets = Marshal.load(IO.binread(File.join(path, 'assets')))
             block = Spider::TemplateBlocks::CompiledBlock.new(init_code, run_code)
             compiled.block = block
             Dir.new(path).each do |entry|
                 next if entry[0].chr == '.'
-                sub_path = "#{path}/#{entry}"
+                sub_path = File.join(path, entry)
                 next if entry == '__info'
                 next unless File.directory?(sub_path)
                 compiled.subtemplates[entry] = get_compiled_template(sub_path)
             end
             return compiled
         end
         
         def load_cache(template_path)
             # debug("Using cached #{template_path}")
             full_path = get_location(template_path)
-            lock_file = File.new(full_path)
+            lock_file = File.new(File.join(full_path, 'lock'))
             lock_file.flock(File::LOCK_SH)
             compiled = get_compiled_template(full_path)
             lock_file.flock(File::LOCK_UN)
             return compiled
         end
         
         def write_compiled_template(compiled, path)
             compiled.cache_path = path
-            File.open(path+'/init.rb', 'w') do |file|
+            File.open(File.join(path, 'init.rb'), 'w') do |file|
                 file.puts(compiled.block.init_code)
             end
-            File.open(path+'/run.rb', 'w') do |file|
+            File.open(File.join(path, 'run.rb'), 'w') do |file|
                 file.puts(compiled.block.run_code)
             end
-            File.open(path+'/assets', 'w') do |file|
+            File.open(File.join(path, 'assets'), 'wb') do |file|
                 file.puts(Marshal.dump(compiled.assets))
             end
             compiled.subtemplates.each do |id, sub|
-                sub_path = "#{path}/#{id}"
+                sub_path = File.join(path, id)
                 FileUtils.mkpath(sub_path)
                 write_compiled_template(sub, sub_path)
             end
             compiled.devel_info.each do |name, val|
-                FileUtils.mkpath("#{path}/__info")
-                sub_path = "#{path}/__info/#{name}"
+                sub_path = File.join(path, '__info')
+                FileUtils.mkpath(sub_path)
+                sub_path = File.join(sub_path, name)
                 File.open(sub_path, 'w') do |f|
                     f.puts(val)
                 end
             end
             if Spider.config.get('template.cache.disable')
@@ -125,14 +124,14 @@
         end
         
         def write_cache(template_path, compiled_template)
             full_path = get_location(template_path)
             FileUtils.mkpath(full_path)
-            lock_file = File.new(full_path+'/lock', 'w')
+            lock_file = File.new(File.join(full_path, 'lock'), 'w')
             lock_file.flock(File::LOCK_EX)
             write_compiled_template(compiled_template, full_path)
             modified = compiled_template.collect_mtimes
-            File.open(full_path+'/check', 'w') do |file|
+            File.open(File.join(full_path, 'check'), 'wb') do |file|
                 file.puts(Marshal.dump(modified))
             end
             lock_file.flock(File::LOCK_UN)
         end