mrpastewart/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

+6

Browse source
This commit is contained in:
Tobe O 2018-06-22 23:59:41 -04:00
parent 5d851b6cde
commit 4e6d280b8f
20 changed files with 169 additions and 275 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.idea/libraries/Dart_Packages.xml
View file

@ -12,7 +12,7 @@
<entry key="angel_http_exception"> <entry key="angel_http_exception">
<value> <value>
<list> <list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" /> <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+1/lib" />
</list> </list>
</value> </value>
</entry> </entry>
@ -496,7 +496,7 @@
</properties> </properties>
<CLASSES> <CLASSES>
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.1/lib" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_jael-1.0.1/lib" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_jael-1.0.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib" /> <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib" />

327
.idea/workspace.xml
View file

@ -1,43 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Fix hooking bug"> <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/analysis_options.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/analysis_options.yaml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/hooks.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/hooks.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/metrics.dart" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" /> <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/routable.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/routable.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/core/typed_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/typed_service.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/stats/stats.dart" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lib/src/util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/util.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/accepts_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/accepts_test.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/di_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/di_test.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/exception_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/exception_test.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_test.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_test.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_test.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/typed_service_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/typed_service_test.dart" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
@ -60,95 +27,20 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="127" column="57" selection-start-line="127" selection-start-column="57" selection-end-line="127" selection-end-column="57" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false"> <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart"> <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="32"> <state relative-caret-position="-504">
<caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" /> <caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false"> <file leaf-file-name="injection.dart" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/test/server_test.dart"> <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146"> <state relative-caret-position="283">
<caret line="193" column="41" selection-start-line="193" selection-start-column="41" selection-end-line="193" selection-end-column="41" /> <caret line="146" column="58" selection-start-line="146" selection-start-column="58" selection-end-line="146" selection-end-column="58" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/routing_test.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="120" column="39" selection-start-line="120" selection-start-column="39" selection-end-line="120" selection-end-column="39" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="typed_service_test.dart" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="109">
<caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="serialize_test.dart" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146">
<caret line="17" column="71" selection-start-line="17" selection-start-column="71" selection-end-line="17" selection-end-column="71" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="accepts_test.dart" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="20" selection-start-column="20" selection-end-column="20" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146">
<caret line="97" column="49" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="exception_test.dart" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/exception_test.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="17" column="27" lean-forward="true" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
<folding>
<element signature="e#1#55#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="142">
<caret line="51" column="61" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -165,17 +57,15 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>execute</find>
<find>lazyBod</find>
<find>lazyBody()</find> <find>lazyBody()</find>
<find>addRout</find> <find>addRout</find>
<find>lazyBody</find> <find>lazyBody</find>
<find>_body = nu</find> <find />
<find>_body</find> <find>_body</find>
<find>MID</find> <find>MID</find>
<find>beforeIndex</find> <find>beforeIndex</find>
<find>read(</find> <find>read(</find>
<find>new Trac</find> <find />
<find>frame</find> <find>frame</find>
<find>logger.</find> <find>logger.</find>
<find>Stopwa</find> <find>Stopwa</find>
@ -190,24 +80,26 @@
<find>HttpStatus.</find> <find>HttpStatus.</find>
<find>JSON</find> <find>JSON</find>
<find>ContentType.JSON.toString()</find> <find>ContentType.JSON.toString()</find>
<find>(req, res)</find> <find />
<find>headers: headers,</find> <find />
<find>_</find> <find>_</find>
<find>ContentType.HTML.mimeType</find> <find>ContentType.HTML.mimeType</find>
<find>ContentType.JSON.mimeType</find> <find>ContentType.JSON.mimeType</find>
<find>parameters</find>
<find />
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>after</replace> <replace>after</replace>
<replace>fatalErrorStream</replace> <replace>fatalErrorStream</replace>
<replace>onController</replace> <replace>onController</replace>
<replace>if (_isClosed &amp;&amp; !_useStream)</replace> <replace />
<replace>logger?.warning</replace> <replace>logger?.warning</replace>
<replace>JSON.decode</replace> <replace>JSON.decode</replace>
<replace>query</replace> <replace>query</replace>
<replace>cookie</replace> <replace>cookie</replace>
<replace>req.path</replace> <replace>req.path</replace>
<replace>req.path`</replace> <replace>req.path`</replace>
<replace>autoSnakeCaseNames == false ? $0 : '$1ated_at'</replace> <replace />
<replace>appa</replace> <replace>appa</replace>
<replace>isClosed</replace> <replace>isClosed</replace>
<replace>useStream</replace> <replace>useStream</replace>
@ -215,15 +107,15 @@
<replace>!isOpen</replace> <replace>!isOpen</replace>
<replace>'server'</replace> <replace>'server'</replace>
<replace>FutureOr</replace> <replace>FutureOr</replace>
<replace>var body = await getBody(rs);</replace> <replace />
<replace /> <replace />
<replace>=</replace> <replace>=</replace>
<replace>{</replace> <replace>{</replace>
<replace>'accept'</replace> <replace>'accept'</replace>
<replace>'content-type'</replace> <replace>'content-type'</replace>
<replace>403</replace> <replace>403</replace>
<replace>(RequestContext req, res)</replace> <replace />
<replace>headers: headers.cast&lt;String, String&gt;(),</replace> <replace />
<replace>this.</replace> <replace>this.</replace>
<replace>'text/html'</replace> <replace>'text/html'</replace>
<replace>'application/json'</replace> <replace>'application/json'</replace>
@ -266,7 +158,6 @@
<option value="$PROJECT_DIR$/performance/hello/main.dart" /> <option value="$PROJECT_DIR$/performance/hello/main.dart" />
<option value="$PROJECT_DIR$/example/templating.dart" /> <option value="$PROJECT_DIR$/example/templating.dart" />
<option value="$PROJECT_DIR$/example/views/index.jl" /> <option value="$PROJECT_DIR$/example/views/index.jl" />
<option value="$PROJECT_DIR$/pubspec.yaml" />
<option value="$PROJECT_DIR$/analysis_options.yaml" /> <option value="$PROJECT_DIR$/analysis_options.yaml" />
<option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" /> <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
<option value="$PROJECT_DIR$/lib/src/stats/stats.dart" /> <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
@ -276,14 +167,12 @@
<option value="$PROJECT_DIR$/lib/src/core/server.dart" /> <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
<option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" /> <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
<option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" /> <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
<option value="$PROJECT_DIR$/CHANGELOG.md" />
<option value="$PROJECT_DIR$/lib/src/util.dart" /> <option value="$PROJECT_DIR$/lib/src/util.dart" />
<option value="$PROJECT_DIR$/test/primitives_test.dart" /> <option value="$PROJECT_DIR$/test/primitives_test.dart" />
<option value="$PROJECT_DIR$/test/services_test.dart" /> <option value="$PROJECT_DIR$/test/services_test.dart" />
<option value="$PROJECT_DIR$/test/streaming_test.dart" /> <option value="$PROJECT_DIR$/test/streaming_test.dart" />
<option value="$PROJECT_DIR$/lib/hooks.dart" /> <option value="$PROJECT_DIR$/lib/hooks.dart" />
<option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" /> <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
<option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
<option value="$PROJECT_DIR$/lib/src/core/request_context.dart" /> <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
<option value="$PROJECT_DIR$/lib/src/core/routable.dart" /> <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
<option value="$PROJECT_DIR$/lib/src/core/map_service.dart" /> <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
@ -301,6 +190,9 @@
<option value="$PROJECT_DIR$/test/routing_test.dart" /> <option value="$PROJECT_DIR$/test/routing_test.dart" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" /> <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
<option value="$PROJECT_DIR$/test/typed_service_test.dart" /> <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
<option value="$PROJECT_DIR$/pubspec.yaml" />
<option value="$PROJECT_DIR$/CHANGELOG.md" />
<option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
</list> </list>
</option> </option>
</component> </component>
@ -314,10 +206,10 @@
<packageJsonPaths /> <packageJsonPaths />
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="26" /> <option name="x" value="90" />
<option name="y" value="22" /> <option name="y" value="23" />
<option name="width" value="1326" /> <option name="width" value="1282" />
<option name="height" value="772" /> <option name="height" value="784" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" /> <ConfirmationsSetting value="2" id="Add" />
@ -345,6 +237,13 @@
<item name="lib" type="cbb8eebc:String" user="lib" /> <item name="lib" type="cbb8eebc:String" user="lib" />
<item name="src" type="cbb8eebc:String" user="src" /> <item name="src" type="cbb8eebc:String" user="src" />
</path> </path>
<path>
<item name="Root" type="cbb8eebc:String" user="Root" />
<item name="framework" type="cbb8eebc:String" user="framework" />
<item name="lib" type="cbb8eebc:String" user="lib" />
<item name="src" type="cbb8eebc:String" user="src" />
<item name="core" type="cbb8eebc:String" user="core" />
</path>
<path> <path>
<item name="Root" type="cbb8eebc:String" user="Root" /> <item name="Root" type="cbb8eebc:String" user="Root" />
<item name="framework" type="cbb8eebc:String" user="framework" /> <item name="framework" type="cbb8eebc:String" user="framework" />
@ -398,7 +297,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="Dart Command Line App.main.dart"> <component name="RunManager" selected="Dart Test.tests in extension_test.dart">
<configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true"> <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
<option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" /> <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
<option name="scope" value="GROUP_OR_TEST_BY_NAME" /> <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@ -678,14 +577,8 @@
<workItem from="1529523346006" duration="682000" /> <workItem from="1529523346006" duration="682000" />
<workItem from="1529713102021" duration="161000" /> <workItem from="1529713102021" duration="161000" />
<workItem from="1529722767717" duration="59000" /> <workItem from="1529722767717" duration="59000" />
<workItem from="1529722829709" duration="1693000" /> <workItem from="1529722829709" duration="1759000" />
</task> <workItem from="1529724977574" duration="1313000" />
<task id="LOCAL-00040" summary="autoIdAndDateFields in MapService">
<created>1511026951368</created>
<option name="number" value="00040" />
<option name="presentableId" value="LOCAL-00040" />
<option name="project" value="LOCAL" />
<updated>1511026951368</updated>
</task> </task>
<task id="LOCAL-00041" summary="+8"> <task id="LOCAL-00041" summary="+8">
<created>1511026990202</created> <created>1511026990202</created>
@ -1023,16 +916,17 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1529523884121</updated> <updated>1529523884121</updated>
</task> </task>
<option name="localTasksCounter" value="89" /> <task id="LOCAL-00089" summary="+5">
<created>1529724578292</created>
<option name="number" value="00089" />
<option name="presentableId" value="LOCAL-00089" />
<option name="project" value="LOCAL" />
<updated>1529724578293</updated>
</task>
<option name="localTasksCounter" value="90" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
<history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 53m 25s.xml">
<configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
</history-entry>
<history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 54m 45s.xml">
<configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
</history-entry>
<history-entry file="All_Tests - 2018.06.08 at 02h 54m 57s.xml"> <history-entry file="All_Tests - 2018.06.08 at 02h 54m 57s.xml">
<configuration name="All Tests" configurationId="DartTestRunConfigurationType" /> <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
</history-entry> </history-entry>
@ -1057,9 +951,15 @@
<history-entry file="All_Tests - 2018.06.20 at 15h 44m 03s.xml"> <history-entry file="All_Tests - 2018.06.20 at 15h 44m 03s.xml">
<configuration name="All Tests" configurationId="DartTestRunConfigurationType" /> <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
</history-entry> </history-entry>
<history-entry file="tests_in_extension_test_dart - 2018.06.22 at 23h 46m 08s.xml">
<configuration name="tests in extension_test.dart" configurationId="DartTestRunConfigurationType" />
</history-entry>
<history-entry file="tests_in_extension_test_dart - 2018.06.22 at 23h 57m 51s.xml">
<configuration name="tests in extension_test.dart" configurationId="DartTestRunConfigurationType" />
</history-entry>
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="151785000" /> <option name="totallyTimeSpent" value="153164000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -1071,7 +971,7 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="26" y="22" width="1326" height="772" extended-state="0" /> <frame x="0" y="0" width="1440" height="900" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info anchor="right" id="Palette" order="3" /> <window_info anchor="right" id="Palette" order="3" />
@ -1090,28 +990,28 @@
<window_info id="UI Designer" order="2" /> <window_info id="UI Designer" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" /> <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
<window_info anchor="bottom" id="Messages" order="7" weight="0.33481482" /> <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
<window_info anchor="right" id="Palette&#9;" order="3" /> <window_info anchor="right" id="Palette&#9;" order="3" />
<window_info id="Image Layers" order="2" /> <window_info id="Image Layers" order="2" />
<window_info anchor="right" id="Capture Analysis" order="3" /> <window_info anchor="right" id="Capture Analysis" order="3" />
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.4" />
<window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" /> <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
<window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.48" /> <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3987879" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27024922" /> <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.3927273" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32905984" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24248926" />
<window_info anchor="right" id="SciView" order="4" /> <window_info anchor="right" id="SciView" order="4" />
<window_info anchor="right" id="Theme Preview" order="3" /> <window_info anchor="right" id="Theme Preview" order="3" />
<window_info id="Favorites" order="3" side_tool="true" /> <window_info id="Favorites" order="3" side_tool="true" />
<window_info anchor="right" id="Flutter Inspector" order="4" /> <window_info anchor="right" id="Flutter Inspector" order="4" />
<window_info anchor="bottom" id="DB Execution Console" order="8" /> <window_info anchor="bottom" id="DB Execution Console" order="8" />
<window_info anchor="right" id="Coverage" order="3" side_tool="true" /> <window_info anchor="right" id="Coverage" order="3" side_tool="true" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info id="DB Browser" order="2" weight="0.32998413" /> <window_info id="DB Browser" order="2" weight="0.32998413" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Data View" order="4" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="right" id="Data View" order="4" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -1122,7 +1022,6 @@
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<MESSAGE value="Change return type of `AngelHttp.createRequestContext`" />
<MESSAGE value="Deprecated `ResponseContext.io`, added HTTP equivalent" /> <MESSAGE value="Deprecated `ResponseContext.io`, added HTTP equivalent" />
<MESSAGE value="Removed `HttpHeaders` in `ResponseContext`" /> <MESSAGE value="Removed `HttpHeaders` in `ResponseContext`" />
<MESSAGE value="Deprecated AngelMetrics" /> <MESSAGE value="Deprecated AngelMetrics" />
@ -1147,7 +1046,8 @@
<MESSAGE value="1.1.4+2" /> <MESSAGE value="1.1.4+2" />
<MESSAGE value="Fix async bugs" /> <MESSAGE value="Fix async bugs" />
<MESSAGE value="Fix hooking bug" /> <MESSAGE value="Fix hooking bug" />
<option name="LAST_COMMIT_MESSAGE" value="Fix hooking bug" /> <MESSAGE value="+5" />
<option name="LAST_COMMIT_MESSAGE" value="+5" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
@ -1294,16 +1194,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/CHANGELOG.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="32">
<caret line="2" column="33" selection-start-line="2" selection-start-column="33" selection-end-line="2" selection-end-column="33" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/src/util.dart"> <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336"> <state relative-caret-position="336">
@ -1311,20 +1201,8 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart"> <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart" />
<provider selected="true" editor-type-id="text-editor"> <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
<state relative-caret-position="168">
<caret line="33" column="21" lean-forward="true" selection-start-line="33" selection-start-column="21" selection-end-line="33" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1152">
<caret line="76" column="11" selection-start-line="76" selection-start-column="11" selection-end-line="76" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/primitives_test.dart"> <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="256"> <state relative-caret-position="256">
@ -1367,13 +1245,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146">
<caret line="79" column="40" selection-start-line="79" selection-start-column="40" selection-end-line="79" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart"> <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293"> <state relative-caret-position="293">
@ -1412,13 +1283,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pubspec.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="224">
<caret line="14" column="19" lean-forward="true" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/di_test.dart"> <entry file="file://$PROJECT_DIR$/test/di_test.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408"> <state relative-caret-position="408">
@ -1456,29 +1320,53 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart"> <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146"> <state relative-caret-position="1488">
<caret line="97" column="49" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" /> <caret line="97" column="49" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="32">
<caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/serialize_test.dart"> <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146"> <state relative-caret-position="224">
<caret line="17" column="71" selection-start-line="17" selection-start-column="71" selection-end-line="17" selection-end-column="71" /> <caret line="17" column="71" selection-start-line="17" selection-start-column="71" selection-end-line="17" selection-end-column="71" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/test/server_test.dart"> <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146"> <state relative-caret-position="224">
<caret line="193" column="41" selection-start-line="193" selection-start-column="41" selection-end-line="193" selection-end-column="41" /> <caret line="17" column="27" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="816">
<caret line="51" column="61" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/CHANGELOG.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="16">
<caret line="1" column="53" selection-start-line="1" selection-start-column="53" selection-end-line="1" selection-end-column="53" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pubspec.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="15" column="24" lean-forward="true" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="109">
<caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1489,27 +1377,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/test/exception_test.dart"> <entry file="file://$PROJECT_DIR$/test/server_test.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34"> <state relative-caret-position="146">
<caret line="17" column="27" lean-forward="true" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" /> <caret line="193" column="41" selection-start-line="193" selection-start-column="41" selection-end-line="193" selection-end-column="41" />
<folding>
<element signature="e#1#55#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart"> <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="142"> <state relative-caret-position="-504">
<caret line="51" column="61" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" /> <caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/test/typed_service_test.dart"> <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="109"> <state relative-caret-position="283">
<caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" /> <caret line="146" column="58" selection-start-line="146" selection-start-column="58" selection-end-line="146" selection-end-column="58" />
</state> </state>
</provider> </provider>
</entry> </entry>

4
CHANGELOG.md
View file

@ -1,3 +1,7 @@
# 1.1.4+6
* Almost 100% working with `2.0.0-dev.64.1`. In said version
of Dart, `dart:mirrors` is broken, and therefore breaks detection of metadata.
# 1.1.4+5 # 1.1.4+5
* Intermediary release while patching up Dart 2 bugs. * Intermediary release while patching up Dart 2 bugs.
* Stricter Dart 2 use. * Stricter Dart 2 use.

1
lib/src/core/injection.dart
View file

@ -151,6 +151,7 @@ InjectionRequest preInject(Function handler) {
.firstWhere((m) => m.type.isAssignableTo(_Parameter), .firstWhere((m) => m.type.isAssignableTo(_Parameter),
orElse: () => null) orElse: () => null)
?.reflectee as Parameter; ?.reflectee as Parameter;
print(p);
if (p != null) { if (p != null) {
injection.parameters[name] = new Parameter( injection.parameters[name] = new Parameter(
cookie: p.cookie, cookie: p.cookie,

9
lib/src/core/response_context.dart
View file

@ -218,8 +218,9 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
if (!isOpen) throw closed(); if (!isOpen) throw closed();
headers headers
..['content-type'] = 'text/html' ..['content-type'] = 'text/html'
..['location'] = ..['location'] = url is String
url is String ? url : app.navigate(url as Iterable, absolute: absolute); ? url
: app.navigate(url as Iterable, absolute: absolute);
statusCode = code ?? 302; statusCode = code ?? 302;
write(''' write('''
<!DOCTYPE html> <!DOCTYPE html>
@ -290,7 +291,9 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
final head = final head =
controller.findExpose().path.toString().replaceAll(_straySlashes, ''); controller.findExpose().path.toString().replaceAll(_straySlashes, '');
final tail = matched.makeUri(params.cast<String, dynamic>()).replaceAll(_straySlashes, ''); final tail = matched
.makeUri(params.cast<String, dynamic>())
.replaceAll(_straySlashes, '');
redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code); redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code);
} }

4
lib/src/core/server.dart
View file

@ -185,8 +185,8 @@ class Angel extends AngelBase {
logger?.warning( logger?.warning(
'This route will be ignored, and no requests will ever reach it.'); 'This route will be ignored, and no requests will ever reach it.');
} }
return super return super.mount(path.toString(), router,
.mount(path.toString(), router, hooked: hooked != false, namespace: namespace); hooked: hooked != false, namespace: namespace);
} }
/// Loads some base dependencies into the service container. /// Loads some base dependencies into the service container.

3
lib/src/core/service.dart
View file

@ -107,8 +107,7 @@ class Service extends Routable {
_addRoutesInner(service ?? this, bootstrappers); _addRoutesInner(service ?? this, bootstrappers);
} }
void _addRoutesInner(Service service, void _addRoutesInner(Service service, List handlers) {
List handlers) {
Map restProvider = {'provider': Providers.rest}; Map restProvider = {'provider': Providers.rest};
// Add global middleware if declared on the instance itself // Add global middleware if declared on the instance itself

13
lib/src/http/angel_http.dart
View file

@ -146,8 +146,9 @@ class AngelHttp {
runPipeline = () => app.executeHandler(handler, req, res); runPipeline = () => app.executeHandler(handler, req, res);
else { else {
var current = runPipeline; var current = runPipeline;
runPipeline = () => current().then((result) => runPipeline = () => current().then((result) => !result
!result ? new Future.value(result) : app.executeHandler(handler, req, res)); ? new Future.value(result)
: app.executeHandler(handler, req, res));
} }
} }
@ -352,10 +353,10 @@ class AngelHttp {
Future<ResponseContext> createResponseContext(HttpResponse response, Future<ResponseContext> createResponseContext(HttpResponse response,
[RequestContext correspondingRequest]) => [RequestContext correspondingRequest]) =>
new Future<ResponseContext>.value( new Future<ResponseContext>.value(new HttpResponseContextImpl(
new HttpResponseContextImpl(response, app, correspondingRequest as HttpRequestContextImpl) response, app, correspondingRequest as HttpRequestContextImpl)
..serializer = (app.serializer ?? god.serialize) ..serializer = (app.serializer ?? god.serialize)
..encoders.addAll(app.encoders ?? {})); ..encoders.addAll(app.encoders ?? {}));
/// Limits the maximum number of requests to be handled concurrently by this instance. /// Limits the maximum number of requests to be handled concurrently by this instance.
/// ///

7
lib/src/http/http.dart
View file

@ -13,10 +13,11 @@ export 'http_request_context.dart';
export 'http_response_context.dart'; export 'http_response_context.dart';
/// Boots a shared server instance. Use this if launching multiple isolates /// Boots a shared server instance. Use this if launching multiple isolates
Future<HttpServer> startShared(address, int port) => HttpServer Future<HttpServer> startShared(address, int port) =>
.bind(address ?? '127.0.0.1', port ?? 0, shared: true); HttpServer.bind(address ?? '127.0.0.1', port ?? 0, shared: true);
Future<HttpServer> Function(dynamic, int) startSharedSecure(SecurityContext securityContext) { Future<HttpServer> Function(dynamic, int) startSharedSecure(
SecurityContext securityContext) {
return (address, int port) => HttpServer.bindSecure( return (address, int port) => HttpServer.bindSecure(
address ?? '127.0.0.1', port ?? 0, securityContext, address ?? '127.0.0.1', port ?? 0, securityContext,
shared: true); shared: true);

4
performance/hello/raw.dart
View file

@ -11,9 +11,7 @@ main() {
} }
void start(int id) { void start(int id) {
HttpServer HttpServer.bind('127.0.0.1', 3000, shared: true).then((server) {
.bind('127.0.0.1', 3000, shared: true)
.then((server) {
print( print(
'Instance #$id listening at http://${server.address.address}:${server.port}'); 'Instance #$id listening at http://${server.address.address}:${server.port}');

2
pubspec.yaml
View file

@ -1,5 +1,5 @@
name: angel_framework name: angel_framework
version: 1.1.4+5 version: 1.1.4+6
description: A high-powered HTTP server with DI, routing and more. description: A high-powered HTTP server with DI, routing and more.
author: Tobe O <thosakwe@gmail.com> author: Tobe O <thosakwe@gmail.com>
homepage: https://github.com/angel-dart/angel_framework homepage: https://github.com/angel-dart/angel_framework

11
test/exception_test.dart
View file

@ -11,18 +11,17 @@ main() {
isException(401, '401 Not Authenticated')); isException(401, '401 Not Authenticated'));
expect(new AngelHttpException.paymentRequired(), expect(new AngelHttpException.paymentRequired(),
isException(402, '402 Payment Required')); isException(402, '402 Payment Required'));
expect(new AngelHttpException.forbidden(), expect(
isException(403, '403 Forbidden')); new AngelHttpException.forbidden(), isException(403, '403 Forbidden'));
expect(new AngelHttpException.notFound(), expect(
isException(404, '404 Not Found')); new AngelHttpException.notFound(), isException(404, '404 Not Found'));
expect(new AngelHttpException.methodNotAllowed(), expect(new AngelHttpException.methodNotAllowed(),
isException(405, '405 Method Not Allowed')); isException(405, '405 Method Not Allowed'));
expect(new AngelHttpException.notAcceptable(), expect(new AngelHttpException.notAcceptable(),
isException(406, '406 Not Acceptable')); isException(406, '406 Not Acceptable'));
expect(new AngelHttpException.methodTimeout(), expect(new AngelHttpException.methodTimeout(),
isException(408, '408 Timeout')); isException(408, '408 Timeout'));
expect(new AngelHttpException.conflict(), expect(new AngelHttpException.conflict(), isException(409, '409 Conflict'));
isException(409, '409 Conflict'));
expect(new AngelHttpException.notProcessable(), expect(new AngelHttpException.notProcessable(),
isException(422, '422 Not Processable')); isException(422, '422 Not Processable'));
expect(new AngelHttpException.notImplemented(), expect(new AngelHttpException.notImplemented(),

3
test/hooked_test.dart
View file

@ -71,7 +71,8 @@ main() {
}); });
var response = await client.post("$url/todos", var response = await client.post("$url/todos",
body: god.serialize({"arbitrary": "data"}), headers: headers.cast<String, String>()); body: god.serialize({"arbitrary": "data"}),
headers: headers.cast<String, String>());
print(response.body); print(response.body);
Map result = god.deserialize(response.body); Map result = god.deserialize(response.body);
expect(result["hello"], equals("hooked world")); expect(result["hello"], equals("hooked world"));

6
test/parameter_meta_test.dart
View file

@ -85,12 +85,14 @@ main() {
// Invalid request // Invalid request
var rq = new MockHttpRequest('GET', Uri.parse('/session'))..close(); var rq = new MockHttpRequest('GET', Uri.parse('/session'))..close();
var rs = rq.response; var rs = rq.response;
http.handleRequest(rq).timeout(const Duration(seconds: 5)).catchError((_) => null); http
.handleRequest(rq)
.timeout(const Duration(seconds: 5))
.catchError((_) => null);
await printResponse(rs); await printResponse(rs);
expect(rs.statusCode, 500); expect(rs.statusCode, 500);
rq = new MockHttpRequest('GET', Uri.parse('/session')); rq = new MockHttpRequest('GET', Uri.parse('/session'));
rq.session['foo'] = 'bar'; rq.session['foo'] = 'bar';
rq.close(); rq.close();

7
test/routing_test.dart
View file

@ -94,8 +94,7 @@ main() {
app.dumpTree(header: "DUMPING ROUTES:", showMatchers: true); app.dumpTree(header: "DUMPING ROUTES:", showMatchers: true);
client = new http.Client(); client = new http.Client();
var server = var server = await new AngelHttp(app).startServer('127.0.0.1', 0);
await new AngelHttp(app).startServer('127.0.0.1', 0);
url = "http://${server.address.host}:${server.port}"; url = "http://${server.address.host}:${server.port}";
}); });
@ -156,8 +155,8 @@ main() {
test('Can serialize function result as JSON', () async { test('Can serialize function result as JSON', () async {
Map headers = {'Content-Type': 'application/json'}; Map headers = {'Content-Type': 'application/json'};
String postData = json.encode({'it': 'works'}); String postData = json.encode({'it': 'works'});
var response = var response = await client.post("$url/lambda",
await client.post("$url/lambda", headers: headers.cast<String, String>(), body: postData); headers: headers.cast<String, String>(), body: postData);
print('Response: ${response.body}'); print('Response: ${response.body}');
expect(json.decode(response.body)['it'], equals('works')); expect(json.decode(response.body)['it'], equals('works'));
}); });

9
test/server_test.dart
View file

@ -174,8 +174,7 @@ main() {
http.handleRequest(rq); http.handleRequest(rq);
await rq.response.toList(); await rq.response.toList();
expect(rq.response.statusCode, 403); expect(rq.response.statusCode, 403);
expect( expect(rq.response.headers.contentType.mimeType, 'application/json');
rq.response.headers.contentType.mimeType, 'application/json');
}); });
test('can throw in finalizer', () async { test('can throw in finalizer', () async {
@ -185,8 +184,7 @@ main() {
http.handleRequest(rq); http.handleRequest(rq);
await rq.response.toList(); await rq.response.toList();
expect(rq.response.statusCode, 403); expect(rq.response.statusCode, 403);
expect( expect(rq.response.headers.contentType.mimeType, 'application/json');
rq.response.headers.contentType.mimeType, 'application/json');
}); });
test('can send html', () async { test('can send html', () async {
@ -196,8 +194,7 @@ main() {
http.handleRequest(rq); http.handleRequest(rq);
await rq.response.toList(); await rq.response.toList();
expect(rq.response.statusCode, 403); expect(rq.response.statusCode, 403);
expect( expect(rq.response.headers.contentType?.mimeType, 'text/html');
rq.response.headers.contentType?.mimeType, 'text/html');
}); });
}); });
} }

24
test/services_test.dart
View file

@ -51,8 +51,8 @@ main() {
test('can create data', () async { test('can create data', () async {
String postData = god.serialize({'text': 'Hello, world!'}); String postData = god.serialize({'text': 'Hello, world!'});
var response = var response = await client.post("$url/todos",
await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData); headers: headers.cast<String, String>(), body: postData);
expect(response.statusCode, 201); expect(response.statusCode, 201);
var json = god.deserialize(response.body); var json = god.deserialize(response.body);
print(json); print(json);
@ -61,7 +61,8 @@ main() {
test('can fetch data', () async { test('can fetch data', () async {
String postData = god.serialize({'text': 'Hello, world!'}); String postData = god.serialize({'text': 'Hello, world!'});
await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData); await client.post("$url/todos",
headers: headers.cast<String, String>(), body: postData);
var response = await client.get("$url/todos/0"); var response = await client.get("$url/todos/0");
expect(response.statusCode, 200); expect(response.statusCode, 200);
var json = god.deserialize(response.body); var json = god.deserialize(response.body);
@ -71,10 +72,11 @@ main() {
test('can modify data', () async { test('can modify data', () async {
String postData = god.serialize({'text': 'Hello, world!'}); String postData = god.serialize({'text': 'Hello, world!'});
await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData); await client.post("$url/todos",
headers: headers.cast<String, String>(), body: postData);
postData = god.serialize({'text': 'modified'}); postData = god.serialize({'text': 'modified'});
var response = var response = await client.patch("$url/todos/0",
await client.patch("$url/todos/0", headers: headers.cast<String, String>(), body: postData); headers: headers.cast<String, String>(), body: postData);
expect(response.statusCode, 200); expect(response.statusCode, 200);
var json = god.deserialize(response.body); var json = god.deserialize(response.body);
print(json); print(json);
@ -83,10 +85,11 @@ main() {
test('can overwrite data', () async { test('can overwrite data', () async {
String postData = god.serialize({'text': 'Hello, world!'}); String postData = god.serialize({'text': 'Hello, world!'});
await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData); await client.post("$url/todos",
headers: headers.cast<String, String>(), body: postData);
postData = god.serialize({'over': 'write'}); postData = god.serialize({'over': 'write'});
var response = var response = await client.post("$url/todos/0",
await client.post("$url/todos/0", headers: headers.cast<String, String>(), body: postData); headers: headers.cast<String, String>(), body: postData);
expect(response.statusCode, 200); expect(response.statusCode, 200);
var json = god.deserialize(response.body); var json = god.deserialize(response.body);
print(json); print(json);
@ -97,7 +100,8 @@ main() {
test('can delete data', () async { test('can delete data', () async {
String postData = god.serialize({'text': 'Hello, world!'}); String postData = god.serialize({'text': 'Hello, world!'});
var created = await client var created = await client
.post("$url/todos", headers: headers.cast<String, String>(), body: postData) .post("$url/todos",
headers: headers.cast<String, String>(), body: postData)
.then((r) => json.decode(r.body)); .then((r) => json.decode(r.body));
var response = await client.delete("$url/todos/${created['id']}"); var response = await client.delete("$url/todos/${created['id']}");
expect(response.statusCode, 200); expect(response.statusCode, 200);