Merge 3d4e4f1 into 9b62cde

.travis.yml

@@ -3,3 +3,4 @@ node_js:
   - 0.10
 after_script:
   - npm run coveralls
+sudo: false

lib/index.coffee

@@ -4,16 +4,14 @@ _         = require 'lodash'
 W         = require 'when'
 
 module.exports = (opts) ->
-  codes = ['200', '301', '302', '404']
-
   class RootsNetlify
     constructor: (@roots) ->
       @util = new RootsUtil(@roots)
 
     setup: ->
       W(opts).with(@)
         .then (opts) ->
-          @opts = _.defaults(opts, {redirects: {}, rewrites: {}, headers: {}})
+          @opts = _.defaults(opts, {redirects: {}, headers: {}})
         .then ->
           W.all([write_headers.call(@), write_redirects.call(@)])
 
@@ -26,15 +24,5 @@ module.exports = (opts) ->
       @util.write '_headers', res
 
     write_redirects = ->
-      redirects = _.pick(@opts.redirects, codes)
-      redirects['200'] ?= {}
-      redirects['301'] ?= {}
-      _.merge(redirects['200'], @opts.rewrites)
-      _.merge(redirects['301'], _.omit(@opts.redirects, codes))
-
-      res = _.reduce redirects, (str, conf, code) ->
-        for k, v of conf
-          str += "#{k} #{v} #{code}\n"
-        return str
-      , ''
+      res = @opts.redirects.join('\n')
       @util.write '_redirects', res

readme.md

@@ -27,16 +27,14 @@ netlify = require 'roots-netlify'
 module.exports =
   extensions: [
     netlify
-      redirects:
-        '/news': '/blog'
-        '/news/:year/:month:/:date/:slug': '/blog/:year/:month/:date/:story_id'
-        '/news/*': '/blog/:splat'
-        '302':
-          '/temp_redirect': '/'
-        '404':
-          '/ecommerce': '/closed'
-      rewrites:
-        '/*': '/index.html'
+      redirects: [
+        '/news /blog 200'
+        '/news/:year/:month:/:date/:slug /blog/:year/:month/:date/:story_id 200'
+        '/news/* /blog/:splat 200'
+        '/redirect / 301'
+        '/temp_redirect / 302'
+        '/ecommerce /closed 404'
+      ]
       headers:
         '/protected/path':
           'Cache-Control': 'max-age: 3000'
@@ -49,7 +47,7 @@ module.exports =
 
 Read the Netlify documentation on [redirects](https://docs.netlify.com/redirects/) and [headers](https://docs.netlify.com/headers_and_basic_auth) to learn more.
 
-Redirects added to the `redirects` object return a status code of `301` while those added to the `rewrites` object will return `200` (a rewrite). Netlify also [supports](https://docs.netlify.com/redirects#http-status-codes) two other status codes: `302` and `404`. In order to configure your redirects for these, add a `302` or `404` key to `redirects` and nest your configuration object there (see example above).
+The `redirects` property accepts an array of redirects or rewrite rules (in order) with their respective HTTP code appended at the end as described in Netlify's documentation.
 
 ### Promises
 

test/fixtures/basic/app.coffee

@@ -4,16 +4,14 @@ module.exports =
   ignores: ["**/.DS_Store"]
   extensions: [
     netlify
-      redirects:
-        '/news': '/blog'
-        '/news/:year/:month:/:date/:slug': '/blog/:year/:month/:date/:story_id'
-        '/news/*': '/blog/:splat'
-        '302':
-          '/temp_redirect': '/'
-        '404':
-          '/ecommerce': '/closed'
-      rewrites:
-        '/*': '/index.html'
+      redirects: [
+        '/* /index.html 200'
+        '/news /blog 301'
+        '/news/:year/:month:/:date/:slug /blog/:year/:month/:date/:story_id 301'
+        '/news/* /blog/:splat 301'
+        '/temp_redirect / 302'
+        '/ecommerce /closed 404'
+      ]
       headers:
         '/protected/path':
           'Cache-Control': 'max-age: 3000'

test/fixtures/promises/app.coffee

@@ -2,16 +2,14 @@ netlify = require '../../..'
 W       = require 'when'
 
 config =
-  redirects:
-    '/news': '/blog'
-    '/news/:year/:month:/:date/:slug': '/blog/:year/:month/:date/:story_id'
-    '/news/*': '/blog/:splat'
-    '302':
-      '/temp_redirect': '/'
-    '404':
-      '/ecommerce': '/closed'
-  rewrites:
-    '/*': '/index.html'
+  redirects: [
+    '/ecommerce /closed 404'
+    '/* /index.html 200'
+    '/news /blog 301'
+    '/news/:year/:month:/:date/:slug /blog/:year/:month/:date/:story_id 301'
+    '/news/* /blog/:splat 301'
+    '/temp_redirect / 302'
+  ]
   headers:
     '/protected/path':
       'Cache-Control': 'max-age: 3000'

test/fixtures/promises/expected/_redirects

@@ -1,6 +1,6 @@
+/ecommerce /closed 404
 /* /index.html 200
 /news /blog 301
 /news/:year/:month:/:date/:slug /blog/:year/:month/:date/:story_id 301
 /news/* /blog/:splat 301
 /temp_redirect / 302
-/ecommerce /closed 404