fir 0.0.1 → 0.0.3

data/README.markdown

@@ -96,6 +96,10 @@ Most of us will be perfectly happy managing content by editing the files in the
 
 Fir isn't a CMS. Instead, it exposes a minimal, RESTful API for managing content. The idea is that content should be managed with specially-designed Fir clients, rather than through Fir itself. You can see how this works by downloading the [example app](http://github.com/jarrett/fir-example), booting it, and visiting `/manage-content.html` in your browser. The source of that page is available [on GitHub](http://github.com/jarrett/fir-example/blob/master/public/manage-content.html).
 
+Fir's API uses HTTP basic authentication. The users list is stored in `users.yml`. To create a user or change an existing user's password, run:
+
+	rake users:add user=username pass=password
+
 Webserver Support
 =================
 

data/example/public/dispatch.cgi

@@ -0,0 +1,34 @@
+#!/usr/bin/ruby
+
+# This script is called when running Fir as a CGI, which isn't recommended.
+# Still, here it is, in case you want to try.
+# 
+# This script will not be operational unless the webserver is configured properly.
+# In Apache, you need to enable mod_rewrite in .htaccess files for this directory.
+# That usually means setting AllowOverride to All. (http://httpd.apache.org/docs/1.3/mod/core.html#allowoverride)
+# Apache must also be told that CGI is allowed in this directory. This is done with the ExecCGI option
+# (http://httpd.apache.org/docs/1.3/mod/core.html#options).
+# 
+# Learn more about CGI under Apache: http://httpd.apache.org/docs/1.3/howto/cgi.html
+# 
+# You must also set up rewrite rules so the requests get sent to this script.
+# See how it's done in .htaccess in this directory.
+# 
+# Besides the performance issues, CGI has another disadvantage. Apache (and perhaps others) unescapes
+# URLs before sending them to your CGI script. Passenger does not. Fir, being designed for Passenger,
+# unescapes URLs. So, when running Fir as a CGI, all URLs will be escaped twice. This breaks certain URLs.
+# For example:
+#
+#   http://example.com/the%2Bsign
+#
+# ...will break. Apache will unescape the path to "the+sign." Fir will then unescape it again to "the sign."
+
+require 'rubygems'
+require 'fir'
+
+FIR_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+require File.expand_path(File.join(FIR_ROOT, 'config.rb'))
+
+builder = Rack::Builder.new(&Fir.boot_proc)
+
+Rack::Handler::CGI.run builder

data/lib/fir/boot.rb

@@ -2,6 +2,10 @@ module Fir
 	def self.boot_proc
 		# This get called in config.ru. Thus, Passenger can eval the contents of config.ru the way it wants to
 		lambda do
+			# Depending on the location of the script that invoked Fir, all the relative paths may be messed up.
+			# This happens, for example, when running dispatch.cgi from the public directory. Changing the working
+			# directory fixes that.
+			Dir.chdir(FIR_ROOT)
 			::Fir.validate_config
 			#use ::Rack::Reloader # Only when developing the Fir gem
 			use ::Rack::ContentLength

data/lib/fir/pages.rb

@@ -34,12 +34,12 @@ module Fir
 		include TemplateLoading
 		
 		def initialize
-			@page_config = yaml_or_empty('pages.yml')
+			@page_config = yaml_or_empty(File.join(FIR_ROOT, 'pages.yml'))
 			@path_mappings = @page_config.inject({}) do |mappings, (page, configs)|
 				mappings[configs['path']] = page if configs['path']
 				mappings
 			end
-			@menus = yaml_or_empty('menus.yml')
+			@menus = yaml_or_empty(File.join(FIR_ROOT, 'menus.yml'))
 		end
 		
 		def call(env)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - jarrett
@@ -98,6 +98,7 @@ files:
 - example/pages/products/dynamite.html.erb
 - example/pages/products/index.markdown
 - example/pages/products/mouse-trap.html.erb
+- example/public/dispatch.cgi
 - example/public/manage-content.html
 - example/public/static.txt
 - example/public/stylesheets/style.css