fir 0.0.8 → 0.0.9

data/example/Rakefile

@@ -1,5 +1,6 @@
 FIR_ROOT = File.expand_path(File.dirname(__FILE__))
 
+#$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '../lib')) # Enable this to run against the code in the parent directory instead of the intalled gem
 require 'rubygems'
 require 'fir'
 

data/example/layouts/application.html.erb

@@ -11,7 +11,7 @@
 	</title>
 	<meta http-equiv="content-type" content="text/html;charset=utf-8"/>
 	<% if @description and !@description.empty? %>
-		<meta name="description" content="<%= h @page_description %>"/>
+		<meta name="description" content="<%= h @description %>"/>
 	<% end %>
 	
 	<!--[if !IE 6]><!-->

data/lib/fir/boot.rb

@@ -7,10 +7,6 @@ module Fir
 			# directory fixes that.
 			Dir.chdir(FIR_ROOT)
 			::Fir.validate_config
-			# This allows us to invoke Rackup with -e "FORCE_CACHING = true"
-			if defined?(FORCE_CACHING) and FORCE_CACHING
-				Fir.config.perform_caching = true
-			end
 			#use ::Rack::Reloader # Only when developing the Fir gem
 			use ::Rack::ContentLength
 			use ::Fir::Static

data/lib/fir/tasks.rb

@@ -28,24 +28,14 @@ module Fir
 				end
 			end
 			desc 'Export the site to static HTML. (For web hosts that can\'t support Rack. But mod_rewrite must be enabled for .htaccess!) ' +
-				'This will temporarily run Rackup on port 3000 or another port you specify. Usage: rake export dir=path_to_export_to [port=3000]'
+				'Usage: rake export dir=path_to_export_to'
 			task :export do
 				require 'fileutils'
 				
 				if !ENV.has_key?('dir') or ENV['dir'].empty?
-					raise(ArgumentError, 'Usage: rake export dir=path_to_export_to [port=3000]')
+					raise(ArgumentError, 'Usage: rake export dir=path_to_export_to')
 				end
 				
-				port = ENV['port'] || 9292
-				
-				pid_file = 'cache_gen_server.pid'
-				
-				puts 'Starting Rackup with caching turned on...'
-				fork do
-					exec %Q{rackup -p #{port} -e "FORCE_CACHING = true" -D --pid #{pid_file}}
-				end
-				sleep(1) # Give the server a moment to boot
-				
 				page_config = YAML.load(File.read(File.join(FIR_ROOT, 'pages.yml')))
 				path_mappings = page_config.inject({}) do |mappings, (page, configs)|
 					mappings[configs['path']] = page if configs['path']
@@ -64,36 +54,18 @@ module Fir
 					result
 				end + path_mappings.keys
 				
-				puts 'Getting each page to generate the cache...'
+				puts 'Iniitalizing Fir site...'
 				
+				Fir.config.force_caching = true
+				require File.expand_path(File.join(FIR_ROOT, 'config.rb'))
+				builder = Rack::Builder.new(&Fir.boot_proc)
+				
+				puts 'Getting each page to generate the cache...'				
 				paths.each do |path|
-					getter = lambda { Net::HTTP.get(URI.parse("http://localhost:#{port}/#{path}")) }
-					failure_count = 0
-					giving_up = false
-					success = false
-					while failure_count <= 3 and !success
-						puts '  GET ' + path
-						begin
-							getter.call
-							success = true
-						rescue
-							failure_count += 1
-							if failure_count <= 3
-								puts '    Could not connect. Retrying.'
-								sleep(1)
-							else
-								puts '    Could not connect. Giving up.'
-								giving_up = true
-							end
-						end
-					end
-					break if giving_up
+					puts '  GET ' + path
+					builder.call({'PATH_INFO' => '/' + path})
 				end
 				
-				server_pid = File.read(pid_file).to_i
-				Process.kill('SIGINT', server_pid)
-				File.delete(pid_file)
-				
 				copy_from = File.join(FIR_ROOT, 'public', '.')
 				copy_to = ENV['dir']
 				unless File.exists?(copy_to)

data/lib/fir/util.rb

@@ -11,6 +11,8 @@ module Fir
 	def self.config
 		@config ||= OpenStruct.new
 		yield @config if block_given?
+		# force_caching allows the export task to turn caching on even if it's set to off in config.rb
+		@config.perform_caching = true if @config.force_caching
 		# Default configs go here
 		@config.perform_caching ||= false
 		@config.relative_url_root ||= ''

data/skeleton/layouts/application.html.erb

@@ -11,7 +11,7 @@
 	</title>
 	<meta http-equiv="content-type" content="text/html;charset=utf-8"/>
 	<% if @description and !@description.empty? %>
-		<meta name="description" content="<%= h @page_description %>"/>
+		<meta name="description" content="<%= h @description %>"/>
 	<% end %>
 	
 	<!--[if !IE 6]><!-->

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - jarrett
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -06:00
+date: 2010-03-02 00:00:00 -06:00
 default_executable: fir
 dependencies: 
 - !ruby/object:Gem::Dependency