waitress-core 0.2.1 → 0.2.2

data/lib/waitress/chef.rb

@@ -1,113 +1,113 @@
-module Waitress
-
-  # The chef class handles the cooking of responses, by serving errors and files
-  # from the Filesystem, as well as providing a system for including files within
-  # handlers and .wrb files. This class handles most loading from Filesystems
-  # and serving of the body of a response.
-  class Chef
-
-    HANDLERS = {
-      404 => Handler404.new
-    }
-
-    # Get the waitress resources directory, containing templates and the default
-    # http assets of waitress
-    def self.resources
-      File.expand_path "../resources", __FILE__
-    end
-
-    # Get the waitress HTTP assets directory, containing the default index, 404
-    # and styles resources.
-    def self.resources_http
-      File.join(resources, "http")
-    end
-
-    # Set the response to use an error page with the given error code (usually 404)
-    def self.error code, request, response, client, vhost
-      HANDLERS[code].serve!(request, response, client, vhost)
-    end
-
-    # Serve a file from the Filesystem, automatically handling based on whether the
-    # file is dynamic or static. This will set the body io and any required
-    # headers on the reponse object.
-    def self.serve_file request, response, client, vhost, file
-      if File.extname(file) == ".wrb" || File.extname(file) == ".rb"
-        response.mime ".html"
-        include_absfile File.expand_path(file)
-      else
-        response.mime File.extname(file)
-        response.body_io File.open(file, "r")
-      end
-    end
-
-    # Include a file from the VHost loadpath in the current running instance.
-    # Params:
-    # +filename+:: The filename of the file, relative to the load path of the VHost.
-    def self.include_file filename
-      lp = $VHOST.load_path
-      target = nil
-      lp.each do |path|
-        fl = File.join(path, filename)
-        ext = ["", ".rb", ".wrb"]
-        ext.each do |e|
-          flnew = "#{fl}#{e}"
-          target = flnew if File.exist?(flnew)
-        end
-      end
-
-      raise LoadError.new("Include does not exist in Load Path: #{target}") if target.nil?
-      include_absfile target
-    end
-
-    # Include a file from anywhere in the filesystem (absolute) in the current running
-    # instance. This will load the file's content and, if dynamic, evaluate it to the
-    # current response.
-    # Params:
-    # +target+:: The target file, given in absolute path form.
-    def self.include_absfile target
-      ext = File.extname target
-      bind = Waitress::EvalBindings.new
-      if ext == ".wrb"
-        Waitress::WRBParser.parse!(File.read(target), $RESPONSE.body_io) do |txt, lino|
-          eval(txt, bind.context, target, lino)         # For some reason, rb_f_eval is not exposed to ruby.h
-        end
-      elsif ext == ".rb"
-        require target
-      else
-        echo File.read(target)
-      end
-    end
-
-    # Find a file to serve. This is used by the DirHandler
-    # to automatically include an index file if it exists under the
-    # requested directory, automatically add the .wrb or .html file extension
-    # for paths without the extension, etc. A hash containing the result (ok / notfound)
-    # and the new filepath will be given.
-    def self.find_file abspath
-      ret = {}
-      if File.exist?(abspath)
-        if File.directory?(abspath)
-          wrb = File.join(abspath, "index.wrb")
-          html = File.join(abspath, "index.html")
-          if File.exist?(wrb)
-            ret = { :result => :ok, :file => wrb }
-          elsif File.exist?(html)
-            ret = { :result => :ok, :file => html }
-          else
-            ret = { :result => :dir, :file => abspath }
-          end
-        else
-          ret = { :result => :ok, :file => abspath }
-        end
-      elsif File.exist?("#{abspath}.html")
-        ret = { :result => :ok, :file => "#{abspath}.html" }
-      elsif File.exist?("#{abspath}.wrb")
-        ret = { :result => :ok, :file => "#{abspath}.wrb" }
-      else
-        ret = { :result => :notfound }
-      end
-      ret
-    end
-
-  end
-end
+module Waitress
+
+  # The chef class handles the cooking of responses, by serving errors and files
+  # from the Filesystem, as well as providing a system for including files within
+  # handlers and .wrb files. This class handles most loading from Filesystems
+  # and serving of the body of a response.
+  class Chef
+
+    HANDLERS = {
+      404 => Handler404.new
+    }
+
+    # Get the waitress resources directory, containing templates and the default
+    # http assets of waitress
+    def self.resources
+      File.expand_path "../resources", __FILE__
+    end
+
+    # Get the waitress HTTP assets directory, containing the default index, 404
+    # and styles resources.
+    def self.resources_http
+      File.join(resources, "http")
+    end
+
+    # Set the response to use an error page with the given error code (usually 404)
+    def self.error code, request, response, client, vhost
+      HANDLERS[code].serve!(request, response, client, vhost)
+    end
+
+    # Serve a file from the Filesystem, automatically handling based on whether the
+    # file is dynamic or static. This will set the body io and any required
+    # headers on the reponse object.
+    def self.serve_file request, response, client, vhost, file
+      if File.extname(file) == ".wrb" || File.extname(file) == ".rb"
+        response.mime ".html"
+        include_absfile File.expand_path(file)
+      else
+        response.mime File.extname(file)
+        response.body_io File.open(file, "r")
+      end
+    end
+
+    # Include a file from the VHost loadpath in the current running instance.
+    # Params:
+    # +filename+:: The filename of the file, relative to the load path of the VHost.
+    def self.include_file filename
+      lp = $VHOST.load_path
+      target = nil
+      lp.each do |path|
+        fl = File.join(path, filename)
+        ext = ["", ".rb", ".wrb"]
+        ext.each do |e|
+          flnew = "#{fl}#{e}"
+          target = flnew if File.exist?(flnew)
+        end
+      end
+
+      raise LoadError.new("Include does not exist in Load Path: #{target}") if target.nil?
+      include_absfile target
+    end
+
+    # Include a file from anywhere in the filesystem (absolute) in the current running
+    # instance. This will load the file's content and, if dynamic, evaluate it to the
+    # current response.
+    # Params:
+    # +target+:: The target file, given in absolute path form.
+    def self.include_absfile target
+      ext = File.extname target
+      bind = Waitress::EvalBindings.new
+      if ext == ".wrb"
+        Waitress::WRBParser.parse!(File.read(target), $RESPONSE.body_io) do |txt, lino|
+          eval(txt, bind.context, target, lino)         # For some reason, rb_f_eval is not exposed to ruby.h
+        end
+      elsif ext == ".rb"
+        require target
+      else
+        echo File.read(target)
+      end
+    end
+
+    # Find a file to serve. This is used by the DirHandler
+    # to automatically include an index file if it exists under the
+    # requested directory, automatically add the .wrb or .html file extension
+    # for paths without the extension, etc. A hash containing the result (ok / notfound)
+    # and the new filepath will be given.
+    def self.find_file abspath
+      ret = {}
+      if File.exist?(abspath)
+        if File.directory?(abspath)
+          wrb = File.join(abspath, "index.wrb")
+          html = File.join(abspath, "index.html")
+          if File.exist?(wrb)
+            ret = { :result => :ok, :file => wrb }
+          elsif File.exist?(html)
+            ret = { :result => :ok, :file => html }
+          else
+            ret = { :result => :dir, :file => abspath }
+          end
+        else
+          ret = { :result => :ok, :file => abspath }
+        end
+      elsif File.exist?("#{abspath}.html")
+        ret = { :result => :ok, :file => "#{abspath}.html" }
+      elsif File.exist?("#{abspath}.wrb")
+        ret = { :result => :ok, :file => "#{abspath}.wrb" }
+      else
+        ret = { :result => :notfound }
+      end
+      ret
+    end
+
+  end
+end

