nyara 0.0.1.pre.4 → 0.0.1.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dc7b625bcf917f1fc957ca42953345df87faa40
-  data.tar.gz: f7c7669fed83475cb1626dec024e30eed7cf76ee
+  metadata.gz: ff97920b70aa73d175c0c11ceabd1d2117d680da
+  data.tar.gz: 37bb1733ddfafef3a1ce806e58e1ddf145396a15
 SHA512:
-  metadata.gz: e76227e8c9e4f4dc292b32e1cc72e11525e91a5b6f54784d4f7f6a63fba4b126f5fea81070cf793723908d82182faac1e3a47d3835903a99426fb82cb85e93b1
-  data.tar.gz: 592183cbad4bb90c3090a752832a2e7d26138e07b38bf2e7cb94544046619c3f6f620c566e21119f80f8c99c0f360c0be49f0303b51b19b6ac25a0c4a564c407
+  metadata.gz: dabf49a57dd4c1e91693020c699e5dcb9a5726663af573a162d8c1df44d712c0ac4894b15e943010e5259488746d4da117d98c127563b7a75905813dcc2bceb5
+  data.tar.gz: 636bbcd0ab74719cb7feb9c93891dc04287c3445eb19465c8bb232495b935964b7e4f9da582e6faed3a33f5d6be14f7410b9534096832692cbafcda8ee35ab8e

data/ext/extconf.rb

@@ -11,12 +11,7 @@ end
 
 def tweak_cflags
   mf_conf = RbConfig::MAKEFILE_CONFIG
-  if mf_conf['CC'] =~ /clang/
-    # enable c++0x. this can not be installed on $CPPFLAGS, wtf??
-    mf_conf['CXXFLAGS'] << ' -stdlib=libc++ -std=c++0x'
-    $CFLAGS << ' $(xflags)'
-  else
-    mf_conf['CXXFLAGS'] << ' -std=c++0x'
+  if mf_conf['CC'] =~ /gcc/
     $CFLAGS << ' -std=c99 -Wno-declaration-after-statement $(xflags)'
   end
 

data/ext/request.c

