benofsky-bolt 0.3.3 → 0.4

data/bin/bolt

@@ -8,11 +8,18 @@
 #  Copyright 2010 Ben McRedmond. All rights reserved.
 # 
 
-begin
-  require 'bolt'  
-rescue LoadError
+unless ENV['BOLT_DEV'] == "true"
+  begin
+    require 'bolt'  
+  rescue LoadError
+    require 'rubygems'
+    require 'bolt'
+  end
+else
+  base = File.expand_path(File.dirname(File.dirname(__FILE__)))
+  $:.push("#{base}/lib/")
+  require 'bolt.rb'
   require 'rubygems'
-  require 'bolt'
 end
 
 b = Bolt::Bolt.new

data/lib/bolt/page.rb

@@ -15,7 +15,8 @@ def render(view, options = {})
   options[:template] = $config_file['primary_template'] if options[:template].nil?
   options[:engine] ||= "haml"
 
-  raise ArgumentError, ":engine cannot be view" if options[:engine] == "view"    
+  raise ArgumentError, ":engine cannot be view" if options[:engine] == "view"
+  
   require options[:engine_require] || options[:engine]
   
   @content = render_view(view_as_string(view, options[:engine]), options[:engine])

data/lib/bolt/serve.rb

@@ -0,0 +1,145 @@
+# 
+#  serve.rb
+#  bolt
+#  
+#  Created by Ben McRedmond on 2010-06-06.
+#  Copyright 2010 Ben McRedmond. All rights reserved.
+# 
+
+require 'socket'
+require 'time'
+require 'drb/drb'
+
+require 'bolt/build'
+
+class File
+  def content_type
+    mime = {'.jpeg'  => 'image/jpeg',        '.jpg'   => 'image/jpeg',
+            '.png'   => 'image/png',         '.gif'   => 'image/gif',
+            '.mp3'   => 'audio/mpeg3',       '.aif'   => 'audio/aiff',
+            '.mid'   => 'audio/midi',        '.wav'   => 'audio/wav',
+            '.m4a'   => 'audio/MP4A-LATM',   '.3gp'   => 'video/3gpp',
+            '.dv'    => 'video/DV',          '.mp4'   => 'video/H264',
+            '.pdf'   => 'application/pdf',   '.js'    => 'application/js',
+            '.json'  => 'application/json',  '.xml'   => 'text/xml',
+            '.html'  => 'text/html',         '.htm'   => 'text/htm',
+            '.css'   => 'text/css',          '.txt'   => 'text/plain'}
+    mime[File.extname(self.path)] || 'application/octet-stream'
+  end
+  
+  def to_s
+    s = ""
+    self.each {|line| s += line}
+    s
+  end
+end
+
+module Bolt
+  class DRbHash < Hash
+    include DRbUndumped
+  end    
+  
+  class Serve < Build    
+    attr_accessor :pages
+  
+    def initialize
+      super
+      @pages = DRbHash.new
+      
+      DRb.start_service(nil, self)
+      $drb_uri = DRb.uri
+      
+      @server = HTTPServer.new(:host => $config.serve_host, :port => $config.serve_port)
+      
+      @errors_base = File.expand_path(File.dirname(File.dirname(__FILE__))) + '/bolt/serve_errors/'
+      trap("INT") { exit! }
+    end
+  
+    def run
+      # This has to be loaded after the DRb server is started above
+      load 'bolt/serve_page.rb'
+      
+      begin
+        while(request = @server.listen)
+          # Bit of magic here (eek)
+          # Basically the parent class Build loads each page in the pages directory
+          # for whatever project we're in, however the bolt/serve_page require up above
+          # overrides the standard page method used in these pages to instead send us 
+          # the block used to generate the page, so basically @pages is full of 
+          # url => block references.
+          load_pages        
+          parse_config
+        
+          page = @pages[request['GET'].gsub(/\.html/,'')[1..-1]]
+        
+          if(!page.nil?)
+            @server.reply(page.call)
+          elsif(File.exists?(d($config.resources) + request['GET']))
+            f = File.new(d($config.resources) + request['GET'])            
+            @server.reply(f.to_s, 200, 'Content-Type' => f.content_type)
+          else
+            @server.reply(File.new(@errors_base + '404.html').to_s, 404)
+          end
+        end
+      rescue Exception => e
+        puts e
+        @server.reply(File.new(@errors_base + '500.html').to_s, 500)
+        retry
+      end
+      
+      DRb.thread.join
+    end
+  
+  end
+  
+  class HTTPServer  
+    def initialize(options={})
+      options[:host] ||= '127.0.0.1'
+      options[:port] ||= '2658'
+
+      @server = TCPServer.new(options[:host], options[:port])
+      puts "## Starting BoltServe on http://#{options[:host]}:#{options[:port]} ## \n\n"
+    end
+
+    def listen()
+      @session = @server.accept
+      @request = {}
+      @request['headers'] = {}
+
+      while(header = @session.gets)
+        if(header == "\r\n")
+          break
+        elsif(!header.scan(/GET .* HTTP.*/).empty?)
+          @request['GET'] = header.gsub(/GET /, '').gsub(/ HTTP.*/, '').strip
+        else
+          h = header.split(':')
+          @request['headers'][h[0]] = h[1].strip unless h[1].nil?
+        end
+      end
+
+      puts "Request from: #{@session.addr[2]} \n\tfor: #{@request['GET']}\n\n"
+      @request
+    end
+
+    def reply(body, status = '200', headers={})
+      headers['Content-Length'] ||= body.length
+      headers['Connection'] ||= 'close'
+      headers['Date'] ||= Time.now.getgm
+      headers['Last-Modified'] ||= headers['Date']    
+      headers['Content-Type'] ||= 'text/html; charset=UTF-8'
+
+      headers['Server'] = 'Bolt Development Server'
+
+      @session.print("HTTP/1.1 #{status}\n")
+      headers.each do |header, value|
+        @session.print("#{header}: #{value}\n")
+      end
+
+      @session.print("\n")    
+      @session.print(body)
+      @session.print("\r\n")
+
+      @session.close()
+    end
+  end
+end

