Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
balderdashy/sails
383366063/sails
Abdelhamidhenni/sails
AhmedAssaf/sails
AmeenAhmed/sails
AndrewJHart/sails
BharathMG/sails
Brianchat/sails
BrowserSwarm/sails
CNXTEoEorg/sails
CarterTsai/sails
D1plo1d/sails
Diullei/sails
DruRly/sails
Ericbdr/sails
GitUser1123/sails
HnLong/sails
Jalalhejazi/sails
JaniL/sails
Jemmy/sails
KallunaLovegood/sails
LaPatatePourrie/sails
MIKNOTAURO/sails
MakoLabs/sails
MiguelMadero/sails
MrJohnsson77/sails
Neener54/sails
R510/sails
RafaelQuirino/sails
RajaRamu/sails
Roepnack/sails
Shyp/sails
SoftScouts/sails
SuiOni/sails
Tadwork/sails
Tidwell/sails
VilleSalonen/sails
WesRateur/sails
WittBulter/sails
Yomguithereal/sails
ZheFeng/sails
Zolmeister/sails
aatibudhi/sails
abpin/sails
adba/sails
airclear/sails
akosipc/sails
alexferreira/sails
amit2014/sails
andineck/sails
androm3da444/sails
androolloyd/sails
anil3a/sails
aperera/sails
arjunpola/sails
ashier/sails
atultagra23/sails
bencruz/sails
benrudolph/sails
bernardpeh/sails
boarderdav/sails
bpartridge83/sails
brainv/sails
cainstudios/sails
chadrickm/sails
chrisbroome/sails
ciaranmaher/sails
clwillingham/sails
codershop/sails
colynb/sails
conceptualitis/sails
curtislacy/sails
cyrilf/sails
d4mn/sails
dasher/sails
dataliven/sails
davgit/sails
davidball/sails
denismars/sails
dubcanada/sails
dydycloud/sails
dylanized/sails
dzotcrew/sails
eistrati/sails
elnights/sails
esk525/sails
ferrants/sails
fotomut/sails
freshvolk/sails
gdi2290/sails
ghosthamlet/sails
gijs/sails
gorangajic/sails
greeze/sails
grigorkh/sails
growlybear/sails
guiquanz/sails
hacksparrow/sails
hamed880/sails
hametGh/sails
hasantayyar/sails
hellojwilde/sails
hemant19cse/sails
ibank/sails
icanhazbroccoli/sails
ichabodcole/sails
irfan/sails
jaredtking/sails
jasonmarkbeaton/sails
javaallah/sails
jayceefun/sails
jeffhigham/sails
jianpingw/sails
jlertle/sails
joelfoy/sails
john24318/sails
jrrojasg/sails
juanandrango/sails
jwietelmann/sails
kaiquewdev/sails
kfatehi/sails
khandieyea/sails
ktkaushik/sails
ky0615/sails
leksa/sails
leo-nard/sails
lexagosto/sails
lhcezar/sails
lightjs/sails
luisj135/sails
madbook/sails
malachaifrazier/sails
manpreetnarang/sails
marlncpe/sails
mashlol/sails
mauricionr/sails
mayconheerdt/sails
mbenin-urbandaddy/sails
metaford/sails
miangraham/sails
michaelBenin/sails
mlcunha/sails
mnaughto/sails
montazze/sails
muthhus/sails
naxvictor/sails
nikhiljohn10/sails
nolifelover/sails
notjrbauer/sails
np42/sails
obrienmd/sails
onurak/sails
osmanehmad/sails
pallavrustogi/sails
particlebanana/sails
pcragone/sails
pepoviola/sails
peterpay/sails
pmq20/sails
poojan/sails
pstinghua/sails
reecelewellen/sails
rishabhmhjn/sails
rkJun/sails
robincafolla/sails
robskillington/sails
sailorjs/sails
samhunta/sails
saronwei/sails
sgress454/sails
shanehyde/sails
shendongming/sails
sindsri/sails
sineer/sails
slajax/sails
slantzjr/sails
tankerwng/sails
taogb/sails
tbaweb/sails
tealdev/sails
themouette/sails
tiffon/sails
timestep/sails
tonychenc/sails
tripitakit/sails
twocngdagz/sails
vernonk/sails
vicapow/sails
vinone/sails
virpool/sails
vizo/sails
voicedata/sails
whatifif/sails
woerwin/sails
wolneykien/sails
xdissent/sails
xsurge83/sails
zhaoxiongfei/sails
zmilan/sails
zohararad/sails
Nothing to show
Choose a Head Repository
balderdashy/sails
383366063/sails
Abdelhamidhenni/sails
AhmedAssaf/sails
AmeenAhmed/sails
AndrewJHart/sails
BharathMG/sails
Brianchat/sails
BrowserSwarm/sails
CNXTEoEorg/sails
CarterTsai/sails
D1plo1d/sails
Diullei/sails
DruRly/sails
Ericbdr/sails
GitUser1123/sails
HnLong/sails
Jalalhejazi/sails
JaniL/sails
Jemmy/sails
KallunaLovegood/sails
LaPatatePourrie/sails
MIKNOTAURO/sails
MakoLabs/sails
MiguelMadero/sails
MrJohnsson77/sails
Neener54/sails
R510/sails
RafaelQuirino/sails
RajaRamu/sails
Roepnack/sails
Shyp/sails
SoftScouts/sails
SuiOni/sails
Tadwork/sails
Tidwell/sails
VilleSalonen/sails
WesRateur/sails
WittBulter/sails
Yomguithereal/sails
ZheFeng/sails
Zolmeister/sails
aatibudhi/sails
abpin/sails
adba/sails
airclear/sails
akosipc/sails
alexferreira/sails
amit2014/sails
andineck/sails
androm3da444/sails
androolloyd/sails
anil3a/sails
aperera/sails
arjunpola/sails
ashier/sails
atultagra23/sails
bencruz/sails
benrudolph/sails
bernardpeh/sails
boarderdav/sails
bpartridge83/sails
brainv/sails
cainstudios/sails
chadrickm/sails
chrisbroome/sails
ciaranmaher/sails
clwillingham/sails
codershop/sails
colynb/sails
conceptualitis/sails
curtislacy/sails
cyrilf/sails
d4mn/sails
dasher/sails
dataliven/sails
davgit/sails
davidball/sails
denismars/sails
dubcanada/sails
dydycloud/sails
dylanized/sails
dzotcrew/sails
eistrati/sails
elnights/sails
esk525/sails
ferrants/sails
fotomut/sails
freshvolk/sails
gdi2290/sails
ghosthamlet/sails
gijs/sails
gorangajic/sails
greeze/sails
grigorkh/sails
growlybear/sails
guiquanz/sails
hacksparrow/sails
hamed880/sails
hametGh/sails
hasantayyar/sails
hellojwilde/sails
hemant19cse/sails
ibank/sails
icanhazbroccoli/sails
ichabodcole/sails
irfan/sails
jaredtking/sails
jasonmarkbeaton/sails
javaallah/sails
jayceefun/sails
jeffhigham/sails
jianpingw/sails
jlertle/sails
joelfoy/sails
john24318/sails
jrrojasg/sails
juanandrango/sails
jwietelmann/sails
kaiquewdev/sails
kfatehi/sails
khandieyea/sails
ktkaushik/sails
ky0615/sails
leksa/sails
leo-nard/sails
lexagosto/sails
lhcezar/sails
lightjs/sails
luisj135/sails
madbook/sails
malachaifrazier/sails
manpreetnarang/sails
marlncpe/sails
mashlol/sails
mauricionr/sails
mayconheerdt/sails
mbenin-urbandaddy/sails
metaford/sails
miangraham/sails
michaelBenin/sails
mlcunha/sails
mnaughto/sails
montazze/sails
muthhus/sails
naxvictor/sails
nikhiljohn10/sails
nolifelover/sails
notjrbauer/sails
np42/sails
obrienmd/sails
onurak/sails
osmanehmad/sails
pallavrustogi/sails
particlebanana/sails
pcragone/sails
pepoviola/sails
peterpay/sails
pmq20/sails
poojan/sails
pstinghua/sails
reecelewellen/sails
rishabhmhjn/sails
rkJun/sails
robincafolla/sails
robskillington/sails
sailorjs/sails
samhunta/sails
saronwei/sails
sgress454/sails
shanehyde/sails
shendongming/sails
sindsri/sails
sineer/sails
slajax/sails
slantzjr/sails
tankerwng/sails
taogb/sails
tbaweb/sails
tealdev/sails
themouette/sails
tiffon/sails
timestep/sails
tonychenc/sails
tripitakit/sails
twocngdagz/sails
vernonk/sails
vicapow/sails
vinone/sails
virpool/sails
vizo/sails
voicedata/sails
whatifif/sails
woerwin/sails
wolneykien/sails
xdissent/sails
xsurge83/sails
zhaoxiongfei/sails
zmilan/sails
zohararad/sails
Nothing to show
Checking mergeability… Don’t worry, you can still create the pull request.
Commits on Dec 23, 2015
kevinburke and Kevin Burke
Add Circle test runner
Replaces the default Travis test runner with one for CircleCI. Had to bump the
test timeout to get the tests to pass - haven't figured out why the test is
taking so long but figured let's get them passing first.
Kevin Burke
Kevin Burke
Update README
Point out what's going to be different between this fork and the wider Sails
project.
Kevin Burke
Kevin Burke
Bump CSRF test timeout again
We just got another failure on the master branch.
Kevin Burke
Kevin Burke
Remove Grunt and dependencies from the project
We don't use them and they cause a lot of peer-dependency errors, so let's
strip Grunt and related code from the project.

