r2ree 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1880fd4e308c99714e1ea13e5c796eb9afc50ad1
-  data.tar.gz: d6d536b0ff188ea98d48453f4ae2a94779d6d765
+SHA256:
+  metadata.gz: 3c8335cbef249961ab636592b8c0915feea8d6c10b977b71c5d3024b133c490a
+  data.tar.gz: 90dfad4cb86a41f33a4c569b3f63c99bc4d21fe67db2e0e8bcc40f56aba49825
 SHA512:
-  metadata.gz: 2d5e9858d46d1c6e97e79b7b54e958ce07e5c97f661f0bb56cccad5580fc5b5e046fdc34c989bd54acebc3e5d35301024643d17c71a6f87c6a39d532691be6a5
-  data.tar.gz: b277343834e0096d6ad7df512b7873a3dbc328283ac866f93e1f8b9dce7f8dfbfab2fc42d944626106d9410f1934da04bbf1b1e000818d91cea8c3de4022f040
+  metadata.gz: 93ac6878efc2d145ba8faf1a4b1575ddbe9eb0337b37f843bf5eb9b6e3e61d6951d0d9993f1f6ad9e6c0135208be8bc44274f24ce8612498cf6c9a0e1ee85541
+  data.tar.gz: 838a4fa38d82e1500f17f901bd28ac36970cf93a148a1f8e24144253a73aea9dbfa7ce3a725faf84eed0af771e12afe424060cff9ea0f167f1c2339d8650435d

data/lib/r2ree/version.rb

@@ -1,3 +1,3 @@
 class R2ree
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/vendor/r2ree/.travis.yml

@@ -1,21 +1,47 @@
+sudo: required
+dist: trusty
 language: cpp
 os:
   - linux
   - osx
-cache:
-  - apt
-compiler:
-  - clang
-  - gcc
-before_install:
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi
+compiler: clang++
+env: CXXFLAGS='-std=c++11'
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+      - george-edison55-precise-backports
+    packages:
+      - cmake
+      - cmake-data
+      - libgtest-dev
+matrix:
+  include:
+    - compiler: clang++-3.6
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.6
+          packages:
+            - clang-3.6
+      env: CXX=clang++-3.6
+    - compiler: clang++-3.7
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.7
+          packages:
+            - clang-3.7
+      env: CXX=clang++-3.7
 install:
   - wget https://github.com/google/googletest/archive/release-1.7.0.zip -O googletest-release-1.7.0.zip
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then unzip -q googletest-release-1.7.0.zip && cd googletest-release-1.7.0 && sudo cp -r include/gtest /usr/local/include && g++ src/gtest-all.cc -I. -Iinclude -c && g++ src/gtest_main.cc -I. -Iinclude -c && ar -rv libgtest.a gtest-all.o && ar -rv libgtest_main.a gtest_main.o && sudo mv *.a /usr/local/lib && g++ -m32 src/gtest-all.cc -I. -Iinclude -c && g++ -m32 src/gtest_main.cc -I. -Iinclude -c && ar -rv libgtest.a gtest-all.o && ar -rv libgtest_main.a gtest_main.o && sudo mkdir /usr/local/lib32 && sudo mv *.a /usr/local/lib32 && cd ..; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then unzip -q googletest-release-1.7.0.zip && cd googletest-release-1.7.0 && sudo cp -r include/gtest /usr/local/include && clang++ src/gtest-all.cc -I. -Iinclude -c && g++ src/gtest_main.cc -I. -Iinclude -c && ar -rv libgtest.a gtest-all.o && ar -rv libgtest_main.a gtest_main.o && sudo mv *.a /usr/local/lib && cd ..; fi
-matrix:
-  exclude:
-    - os: osx
-      compiler: gcc
 script:
-  - mkdir build && cd build && cmake .. && make && ./r2ree_test
+  - mkdir build
+  - cd build
+  - cmake ..
+  - cat Makefile
+  - make
+  - ./r2ree_test

data/vendor/r2ree/CMakeLists.txt

@@ -20,7 +20,7 @@ set(EXT_PROJECTS_DIR ${PROJECT_SOURCE_DIR}/ext)
 
 add_subdirectory(${EXT_PROJECTS_DIR}/gtest)
 
-set(CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ -Iinclude -include ${PROJECT_SOURCE_DIR}/src/r2ree.cc")
+set(CMAKE_CXX_FLAGS "-std=c++11 ${CXX_FLAGS} -Iinclude -include ${PROJECT_SOURCE_DIR}/src/r2ree.cc")
 
 #-------------------
 # Test

data/vendor/r2ree/README.md

@@ -1,5 +1,7 @@
 # r2ree
 
+[![Build Status](https://travis-ci.org/namusyaka/r2ree.svg?branch=master)](https://travis-ci.org/namusyaka/r2ree)
+
 Radix tree implementation for use in HTTP routing.
 
 r2ree is written in C++ and licensed under the MIT License, it can be used as a library.

data/vendor/r2ree/ext/gtest/CMakeLists.txt

@@ -28,4 +28,4 @@ set(GTEST_INCLUDE_DIRS ${source_dir}/googletest/include PARENT_SCOPE)
 
 # Specify MainTest's link libraries
 ExternalProject_Get_Property(googletest binary_dir)
-set(GTEST_LIBS_DIR ${binary_dir}/googlemock/gtest PARENT_SCOPE)
+set(GTEST_LIBS_DIR ${binary_dir}/lib PARENT_SCOPE)

data/vendor/r2ree/src/r2ree.cc

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2016 namusyaka
+ * Copyright (c) 2016 namusyaka, shiyanhui
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -163,14 +163,16 @@ namespace r2ree {
   }
 
   parse_result radix_tree::get(const string &path) {
-    parameters params = parameters{ new parameter[root->max_parameters] };
+    parameters params = parameters{ new parameter[root->max_parameters], 0};
 
     auto root = this->root;
     int i = 0, n = path.size(), p;
 
     while (i < n) {
-      if (root->indices.empty())
+      if (root->indices.empty()) {
+        delete[] params.params;
         return parse_result();
+      }
 
       if (root->indices[0] == colon) {
         root = root->children[0];
@@ -183,8 +185,10 @@ namespace r2ree {
         break;
       } else {
         root = root->get_child(path[i]);
-        if (!root || path.substr(i, root->path.size()) != root->path)
+        if (!root || path.substr(i, root->path.size()) != root->path) {
+          delete[] params.params;
           return parse_result();
+        }
         i += root->path.size();
       }
     }

data/vendor/r2ree/test/gtest_r2ree.cc

@@ -73,4 +73,21 @@ namespace {
     ASSERT_EQ("foo",       params.params[1].second);
     ASSERT_EQ(true,        std::get<3>(actual));
   }
+
+  TEST_F(r2ree_test, get_with_splat) {
+    r2ree::parse_result actual;
+    r2ree::parameters params;
+
+    tree.insert("/splat/*");
+
+    actual = tree.get("/splat/boofoowoo");
+    params = std::get<2>(actual);
+
+    ASSERT_EQ(true,        std::get<0>(actual));
+    ASSERT_EQ(0,           std::get<1>(actual));
+    ASSERT_EQ(1,           params.size);
+    ASSERT_EQ("",          params.params[0].first);
+    ASSERT_EQ("boofoowoo", params.params[0].second);
+    ASSERT_EQ(true,        std::get<3>(actual));
+  }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r2ree
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - namusyaka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2019-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: r2ree radix tree implementation for ruby