waitress-core 0.2.1 → 0.2.2

data/lib/waitress/parse/query.rb

@@ -1,60 +1,60 @@
-module Waitress
-  # A lot of this class uses methods from Rack::QueryParser in order to Parse
-  # a given QueryString into a Hash of key/value pairs
-  class QueryParser
-    require 'uri'
-
-    DEFAULT_SEP = /[&;] */n
-
-    # Unescape a HTTP URL to regular text. e.g. %20 becomes a space (" ")
-    def self.unescape str, enc=Encoding::UTF_8
-      URI.decode_www_form_component(str, enc)
-    end
-
-    # Parse the given QueryString into a hash of key/value pairs
-    def self.parse qs
-      return {} if qs.nil? || qs.empty?
-      results = {}
-      (qs || '').split(DEFAULT_SEP).each do |p|
-        k, v = p.split('='.freeze, 2).map! { |s| unescape(s) }
-
-        normalize results, k, v
-      end
-      results
-    end
-
-    def self.normalize hash, name, v
-      name =~ %r(\A[\[\]]*([^\[\]]+)\]*)
-      k = $1 || ''
-      after = $' || ''
-
-      return if k.empty?
-
-      if after == ""
-        hash[k] = v
-      elsif after == "["
-        hash[name] = v
-      elsif after == "[]"
-        hash[k] ||= []
-        raise TypeError, "expected Array (got #{hash[k].class.name}) for param `#{k}'" unless hash[k].is_a?(Array)
-        hash[k] << v
-      elsif after =~ %r(^\[\]\[([^\[\]]+)\]$) || after =~ %r(^\[\](.+)$)
-        child_key = $1
-        hash[k] ||= []
-        raise TypeError, "expected Array (got #{hash[k].class.name}) for param `#{k}'" unless hash[k].is_a?(Array)
-        if hash[k].last.is_a?(Hash) && !hash[k].last.key?(child_key)
-          normalize(hash[k].last, child_key, v)
-        else
-          hash[k] << normalize({}, child_key, v)
-        end
-      else
-        hash[k] ||= {}
-        raise TypeError, "expected Hash (got #{hash[k].class.name}) for param `#{k}'" unless hash[k].is_a?(Hash)
-        hash[k] = normalize(hash[k], after, v)
-      end
-
-      hash
-    end
-
-  end
-end
+module Waitress
+  # A lot of this class uses methods from Rack::QueryParser in order to Parse
+  # a given QueryString into a Hash of key/value pairs
+  class QueryParser
+    require 'uri'
+
+    DEFAULT_SEP = /[&;] */n
+
+    # Unescape a HTTP URL to regular text. e.g. %20 becomes a space (" ")
+    def self.unescape str, enc=Encoding::UTF_8
+      URI.decode_www_form_component(str, enc)
+    end
+
+    # Parse the given QueryString into a hash of key/value pairs
+    def self.parse qs
+      return {} if qs.nil? || qs.empty?
+      results = {}
+      (qs || '').split(DEFAULT_SEP).each do |p|
+        k, v = p.split('='.freeze, 2).map! { |s| unescape(s) }
+
+        normalize results, k, v
+      end
+      results
+    end
+
+    def self.normalize hash, name, v
+      name =~ %r(\A[\[\]]*([^\[\]]+)\]*)
+      k = $1 || ''
+      after = $' || ''
+
+      return if k.empty?
+
+      if after == ""
+        hash[k] = v
+      elsif after == "["
+        hash[name] = v
+      elsif after == "[]"
+        hash[k] ||= []
+        raise TypeError, "expected Array (got #{hash[k].class.name}) for param `#{k}'" unless hash[k].is_a?(Array)
+        hash[k] << v
+      elsif after =~ %r(^\[\]\[([^\[\]]+)\]$) || after =~ %r(^\[\](.+)$)
+        child_key = $1
+        hash[k] ||= []
+        raise TypeError, "expected Array (got #{hash[k].class.name}) for param `#{k}'" unless hash[k].is_a?(Array)
+        if hash[k].last.is_a?(Hash) && !hash[k].last.key?(child_key)
+          normalize(hash[k].last, child_key, v)
+        else
+          hash[k] << normalize({}, child_key, v)
+        end
+      else
+        hash[k] ||= {}
+        raise TypeError, "expected Hash (got #{hash[k].class.name}) for param `#{k}'" unless hash[k].is_a?(Hash)
+        hash[k] = normalize(hash[k], after, v)
+      end
+
+      hash
+    end
+
+  end
+end