A casualty of this is the `sails www` command, which tries to call Grunt to
build some stuff. Since we don't have Grunt anymore, this command can't do
anything.

As far as I can tell everything seems to still load okay; the tests pass, and
`sails lift` still works just fine.
Kevin Burke
Kevin Burke
Merge pull request #5 from Shyp/update-waterline
Point waterline dependency at Shyp's version
Kevin Burke
Kevin Burke
Log tests if they are slower than 2ms
Add a very basic Makefile and tell CircleCI to use the Makefile instead of
running `npm test`.
Kevin Burke
Kevin Burke
Bump pubsub timeout
This test failed with a timeout, let's bump the timeout so that it can complete
on time.

This is a good candidate to get removed but let's just make it pass for now
until we have a chance to revisit the larger pubsub logic.
Kevin Burke
Kevin Burke
Commits on Dec 24, 2015
Kevin Burke
Kevin Burke
Add initial shrinkwrap file
Alphabetizes dependencies. Tries as hard as possible to match our current Shyp
dependencies. Adds clingwrap for shrinkwrapping dependencies without the URL
fields.
Kevin Burke
Kevin Burke
Kevin Burke
Kevin Burke
Only shrinkwrap prod dependencies
Otherwise when we try to npm install sails into the Shyp API repo it complains
about the extraneous dev dependencies, which we don't want in the API project.
Kevin Burke
Kevin Burke
Kevin Burke
Kevin Burke
Merge pull request #10 from Shyp/sort-dev-packages
Sort dev packages alphabetically
Kevin Burke
Kevin Burke
Fix shrinkwrap
Now that the Sails dependencies in the Shyp API are alphabetized, we can
generate a much better diff, and lock the dependency dependencies to the
versions in the Shyp API.