data/lib/waitress/configure.rb

@@ -1,121 +1,121 @@
-module Waitress
-
-  # The Configure Class is used to load Waitress configurations from the filesystem,
-  # usually used in the config.rb file.
-  class Configure
-
-    # Endpoint for Waitress.configure!
-    def self.configure! *args, &block
-      raise "Using 'configure!' outside of file target" if @@configure_target.nil?
-      @@configure_target.read_configure *args, &block
-    end
-
-    def self.config_target o
-      @@configure_target = o
-    end
-
-    attr_accessor :servers
-    attr_accessor :root
-
-    def initialize root
-      @root = root
-      @configurations = []
-      generate_configs
-
-      load_cfg
-
-      @servers = @configurations.map do |conf|
-        s = Waitress::HttpServer.new
-        conf.hosts.each { |h| s << h }
-        s.set_processes conf.processes
-        s.ports *conf.ports
-        s
-      end
-      puts "Waitress Configuration Complete"
-      puts "Servers Started on Ports: "
-      @servers.each do |x|
-        puts "\t#{x.ports.join ", "}"
-      end
-    end
-
-    # Run all servers in this configuration
-    def run
-      @servers.each { |s| s.run }
-    end
-
-    # Join all the server threads in this configuration
-    def join
-      @servers.each { |s| s.join }
-    end
-
-    # Read the configuration object
-    def read_configure *args, &block
-      config = Configuration.new self, *args
-      block.call(config)
-      @configurations << config
-    end
-
-    # Generate the configuration file if it doesn't already exist.
-    def generate_configs
-      FileUtils.mkdir_p(@root) unless File.exist?(@root)
-      raise "File #{@root} is not a directory!" unless File.directory?(@root)
-      @config = File.join(@root, "config.rb")
-      unless File.exist?(@config)
-        c = File.read(File.join(Waitress::Chef.resources, "default_config.rb"))
-        File.write(@config, c)
-      end
-    end
-
-    # Load the config.rb file
-    def load_cfg
-      Waitress::Configure.config_target self
-      path = File.absolute_path(@config)
-      require path
-      Waitress::Configure.config_target nil
-    end
-
-  end
-
-  # The Configuration Class is the object that contains a configuration
-  # of a single server instance, hosting all the methods provided by
-  # Waitress.configure!
-  class Configuration
-
-    attr_accessor :hosts
-    attr_accessor :ports
-    attr_accessor :processes
-
-    def initialize configure, *ports
-      @ports = *ports
-      @hosts = []
-      @configure = configure
-
-      @processes = 10
-      @processes = ENV["WAITRESS_PROCESSES"].to_i if ENV.include? "WAITRESS_PROCESSES"
-    end
-
-    # Create a new VirtualHost with the given regex, priority, and configure it
-    # inside of its own block.
-    def host regex, priority=50, &block
-      host = Waitress::Vhost.new regex, priority
-      host.set_configure @configure
-      block.call(host)
-      @hosts << host
-      host
-    end
-
-    # Over all the registered VHosts, call this method. Use this to configure
-    # a similar setting for all vhosts at once instead of duplicating code
-    # across all of them.
-    def all_hosts &block
-      @hosts.each { |h| block.call(h) }
-    end
-
-    def to_s
-      m = lambda { |a,x| x.nil? ? "" : "\r\n#{a}=#{x.inspect}" }
-      "#<#{self.class} #{m.call('ports', @ports)} #{m.call('hosts', @hosts)}>"
-    end
-
-  end
-
-end
+module Waitress
+
+  # The Configure Class is used to load Waitress configurations from the filesystem,
+  # usually used in the config.rb file.
+  class Configure
+
+    # Endpoint for Waitress.configure!
+    def self.configure! *args, &block
+      raise "Using 'configure!' outside of file target" if @@configure_target.nil?
+      @@configure_target.read_configure *args, &block
+    end
+
+    def self.config_target o
+      @@configure_target = o
+    end
+
+    attr_accessor :servers
+    attr_accessor :root
+
+    def initialize root
+      @root = root
+      @configurations = []
+      generate_configs
+
+      load_cfg
+
+      @servers = @configurations.map do |conf|
+        s = Waitress::HttpServer.new
+        conf.hosts.each { |h| s << h }
+        s.set_processes conf.processes
+        s.ports *conf.ports
+        s
+      end
+      puts "Waitress Configuration Complete"
+      puts "Servers Started on Ports: "
+      @servers.each do |x|
+        puts "\t#{x.ports.join ", "}"
+      end
+    end
+
+    # Run all servers in this configuration
+    def run
+      @servers.each { |s| s.run }
+    end
+
+    # Join all the server threads in this configuration
+    def join
+      @servers.each { |s| s.join }
+    end
+
+    # Read the configuration object
+    def read_configure *args, &block
+      config = Configuration.new self, *args
+      block.call(config)
+      @configurations << config
+    end
+
+    # Generate the configuration file if it doesn't already exist.
+    def generate_configs
+      FileUtils.mkdir_p(@root) unless File.exist?(@root)
+      raise "File #{@root} is not a directory!" unless File.directory?(@root)
+      @config = File.join(@root, "config.rb")
+      unless File.exist?(@config)
+        c = File.read(File.join(Waitress::Chef.resources, "default_config.rb"))
+        File.write(@config, c)
+      end
+    end
+
+    # Load the config.rb file
+    def load_cfg
+      Waitress::Configure.config_target self
+      path = File.absolute_path(@config)
+      require path
+      Waitress::Configure.config_target nil
+    end
+
+  end
+
+  # The Configuration Class is the object that contains a configuration
+  # of a single server instance, hosting all the methods provided by
+  # Waitress.configure!
+  class Configuration
+
+    attr_accessor :hosts
+    attr_accessor :ports
+    attr_accessor :processes
+
+    def initialize configure, *ports
+      @ports = *ports
+      @hosts = []
+      @configure = configure
+
+      @processes = 5
+      @processes = ENV["WAITRESS_PROCESSES"].to_i if ENV.include? "WAITRESS_PROCESSES"
+    end
+
+    # Create a new VirtualHost with the given regex, priority, and configure it
+    # inside of its own block.
+    def host regex, priority=50, &block
+      host = Waitress::Vhost.new regex, priority
+      host.set_configure @configure
+      block.call(host)
+      @hosts << host
+      host
+    end
+
+    # Over all the registered VHosts, call this method. Use this to configure
+    # a similar setting for all vhosts at once instead of duplicating code
+    # across all of them.
+    def all_hosts &block
+      @hosts.each { |h| block.call(h) }
+    end
+
+    def to_s
+      m = lambda { |a,x| x.nil? ? "" : "\r\n#{a}=#{x.inspect}" }
+      "#<#{self.class} #{m.call('ports', @ports)} #{m.call('hosts', @hosts)}>"
+    end
+
+  end
+
+end