data/lib/bolt/serve_errors/404.html

@@ -0,0 +1,58 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <title>404 - Page Not found</title>    
+    <style type="text/css">
+      html, body {
+        padding: 0;        
+        margin: 0;
+      }
+    
+      body {
+        background-color: #fff;
+        border-top: 2px solid red;
+        font-family: Georgia, serif;
+        font-size: 12px;
+      }
+      
+      h1 { 
+        text-shadow: #ddd 1px 2px 0px;
+        text-align: center;
+        color: #000;
+        font-size: 25px;
+        font-family: Helvetica;
+      }
+      
+      p, ul {        
+        line-height: 18px;
+      }
+      
+      ul li {
+        margin-bottom: 5px;        
+      }
+      
+      #container {
+        width: 350px;
+        margin: 100px auto;
+      }
+    </style>
+  </head>
+  
+  <body>
+      <div id="container">
+        <h1>Page Not Found</h1>
+        <p>
+          Sorry BoltServe couldn't find the page you requested, a few suggestions:
+          <ul>
+            <li>Check the console for errors.</li>
+            <li>Check for typos in the <em>page</em> block.</li>
+            <li>Check that you copied the file you want into the resources directory (if it's not a page) and that it has correct permissions for BoltServe to access it.</li>
+          </ul>
+          Hope that helps and sorry if it doesn't!
+        </p>
+      </div>
+  </body>
+</html>

data/lib/bolt/serve_errors/500.html

@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <title>500 - Server Error</title>    
+    <style type="text/css">
+      html, body {
+        padding: 0;        
+        margin: 0;
+      }
+    
+      body {
+        background-color: #fff;
+        border-top: 2px solid red;
+        font-family: Georgia, serif;
+        font-size: 12px;
+      }
+      
+      h1 { 
+        text-shadow: #ddd 1px 2px 0px;
+        text-align: center;
+        color: #000;
+        font-size: 25px;
+        font-family: Helvetica;
+      }
+      
+      p, ul {        
+        line-height: 18px;
+      }
+      
+      ul li {
+        margin-bottom: 5px;        
+      }
+      
+      #container {
+        width: 350px;
+        margin: 100px auto;
+      }
+    </style>
+  </head>
+  
+  <body>
+      <div id="container">
+        <h1>Server Error</h1>
+        <p>
+          Sorry BoltServe couldn't generate the page you requested, something is wrong. Some suggestions:
+          <ul>
+            <li>Check the console for errors, there will be one there.</li>
+            <li>Check for typos in your pages.</li>
+          </ul>
+          Hope that helps and sorry if it doesn't!
+        </p>
+      </div>
+  </body>
+</html>

data/lib/bolt/serve_page.rb

@@ -0,0 +1,9 @@
+require 'drb'
+
+DRb.start_service()
+@serve_instance = DRbObject.new(nil, $drb_uri)
+
+def page(page, &block)
+  page = "" if page == "index"
+  @serve_instance.pages[page] = block
+end

data/lib/bolt.rb

@@ -14,7 +14,8 @@ module Bolt
     def initialize
       $config = OpenStruct.new
       @commands = {"create" => true,
-                   "build" => true}
+                   "build" => true,
+                   "serve" => true}
     end
     
     # Parses command line options then runs the specified command
@@ -42,6 +43,11 @@ module Bolt
       require 'bolt/build'
       Build.new.run
     end
+    
+    def serve
+      require 'bolt/serve'
+      Serve.new.run
+    end
 
     # Parses command line options
     def parse_options
@@ -51,9 +57,11 @@ module Bolt
       $config.out = "out"
       $config.pages = "pages"
       $config.config = "config.yml"
+      $config.serve_host = "127.0.0.1"
+      $config.serve_port = "2658"
       
       opts = OptionParser.new do |opts|
-        opts.banner = "Usage: bolt {create/build} [options] [file]"
+        opts.banner = "Usage: bolt {create/build/serve} [options] [file]"
 
         opts.on("-r", "--resources [resource-dir]", "Resources directory") do |opts|
           $config.resources = opts
@@ -78,6 +86,14 @@ module Bolt
         opts.on("-c", "--config [config-file.yml]", "Config file") do |opts|
           $config.config = opts
         end
+        
+        opts.on("-H", "--host [host]", "Serve development server host") do |opts|
+          $config.serve_host = opts
+        end
+        
+        opts.on("-P", "--port [port]", "Serve development server port") do |opts|
+          $config.serve_port = opts
+        end
 
         opts.on_tail("-h", "--help", "Show this help message") do
           puts opts

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Ben McRedmond
@@ -15,7 +14,7 @@ bindir:
 - bin
 cert_chain: []
 
-date: 2010-05-02 00:00:00 +01:00
+date: 2010-06-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,8 +43,12 @@ files:
 - lib/bolt/build.rb
 - lib/bolt/page.rb
 - lib/bolt/project.rb
+- lib/bolt/serve.rb
+- lib/bolt/serve_page.rb
 - lib/bolt/view.rb
 - lib/bolt.rb
+- lib/bolt/serve_errors/404.html
+- lib/bolt/serve_errors/500.html
 - bin/bolt
 - LICENSE
 - default_files/application.haml