data/lib/waitress/request.rb

@@ -1,45 +1,45 @@
-module Waitress
-  # The request class is used to represent a HTTP request by a client. This includes
-  # all the headers sent to the server by the client, request URI and those properties
-  # parsed by Mongrel, including the Path and QueryString. GET and POST queries are to
-  # be parsed on-request by the handler or .wrb file as to not waste CPU resources.
-  class Request
-
-    attr_accessor :method
-    attr_accessor :path
-    attr_accessor :uri
-    attr_accessor :querystring
-    attr_accessor :http_version
-    attr_accessor :body
-    attr_accessor :headers
-
-    def initialize method, path, uri, query, http_version, body, headers
-      @method = method
-      @path = Waitress::QueryParser.unescape(path)
-      @uri = Waitress::QueryParser.unescape(uri)
-      @querystring = query
-      @http_version = http_version
-      @body = body
-      @headers = headers
-      @marks = {}
-    end
-
-    # The GET query for the request in the form of a hash. This is parsed on-request
-    def get_query
-      @get ||= Waitress::QueryParser.parse(@querystring)
-      @get
-    end
-
-    # The POST query for the request in the form of a hash. This is parsed on-request
-    def post_query
-      @post ||= Waitress::QueryParser.parse(@body)
-      @post
-    end
-
-    def to_s
-      m = lambda { |a,x| x.nil? ? "" : "#{a}=#{x.inspect}" }
-      "#<#{self.class} method=#{@method} path=#{@path} #{m.call("query", @query)}>"
-    end
-
-  end
-end
+module Waitress
+  # The request class is used to represent a HTTP request by a client. This includes
+  # all the headers sent to the server by the client, request URI and those properties
+  # parsed by Mongrel, including the Path and QueryString. GET and POST queries are to
+  # be parsed on-request by the handler or .wrb file as to not waste CPU resources.
+  class Request
+
+    attr_accessor :method
+    attr_accessor :path
+    attr_accessor :uri
+    attr_accessor :querystring
+    attr_accessor :http_version
+    attr_accessor :body
+    attr_accessor :headers
+
+    def initialize method, path, uri, query, http_version, body, headers
+      @method = method
+      @path = Waitress::QueryParser.unescape(path)
+      @uri = Waitress::QueryParser.unescape(uri)
+      @querystring = query
+      @http_version = http_version
+      @body = body
+      @headers = headers
+      @marks = {}
+    end
+
+    # The GET query for the request in the form of a hash. This is parsed on-request
+    def get_query
+      @get ||= Waitress::QueryParser.parse(@querystring)
+      @get
+    end
+
+    # The POST query for the request in the form of a hash. This is parsed on-request
+    def post_query
+      @post ||= Waitress::QueryParser.parse(@body)
+      @post
+    end
+
+    def to_s
+      m = lambda { |a,x| x.nil? ? "" : "#{a}=#{x.inspect}" }
+      "#<#{self.class} method=#{@method} path=#{@path} #{m.call("query", @query)}>"
+    end
+
+  end
+end

data/lib/waitress/resources/default_config.rb