For ease of use, install mime, debug, node-uuid, and optimist at the top level,
so that it's easier to match up with the Shyp API versions of each project, and
generate the smallest possible diff.

A lot of the version numbers go backwards, which is fine; they're matching up
with the values they take in the Shyp API.
Kevin Burke
Kevin Burke
Commits on Jan 04, 2016
Kevin Burke
Kevin Burke
Upgrade Waterline to 1.0.1
This makes the npm-shrinkwrap for Waterline match up with the npm-shrinkwrap
that's in the Shyp API, since we're now installing the Waterline dependencies
via Waterline's shrinkwrap file.
Kevin Burke
Kevin Burke
Commits on Jan 05, 2016
Kevin Burke
Kevin Burke
Change the default port from 1337
1337 is "leet", which is pretty juvenile; see the Urban
Dictionary page for more info. Change it to 6789. Per
https://en.wikipedia.org/wiki/List_of_TCP_and_UDP_port_numbers, nothing
noteworthy is running on that port.
Kevin Burke
Kevin Burke
Remove CSRF support
We only use policy/token based authentication, no cookies, and there's no way
to ask for a CSRF token before making a request, so let's remove it.
Kevin Burke
Kevin Burke
Remove pubsub and sockets
They're unused and we don't want them.
Kevin Burke
Kevin Burke
Kevin Burke
Kevin Burke
Remove dependency on prompt
If a project did not define a migrate strategy, Sails would prompt the user to
enter one. We don't need this setting and we don't let users choose between
strategies anymore - we only allow the 'safe' strategy.

Replaces the code that prompts the user with an error, and removes the "prompt"
dependency from package.json and npm-shrinkwrap.json.
Kevin Burke
Kevin Burke
Remove the roadmap
We have no plans to implement any of these features.
Kevin Burke
Kevin Burke
Fix npm at version 2
It prevents clingwrap from attempting to install npm 3 (which we don't want)
and also quiets a warning when `npm install`ing Sails.
Kevin Burke
Kevin Burke
Update Waterline to 1.1.0
The primary change here is to remove the 'alter' migration strategy from
Waterline. In addition, we remove a lot of code related to dynamic finders and
association finders, both of which we don't use.

Diff is here: Shyp/waterline@v1.0.1...v1.1.0

In addition we upgraded waterline-schema to 0.2.0, to remove 'alter' as the
default migration strategy.

Shyp/waterline-schema@shyp-master-0.1.17...v0.2.0
Kevin Burke
Kevin Burke
Commits on Jan 07, 2016
Kevin Burke
Kevin Burke
Upgrade Waterline to Shyp/1.3.0
This update fixes the error where `create([item1, item2])` would occasionally
return results out of order. Finally results will be returned in the same error
that you create them!

Also removes support for `findOrCreate` and `findOrCreateEach`, the
`afterValidate` lifecycle callback, and the `afterCreate` lifecycle callback.

Shyp/waterline@v1.1.0...v1.3.0
Kevin Burke
Kevin Burke
Commits on Jan 09, 2016
Kevin Burke
Kevin Burke
Replace Anchor with Lusitania
Same package, same semantics, different name. No more confusion with Shyp
anchor.
Kevin Burke
Kevin Burke
Commits on Feb 22, 2016
Kevin Burke
Kevin Burke
Lock down package versions
This sets every package version in package.json to the same value in
npm-shrinkwrap.json.
Kevin Burke
Kevin Burke
Disable methodOverride
Pretty much every HTTP client nowadays (and certainly every client we support)
can support PUT and DELETE requests, and this method invocation is changing
with Express 4. Remove the `_method` hack.
Kevin Burke
Kevin Burke
Remove connect-flash dependency
It's used to display flash messages via `req.flash('some message')` but our API
has no use for flash messages, so it's safe to remove this, the callback, and
the one place where Sails attempts to flash a message.
Kevin Burke
Kevin Burke
Point at Shyp's fork of sails-generate
The Shyp fork changes req.session.authenticated to req.authenticated in
the sessionAuth example policy. Updates the one fake_auth.js policy in the
Sails tests that depends on it. Also removes any mention of CSRF, sockets or
sessions, and the associated configs.

Diffs:

- balderdashy/sails-generate-backend@v0.11.3...Shyp:v1.0.0
- balderdashy/sails-generate@v0.11.6...Shyp:v1.0.0
Kevin Burke
Kevin Burke
Remove sessions
We use tokens for auth, there's no need for this code, which tries to store
session tokens in memory, and would need to change with the move to Express 4.
Kevin Burke
Kevin Burke
Remove the favicon middleware
Express 4 relies on serve-favicon version 2.0.0, which requires a default
favicon; Sails doesn't have one in the repo, and it doesn't make sense for us
anyway. We serve the favicon from the filesystem, browsers rarely have a need
to navigate to api.shyp.com, and if we felt we needed a more "scalable" favicon
serving mechanism, we could easily take the dependency in the Shyp API, not
here.
Commits on Feb 23, 2016
Kevin Burke
Kevin Burke
Remove default X-Powered-By header
We don't want to reveal that we're using Sails, or which version we're using.
Commits on Feb 24, 2016
Kevin Burke
Kevin Burke
Upgrade Waterline to v3.2.0
This pulls in additional (better) changes to the validation error formatting,
based on testing against the Shyp API. Also pulls in a change to clone data
before sending it to the database for INSERT/UPDATE queries.

Furthermore, there's a small change to avoid `SET`ting a primary key when
calling `.save()` on a record - only update the other fields.

We'll need to test this in the Shyp API and probably make some changes in the
API based on it.

Diff: Shyp/waterline@v2.0.0...v3.2.0
Kevin Burke
Kevin Burke
Kevin Burke
Kevin Burke
Upgrade waterline to v3.3.0
This change makes waterline.WLError inherit from the Javascript Error object,
which makes it catchable via (instanceof Error) checks.

Diff: Shyp/waterline@v3.2.0...v3.3.0
Kevin Burke
Kevin Burke
Kevin Burke
Kevin Burke
Bump Waterline to v3.4.0
This change passes through the originalError property when creating
a WLValidationError - we use it to figure out what to do when there's
a constraint failure.
Kevin Burke
Kevin Burke
Commits on Feb 25, 2016
Kevin Burke
Kevin Burke
Upgrade Express to v4
This was accomplished by installing Express 4, attempting to run the tests,
observing things that broke, and then fixing them. In some cases, I leaned on
the work done in #3235 to figure out
how to do something. The most comprehensive change is to the router, which is
its own Router object, and no longer a function on an Express `app`.

Adds two new dependencies (which were removed from Express core): cookie-parser
and compression. In some cases we removed the dependency on Express instead of
upgrading - we no longer try to serve favicons, or deal with sessions.
Kevin Burke
Kevin Burke
Commits on Mar 16, 2016
Kevin Burke
Kevin Burke
Don't throw error in CORS hook
Previously preflight requests would cause a TypeError in cors/index.js - see
#3662 for more information on how
this occurs.

Fixes the error by converting any `undefined` values to a dictionary before
continuing processing- it's not perfect but it solves the problem.
Kevin Burke
Kevin Burke
Commits on Mar 21, 2016
Kevin Burke
Kevin Burke
Update README to indicate progress so far
In terms of what's been deleted and what casual browsers can expect from this
project.
Kevin Burke
Kevin Burke
Remove dependency on microtime
Per #3211, this version of microtime
doesn't work with Node 4, and is trivially replaceable with `process.hrtime`
from the standard library.

Patch mostly applied from commit b0b94c9 in
the upstream repository. You probably want to view this diff with whitespace
changes disabled, the actual diff is very short.
Kevin Burke
Kevin Burke
Bump Waterline to v3.5.0
This version of Waterline adds support for debugging error construction, which
we need because our stack is throwing errors that we don't know much about.

Diff: Shyp/waterline@v3.4.0...v3.5.0
Kevin Burke
Kevin Burke
Upgrade Sails to Node 4
Have circle.yml now call the makefile to install this dependency. This pattern
emerged from work in shyp_api.
Node version no longer needed...
...it's centralized to the correct place (where we're curling from).
Commits on Apr 08, 2016
Kevin Burke
Kevin Burke
Remove userhooks hook
We don't need it or use it
Kevin Burke
Kevin Burke
Remove bootstrap and signal handlers
App lifting and lowering should be handled entirely in user-land, where the
user can combine lowering with other shutdown tasks. Once we merge this change,
we'll need to update the API to handle SIGTERM and shut itself down. This is
a benefit, since our shutdown handlers will finally actually run.

