Skip to content

Commit

Permalink
Merge branch 'release/1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
dylanfoster committed Mar 18, 2017
2 parents f179e1c + 43af7d8 commit 9e35f52
Show file tree
Hide file tree
Showing 99 changed files with 14,352 additions and 16,180 deletions.
51 changes: 51 additions & 0 deletions .bithoundrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"critics": {
"lint": { "engined": "eslint" },
"wc": { "limit": 400 }
},
"ignore": [
"**/docs/**",
"**/deps/**",
"**/node_modules/**",
"**/thirdparty/**",
"**/third_party/**",
"**/vendor/**",
"**/**-min-**",
"**/**-min.**",
"**/**.min.**",
"**/**jquery.?(ui|effects)-*.*.?(*).?(cs|j)s",
"**/**jquery-*.*.?(*).?(cs|j)s",
"**/prototype?(*).js",
"**/mootools*.*.*.js",
"**/dojo.js",
"**/MochiKit.js",
"**/yahoo-*.js",
"**/yui*.js",
"**/ckeditor*.js",
"**/tiny_mce*.js",
"**/tiny_mce/?(langs|plugins|themes|utils)/**",
"**/MathJax/**",
"**/shBrush*.js",
"**/shCore.js",
"**/shLegacy.js",
"**/modernizr.custom.?(*).js",
"**/knockout-*.*.*.debug.js",
"**/extjs/*.js",
"**/extjs/*.xml",
"**/extjs/*.txt",
"**/extjs/*.html",
"**/extjs/*.properties",
"**/extjs/.sencha",
"**/extjs/docs/**",
"**/extjs/builds/**",
"**/extjs/cmd/**",
"**/extjs/examples/**",
"**/extjs/locale/**",
"**/extjs/packages/**",
"**/extjs/plugins/**",
"**/extjs/resources/**",
"**/extjs/src/**",
"**/extjs/welcome/**",
"bower_components/**"
]
}
62 changes: 62 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,65 @@
<a name="1.0.0"></a>
# [1.0.0](https://github.com/dylanfoster/parch/compare/0.12.0...v1.0.0) (2017-03-18)


### Features