@@ -1,52 +1,52 @@
-# This is the configuration for your waitress server, accepting connections on port '2910'
-Waitress.configure!(2910) do |w|
-
-  # You can run regular Ruby Code in here, too!
-  @home = "~/.waitress/www/"
-  def fl file
-    File.join(@home, file)
-  end
-
-  # This is your main Virtual Host, accepting connections to 'example.mysite.com'
-  w.host(/example.mysite.com/) do |host|
-    # This is where your public documents and pages are stored
-    host.root fl("example/http")
-
-    # This is where your non-public includes are stored
-    host.includes fl("example/rb")
-
-    # This will show up when a 404 error occurs
-    # host.set_404 fl("example/http/404.html")
-
-    # Want to rewrite a URL? No problem.
-    host.rewrite /some_url/, "some_other_url"
-    host.rewrite /capture_group_(\d)/, "capture/group\\1"
-
-    # Bind_Lib will allow you to automatically import lib tags into .wrb files
-    # Before they are sent to the client.
-    host.bind_lib /jquery.*/, :js, "jquery"
-    host.bind_lib /boostrap.*/, :css, "boots"
-
-    # Use combos to chain together libraries into a collection
-    host.combo "all-lib", "jquery", "boots"
-
-    # Change this to change where you store your libraries
-    host.libdir fl("libs")
-
-    # Change this to choose what URI the libraries are linked
-    # to (yoursite.com/libraries/library_name)
-    host.liburi "libraries"
-  end
-
-  # This is your other Virtual Host, accepting connections to any domain.
-  # The '0' represents the priority, with the default being 50. Higher priority
-  # Hosts will be chosen if the request matches multiple Hosts.
-  w.host(/.*/, 0) do |host|
-    # This is where your public documents and pages are stored
-    host.root fl("main/http")
-
-    # This is where your non-public includes are stored
-    host.includes fl("main/rb")
-  end
-
-end
+# This is the configuration for your waitress server, accepting connections on port '2910'
+Waitress.configure!(2910) do |w|
+
+  # You can run regular Ruby Code in here, too!
+  @home = File.dirname(__FILE__)
+  def fl file
+    File.join(@home, file)
+  end
+
+  # This is your main Virtual Host, accepting connections to 'example.mysite.com'
+  w.host(/example.mysite.com/) do |host|
+    # This is where your public documents and pages are stored
+    host.root fl("example/http")
+
+    # This is where your non-public includes are stored
+    host.includes fl("example/rb")
+
+    # This will show up when a 404 error occurs
+    # host.set_404 fl("example/http/404.html")
+
+    # Want to rewrite a URL? No problem.
+    host.rewrite /some_url/, "some_other_url"
+    host.rewrite /capture_group_(\d)/, "capture/group\\1"
+
+    # Bind_Lib will allow you to automatically import lib tags into .wrb files
+    # Before they are sent to the client.
+    host.bind_lib /jquery.*/, :js, "jquery"
+    host.bind_lib /boostrap.*/, :css, "boots"
+
+    # Use combos to chain together libraries into a collection
+    host.combo "all-lib", "jquery", "boots"
+
+    # Change this to change where you store your libraries
+    host.libdir fl("libs")
+
+    # Change this to choose what URI the libraries are linked
+    # to (yoursite.com/libraries/library_name)
+    host.liburi "libraries"
+  end
+
+  # This is your other Virtual Host, accepting connections to any domain.
+  # The '0' represents the priority, with the default being 50. Higher priority
+  # Hosts will be chosen if the request matches multiple Hosts.
+  w.host(/.*/, 0) do |host|
+    # This is where your public documents and pages are stored
+    host.root fl("main/http")
+
+    # This is where your non-public includes are stored
+    host.includes fl("main/rb")
+  end
+
+end

data/lib/waitress/resources/http/404.html

@@ -1,18 +1,18 @@
-<html>
-  <head>
-    <title> 404 - Page Not Found </title>
-    <link rel="stylesheet" href="/css/hack.css">
-    <link rel="stylesheet" href="/css/waitress.css">
-  </head>
-  <body>
-    <div id="maincontainer">
-      <div class="textcontainer">
-        <h1> 404 </h1>
-        <h2> You ordered something that wasn't on the menu </h2>
-      </div>
-      <div class="imgcontainer">
-        <img src="/img/404.png">
-      </div>
-    </div>
-  </body>
-</html>
+<html>
+  <head>
+    <title> 404 - Page Not Found </title>
+    <link rel="stylesheet" href="/css/hack.css">
+    <link rel="stylesheet" href="/css/waitress.css">
+  </head>
+  <body>
+    <div id="maincontainer">
+      <div class="textcontainer">
+        <h1> 404 </h1>
+        <h2> You ordered something that wasn't on the menu </h2>
+      </div>
+      <div class="imgcontainer">
+        <img src="/img/404.png">
+      </div>
+    </div>
+  </body>
+</html>

data/lib/waitress/resources/http/css/hack.css

