benofsky-bolt 0.4.5 → 0.4.7

data/lib/bolt/base.rb

@@ -12,7 +12,7 @@ require 'ftools' if RUBY_VERSION.to_f <= 1.8
 $BOLT_BASE = File.dirname(__FILE__) + "/../../"
 
 module Bolt
-  class Base
+  class Base    
     def initialize
       STDOUT.sync = true
     end        
@@ -45,7 +45,7 @@ module Bolt
       options[:copy_from] ||= false
       
       if options[:copy_from]          
-        f = File.copy(options[:copy_from], file)
+        f = FileUtils.copy(options[:copy_from], file)
       else
         f = File.new(file, options[:mode])
       end

data/lib/bolt/serve.rb

@@ -45,6 +45,8 @@ module Bolt
     end
   end
   
+  class NotFound404 < Exception; end;
+  
   class Serve < Build    
     attr_accessor :pages
   
@@ -82,7 +84,11 @@ module Bolt
           page_name = "index" if page_name == ""
           page = @pages[page_name]
           
-          if(!page.nil?)                        
+          # Handle subdirectories
+          page = @pages[page_name + "index"] if page.nil?
+          page = @pages[page_name + "/index"] if page.nil?
+          
+          if(!page.nil?)
             # A tad hacky, otherwise @current_page isn't set properly and all hell breaks loose
             body = PageBinding.new(page_name).instance_eval(&page)
             @server.reply(body)
@@ -90,10 +96,11 @@ module Bolt
             f = File.new(d($config.resources) + request['GET'])            
             @server.reply(f.to_s, 200, 'Content-Type' => f.content_type)
           else
-            # want to raise an exception here
-            @server.reply(File.new(@errors_base + '404.html').to_s, 404)
+            raise NotFound404            
           end
         end
+      rescue NotFound404        
+        @server.reply(File.new(@errors_base + '404.html').to_s, 404)
       rescue Exception => e
         puts "Error: #{e}"
         puts e.backtrace

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: benofsky-bolt
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 5
-  version: 0.4.5
+  prerelease: 
+  version: 0.4.7
 platform: ruby
 authors: 
 - Ben McRedmond
@@ -22,12 +18,10 @@ dependencies:
   name: haml
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
         version: "2.2"
   type: :runtime
   version_requirements: *id001
@@ -66,23 +60,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Bolt is a simple static website generator with great support for dynamic content insertion.