YurtCMS 0.3.1 → 0.4.1

data/lib/parse_ssi.rb

@@ -0,0 +1,72 @@
+
+class ParseSSI
+	attr_reader :web_root, :top, :bottom, :vars
+
+	def initialize web_root
+		@vars = {}
+		@web_root = web_root
+		return
+	end
+
+	def parse file
+
+		# the parse routine currently understands only 3 SSI attributes
+		#
+		# <!--#echo var="FOO" -->
+		#
+		# <!--#include virtual="/path/to/file" -->
+		#
+		# <!--#set var="FOO" value="bar" -->
+		#
+		# more may be added if required.
+
+		result = File.read( @web_root + "/" + file )
+
+		1 while result.sub!(/<!--#(\w+)\s(.*?)\s*-->(\n+)?/) do |match|
+			attrs = parse_attributes($2)
+			case $1
+			when 'echo'
+				@vars[ attrs['var'] ]
+			when 'include'
+				attrs['virtual'].gsub!(/\$\{(\w+)\}/) do |m|
+					if $1
+						@vars[$1] 
+					else
+						m
+					end
+				end
+				File.read( @web_root + "/" + attrs['virtual'] )
+			when 'set'
+				@vars[ attrs['var'] ] = attrs['value']
+				''
+			else
+				match
+			end
+		end
+		result
+	end
+
+	def parse_attributes(source)
+		attrs = Hash.new 
+		source.scan( /(\w+)="([^"]*)"/ ) do |match|
+			attrs[$1] = $2
+		end
+		return attrs
+	end
+
+	def set_tag var, value
+		[ '<!--#set var="' + var + '" value="', value.to_s, '" -->', "\n" ].join
+	end
+
+	def virtual_include_tag path
+		[ '<!--#include virtual="' + path.to_s + '" -->', "\n" ].join
+	end
+
+	def file_include_tag path
+		[ '<!--#include virtual="' + @web_root + path.to_s + '" -->', "\n" ].join
+	end
+
+	def echo_tag var
+		[ '<!--#echo var="' + var + '" -->', "\n" ].join
+	end
+end

data/lib/yurtcms.rb

@@ -1,12 +1,12 @@
-
 	require 'yaml'
 
-
 	class YurtCMS
-		attr_reader :data_store, :web_root, :includes, :metatags, :partial, :ext
+		attr_reader :yurt_root, :data_store, :web_root, :includes, :metatags, :partial, :ext
 		def initialize yurt_root
 			require 'rubygems'
-			require_gem 'BlueCloth'
+			require 'bluecloth' # i used to have require_gem, but i don't think it's needed
+			require 'rubypants'
+			require 'parse_ssi'
 
 			@yurt_root = sanitize_path( yurt_root )
 			@data_store = [ @yurt_root, "content/" ].join
@@ -15,6 +15,7 @@
 			@metatags = ".metatags"
 			@partial = ".partial"
 			@ext = ".html"
+			@ssi = ParseSSI.new(@web_root)
 		end
 		
 		def merge path, file
@@ -93,14 +94,15 @@
 		end
 
 		def make_metatags input
-			t = [ '<!--#set var="TITLE" value="', input.title, '" -->', "\n" ].join if input.title =~ /\w/
-			d = [ '<!--#set var="DESCRIPTION" value="', input.description, '" -->', "\n" ].join if input.description =~ /\w/
-			k = [ '<!--#set var="KEYWORDS" value="', input.keywords, '" -->', "\n" ].join if input.keywords =~ /\w/
+			t = @ssi.set_tag('TITLE', input.title) if input.title =~ /\w/
+			d = @ssi.set_tag('DESCRIPTION', input.description) if input.description =~ /\w/
+			k = @ssi.set_tag('KEYWORDS', input.keywords) if input.keywords =~ /\w/
 
 			[ t, d, k ].join
 		end
 		
 		def parse_content c
+			#RubyPants.new(BlueCloth.new(c).to_html,1).to_html
 			BlueCloth.new(c).to_html
 		end
 		