* **application:** move application init to initializers ([d8d7cb8](https://github.com/dylanfoster/parch/commit/d8d7cb8))
* **containment:** add containment ([07b56cc](https://github.com/dylanfoster/parch/commit/07b56cc))
* **controller:** move controller to registry ([43a99b6](https://github.com/dylanfoster/parch/commit/43a99b6))
* **initializers:** add application initializer ([00c9379](https://github.com/dylanfoster/parch/commit/00c9379))
* **initializers:** instantiate model manager ([099a3a8](https://github.com/dylanfoster/parch/commit/099a3a8))
* **initializers:** log initializers ([ba81b61](https://github.com/dylanfoster/parch/commit/ba81b61))
* **initializers:** move logger to an initializer ([4713bd1](https://github.com/dylanfoster/parch/commit/4713bd1))
* **initializers:** reorder model manager ([f375899](https://github.com/dylanfoster/parch/commit/f375899))
* **inject:** add optional property name ([fb9eee4](https://github.com/dylanfoster/parch/commit/fb9eee4))
* **registry:** add registry and initializers ([2653a71](https://github.com/dylanfoster/parch/commit/2653a71))
* **registry:** add singleton option to register ([350cc81](https://github.com/dylanfoster/parch/commit/350cc81))
* **registry:** throw an error when trying to inject unregistered object ([74d9fef](https://github.com/dylanfoster/parch/commit/74d9fef))
* **router:** move router to registry ([0175af4](https://github.com/dylanfoster/parch/commit/0175af4))
* **router:** use resource name for path segment ([3f81bb4](https://github.com/dylanfoster/parch/commit/3f81bb4)), closes [#6](https://github.com/dylanfoster/parch/issues/6)
* add deprecations ([02911b9](https://github.com/dylanfoster/parch/commit/02911b9))


### BREAKING CHANGES

* router: dynamic path segment for resources has been changed to use the
resource name e.g. :id => :userId. As a result, users using req.params.id will
need to make the update

commit f529a8a954338ba9e48ac77154cdf2b5d14780d2
Merge: ea13de9 8386f45
Author: Dylan Foster <dylan947@gmail.com>
Date: Tue Mar 14 13:07:39 2017 -0700

chore: rebase develop

commit ea13de969b7900d231f6cf9f74a1bd23b8b221e6
Author: Dylan Foster <dylan947@gmail.com>
Date: Tue Mar 14 10:39:09 2017 -0700

test(router): update controller fixture

commit d8835f05e358a9c4b7226caf2ef00b444065ab51
Author: Dylan Foster <dylan947@gmail.com>
Date: Tue Mar 14 10:22:47 2017 -0700

feat(router): use resource name for path segment

commit 8386f451c759baeb9dc2c95bef5daadf055f5649
Author: Dylan Foster <dylan947@gmail.com>
Date: Tue Mar 14 10:39:09 2017 -0700

test(router): update controller fixture

commit 305c724cfe0fc6f684e2a1a1da349ed502dd2fbc
Author: Dylan Foster <dylan947@gmail.com>
Date: Tue Mar 14 10:22:47 2017 -0700

feat(router): use resource name for path segment



<a name="0.12.0"></a>
# [0.12.0](https://github.com/dylanfoster/parch/compare/0.11.0...v0.12.0) (2017-03-13)

Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ parch.start(3000).then(() => {
The above will create the following route mapping

```
POST /users => UserController.create
GET /users => UserController.index
GET /users/:id => UserController.show
PUT /users/:id => UserController.update
DELETE /users/:id => UserController.destroy
GET /users/:userId => UserController.show
POST /users => UserController.create
PUT /users/:userId => UserController.update
DELETE /users/:userId => UserController.destroy
POST /users/resetPassword => UserController.resetPassword
```

Expand All @@ -134,10 +134,10 @@ app.map(function () {

/**
* GET /users => UserController.index
* GET /users/:id => UserController.show
* GET /users/:userId => UserController.show
* POST /users => UserController.create
* PUT /users/:id => UserController.update
* DELETE /users/:id => UserController.destroy
* PUT /users/:userId => UserController.update
* DELETE /users/:userId => UserController.destroy
*/
```

Expand Down
4 changes: 3 additions & 1 deletion docs/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ YUI.add("yuidoc-meta", function(Y) {
"Controller",
"Model",
"ModelManager",
"Registry",
"Route",
"RouteSegment",
"Router"
"Router",
"containment"
],
"modules": [
"parch"
Expand Down
5 changes: 5 additions & 0 deletions docs/assets/css/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

#options-form {
margin-top: 20px;
padding-right: 20px;
}

/* -- Sidebar --------------------------------------------------------------- */
Expand Down Expand Up @@ -60,6 +61,10 @@

/* -- Content --------------------------------------------------------------- */

#docs-main {
margin-top: 65px;
}

.content {
padding-bottom: 50px;
}
Expand Down
155 changes: 155 additions & 0 deletions docs/assets/css/lucid.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
.yuidoc-class-description {
background: none;
border: 0 none;
box-shadow: none;
padding: 0;
font-size: 16px;
line-height: 26px;
margin: 20px 0 40px 0;
}
h1 {
font-weight: 300 !important;
}
h2 {
font-size: 20px !important;
font-weight: normal !important;
color: #B2B2B2 !important;
}
h3 {
font-size: 14px !important;
color: #4A4A4A !important;
}
body a {
color: #4CA0E7;
}

#sidebar .tab-pane li a:hover, #sidebar .tab-pane li a:focus {
background: #A2C7DA !important;
}

.navbar-fixed-top .navbar-inner, .navbar-static-top .navbar-inner {
background: #fff !important;
box-shadow: 0 1px 10px rgba(0, 0, 0, 0.04) !important;
}

code {
color: #806857 !important;
}

ul.inline > li, ol.inline > li {
padding: 0 !important;
}

.method-signature, .method-signature code {
line-height: 20px !important;
font-size: 15px;
background: 0 none;
padding: 0;
border: 0 none;
}
.method-signature .name code {
font-weight: bold !important;
color: #4CA0E7 !important;
}
.method-signature {
margin-bottom: 2px;
}


body .apidocs .item + .item {
border-top: 0 none;
}
body .apidocs .item, body .apidocs .constructor .item {
border: 1px solid #efefef;
padding: 15px 20px;
margin: 0;
}
body .apidocs .item:last-child, body .apidocs .constructor .item:last-child {
border-radius: 0 0 3px 3px;
}
body .apidocs .item:first-child, body .apidocs .constructor .item:first-child {
border-radius: 3px 3px 0 0;
}
body .apidocs .item:first-child:last-child, body .apidocs .constructor .item:first-child:last-child {
border-radius: 3px;
}


.well-small {
min-height: 0 !important;
}

#sidebar {
margin-top: 65px;
}

#api-tabview-filter {
margin: 0 0 10px 0 !important;
}

#api-classes, #api-tabview-filter {
padding: 0 !important;
border: 0 none !important;
}

.page-section h2 {
margin: 20px 0;
}
.meta, .meta a, .meta code {
color: #bbb !important;
}

.nav-list > li > a, .nav-list .nav-header {
line-height: 20px;
margin: 0 !important;
padding: 0 !important;
background: none !important;
}
.method-signature .optional {
color: #bbb !important;
}

.paren {
font-family: monospace;
}
.apidocs .args {
margin: 0 !important;
}

.apidocs .flag.optional {
background: #DADADA;
}
.apidocs .flag.final {
background: #B6B6B6;
}

.page-header {
border-bottom: 0 none !important;
}

.yuidoc-class-description pre {
margin-top: 15px !important;
}

.ia + .ia:before {
content: ', ';
}

#class-toc ul li {
line-height: 18px;
}

.apidocs .param .param-description {
padding-top: 5px;
}

.apidocs .item h4, .apidocs .item h5, .apidocs .item h6 {
color: #626262;
font-family: inherit;
font-size: 13px;
line-height: 20px;
}

.params-list li:last-child {
margin-bottom: 0 !important;
}
18 changes: 9 additions & 9 deletions docs/assets/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,13 @@ abbr {
cursor: help;
}

.prettyprint li.L0,
.prettyprint li.L1,
.prettyprint li.L2,
.prettyprint li.L3,
.prettyprint li.L5,
.prettyprint li.L6,
.prettyprint li.L7,
.prettyprint li.L0,
.prettyprint li.L1,
.prettyprint li.L2,
.prettyprint li.L3,
.prettyprint li.L5,
.prettyprint li.L6,
.prettyprint li.L7,
.prettyprint li.L8 {
list-style: decimal;
}
Expand Down Expand Up @@ -423,15 +423,15 @@ h2, h3, h4, h5, h6 {
}

/* Class/module metadata such as "Uses", "Extends", "Defined in", etc. */
/*.apidocs .meta {
.apidocs .meta {
background: #f9f9f9;
border-color: #efefef;
color: #555;
font-size: 11px;
padding: 3px 6px;
}

.apidocs .meta p { margin: 0; }*/
.apidocs .meta p { margin: 0; }

/* Deprecation warning. */
.apidocs .box.deprecated,
Expand Down

0 comments on commit 9e35f52

Please sign in to comment.