waitress-core 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53fac76668e1321e024fed8489d1e3bcf80075e2
-  data.tar.gz: 8cc2c10b4661f3c42a5432eda9504691d1d47bf0
+  metadata.gz: f552a919bea93da988c0e9d2da78f1f7f3ba950b
+  data.tar.gz: 1c68dce7fcd814fd1a2a2ee4ceca5b6a8bf08676
 SHA512:
-  metadata.gz: efb9647f241a506830c1a69f18869e2fcc7b67d8dc092ce0b14512445773fb2e8118a9c3c2ad8809e892f48f176588e32e8e510ef6e9aaaa30c73ec44ca2bb08
-  data.tar.gz: fc393bf48cdebecbadc08d8a1dc3ec998443c3ebeb00242065a0bb5c0e03b65f45f670f92c389c8370cfc17d6f1e3f1922fb99d5c3dd2f27286a7c070ff233b0
+  metadata.gz: 8b2bccd565fbda334321875aa11e1d59f45b995c69f4d061af4c348ced0db5479625cb019b5bf0ccf24e61af5de58b7b7ece144ba74da04f136cedc4fc8c347e
+  data.tar.gz: eab73cf5eff46c885eff8f9c6eb69e6872887958a99c1ef0fb7bf9a5cf42f7b60644d552702c577ab098bb2d1dd98e9ccad9f9b8c445b4bc6fd5433487124d63

data/ext/waitress_http11/http11_wrb_parser.h

@@ -27,17 +27,25 @@ VALUE WRB_Parse(VALUE self, VALUE string, VALUE buffer) {
 
   int i = 0;
   char pc = NULL;
+  int line_cur = 1;
+  int line = 1;
+
   while (i < slen) {
     char c = sptr[i];
+    if (c == '\n') line_cur += 1;
+
     int open_e = i + tarlen;
     char *open_s = substr(sptr, i, tarlen);
 
     if (mat(open_s, tar) && pc != '\\') {
+      line = line_cur;
       int j = open_e;
       int search = 1;
       int q1 = 0; int q2 = 0;
       while (j < slen && search) {
         char cc = sptr[j];
+        if (cc == '\n') line_cur += 1;
+
         int close_e = j + endlen;
         char *close_s = substr(sptr, j, endlen);
 
@@ -48,7 +56,7 @@ VALUE WRB_Parse(VALUE self, VALUE string, VALUE buffer) {
             i = close_e - 1;
             search = 0;
             char *rb_ev = substr(sptr, open_e, j - open_e);
-            rb_eval_string(rb_ev);
+            rb_yield_values(2, rb_str_new2(rb_ev), INT2NUM(line));
           }
         }
 

data/lib/waitress/chef.rb

@@ -66,8 +66,11 @@ module Waitress
     # +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
+        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
@@ -79,7 +82,7 @@ module Waitress
     # 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. 
+    # and the new filepath will be given.
     def self.find_file abspath
       ret = {}
       if File.exist?(abspath)

data/lib/waitress/evalbind.rb

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

data/lib/waitress/server.rb

@@ -56,7 +56,7 @@ module Waitress
 
     # Killall running processes
     def killall
-      @running_processes.each { |x| x.kill }
+      @running_processes.each { |x| x.kill rescue nil }
     end
 
     # Join the server, blocking the current thread in order to keep the server alive.

data/lib/waitress/version.rb

@@ -1,3 +1,3 @@
 module Waitress
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/waitress.rb

@@ -14,6 +14,7 @@ require 'waitress/handlers/dirhandler'
 require 'waitress/handlers/handler404'
 require 'waitress/handlers/libhandler'
 require 'waitress/chef'
+require 'waitress/evalbind'
 
 require 'waitress_http11'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waitress-core
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jaci Brunning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,6 +148,7 @@ files:
 - lib/waitress.rb
 - lib/waitress/chef.rb
 - lib/waitress/configure.rb
+- lib/waitress/evalbind.rb
 - lib/waitress/handlers/dirhandler.rb
 - lib/waitress/handlers/handler.rb
 - lib/waitress/handlers/handler404.rb