sinatra-pages 0.3.0 → 0.4.0

data/lib/sinatra/pages.rb

@@ -7,8 +7,16 @@ module Sinatra
       get route do
         params[:page] = 'home' if params[:page].nil?
         
-        haml params[:page].to_sym
+        begin
+          haml params[:page].to_sym
+        rescue 
+          halt 404
+        end
       end
     end
+    
+    not_found do
+      haml :not_found
+    end
   end
 end

data/spec/pages_spec.rb

@@ -7,7 +7,7 @@ describe Sinatra::Pages do
     Sinatra::Pages
   end
 
-  PAGES = ['Home', 'Generic', 'Generic Test', 'Another Generic Test']
+  PAGES = ['Home', 'Generic', 'Generic Test', 'Another Generic Test', 'Not Found']
 
   file_of = ->(page){page.downcase.gsub ' ', '_'}
   create_file_for = ->(page){File.open("views/#{file_of.(page)}.haml", 'w'){|file| file << page}}
@@ -39,6 +39,15 @@ describe Sinatra::Pages do
         last_response.body.chomp.should == page
       end
     end
+    
+    it "should render the Not Found page if the given route can't find its static page on the 'views' directory." do
+      File.exist?("views/#{file_of.('Do Not Exist')}.haml").should be_false
+
+      get "/#{file_of.('Do Not Exist')}"
+      
+      last_response.should be_not_found
+      last_response.body.chomp.should == 'Not Found'
+    end
   end
 
   after :all do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-pages
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Julio Javier Cicchelli