Handle merge

.gitignore

@@ -71,3 +71,7 @@ crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 
+
+.idea
+.dart_tool
+*.iml

.idea/misc.xml

@@ -1,28 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="JavaScriptSettings">
+  <component name="ProjectRootManager">
-    <option name="languageLevel" value="ES6" />
+    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-          <State>
-            <id>General</id>
-          </State>
-          <State>
-            <id>XPath</id>
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>AngularJS</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
   </component>
 </project>

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/angel_route.iml" filepath="$PROJECT_DIR$/.idea/angel_route.iml" />
+      <module fileurl="file://$PROJECT_DIR$/route.iml" filepath="$PROJECT_DIR$/route.iml" />
     </modules>
   </component>
 </project>

.idea/runConfigurations/Navigate_Tests.xml

@@ -1,6 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Navigate Tests" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
-    <option name="filePath" value="$PROJECT_DIR$/test/navigate_test.dart" />
-    <method />
-  </configuration>
-</component>

.idea/runConfigurations/Params_Tests.xml

@@ -1,6 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Params Tests" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
-    <option name="filePath" value="$PROJECT_DIR$/test/params_test.dart" />
-    <method />
-  </configuration>
-</component>

.idea/runConfigurations/Server_Tests.xml

@@ -1,6 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Server Tests" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
-    <option name="filePath" value="$PROJECT_DIR$/test/server_test.dart" />
-    <method />
-  </configuration>
-</component>

.travis.yml

@@ -1 +1,4 @@
 language: dart
+dart:
+  - dev
+  - stable

CHANGELOG.md

@@ -6,3 +6,9 @@
 an `Iterable<RoutingResult>`, instead of just a `List`.
 * Removed deprecated `Route.as`, as well as `Router.registerMiddleware`.
 * Completely removed `Route.requestMiddleware`.
+
+# 2.0.7
+* Minor strong mode updates to work with stricter Dart 2.
+
+# 2.0.5
+* Patch to work with `combinator@1.0.0`.

analysis_options.yaml

@@ -1,3 +1,7 @@
 analyzer:
   strong-mode:
+<<<<<<< HEAD
     implicit-casts: false
+=======
+      implicit-casts: false
+>>>>>>> 6bf72feffc1af269e2ebfa5d1fbcd4f08ba3ea90

lib/src/grammar.dart

@@ -1,6 +1,7 @@
 part of angel_route.src.router;
 
 class RouteGrammar {
+  static final RegExp rgx = new RegExp(r'\((.+)\)');
   static final Parser<String> notSlash =
       match<String>(new RegExp(r'[^/]+')).value((r) => r.span.text);
 
@@ -13,7 +14,7 @@ class RouteGrammar {
 
   static final Parser<ParameterSegment> parameterSegment = chain([
     parameterName,
-    match('?').value((r) => true).opt(),
+    match<bool>('?').value((r) => true).opt(),
     regExp.opt(),
   ]).map((r) {
     var s = new ParameterSegment(r.value[0] as String, r.value[2] as RegExp);
@@ -45,7 +46,7 @@ class RouteGrammar {
 
   static final Parser<RouteDefinition> routeDefinition = routeSegment
       .separatedBy(match('/'))
-      .map((r) => new RouteDefinition(r.value ?? []))
+      .map<RouteDefinition>((r) => new RouteDefinition(r.value ?? []))
       .surroundedBy(match('/').star().opt());
 }
 

lib/src/middleware_pipeline.dart

@@ -18,5 +18,6 @@ class MiddlewarePipeline<T> {
     return _handlers = handlers;
   }
 
-  MiddlewarePipeline(this.routingResults);
+  MiddlewarePipeline(Iterable<RoutingResult> routingResults)
+      : this.routingResults = routingResults.toList();
 }

test/server_test.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:angel_route/angel_route.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';