Merge pull request #4 from sh/react-0.14

react 0.14 and dependencies bump

Author: snd

.travis.yml

@@ -1,9 +1,9 @@
 language: node_js
 node_js:
   - "0.12"
-  - "iojs-2"
   - "iojs-3"
-  - "4.0"
+  - "4"
+  - "5"
 script: npm run $NPM_COMMAND
 sudo: false
 env:
@@ -19,18 +19,18 @@ env:
 matrix:
   exclude:
     # don't test in browsers more than once
-    - node_js: "iojs-2"
-      env: NPM_COMMAND=test-in-browsers
     - node_js: "iojs-3"
       env: NPM_COMMAND=test-in-browsers
-    - node_js: "4.0"
+    - node_js: "4"
+      env: NPM_COMMAND=test-in-browsers
+    - node_js: "5"
       env: NPM_COMMAND=test-in-browsers
     # don't collect code coverage more than once
-    - node_js: "iojs-2"
-      env: NPM_COMMAND=test-with-coverage
     - node_js: "iojs-3"
       env: NPM_COMMAND=test-with-coverage
-    - node_js: "4.0"
+    - node_js: "4"
+      env: NPM_COMMAND=test-with-coverage
+    - node_js: "5"
       env: NPM_COMMAND=test-with-coverage
     # don't test 0.12 more than once
     - node_js: "0.12"

package.json

@@ -39,16 +39,17 @@
     "node": ">=0.10.0"
   },
   "dependencies": {
-    "react": "0.13.3"
+    "react": "0.14.7"
   },
   "devDependencies": {
     "codecov.io": "0.1.6",
     "coffee-script": "1.10.0",
-    "tape": "4.2.0",
+    "tape": "4.4.0",
     "coffeetape": "1.0.1",
-    "istanbul": "0.3.19",
-    "zuul": "3.4.0",
-    "coffeeify": "1.1.0"
+    "istanbul": "0.4.2",
+    "zuul": "3.9.0",
+    "coffeeify": "2.0.1",
+    "react-dom": "0.14.7"
   },
   "scripts": {
     "compile": "coffee --bare --compile --output lib/ src/",

test/react-kup.coffee

@@ -1,13 +1,14 @@
 test = require 'tape'
-React = require 'react/addons'
+React = require 'react'
+ReactDOMServer = require 'react-dom/server'
 
 reactKup = require('../lib/react-kup')
 
 removeReactAttributes = (string) ->
   string.replace(/\ data-react[^=]*="[^"]*"/g, '')
 
 elementToString = (element) ->
-  html = React.renderToString element
+  html = ReactDOMServer.renderToString element
   removeReactAttributes html
 
 removeLayout = (string) ->
@@ -109,14 +110,14 @@ test 'build', (t) ->
     t.end()
 
   t.test 'existing element with wrapper', (t) ->
-    div = reactKup (k) ->
-      k.div 'hey there'
+    span = reactKup (k) ->
+      k.span 'hey there'
 
     element = reactKup (k) ->
       k.p ->
-        k.build div
+        k.build span
     t.ok elementProducesMarkup element, """
-      <p><div>hey there</div></p>
+      <p><span>hey there</span></p>
     """
     t.end()
 
@@ -208,7 +209,7 @@ test 'inner text content', (t) ->
       <div>
         <span>text in span</span>
         <span>inner text</span>
-        <br>
+        <br/>
         <span>another inner text</span>
       </div>
     """
@@ -229,7 +230,7 @@ test 'nested', (t) ->
       <h1 id="heading">Heading</h1>
       <p>
         <span>hello</span>
-        <br>
+        <br/>
         <span>world</span>
       </p>
       <h2>Heading</h2>
@@ -318,7 +319,7 @@ test 'complex react example', (t) ->
         <li>Buy Sugar</li>
       </ul>
       <form>
-        <input value="Add #3">
+        <input value="Add #3"/>
         <button>Add #3</button>
       </form>
     </div>
@@ -363,3 +364,31 @@ test 'another complex react example', (t) ->
   """
 
   t.end()
+
+test 'stateless functional component', (t) ->
+  helloMessage = (props) ->
+    reactKup (k) ->
+      k.div "Hello #{props.name}"
+
+  element = React.createElement helloMessage,
+    name: 'John'
+
+  t.ok elementProducesMarkup element, """
+    <div>Hello John</div>
+  """
+
+  t.end()
+
+test 'stateless functional component with implicit return', (t) ->
+  helloMessage = ({name}) ->
+    reactKup (k) ->
+      k.div "Hello #{name}"
+
+  element = React.createElement helloMessage,
+    name: 'John'
+
+  t.ok elementProducesMarkup element, """
+    <div>Hello John</div>
+  """
+
+  t.end()