@@ -1,37 +1,37 @@
-/*!
- *  Hack v2.013 - https://sourcefoundry.org/hack/
- *  Licenses - Fonts: Hack Open Font License + Bitstream Vera license, CSS: MIT License
- */
-/* FONT PATHS
- * -------------------------- */
-@font-face {
-  font-family: 'Hack';
-  src: url('../fonts/eot/latin/hack-regular-latin-webfont.eot?v=2.013');
-  src: url('../fonts/eot/latin/hack-regular-latin-webfont.eot?#iefix&v=2.013') format('embedded-opentype'), url('../fonts/woff2/latin/hack-regular-latin-webfont.woff2?v=2.013') format('woff2'), url('../fonts/woff/latin/hack-regular-latin-webfont.woff?v=2.013') format('woff'), url('../fonts/web-ttf/latin/hack-regular-latin-webfont.ttf?v=2.013') format('truetype'), url('../fonts/svg/latin/hack-regular-latin-webfont.svg?v=2.013#hackregular') format('svg');
-  font-weight: 400;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'Hack';
-  src: url('../fonts/eot/latin/hack-bold-latin-webfont.eot?v=2.013');
-  src: url('../fonts/eot/latin/hack-bold-latin-webfont.eot?#iefix&v=2.013') format('embedded-opentype'), url('../fonts/woff2/latin/hack-bold-latin-webfont.woff2?v=2.013') format('woff2'), url('../fonts/woff/latin/hack-bold-latin-webfont.woff?v=2.013') format('woff'), url('../fonts/web-ttf/latin/hack-bold-latin-webfont.ttf?v=2.013') format('truetype'), url('../fonts/svg/latin/hack-bold-latin-webfont.svg?v=2.013#hackbold') format('svg');
-  font-weight: 700;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'Hack';
-  src: url('../fonts/eot/latin/hack-italic-latin-webfont.eot?v=2.013');
-  src: url('../fonts/eot/latin/hack-italic-latin-webfont.eot?#iefix&v=2.013') format('embedded-opentype'), url('../fonts/woff2/latin/hack-italic-latin-webfont.woff2?v=2.013') format('woff2'), url('../fonts/woff/latin/hack-italic-latin-webfont.woff?v=2.013') format('woff'), url('../fonts/web-ttf/latin/hack-italic-latin-webfont.ttf?v=2.013') format('truetype'), url('../fonts/svg/latin/hack-italic-latin-webfont.svg?v=2.013#hackitalic') format('svg');
-  font-weight: 400;
-  font-style: italic;
-}
-
-@font-face {
-  font-family: 'Hack';
-  src: url('../fonts/eot/latin/hack-bolditalic-latin-webfont.eot?v=2.013');
-  src: url('../fonts/eot/latin/hack-bolditalic-latin-webfont.eot?#iefix&v=2.013') format('embedded-opentype'), url('../fonts/woff2/latin/hack-bolditalic-latin-webfont.woff2?v=2.013') format('woff2'), url('../fonts/woff/latin/hack-bolditalic-latin-webfont.woff?v=2.013') format('woff'), url('../fonts/web-ttf/latin/hack-bolditalic-latin-webfont.ttf?v=2.013') format('truetype'), url('../fonts/svg/latin/hack-bolditalic-latin-webfont.svg?v=2.013#hackbolditalic') format('svg');
-  font-weight: 700;
-  font-style: italic;
-}
+/*!
+ *  Hack v2.013 - https://sourcefoundry.org/hack/
+ *  Licenses - Fonts: Hack Open Font License + Bitstream Vera license, CSS: MIT License
+ */
+/* FONT PATHS
+ * -------------------------- */
+@font-face {
+  font-family: 'Hack';
+  src: url('../fonts/eot/latin/hack-regular-latin-webfont.eot?v=2.013');
+  src: url('../fonts/eot/latin/hack-regular-latin-webfont.eot?#iefix&v=2.013') format('embedded-opentype'), url('../fonts/woff2/latin/hack-regular-latin-webfont.woff2?v=2.013') format('woff2'), url('../fonts/woff/latin/hack-regular-latin-webfont.woff?v=2.013') format('woff'), url('../fonts/web-ttf/latin/hack-regular-latin-webfont.ttf?v=2.013') format('truetype'), url('../fonts/svg/latin/hack-regular-latin-webfont.svg?v=2.013#hackregular') format('svg');
+  font-weight: 400;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Hack';
+  src: url('../fonts/eot/latin/hack-bold-latin-webfont.eot?v=2.013');
+  src: url('../fonts/eot/latin/hack-bold-latin-webfont.eot?#iefix&v=2.013') format('embedded-opentype'), url('../fonts/woff2/latin/hack-bold-latin-webfont.woff2?v=2.013') format('woff2'), url('../fonts/woff/latin/hack-bold-latin-webfont.woff?v=2.013') format('woff'), url('../fonts/web-ttf/latin/hack-bold-latin-webfont.ttf?v=2.013') format('truetype'), url('../fonts/svg/latin/hack-bold-latin-webfont.svg?v=2.013#hackbold') format('svg');
+  font-weight: 700;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Hack';
+  src: url('../fonts/eot/latin/hack-italic-latin-webfont.eot?v=2.013');
+  src: url('../fonts/eot/latin/hack-italic-latin-webfont.eot?#iefix&v=2.013') format('embedded-opentype'), url('../fonts/woff2/latin/hack-italic-latin-webfont.woff2?v=2.013') format('woff2'), url('../fonts/woff/latin/hack-italic-latin-webfont.woff?v=2.013') format('woff'), url('../fonts/web-ttf/latin/hack-italic-latin-webfont.ttf?v=2.013') format('truetype'), url('../fonts/svg/latin/hack-italic-latin-webfont.svg?v=2.013#hackitalic') format('svg');
+  font-weight: 400;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'Hack';
+  src: url('../fonts/eot/latin/hack-bolditalic-latin-webfont.eot?v=2.013');
+  src: url('../fonts/eot/latin/hack-bolditalic-latin-webfont.eot?#iefix&v=2.013') format('embedded-opentype'), url('../fonts/woff2/latin/hack-bolditalic-latin-webfont.woff2?v=2.013') format('woff2'), url('../fonts/woff/latin/hack-bolditalic-latin-webfont.woff?v=2.013') format('woff'), url('../fonts/web-ttf/latin/hack-bolditalic-latin-webfont.ttf?v=2.013') format('truetype'), url('../fonts/svg/latin/hack-bolditalic-latin-webfont.svg?v=2.013#hackbolditalic') format('svg');
+  font-weight: 700;
+  font-style: italic;
+}