data/lib/waitress/evalbind.rb

@@ -1,9 +1,9 @@
-module Waitress
-  class EvalBindings
-
-    def context
-      binding()
-    end
-
-  end
-end
+module Waitress
+  class EvalBindings
+
+    def context
+      binding()
+    end
+
+  end
+end

data/lib/waitress/handlers/dirhandler.rb

@@ -1,39 +1,39 @@
-module Waitress
-
-  # The DirHandler class is an instance of +Waitress::Handler+ that is responsible
-  # for loading files from the filesystem and serving them if they exist in the VHost's
-  # root. It automatically handles mimetypes, evaluation and almost everything about
-  # the serving process for files in the FileSystem.
-  class DirHandler < Handler
-
-    attr_accessor :priority
-    attr_accessor :directory
-
-    # Get the instance of DirHandler that will load Waitress' resources
-    # such as the default 404 and index pages, as well as CSS and JS
-    def self.resources_handler
-      @@resources_handler ||= Waitress::DirHandler.new(Waitress::Chef.resources_http, -1000)
-      @@resources_handler
-    end
-
-    # Create a new DirHandler, with the given FileSystem directory as a root
-    # and priority.
-    def initialize directory, priority=50
-      @directory = File.absolute_path(directory)
-      @priority = priority
-    end
-
-    def respond? request, vhost
-      path = File.expand_path File.join("#{directory}", request.path)
-      res = Waitress::Chef.find_file(path)[:result]
-      path.include?(directory) && (res == :ok)
-    end
-
-    def serve request, response, client, vhost
-      path = File.expand_path File.join("#{directory}", request.path)
-      file = Waitress::Chef.find_file(path)[:file]
-      Waitress::Chef.serve_file request, response, client, vhost, file
-    end
-
-  end
-end
+module Waitress
+
+  # The DirHandler class is an instance of +Waitress::Handler+ that is responsible
+  # for loading files from the filesystem and serving them if they exist in the VHost's
+  # root. It automatically handles mimetypes, evaluation and almost everything about
+  # the serving process for files in the FileSystem.
+  class DirHandler < Handler
+
+    attr_accessor :priority
+    attr_accessor :directory
+
+    # Get the instance of DirHandler that will load Waitress' resources
+    # such as the default 404 and index pages, as well as CSS and JS
+    def self.resources_handler
+      @@resources_handler ||= Waitress::DirHandler.new(Waitress::Chef.resources_http, -1000)
+      @@resources_handler
+    end
+
+    # Create a new DirHandler, with the given FileSystem directory as a root
+    # and priority.
+    def initialize directory, priority=50
+      @directory = File.absolute_path(directory)
+      @priority = priority
+    end
+
+    def respond? request, vhost
+      path = File.expand_path File.join("#{directory}", request.path)
+      res = Waitress::Chef.find_file(path)[:result]
+      path.include?(directory) && (res == :ok)
+    end
+
+    def serve request, response, client, vhost
+      path = File.expand_path File.join("#{directory}", request.path)
+      file = Waitress::Chef.find_file(path)[:file]
+      Waitress::Chef.serve_file request, response, client, vhost, file
+    end
+
+  end
+end