@@ -89,10 +89,8 @@ void nyara_request_term_close(VALUE self, bool write_last_chunk) {
   P;
   if (write_last_chunk || p->status == 200) {
     // usually this succeeds, while not, it doesn't matter cause we are closing it
-#   pragma GCC diagnostic push
-#   pragma GCC diagnostic ignored "-Wunused-result"
-    write(p->fd, "0\r\n\r\n", 5);
-#   pragma GCC diagnostic pop
+    if (write(p->fd, "0\r\n\r\n", 5)) {
+    }
   }
   nyara_detach_fd(p->fd);
   p->fd = 0;

data/ext/route.cc

@@ -45,7 +45,11 @@ struct RouteEntry {
 };
 
 typedef std::vector<RouteEntry> RouteEntries;
-static std::map<enum http_method, RouteEntries*> route_map;
+typedef RouteEntries::iterator EntriesIter;
+typedef std::map<enum http_method, RouteEntries*> RouteMap;
+typedef RouteMap::iterator MapIter;
+
+static RouteMap route_map;
 static OnigRegion region; // we can reuse the region without worrying thread safety
 static ID id_to_s;
 static rb_encoding* u8_enc;
@@ -56,7 +60,7 @@ static bool start_with(const char* a, long a_len, const char* b, long b_len) {
   if (b_len > a_len) {
     return false;
   }
-  for (size_t i = 0; i < b_len; i++) {
+  for (long i = 0; i < b_len; i++) {
     if (a[i] != b[i]) {
       return false;
     }
@@ -76,9 +80,9 @@ static enum http_method canonicalize_http_method(VALUE m) {
 }
 
 static VALUE ext_clear_route(VALUE req) {
-  for (auto i = route_map.begin(); i != route_map.end(); ++i) {
+  for (MapIter i = route_map.begin(); i != route_map.end(); ++i) {
     RouteEntries* entries = i->second;
-    for (auto j = entries->begin(); j != entries->end(); ++j) {
+    for (EntriesIter j = entries->begin(); j != entries->end(); ++j) {
       j->dealloc();
     }
     delete entries;
@@ -91,7 +95,7 @@ static VALUE ext_register_route(VALUE self, VALUE v_e) {
   // get route entries
   enum http_method m = canonicalize_http_method(rb_iv_get(v_e, "@http_method"));
   RouteEntries* route_entries;
-  auto map_iter = route_map.find(m);
+  MapIter map_iter = route_map.find(m);
   if (map_iter == route_map.end()) {
     route_entries = new RouteEntries();
     route_map[m] = route_entries;
@@ -159,15 +163,14 @@ static VALUE ext_list_route(VALUE self) {
   // note: prevent leak with init nil
   volatile VALUE arr = Qnil;
   volatile VALUE e = Qnil;
-  volatile VALUE prefix = Qnil;
   volatile VALUE conv = Qnil;
 
   volatile VALUE route_hash = rb_hash_new();
-  for (auto j = route_map.begin(); j != route_map.end(); j++) {
+  for (MapIter j = route_map.begin(); j != route_map.end(); j++) {
     RouteEntries* route_entries = j->second;
-    VALUE arr = rb_ary_new();
+    arr = rb_ary_new();
     rb_hash_aset(route_hash, rb_str_new2(http_method_str(j->first)), arr);
-    for (auto i = route_entries->begin(); i != route_entries->end(); i++) {
+    for (EntriesIter i = route_entries->begin(); i != route_entries->end(); i++) {
       e = rb_ary_new();
       rb_ary_push(e, i->is_sub ? Qtrue : Qfalse);
       rb_ary_push(e, i->scope);
@@ -227,7 +230,7 @@ static VALUE extract_ext(const char* s, long len) {
 extern "C"
 RouteResult nyara_lookup_route(enum http_method method_num, VALUE vpath, VALUE accept_arr) {
   RouteResult r = {Qnil, Qnil, Qnil, Qnil};
-  auto map_iter = route_map.find(method_num);
+  MapIter map_iter = route_map.find(method_num);
   if (map_iter == route_map.end()) {
     return r;
   }
@@ -237,7 +240,7 @@ RouteResult nyara_lookup_route(enum http_method method_num, VALUE vpath, VALUE a
   long len = RSTRING_LEN(vpath);
   // must iterate all
   bool last_matched = false;
-  auto i = route_entries->begin();
+  EntriesIter i = route_entries->begin();
   for (; i != route_entries->end(); ++i) {
     bool matched;
     if (i->is_sub && last_matched) { // save a bit compare

data/lib/nyara/view.rb

@@ -79,8 +79,9 @@ module Nyara
         if src
           sig = @meth2sig[meth].map{|k| "#{k}: nil" }.join ','
           sig = '_={}' if sig.empty?
+          sig = "(#{sig})" # 2.0.0-p0 requirement
           Renderable.class_eval <<-RUBY, path, 1
-            def render #{sig}
+            def render#{sig}
               #{src}
             end
             alias :#{meth.inspect} render

data/nyara.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "nyara"
-  s.version = "0.0.1.pre.4"
+  s.version = "0.0.1.pre.5"
   s.author = "Zete Lui"
   s.email = "nobody@example.com"
   s.homepage = "https://github.com/luikore/nyara"

data/readme.md

@@ -13,8 +13,8 @@ Not Yet Another Ruby Async web framework and server.
 Requirement
 
 - BSD/Linux/Mac OS X
-- Ruby 2.0.0-p195 or higher (due to some syntax issues, doesn't work on 2.0.0-p0)
-- GCC4.5+ or Clang
+- Ruby 2.0.0 or higher
+- GCC or Clang
 
 Install
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyara
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.4
+  version: 0.0.1.pre.5
 platform: ruby
 authors:
 - Zete Lui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies: []
 description: Fast, slim and fuzzy ruby web framework + server, based on preforked
   event queue and Fiber. NO rack NOR eventmachine are used.