data/lib/waitress/resources/http/css/waitress.css

@@ -1,57 +1,57 @@
-body {
-  background-color: rgb(15, 15, 15);
-  font-family: 'Hack', proxima-nova, helvetica;
-  color: #ddd;
-}
-
-#maincontainer {
-  width: 60%;
-  min-width: 950px;
-  height: 250px;
-  position: absolute;
-  top:0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-
-  text-align: right;
-  margin: auto;
-
-  display: flex;
-}
-
-.textcontainer {
-  width: 65%;
-  padding-right: 5%;
-}
-
-.titlecontainer {
-  text-align: center;
-  display: block;
-}
-
-.imgcontainer {
-  width: 30%;
-  padding-left: 5%;
-  text-align: left;
-  border-left: 3px solid #ddd;
-  opacity: 0.25;
-}
-
-img {
-  height: 250px;
-}
-
-h1, h2 {
-  margin: 0;
-  font-weight: normal;
-}
-
-h1 {
-  font-size: 120px;
-  margin-bottom: -15px;
-}
-
-h2 {
-  font-size: 40px;
-}
+body {
+  background-color: rgb(15, 15, 15);
+  font-family: 'Hack', proxima-nova, helvetica;
+  color: #ddd;
+}
+
+#maincontainer {
+  width: 60%;
+  min-width: 950px;
+  height: 250px;
+  position: absolute;
+  top:0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+
+  text-align: right;
+  margin: auto;
+
+  display: flex;
+}
+
+.textcontainer {
+  width: 65%;
+  padding-right: 5%;
+}
+
+.titlecontainer {
+  text-align: center;
+  display: block;
+}
+
+.imgcontainer {
+  width: 30%;
+  padding-left: 5%;
+  text-align: left;
+  border-left: 3px solid #ddd;
+  opacity: 0.25;
+}
+
+img {
+  height: 250px;
+}
+
+h1, h2 {
+  margin: 0;
+  font-weight: normal;
+}
+
+h1 {
+  font-size: 120px;
+  margin-bottom: -15px;
+}
+
+h2 {
+  font-size: 40px;
+}