Removes the `sails.config.bootstrap` option, which introduces unnecessary
callback complexity to Sails and is unused in our codebase.

Fixes #3693.
Commits on Apr 11, 2016
Kevin Burke
Kevin Burke
Commits on Apr 12, 2016
Kevin Burke
Kevin Burke
Remove skipper and connect
Skipper gets instantiated as part of the `bodyParser` http middleware, which
we don't call in our application stack; I verified this by adding console.log
lines in the appropriate places, sending POST requests to the app, and
verifying nothing changed. This also lets us remove connect, and a crap ton of
dependencies from npm shrinkwrap.
Kevin Burke
Kevin Burke
Remove `server.listen` and `sails lift` CLI (#43)
* remove the `start` module which `listen`s on the web server (too early). app should do this instead.

* Remove the `sails lift` CLI command. Fix tests.
Commits on Apr 13, 2016
Kevin Burke
Kevin Burke
Remove node-uuid dependency
We don't use it anywhere, let's remove it.
Kevin Burke
Kevin Burke
Commits on Apr 19, 2016
Commits on Apr 25, 2016
Kevin Burke
Kevin Burke
Remove controller hook dependency on blueprints
There's probably more that we can rip out here related to Blueprints, but those
changes are tougher. This one crashes unless you define a blueprints config,
even if you don't have blueprints enabled.
Commits on Apr 27, 2016
Kevin Burke
Kevin Burke
Commits on May 16, 2016
Commits on May 19, 2016
dgb
Update Waterline to v3.7.0 (#48)
Updates Waterline to v3.7.0, which has support for coercing primary keys
that are "uuid" type.

Also includes v3.6.0, which consists of test environment changes.

Diff: Shyp/waterline@v3.5.0...v3.7.0
Derek Barnes
Derek Barnes
Derek Barnes
Derek Barnes
Commits on Jun 21, 2016
Remove HTTP (#49)
* Stripping down Sails
* remove sails `bin/` scripts
* Delete hooks files: http, responses, request, policies, views, controllers, blueprints
* remove shrinkwrap file - does not belong in shared modules.
* Removing obsolete tests.
* remove unused dependencies
Commits on Sep 01, 2016
Showing with 122 additions and 23,374 deletions.
  1. +0 −25 .travis.yml
  2. +25 −0 Makefile
  3. +31 −76 README.md
  4. +0 −53 ROADMAP.md
  5. +0 −31 bin/_commander.js
  6. +0 −21 bin/sails-configure.js
  7. +0 −112 bin/sails-console.js
  8. +0 −55 bin/sails-debug.js
  9. +0 −106 bin/sails-generate.js
  10. +0 −73 bin/sails-lift.js
  11. +0 −57 bin/sails-new.js
  12. +0 −63 bin/sails-www.js
  13. +0 −148 bin/sails.js
  14. +8 −0 circle.yml
  15. +0 −41 errors/fatal.js
  16. +1 −3 lib/app/README.md
  17. +0 −30 lib/app/Sails.js
  18. +1 −17 lib/app/configuration/defaultHooks.js
  19. +0 −2 lib/app/configuration/index.js
  20. +0 −16 lib/app/getBaseurl.js
  21. +3 −12 lib/app/lift.js
  22. +2 −5 lib/app/load.js
  23. +1 −23 lib/app/lower.js
  24. +0 −67 lib/app/private/bootstrap.js
  25. +7 −31 lib/app/private/initialize.js
  26. +0 −176 lib/app/request.js
  27. +0 −30 lib/hooks/blueprints/README.md
  28. +0 −320 lib/hooks/blueprints/actionUtil.js
  29. +0 −189 lib/hooks/blueprints/actions/add.js
  30. +0 −53 lib/hooks/blueprints/actions/create.js
  31. +0 −49 lib/hooks/blueprints/actions/destroy.js
  32. +0 −66 lib/hooks/blueprints/actions/find.js
  33. +0 −43 lib/hooks/blueprints/actions/findOne.js
  34. +0 −65 lib/hooks/blueprints/actions/populate.js
  35. +0 −70 lib/hooks/blueprints/actions/remove.js
  36. +0 −90 lib/hooks/blueprints/actions/update.js
  37. +0 −68 lib/hooks/blueprints/coercePK.js
  38. +0 −412 lib/hooks/blueprints/index.js
  39. +0 −61 lib/hooks/blueprints/jsonp.js
  40. +0 −139 lib/hooks/blueprints/onRoute.js
  41. +0 −26 lib/hooks/controllers/README.md
  42. +0 −123 lib/hooks/controllers/index.js
  43. +0 −246 lib/hooks/controllers/onRoute.js
  44. +0 −215 lib/hooks/cors/index.js
  45. +0 −122 lib/hooks/csrf/index.js
  46. +0 −204 lib/hooks/grunt/index.js
  47. +0 −207 lib/hooks/http/index.js
  48. +0 −112 lib/hooks/http/initialize.js
  49. +0 −191 lib/hooks/http/middleware/defaults.js
  50. +0 −30 lib/hooks/http/middleware/load.js
  51. +0 −120 lib/hooks/http/start.js
  52. +0 −48 lib/hooks/http/view.js
  53. +0 −95 lib/hooks/i18n/index.js
  54. +0 −16 lib/hooks/index.js
  55. +1 −165 lib/hooks/moduleloader/index.js
  56. +3 −75 lib/hooks/orm/index.js
  57. +0 −28 lib/hooks/policies/README.md
  58. +0 −343 lib/hooks/policies/index.js
  59. +0 −38 lib/hooks/pubsub/README.md
  60. +0 −11 lib/hooks/pubsub/drink.js
  61. +0 −1,461 lib/hooks/pubsub/index.js
  62. +0 −11 lib/hooks/pubsub/spit.js
  63. +0 −13 lib/hooks/pubsub/squirt.js
  64. +0 −47 lib/hooks/request/README.md
  65. +0 −116 lib/hooks/request/index.js
  66. +0 −50 lib/hooks/request/locals.js
  67. +0 −48 lib/hooks/request/metadata.js
  68. +0 −68 lib/hooks/request/params.all.js
  69. +0 −87 lib/hooks/request/qualifiers.js
  70. +0 −110 lib/hooks/request/validate.js
  71. +0 −64 lib/hooks/responses/defaults/badRequest.js
  72. +0 −77 lib/hooks/responses/defaults/forbidden.js
  73. +0 −42 lib/hooks/responses/defaults/negotiate.js
  74. +0 −82 lib/hooks/responses/defaults/notFound.js
  75. +0 −48 lib/hooks/responses/defaults/ok.js
  76. +0 −77 lib/hooks/responses/defaults/serverError.js
  77. +0 −229 lib/hooks/responses/index.js
  78. +0 −39 lib/hooks/responses/onRoute.js
  79. +0 −15 lib/hooks/session/README.md
  80. +0 −30 lib/hooks/session/generateSecret.js
  81. +0 −398 lib/hooks/session/index.js
  82. +0 −18 lib/hooks/sockets/README.md
  83. +0 −1 lib/hooks/sockets/index.js
  84. +0 −137 lib/hooks/sockets/lib/authorization.js
  85. +0 −112 lib/hooks/sockets/lib/connection.js
  86. +0 −27 lib/hooks/sockets/lib/getSDKMetadata.js
  87. +0 −297 lib/hooks/sockets/lib/index.js
  88. +0 −31 lib/hooks/sockets/lib/interpreter/ResStream.js
  89. +0 −45 lib/hooks/sockets/lib/interpreter/getVerb.js
  90. +0 −701 lib/hooks/sockets/lib/interpreter/interpret.js
  91. +0 −26 lib/hooks/sockets/lib/interpreter/saveSessionAndThen.js
  92. +0 −161 lib/hooks/sockets/lib/loadSocketIO.js
  93. +0 −6 lib/hooks/userhooks/README.md
  94. +0 −56 lib/hooks/userhooks/index.js
  95. +0 −109 lib/hooks/views/actions.js
  96. +0 −100 lib/hooks/views/configure.js
  97. +0 −818 lib/hooks/views/consolidate.js
  98. +0 −29 lib/hooks/views/defaults.js
  99. +0 −87 lib/hooks/views/index.js
  100. +0 −61 lib/hooks/views/layoutshim.js
  101. +0 −98 lib/hooks/views/onRoute.js
  102. +0 −106 lib/hooks/views/render.js
  103. +0 −336 lib/hooks/views/res.view.js
  104. +0 −40 lib/router/README.md
  105. +0 −354 lib/router/bind.js
  106. +0 −98 lib/router/bindDefaultHandlers.js
  107. +0 −344 lib/router/index.js
  108. +0 −86 lib/router/req.js
  109. +0 −130 lib/router/res.js
  110. +29 −69 package.json
  111. +0 −102 test/benchmarks/README.md
  112. +0 −243 test/benchmarks/sails.load.test.js
  113. +0 −12 test/fixtures/middleware.js
  114. +0 −26 test/helpers/RouteFactory.helper.js
  115. +0 −296 test/helpers/router.js
  116. +0 −173 test/hooks/blueprints/initialize.test.js
  117. +0 −111 test/hooks/request/initialize.test.js
  118. +0 −150 test/hooks/request/req.metadata.test.js
  119. +0 −94 test/hooks/request/req.options.usage.test.js
  120. +0 −155 test/hooks/request/req.validate.test.js
  121. +0 −46 test/hooks/views/intialize.test.js
  122. +0 −61 test/hooks/views/res.view.test.js
  123. +0 −52 test/integration/README.md
  124. +0 −1 test/integration/fixtures/sampleapp/api/controllers/EmptyController.js
  125. +0 −8 test/integration/fixtures/sampleapp/api/controllers/PetController.js
  126. +0 −37 test/integration/fixtures/sampleapp/api/controllers/TestController.js
  127. +0 −37 test/integration/fixtures/sampleapp/api/controllers/UserController.js
  128. +0 −1 test/integration/fixtures/sampleapp/api/controllers/UserProfileController.js
  129. +0 −23 test/integration/fixtures/sampleapp/api/controllers/ViewTestController.js
  130. +0 −9 test/integration/fixtures/sampleapp/api/policies/error_policy.js
  131. +0 −10 test/integration/fixtures/sampleapp/api/policies/fake_auth.js
  132. +1 −1 test/integration/fixtures/sampleapp/config/env/testmysql.js
  133. +5 −8 test/integration/fixtures/sampleapp/config/local.js
  134. +0 −1 test/integration/fixtures/sampleapp/views/viewtest/create.ejs
  135. +0 −1 test/integration/fixtures/sampleapp/views/viewtest/csrf.ejs
  136. +0 −1 test/integration/fixtures/sampleapp/views/viewtest/index.ejs
  137. +0 −1 test/integration/fixtures/sampleapp/views/viewtest/viewOptions.ejs
  138. +0 −197 test/integration/generate.test.js
  139. +4 −29 test/integration/helpers/appHelper.js
  140. +0 −39 test/integration/helpers/httpHelper.js
  141. +0 −4,103 test/integration/helpers/sails.io.js
  142. +0 −34 test/integration/helpers/socketHelper.js
  143. +0 −1,030 test/integration/hook.cors_csrf.test.js
  144. +0 −140 test/integration/hook.i18n.test.js
  145. +0 −344 test/integration/hook.policies.test.js
  146. +0 −233 test/integration/hook.pubsub.modelEvents.context.test.js
  147. +0 −115 test/integration/hook.pubsub.modelEvents.noSubscribers.test.js
  148. +0 −280 test/integration/hook.pubsub.modelEvents.subscribers.test.js
  149. +0 −58 test/integration/hook.sockets.interpreter.test.js
  150. +0 −164 test/integration/lift.test.js
  151. +0 −170 test/integration/new.test.js
  152. +0 −202 test/integration/router.APIScaffold.test.js
  153. +0 −487 test/integration/router.blueprintOptions.test.js
  154. +0 −166 test/integration/router.defaultController.test.js
  155. +0 −290 test/integration/router.specifiedRoutes.test.js
  156. +0 −97 test/integration/router.viewRendering.test.js
  157. +0 −127 test/integration/www.test.js
  158. +0 −4 test/unit/App.prototype.load.test.js
  159. +0 −67 test/unit/bootstrap.test.js
  160. +0 −59 test/unit/req.errors.test.js
  161. +0 −49 test/unit/req.test.js
  162. 0 test/unit/res.test.js
  163. +0 −259 test/unit/router.bind.test.js
  164. +0 −22 test/unit/router.test.js
  165. +0 −41 test/unit/router.unbind.test.js
View

This file was deleted.

Oops, something went wrong.
View
@@ -0,0 +1,25 @@
.PHONY: test install clean shrinkwrap
circle-install:
curl --silent --remote-name https://raw.githubusercontent.com/Shyp/set-node-npm/master/set-node-npm
chmod +x set-node-npm
./set-node-npm
test:
node --version
TZ=GMT ./node_modules/.bin/mocha --bail --slow 2
install:
npm --version
npm install
shrinkwrap: clean
npm cache clear
npm install --production
npm shrinkwrap
npm install --production
npm shrinkwrap
clingwrap npmbegone
clean:
rm -rf node_modules
View
107 README.md
@@ -1,25 +1,41 @@
<h1>
<a href="http://sailsjs.org"><img alt="Sails.js logo" src="http://balderdashy.github.io/sails/images/logo.png" title="Sails.js"/></a>
Shyp's Sails Fork
</h1>
### [Website](http://sailsjs.org/) &nbsp; [Getting Started](http://sailsjs.org/#!getStarted) &nbsp; [Docs](http://sailsjs.org/#!documentation) &nbsp; [Submit Issue](https://github.com/balderdashy/sails/blob/master/README.md#issue-submission)
This is Shyp's fork of the Sails.js project. We use Sails solely as an API, and
we have removed support for many upstream features:
- Grunt
- Blueprints
- Socket support
- Auto routes
- Support for any datastore besides Postgres
- Connect/connect-flash
- Sessions
- CSRF
- Multiple validation errors for a single request (only one error is returned)
- Custom bootstrap in config/bootstrap.js
- Sails no longer clobbers the SIGTERM, SIGUSR2, and SIGINT handlers.
- Skipper
Sails.js is a web framework that makes it easy to build custom, enterprise-grade Node.js apps. It is designed to resemble the MVC architecture from frameworks like Ruby on Rails, but with support for the more modern, data-oriented style of web app development. It's especially good for building realtime features like chat.
By limiting the feature set we hope to reduce the attack surface and ship
something that's more reliable and predictable.
## Contribute/Project Direction
## Installation &nbsp; [![NPM version](https://badge.fury.io/js/sails.svg)](http://badge.fury.io/js/sails)
We'll read community error reports, issues and PR's, though it's unlikely that
we'll have time to test and merge them.
## Tests
We run tests on CircleCI. Here's an image showing whether the tests pass or
fail.
**With [node](http://nodejs.org) [installed](http://sailsjs.org/#!documentation/new-to-nodejs):**
```sh
# Get the latest stable release of Sails
$ sudo npm install sails -g
$ npm install sails@git+https://github.com/Shyp/sails.git#v4.1.0
```
> ######Upgrading from v0.9?
> Be sure and check out the [v0.10 upgrading guide](http://sailsjs.org/#/documentation/concepts/Upgrading).
## Your First Sails Project
**Create a new app:**
@@ -37,83 +53,22 @@ $ cd testProject
$ sails lift
```
**Generate a REST API:**
[![ScreenShot](http://i.imgur.com/Ii88jlhl.png)](https://www.youtube.com/watch?v=GK-tFvpIR7c)
## Compatibility
Sails is built on [Node.js](http://nodejs.org/), [Connect](http://www.senchalabs.org/connect/), [Express](http://expressjs.com/), and [Socket.io](http://socket.io/).
Sails [controllers](http://sailsjs.org/#!documentation/controllers) are compatible with Connect middleware, so in most cases, you can paste code into Sails from an existing Express project and everything will work-- plus you'll be able to use WebSockets to talk to your API, and vice versa.
The ORM, [Waterline](https://github.com/balderdashy/waterline), has a well-defined adapter system for supporting all kinds of datastores. Officially supported databases include [MySQL](https://github.com/balderdashy/sails-mysql), [PostgreSQL](https://github.com/balderdashy/sails-postgresql), [MongoDB](https://github.com/balderdashy/sails-mongo), [Redis](https://github.com/balderdashy/sails-redis), local [disk](https://github.com/balderdashy/sails-disk), and local [memory](https://github.com/balderdashy/sails-memory). [Community adapters](https://github.com/balderdashy/sails-docs/blob/master/intro-to-custom-adapters.md#notable-community-adapters) exist for [CouchDB](https://github.com/search?q=sails+couch&nwo=codeswarm%2Fsails-couchdb-orm&search_target=global&ref=cmdform), [neDB](https://github.com/adityamukho/sails-nedb), [SQLite](https://github.com/AndrewJo/sails-sqlite3/tree/0.10), [Oracle](https://github.com/search?q=sails+oracle&type=Repositories&ref=searchresults), [MSSQL](https://github.com/search?q=sails+mssql&type=Repositories&ref=searchresults), [DB2](https://github.com/search?q=sails+db2&type=Repositories&ref=searchresults), [ElasticSearch](https://github.com/search?q=%28elasticsearch+AND+sails%29+OR+%28elasticsearch+AND+waterline%29+&type=Repositories&ref=searchresults), [Riak](https://github.com/search?q=sails+riak&type=Repositories&ref=searchresults),
[neo4j](https://www.npmjs.org/package/sails-neo4j),
[Amazon RDS](https://github.com/TakenPilot/sails-rds), [DynamoDB](https://github.com/TakenPilot/sails-dynamodb), [Azure Tables](https://github.com/azuqua/sails-azuretables), and [RethinkDB](https://github.com/search?q=%28%28sails+rethinkdb+in%3Aname%29+OR+%28waterline+rethinkdb+in%3Aname%29%29&type=Repositories&ref=searchresults); for various 3rd-party REST APIs like Quickbooks, Yelp, and Twitter, including a configurable generic [REST API adapter](https://github.com/zohararad/sails-rest); plus some [eclectic projects](https://www.youtube.com/watch?v=OmcQZD_LIAE).
<!-- Core adapter logos -->
<a target="_blank" href="http://www.mysql.com">
<img width="75" src="http://www.mysql.com/common/logos/powered-by-mysql-125x64.png" alt="Powered by MySQL" title="sails-mysql: MySQL adapter for Sails"/>
</a>&nbsp; &nbsp; &nbsp; &nbsp;
<a target="_blank" href="http://www.postgresql.org/"><img width="50" title="PostgreSQL" src="http://i.imgur.com/OSlDDKv.png"/></a>&nbsp; &nbsp; &nbsp; &nbsp;
<a target="_blank" href="http://www.mongodb.org/"><img width="100" title="MongoDB" src="http://i.imgur.com/bC2j13z.png"/></a>&nbsp; &nbsp; &nbsp; &nbsp;
<a target="_blank" href="http://redis.io/"><img width="75" title="Redis" src="http://i.imgur.com/dozv0ub.jpg"/></a>&nbsp; &nbsp; &nbsp; &nbsp;
<!-- /core adapter logos -->
## Issue Submission
Make sure you've read the [issue submission guidelines](https://github.com/balderdashy/sails/blob/master/CONTRIBUTING.md#opening-issues) before opening a new issue.
Sails is composed of a [number of different sub-projects](https://github.com/balderdashy/sails/blob/master/MODULES.md), many of which have [their own dedicated repository](https://github.com/search?q=sails+user%3Amikermcneil+user%3Abalderdashy+user%3Aparticlebanana&type=Repositories&ref=advsearch&l=). If you suspect an issue in one of Sails sub-modules, you'll usually find its repo on the [organization](https://github.com/balderdashy) page. Click [here](https://github.com/balderdashy/sails/search?q=&type=Issues) to search/post issues in this repository.
Sails is built on [Node.js](http://nodejs.org/), and [Express](http://expressjs.com/)
## Feature Requests
See the [Trello board](https://trello.com/b/cGzNVE0b/sails-js-feature-requests) to view/discuss our roadmap and [request features](https://github.com/balderdashy/sails/blob/master/CONTRIBUTING.md#requesting-features).
## Contribute
See the [contribution guide](https://github.com/balderdashy/sails/blob/master/CONTRIBUTING.md).
## Support
Need help or have a question?
- [Tutorials](https://github.com/balderdashy/sails-docs/blob/master/FAQ.md#where-do-i-get-help)
- [Stackoverflow](http://stackoverflow.com/questions/tagged/sails.js)
- [#sailsjs on Freenode](http://webchat.freenode.net/) (IRC channel)
- [Professional/Enterprise Options](https://github.com/balderdashy/sails-docs/blob/master/FAQ.md#are-there-professional-support-options)
_Please don't use the issue tracker for support/questions._
## Links
- [Website](http://sailsjs.org/)
- [Official Documentation](http://sailsjs.org/#!documentation)
- [Changelog](https://github.com/balderdashy/sails-docs/blob/0.9/changelog.md)
- [Roadmap](https://github.com/balderdashy/sails-wiki/blob/0.9/roadmap.md)
- [Google Group](https://groups.google.com/forum/?fromgroups#!forum/sailsjs)
- [Twitter](https://twitter.com/sailsjs)
- [SailsCasts](http://irlnathan.github.io/sailscasts/)
Sails [controllers](http://sailsjs.org/#!documentation/controllers) are compatible with Connect middleware, so in most cases, you can paste code into Sails from an existing Express project and everything will work.
The ORM, [Waterline](https://github.com/balderdashy/waterline), has a
well-defined adapter system for supporting Postgres.
## Team
Sails is actively built and maintained by [Balderdash](http://balderdash.co) ([@balderdashy](http://twitter.com/balderdashy)), a realtime web & mobile studio, with the help of these [contributors](https://github.com/balderdashy/sails/graphs/contributors):
[![Mike McNeil](http://gravatar.com/avatar/199046437b76e6ca73e00b4cc182a1c5?s=144)](http://michaelmcneil.com) | [![Cody Stoltman](https://1.gravatar.com/avatar/368567acca0c5dfb9a4ff512c5c0c3fa?s=144)](http://particlebanana.com) | [![Scott Gress](https://0.gravatar.com/avatar/b74e07aa543552709bf546ca279c9c67?s=144)](http://www.pigandcow.com/) | [![Greg Thornton](https://2.gravatar.com/avatar/b7c50edb558d5289331440f45ff600b0?s=144)](http://xdissent.com) | [![Zoli Kahan](http://gravatar.com/avatar/55dbeca986f875e1d1cb4d51e2fc42e4?s=144)](http://www.zolmeister.com/)
:---:|:---:|:---:|:---:|:---:
[Mike McNeil](http://michaelmcneil.com) | [Cody Stoltman](https://github.com/particlebanana) | [Scott Gress](https://github.com/sgress454) | [Greg Thornton](https://github.com/xdissent) | [Zoli Kahan](https://github.com/Zolmeister)
[Balderdash](http://balderdash.co) designs/builds scalable Node.js apps for startups and enterprise customers. After building a few apps and taking them into production, we realized that the Node.js development landscape was very much still the Wild West. Over time, after trying lots of different methodologies, we decided to crystallize all of our best practices into this framework. [I](http://twitter.com/mikermcneil) hope it saves you some time :)
This fork is actively built and maintained by [the Shyp engineering team](https://github.com/Shyp)
## License
[MIT License](http://sails.mit-license.org/) Copyright © 2012-2014 Mike McNeil
> Sails is built around so many great open-source technologies that it would never have crossed our minds to keep it proprietary. We owe huge gratitude and props to TJ Holowaychuk ([@visionmedia](https://github.com/visionmedia)) and Guillermo Rauch ([@guille](https://github.com/guille)) for the work they did, as well as the stewards of all the other open-source modules we use. Sails could never have been developed without your tremendous contributions to the node community.
![image_squidhome@2x.png](http://sailsjs.org/images/bkgd_squid@2x.png)
[![githalytics.com alpha](https://cruel-carlota.pagodabox.com/8acf2fc2ca0aca8a3018e355ad776ed7 "githalytics.com")](http://githalytics.com/balderdashy/sails)
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

Showing you all comments on commits in this comparison.

@benbuckman

This comment has been minimized.

Show comment
Hide comment
@benbuckman

benbuckman May 13, 2016

@kevinburkeshyp Can this 4.8.0 version be applied to shyp_api? (I'd like to continue to remove pieces of Sails, but this is sort of blocking.)
Thanks

benbuckman commented on 78ead64 May 13, 2016

@kevinburkeshyp Can this 4.8.0 version be applied to shyp_api? (I'd like to continue to remove pieces of Sails, but this is sort of blocking.)
Thanks

@kevinburkeshyp

This comment has been minimized.

Show comment
Hide comment

kevinburkeshyp commented on 78ead64 May 13, 2016

Yes