@@ -110,14 +112,8 @@
 			end
 
 			[
-				'<!--#set var="PAGE" value="',
-				path,
-				'" -->',
-				"\n",
-				'<!--#include virtual="/includes/',
-				template,
-				'" -->',
-				"\n"
+				@ssi.set_tag('PAGE', path),
+				@ssi.virtual_include_tag('/includes/' + template),
 			].join
 		end
 		

data/site/yurt/index.html

@@ -86,7 +86,7 @@
 						Element.show('spinner');
 						// use an argument looking like this: document.forms["newfile"].content.value
 
-						var url = "/yurt/yurt.cgi/preview/"
+						var url = "/preview/"
 						var pars = 'c=' + escape( content );
 						var target = 'nf_preview';
 
@@ -125,16 +125,17 @@
 		<div id="workspace">
 		</div>
 		<ul id="directory_actions" class="actions" style="display: none;">
-			<li><a href="/yurt/yurt.cgi/open" class="first" onclick="openFolder(this.href); return false;">Open</a></li>
-			<li><a href="/yurt/yurt.cgi/new_folder" onclick="dispatch(this.href); return false;">New folder...</a></li>
-			<li><a href="/yurt/yurt.cgi/new_file" onclick="dispatch(this.href); return false;">New file...</a></li>
-			<li><a href="/yurt/yurt.cgi/delete" onclick="dispatch(this.href); return false;">Delete</a></li>
+			<li><a href="/open" class="first" onclick="openFolder(this.href); return false;">Open</a></li>
+			<li><a href="/new_folder" onclick="dispatch(this.href); return false;">New folder...</a></li>
+			<li><a href="/new_file" onclick="dispatch(this.href); return false;">New file...</a></li>
+			<li><a href="/delete" onclick="dispatch(this.href); return false;">Delete</a></li>
 		</ul>	
 		<ul id="file_actions" class="actions" style="display: none;">
-			<li><a href="/yurt/yurt.cgi/edit" class="first" onclick="dispatch(this.href); return false;">Edit file...</a></li>
-			<li><a href="/yurt/yurt.cgi/delete" onclick="dispatch(this.href); return false;">Delete</a></li>
+			<li><a href="/edit" class="first" onclick="dispatch(this.href); return false;">Edit file...</a></li>
+			<li><a href="/delete" onclick="dispatch(this.href); return false;">Delete</a></li>
 		</ul>
 		<div id="spinner" style="display: none;"><img src="/yurt/media/images/spinner.gif" width="16" height="16" border="0" alt="" /></div>
+		<div id="staging"><a href="/staging/">View the site in a staging environment</a></div>
 	</body>
 </html>
 

data/site/yurt/media/css/styles.css

@@ -182,3 +182,24 @@
 						font-family: monospace;
 					}
 
+					#staging {
+						position: absolute;
+						top: 50px;
+						left: 600px;
+						height: 20px;
+						background-color: #eeeeea;
+						border: 1px solid black;
+						border-bottom: 0px none;
+						font-family: Geneva, verdana;
+						font-size: 12px;
+						padding: 4px;
+					}
+
+					#staging a {
+						color: #000;
+						text-decoration: none;
+					}
+
+					#staging a:hover {
+						text-decoration: underline;
+					}

data/site/yurt/yurt.cgi

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby -rubygems
 
 require 'yurtcms'
+require 'parse_ssi'
 require 'camping'
 require 'bluecloth'
 
@@ -105,6 +106,74 @@ module Yurt::Controllers
 			render :cancel
 		end
 	end
