fir 0.0.10 → 0.0.11

data/README.markdown

@@ -133,7 +133,7 @@ There's one obvious downside to this approach: you'll lose any dynamic features
 
 ## Exporting to HTML Locally ##
 
-You can also export your whole site to static HTML on your local machine. If you To export:
+You can also export your whole site to static HTML on your local machine:
 
 	rake export dir=~/sites/exported_example
 

data/lib/fir/admin.rb

@@ -58,19 +58,19 @@ module Fir
 					elsif File.exists?(page_path)
 						case env['REQUEST_METHOD'].downcase
 						when 'get'
-							retrieve_page(page_path)
+							return retrieve_page(page_path)
 						when 'delete'
-							return method_not_allowed('DELETE not yet implemented')
+							return delete_page(page_path)
 						else
 							return method_not_allowed('Only GET and POST are allowed')
 						end
 					else
-						not_found
+						return not_found
 					end
 				elsif path.match(/^\/?-admin\/pages$/)
-					page_index
+					return page_index
 				else
-					not_found
+					return not_found
 				end
 			else
 				return @app.call(env)
@@ -79,6 +79,12 @@ module Fir
 		
 		protected
 		
+		def delete_page(page_path)
+			File.delete(page_path)
+			Fir.clear_cache(page_path.sub(File.join(FIR_ROOT, 'pages'), ''))
+			[200, {'Content-Type' => 'text/plain'}, "#{page_path} has been deleted."]
+		end
+		
 		def page_index
 			builder = Builder::XmlMarkup.new(:indent => 2)
 			builder.instruct!

data/spec/admin_spec.rb

@@ -78,7 +78,7 @@ describe 'admin interface' do
 			last_response.status.should == 401
 		end
 		
-		context 'with balid login' do
+		context 'with valid login' do
 			before :each do
 				authorize 'johndoe', 'foo'
 				get '/-admin/pages/index.markdown'
@@ -115,7 +115,7 @@ describe 'admin interface' do
 			last_response.status.should == 401
 		end
 		
-		context 'with balid login' do
+		context 'with valid login' do
 			before :each do
 				authorize 'johndoe', 'foo'
 			end
@@ -151,7 +151,7 @@ describe 'admin interface' do
 						file.write 'This is a cached page'
 					end
 					post '/-admin/pages/cached-page.markdown', 'content' => 'New page content'
-					File.exists?(cached_path).should be_false
+					cached_path.should_not exist_on_disk
 				ensure
 					File.delete(cached_path) if File.exists?(cached_path)
 					File.delete(page_path) if File.exists?(page_path)
@@ -169,4 +169,64 @@ describe 'admin interface' do
 			end
 		end
 	end
+	
+	describe 'DELETE page/pagename' do
+		def deleteable_path
+			@deleteable_path ||= File.join(FIR_ROOT, 'pages', 'deleteable.markdown')
+		end
+		
+		before :each do
+			File.open(deleteable_path, 'w') do |file|
+				file.write 'Deleteable'
+			end
+		end
+		
+		after :each do
+			if File.exists?(deleteable_path)
+				File.delete(deleteable_path)
+			end
+		end
+		
+		it 'requires HTTP auth' do
+			delete '/-admin/pages/deleteable.markdown'
+			last_response.status.should == 401
+		end
+		
+		it 'does not accept bad user/pass combos' do
+			authorize 'johndoe', 'wrong'
+			delete '/-admin/pages/deleteable.markdown'
+			last_response.status.should == 401
+		end
+		
+		context 'with valid login' do
+			before :each do
+				authorize 'johndoe', 'foo'
+			end
+			
+			it 'deletes the page' do
+				delete '/-admin/pages/deleteable.markdown'
+				deleteable_path.should_not exist_on_disk
+			end
+			
+			it 'deletes the page from the cache' do
+				cached_path = File.join(FIR_ROOT, 'public', 'cache', 'deleteable.html')
+				begin
+					File.open(cached_path, 'w') do |file|
+						file.write('Cached deleteable')
+					end
+					delete '/-admin/pages/deleteable.markdown'
+					cached_path.should_not exist_on_disk
+				ensure
+					if File.exists?(cached_path)
+						File.delete(cached_path)
+					end
+				end
+			end
+			
+			it 'returns 200' do
+				delete '/-admin/pages/deleteable.markdown'
+				last_response.status.should == 200
+			end
+		end
+	end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - jarrett
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-21 00:00:00 -05:00
+date: 2010-03-22 00:00:00 -05:00
 default_executable: fir
 dependencies: 
 - !ruby/object:Gem::Dependency