+
+	class Static < R '/(static|staging|media|yurt)/(.*)$'
+		MIME_TYPES = {'.css' => 'text/css', '.js' => 'text/javascript', '.jpg' => 'image/jpeg', '.gif' => 'image/gif', '.png' => 'image/png', '.html' => 'text/html'}
+						  
+		def get path_source, path
+			@y = get_yurtcms
+
+			case path_source
+			when "yurt"
+				web_root = [ @y.yurt_root, 'yurt/' ].join
+				path_to_file = [ @y.yurt_root, 'yurt/', path ].join
+			when "media"
+				web_root = [ @y.web_root, 'media/' ].join
+				path_to_file = [ @y.web_root, 'media/', path ].join
+			else
+				web_root = @y.web_root
+				path_to_file = [ @y.web_root, path ].join
+			end
+
+		
+			if path =~ /\.\./ # sample test to prevent directory traversal attacks
+				@status = "404"
+				"404 - Not Found"
+				return
+			end
+			
+			# not sure if this would be a reasonable assumption to make -- or
+			# if this is the right place to do this
+			if File.directory?(path_to_file)
+				path_to_file = path_to_file + "/index.html"
+				path = path + "index.html"
+			end
+	
+			# bulletproofing access to the files
+			unless File.exists?(path_to_file)
+				@status = "404"
+				"404 - Not Found"
+				return
+			end
+			unless File.file?(path_to_file)
+				@status = "403"
+				"403 - Forbidden"
+				return
+			end
+			unless File.readable?(path_to_file)
+				@status = "403"
+				"403 - Forbidden"
+				return
+			end
+			unless File.size?(path_to_file)
+				@status = "403"
+				"403 - Forbidden"
+				return
+			end
+
+      @headers['Content-Type'] = MIME_TYPES[path_to_file[/\.\w+$/, 0]] || "text/plain"
+
+			# I set this up as a case in case I need to handle alternative mime types.
+			case @headers['Content-Type']
+			when 'text/html'
+				p = ParseSSI.new(web_root)
+				@p = p.parse(path).gsub(/href="\//, 'href="/static/').gsub(/"\/media/, '"/static/media')
+				render :static
+			else
+				@headers['X-Sendfile'] = path_to_file
+			end
+		end
+	end
 end
 
 module Yurt::Helpers
@@ -126,25 +195,15 @@ end
 
 module Yurt::Views
 
- # If you have a `layout' method like this, it
- # will wrap the HTML in the other methods.  The
- # `self << yield' is where the HTML is inserted.
-# def layout
-#	 html do
-#		 title { 'My Yurt' }
-#		 body { self << yield }
-#	 end
-# end
-
  # The `index' view.  Inside your views, you express
  # the HTML in Ruby.  See http://code.whytheluckystiff.net/markaby/.
  def index
-	 p 'This is the index view.'
+	 text File.read("index.html")
  end
 
  def open_folder
 	 text '<ul class="listing">'
-		 @contents.each do |file, type|
+		 @contents.sort.each do |file, type|
 			 li :class => type[0] do
 				 a :href => "#", :onclick => "return false;", :id => @p + "/" + file do
 					 text file 
@@ -170,7 +229,7 @@ module Yurt::Views
 
  def new_file
 	 text %Q(
-	<form action="/yurt/yurt.cgi/new_file/" method="post" name="newfile" class="dialog_box" id="newfile" onsubmit="dispatch_post('/yurt/yurt.cgi/new_file/', 'newfile');return false;">
+	<form action="/new_file/" method="post" name="newfile" class="dialog_box" id="newfile" onsubmit="dispatch_post('/new_file/', 'newfile');return false;">
 		<fieldset>
 		<legend>
 			<a href="#" onclick="toggleTabs('nf_dialog', 'nf_preview', 'nf_help');return false;">New File</a> | 
@@ -188,8 +247,8 @@ module Yurt::Views
 			</div>
 			<textarea name="content" class="contentarea">#{ @f['content'] }</textarea>
 			<input type="hidden" name="path" value="#{@f['path']}" />
-			<input type="button" name="add" value="Save" onclick="dispatch_post('/yurt/yurt.cgi/new_file/', 'newfile')" />
-			<input type="button" name="cancel" value="Cancel" onclick="dispatch('/yurt/yurt.cgi/cancel')" />
+			<input type="button" name="add" value="Save" onclick="dispatch_post('/new_file/', 'newfile')" />
+			<input type="button" name="cancel" value="Cancel" onclick="dispatch('/cancel')" />
 		</div>
 		<div id="nf_preview" class="preview" style="display: none;">
 		</div>
@@ -326,7 +385,7 @@ module Yurt::Views
 
   def new_folder
 		text %Q(
-		<form action="/yurt/yurt.cgi/new_folder/" method="post" name="newfolder" class="dialog_box" id="newfolder" onsubmit="dispatch_post('/yurt/yurt.cgi/new_folder/', 'newfolder');return false;">
+		<form action="/new_folder/" method="post" name="newfolder" class="dialog_box" id="newfolder" onsubmit="dispatch_post('/new_folder/', 'newfolder');return false;">
 		<fieldset>
 		<legend>
 			<a href="#" onclick="toggleTabs('nf_dialog', 'nf_help');return false;">New Folder</a> | 
@@ -335,8 +394,8 @@ module Yurt::Views
 		<div id="nf_dialog" class="dialog">
 		<label><input type="text" name="foldername" value="" /> Folder name</label>
 		<input type="hidden" name="path" value="#{@p}" />
-		<input type="button" name="add" value="Save" onclick="dispatch_post('/yurt/yurt.cgi/new_folder/', 'newfolder')" />
-		<input type="button" name="cancel" value="Cancel" onclick="dispatch('/yurt/yurt.cgi/cancel')" />
+		<input type="button" name="add" value="Save" onclick="dispatch_post('/new_folder/', 'newfolder')" />
+		<input type="button" name="cancel" value="Cancel" onclick="dispatch('/cancel')" />
 		</div>
 		<div id="nf_help" class="help" style="display: none;">
 			<p>Please use characters that you would normally expect to be valid for your folder/directory name.  We suggest using upper and lower case letters, numbers, and the following punctuation (sans quotes): ".", "_", "-".  If you try to type in illegal characters, the application will convert them to underscores.</p>
@@ -384,6 +443,9 @@ module Yurt::Views
 	 	end
 	end
  
+	def static
+		text @p
+	end
 end
 
 if __FILE__ == $0

data/test/cms_filesystem.rb

@@ -1,11 +1,13 @@
 #! /usr/bin/env ruby 
 
-require File.dirname(__FILE__) +'/../lib/yurtcms'
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'yurtcms'
+require 'parse_ssi'
 require 'test/unit'
 
 class Input
-	attr_reader :title, :keywords, :description, :partial, :content, :path, :filename
-	attr_writer :title, :keywords, :description, :partial, :content, :path, :filename
+	attr_reader :title, :keywords, :description, :partial, :content, :path, :filename, :template
+	attr_writer :title, :keywords, :description, :partial, :content, :path, :filename, :template
 end
 
 class TestYurtFS < Test::Unit::TestCase
@@ -43,6 +45,7 @@ class TestYurtFS < Test::Unit::TestCase
 		i.content = "This is *the* content of the file."
 		i.path = "/"
 		i.filename = "my_file"
+		i.template = "template.html"
 
 		@y.write_all_files( i )
 

data/test/cms_strings.rb

@@ -1,6 +1,8 @@
 #! /usr/bin/env ruby 
 
-require File.dirname(__FILE__) +'/../lib/yurtcms'
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'yurtcms'
+require 'parse_ssi'
 require 'test/unit'
 
 class Input
@@ -126,6 +128,7 @@ class TestYurtCMS < Test::Unit::TestCase
 	end
 
 	def test_make_placeholder
+		warn @y.make_placeholder( 'solutions/foo', 'template.html' ) 
 		assert_equal( "<!--#set var=\"PAGE\" value=\"solutions/foo\" -->\n<!--#include virtual=\"/includes/template.html\" -->\n", @y.make_placeholder( 'solutions/foo', 'template.html' ) )
 	end
 	

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: YurtCMS
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2006-11-13 00:00:00 -05:00
+  version: 0.4.1
+date: 2007-01-08 00:00:00 -05:00
 summary: The Web CMS that does less!
 require_paths: 
 - lib
@@ -29,6 +29,7 @@ authors:
 - Robert Hahn
 files: 
 - bin/yurt
+- lib/parse_ssi.rb
 - lib/yurtcms.rb
 - site/content
 - site/htdocs