react_webpack_rails 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4abcce90a9fd0f8ee452f26d43740e03dcb50cb6
-  data.tar.gz: a8ce7c8838761c50eb669e6d9161171696581139
+  metadata.gz: 3dedadf24fa2870a3a88a55a64aa0eb3621da825
+  data.tar.gz: dbf9547a683c1796873a5fd36f5b6def0f04a537
 SHA512:
-  metadata.gz: 358ab702580f5a5bc3db430ad47e33cb239e26362abd9ef89b4783e03fa6cb9e6d112c5faacc857081d9486ce67f4a8479483ce0fff153aacb9bb57f20682a68
-  data.tar.gz: 6cda137ad21c6aaed000f946501a748b85ee06d58e03a36c77621964a1f554912eac9678324c066478d36ffdf6de25df45d86dcbc529925f843a6eef5f51d63f
+  metadata.gz: 52b54c004400fbfbc56901524e73e5dbc9bfecfad0fe436da5e7d8830f03b0bbdea2c53cf24c560866245704152449205c16bcd5d415f5b4b0c561be3cdb5a4c
+  data.tar.gz: 5fe97c37924eb22bbda98aef4603980658917fc10a0027f3a5554c5982c7448231a352b058ba135615aac290c04c0d3523d4f54376b86a166ab7fe280bdaf32d

data/.travis.yml

@@ -2,17 +2,32 @@ branches:
   except:
     - docs
 
+sudo: required
+dist: trusty
 language: ruby
+addons:
+  # From some tests it seems you can only have one firefox addon.
+  # Adding two results in the last one defined being the one installed.
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
+      - google-chrome-beta
 
 cache:
   bundler: true
   directories:
   - spec/rails3_dummy_app/node_modules
   - spec/rails4_dummy_app/node_modules
+  - spec/rails5_dummy_app/node_modules
   - node_modules
 
 matrix:
   include:
+    - rvm: 2.2.4
+      gemfile: spec/rails5_dummy_app/Gemfile
+      env: TEST_SUITE=rails5
     - rvm: 2.2.4
       gemfile: spec/rails4_dummy_app/Gemfile
       env: TEST_SUITE=rails4
@@ -25,6 +40,9 @@ matrix:
     - rvm: 2.2.4
       env: TEST_SUITE=node
 
+before_install:
+  - sudo apt-get update -qq
+
 before_script:
   - npm install -g npm@^2.0
   - npm install -g webpack@^1.12.1

data/CHANGELOG.md

@@ -1,8 +1,30 @@
+## 0.5.0
+* fixed forever setup - solving problems with running node server,
+* renamed `react_element` -> `rwr_element`,
+* dropped deprecated react_router integration,
+* npm dependencies bump,
+* support Rails 5:
+  * added Turbolinks 5 compatibility,
+  * added Rails 5 dummy app for testing.
+
+
+#### migration 0.4.1 -> 0.5.0
+in both: `forever/development.json` & `forever/production.json` replace
+```
+"sourceDir": "./app/react",
+```
+with:
+```
+"workingDir": "./",
+"sourceDir": "app/react",
+```
+
+
 ## 0.4.1
 * Update install generator - set NODE_ENV for production.
 
 #### migration 0.4.0 -> 0.4.1
-* replace `webpack/productino.config.js` with:
+* replace `webpack/production.config.js` with:
 
   ```js
   const Webpack = require('webpack');

data/README.md

@@ -5,7 +5,7 @@
 This gem provides easy and convenient way to build modern JavaScript stack on top of Rails applications using [Webpack](http://webpack.github.io/) and [React](https://facebook.github.io/react/).
 
 ### Development branch!
-See [0.3-stable](https://github.com/netguru/react_webpack_rails/tree/0.3-stable) for latest release.
+See [0.4-stable](https://github.com/netguru/react_webpack_rails/tree/0.4-stable) for latest release.
 
 ## Features
 * [Install Generator](https://github.com/netguru/react_webpack_rails/blob/master/docs/install_generator.md) for quick [Webpack](http://webpack.github.io/) setup.

data/Rakefile

@@ -1,33 +1,55 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 namespace :test do
   desc 'Run all tests'
-  task all: [:node, :gem, :rails3, :rails4] do
+  task all: [:node, :gem, :rails3, :rails4, :rails5] do
     puts 'Finished all tests, yay!'
   end
 
   desc 'Run node package tests'
   task :node do
-    sh %Q(npm test)
+    sh %(npm test)
   end
 
   desc 'Run gem tests'
   task :gem do
-    sh %Q(bundle exec rspec spec/react_webpack_rails_spec.rb spec/react_webpack_rails)
+    sh %(bundle exec rspec spec/react_webpack_rails_spec.rb spec/react_webpack_rails)
   end
 
   desc 'Run rspec for rails3 application'
   task :rails3 do
     Bundler.with_clean_env do
-      sh %Q(cd spec/rails3_dummy_app && npm run build && bundle exec rspec && npm test)
+      sh %(
+        cd spec/rails3_dummy_app &&
+        npm run build &&
+        bundle exec rspec &&
+        npm test
+      )
     end
   end
 
   desc 'Run rspec for rails4 application'
   task :rails4 do
     Bundler.with_clean_env do
-      sh %Q(cd spec/rails4_dummy_app && npm run build && bundle exec rspec && npm test)
+      sh %(
+        cd spec/rails4_dummy_app &&
+        npm run build &&
+        bundle exec rspec &&
+        npm test
+      )
+    end
+  end
+
+  desc 'Run rspec for rails5 application'
+  task :rails5 do
+    Bundler.with_clean_env do
+      sh %(
+        cd spec/rails5_dummy_app &&
+        npm run build &&
+        bundle exec rspec &&
+        npm test
+      )
     end
   end
 end
@@ -36,27 +58,50 @@ task default: 'test:all'
 
 namespace :setup do
   desc 'Prepare every environment'
-  task all: [:node, :gem, :rails3, :rails4] do
+  task all: [:node, :gem, :rails3, :rails4, :rails5] do
     puts 'Prepared all, yay!'
   end
 
   desc 'Prepare node module dependencies'
   task :node do
-    sh %Q(npm install)
+    sh %(npm install)
   end
 
   desc 'Prepare gem dependencies'
   task :gem do
-    sh %Q(bundle install)
+    sh %(bundle install)
   end
 
   desc 'Prepare rails3 test app dependencies'
   task :rails3 do
-    sh %Q(npm install && cd spec/rails3_dummy_app && npm install && bundle install)
+    sh %(
+      npm install &&
+      cd spec/rails3_dummy_app &&
+      rm -rf node_modules/react-webpack-rails &&
+      npm install &&
+      bundle install
+    )
   end
 
   desc 'Prepare rails4 test app dependencies'
   task :rails4 do
-    sh %Q(npm install && cd spec/rails4_dummy_app && npm install && bundle install)
+    sh %(
+      npm install &&
+      cd spec/rails4_dummy_app &&
+      rm -rf node_modules/react-webpack-rails &&
+      npm install &&
+      bundle install
+    )
+  end
+
+  desc 'Prepare rails5 test app dependencies'
+  task :rails5 do
+    sh %(
+      npm install &&
+      cd spec/rails5_dummy_app &&
+      rm -rf node_modules/react-webpack-rails &&
+      npm install &&
+      bundle install
+    )
   end
 end

data/docs/api.md

@@ -108,63 +108,3 @@
     ```ruby
     render react_component: 'MyComponentName', props: MySerializer.new(my_data), tag: :ul, server_side: true
     ```
-
-
-## ReactRouter
-  * #### registerRouter [js]
-    ```js
-    registerRouter(String routerName, class|function component)
-    ```
-
-    Register router so it's globally accessible.
-
-    ##### example:
-
-    ```js
-    import MyComponent from 'my-component';
-
-    registerComponent('MyComponentName', MyComponent);
-    ```
-
-    **note:** Registered components are accessible in globally exposed `RWR.reactRouter` under `routers` property.
-
-  * #### getRouter [js]
-
-    ```js
-    getRouter(String routerName)
-    ```
-
-    Shortcut for accessing registered router.
-
-    ##### example:
-
-    ```js
-    getRouter('MyRouterName');
-    ```
-
-  * #### renderRouter [js]
-
-    ```js
-    renderRouter(String routerName, DOMElement container)
-    ```
-
-    Wrapper over `React.render`. Search and render given router into specified DOM element.
-
-    ##### example:
-
-    ```js
-    var element = document.getElementById('my-element');
-    renderRouter('MyRouterName', element);
-    ```
-
-  * #### react_router [ruby]
-
-    ```ruby
-    react_router(String router_name)
-    ```
-
-    ##### example:
-
-    ```ruby
-    <%= react_router('MyRouterName') %>
-    ```

data/docs/install_generator.md

@@ -50,7 +50,6 @@ And modify:
 * `--no-hot-reload` - skip hot_reload generator
 * `--no-server-side` - skip server_side  generator
 * `--no-karma-setup` - skip karma_setup generator
-* `--react-router` - run react_rotuer generator [DEPRECIATED since v0.3.0 - use [rwr-react_router](https://github.com/netguru/rwr-react_router) instead]
 * `--redux` - install and setup [`rwr-redux`](https://github.com/netguru/rwr-redux) gem
 
 *Detailed description of generators coming soon...*

data/js/src/index.js

@@ -2,15 +2,12 @@ import env from './env';
 import nodes from './nodes';
 import integrationsManager from './integrations-manager';
 import react from './integrations/react';
-import reactRouter from './integrations/react-router';
 import version from './version';
 
 export { react as react };
 export { nodes as nodes };
 export { integrationsManager as integrationsManager };
 export { env as env };
-export { reactRouter as reactRouter };
-
 
 class RWR {
   constructor() {
@@ -22,11 +19,6 @@ class RWR {
     this.renderComponent = react.renderComponent;
     this.unmountComponent = react.unmountComponent;
 
-    this.renderRouter = reactRouter.renderRouter;
-    this.registerRouter = reactRouter.registerRouter;
-    this.unmountRouter = reactRouter.unmountRouter;
-    this.getRouter = reactRouter.getRouter;
-
     this.mountNodes = nodes.mountNodes;
     this.unmountNodes = nodes.unmountNodes;
   }

data/js/src/integrations-manager.js

@@ -1,11 +1,9 @@
 import reactIntegration from './integrations/react';
-import reactRouterIntegration from './integrations/react-router';
 
 class IntegrationsManager {
   constructor() {
     this.integrations = {
       'react-component': reactIntegration.integrationWrapper,
-      'react-router': reactRouterIntegration.integrationWrapper,
     };
   }
 

data/js/src/nodes.js

@@ -1,6 +1,6 @@
 import IntegrationsManager from './integrations-manager';
 
-const ELEMENT_ATTR = 'data-react-element';
+const ELEMENT_ATTR = 'data-rwr-element';
 const PAYLOAD_ATTR = 'data-payload';
 const INTEGRATION_NAME_ATTR = 'data-integration-name';
 const OPTIONS_ATTR = 'data-options';

data/js/src/version.js

@@ -1 +1 @@
-export default '0.4.1';
+export default '0.5.0';

data/js/test/integrations-manager.spec.js

@@ -1,6 +1,5 @@
 import expect from 'expect';
 import reactIntegration from '../src/integrations/react';
-import reactRouterIntegration from '../src/integrations/react-router';
 import subject from '../src/integrations-manager';
 
 describe('IntegrationsManager', function () {
@@ -9,10 +8,7 @@ describe('IntegrationsManager', function () {
       expect(subject.integrations['react-component']).toEqual(
         reactIntegration.integrationWrapper
       );
-      expect(subject.integrations['react-router']).toEqual(
-        reactRouterIntegration.integrationWrapper
-      );
-      expect(Object.keys(subject.integrations).length).toEqual(2);
+      expect(Object.keys(subject.integrations).length).toEqual(1);
     });
   });
 

data/js/test/nodes.spec.js

@@ -56,12 +56,12 @@ describe('Nodes', function () {
         };
       });
 
-      it('uses "data-react-element" as default selector', function () {
+      it('uses "data-rwr-element" as default selector', function () {
         const documentSpy = spyOn(document, 'querySelectorAll');
         mountNodes();
 
         expect(documentSpy.calls.length).toEqual(1);
-        expect(documentSpy).toHaveBeenCalledWith('[data-react-element]');
+        expect(documentSpy).toHaveBeenCalledWith('[data-rwr-element]');
       });
 
       it('mounts nodes', function () {
@@ -99,12 +99,12 @@ describe('Nodes', function () {
         };
       });
 
-      it('uses "data-react-element" as default selector', function () {
+      it('uses "data-rwr-element" as default selector', function () {
         const documentSpy = spyOn(document, 'querySelectorAll');
         unmountNodes();
 
         expect(documentSpy.calls.length).toEqual(1);
-        expect(documentSpy).toHaveBeenCalledWith('[data-react-element]');
+        expect(documentSpy).toHaveBeenCalledWith('[data-rwr-element]');
       });
 
       it('unmounts nodes', function () {

data/lib/assets/javascripts/react_integration.js.erb

@@ -3,51 +3,6 @@ var __RWR_ENV__ = {
   config: <%=JSON(Rails.application.config.react.shared)%>
 };
 
-function deprecatedError(helperName) {
-  var lines = [
-    helperName + ' was removed.',
-    'use RWR.' + helperName + ' instead.',
-    'check react_webpack_rails changelog for details.'
-  ]
-  console.error(lines.join("\n"));
-}
-
-function registerComponent() {
-  deprecatedError('registerComponent');
-}
-
-function getComponent() {
-  deprecatedError('getComponent');
-}
-
-function createComponent() {
-  deprecatedError('createComponent');
-}
-
-function renderComponent() {
-  deprecatedError('renderComponent');
-}
-
-function unmountComponent() {
-  deprecatedError('unmountComponent');
-}
-
-function renderRouter() {
-  deprecatedError('renderRouter');
-}
-
-function registerRouter() {
-  deprecatedError('registerRouter');
-}
-
-function unmountRouter() {
-  deprecatedError('unmountRouter');
-}
-
-function getRouter() {
-  deprecatedError('getRouter');
-}
-
 var RWRhandlers = {
   _mountNodes: function _mountNodes() {
     RWR.mountNodes();
@@ -63,14 +18,21 @@ var RWRhandlers = {
 
   handleTurbolinksEvents: function handleTurbolinksEvents() {
     var unmountEvent;
+    var mountEvent;
 
     if (Turbolinks.EVENTS) {
+      mountEvent = Turbolinks.EVENTS.CHANGE;
       unmountEvent = Turbolinks.EVENTS.BEFORE_UNLOAD;
-    } else {
+    } else if (typeof Turbolinks.controller !== "undefined") {
+      mountEvent = 'turbolinks:load';
+      unmountEvent = 'turbolinks:before-cache';
+    }
+    else {
+      mountEvent = 'page:change';
       unmountEvent = 'page:receive';
       Turbolinks.pagesCached(0);
     }
-    RWRhandlers._handleEvent('page:change', RWRhandlers._mountNodes);
+    RWRhandlers._handleEvent(mountEvent, RWRhandlers._mountNodes);
     RWRhandlers._handleEvent(unmountEvent, RWRhandlers._unmountNodes);
   },
 

data/lib/generators/react_webpack_rails/install/server_side_generator.rb

@@ -20,6 +20,7 @@ module ReactWebpackRails
       def forever
         copy_file 'forever/development.json', 'forever/development.json'
         copy_file 'forever/production.json', 'forever/production.json'
+        create_file 'app/react/.foreverignore'
       end
 
       def node_server

data/lib/generators/react_webpack_rails/install_generator.rb

@@ -19,10 +19,6 @@ module ReactWebpackRails
                  type: :boolean,
                  default: true,
                  desc: 'Run karma_setup generator'
-    class_option :react_router,
-                 type: :boolean,
-                 default: false,
-                 desc: 'Run react_router generator'
     class_option :redux,
                  type: :boolean,
                  default: false,
@@ -54,12 +50,6 @@ module ReactWebpackRails
       generate example_generator
     end
 
-    def generate_react_router
-      return unless options.react_router
-      deprecation_warning
-      generate 'react_webpack_rails:install:react_router --tmp_package'
-    end
-
     def generate_redux
       return unless options.redux
       generate 'react_webpack_rails:install:redux --tmp_package'

data/lib/generators/react_webpack_rails/templates/forever/development.json

@@ -1,8 +1,9 @@
 {
-    "uid": "rwr-node-server",
-    "append": true,
-    "script": "node_server.js",
-    "sourceDir": "./app/react",
-    "watch": true,
-    "watchDirectory": "./app/react"
+  "uid": "rwr-node-server",
+  "append": true,
+  "script": "node_server.js",
+  "workingDir": "./",
+  "sourceDir": "app/react",
+  "watch": true,
+  "watchDirectory": "app/react"
 }

data/lib/generators/react_webpack_rails/templates/forever/production.json

@@ -1,6 +1,7 @@
 {
-    "uid": "rwr-node-server",
-    "append": true,
-    "script": "node_server.js",
-    "sourceDir": "./app/react"
+  "uid": "rwr-node-server",
+  "append": true,
+  "script": "node_server.js",
+  "workingDir": "./",
+  "sourceDir": "app/react",
 }

data/lib/generators/react_webpack_rails/templates/packages/core.json

@@ -1,27 +1,27 @@
 {
   "private": true,
   "devDependencies": {
-    "babel-eslint": "^5.0.0-beta6",
-    "eslint": "^1.7.3",
-    "eslint-plugin-react": "^3.6.3",
-    "webpack-notifier": "^1.2.1"
+    "babel-eslint": "^6.1.0",
+    "eslint": "^2.13.0",
+    "eslint-plugin-react": "^5.2.0",
+    "webpack-notifier": "^1.3.0"
   },
   "dependencies": {
-    "babel-core": "^6.4.0",
-    "babel-loader": "^6.2.1",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-preset-react": "^6.3.13",
-    "babel-preset-stage-1": "^6.3.13",
-    "css-loader": "^0.23.1",
-    "extract-text-webpack-plugin": "^0.8.2",
-    "node-sass": "^3.3.3",
-    "react": "^15.0.1",
-    "react-addons-test-utils": "^15.0.1",
-    "react-dom": "^15.0.1",
-    "react-webpack-rails": "^0.4.0",
-    "sass-loader": "^3.0.0",
+    "babel-core": "^6.10.0",
+    "babel-loader": "^6.2.0",
+    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-react": "^6.11.0",
+    "babel-preset-stage-1": "^6.5.0",
+    "css-loader": "^0.23.0",
+    "extract-text-webpack-plugin": "^1.0.0",
+    "node-sass": "^3.8.0",
+    "react": "^15.1.0",
+    "react-addons-test-utils": "^15.1.0",
+    "react-dom": "^15.1.0",
+    "react-webpack-rails": "^0.5.0",
+    "sass-loader": "^4.0.0",
     "style-loader": "^0.13.1",
-    "webpack": "^1.12.1"
+    "webpack": "^1.13.0"
   },
   "scripts": {
     "start": "webpack -w --config webpack/dev.config.js",

data/lib/generators/react_webpack_rails/templates/packages/hot-reload.json

@@ -1,7 +1,7 @@
 {
   "devDependencies": {
     "react-hot-loader": "^1.3.0",
-    "webpack-dev-server": "^1.12.1"
+    "webpack-dev-server": "^1.14.0"
   },
   "scripts": {
     "start-hot-dev": "webpack-dev-server --hot --inline --config webpack/hot-dev.config.js"

data/lib/generators/react_webpack_rails/templates/packages/js-specs.json

@@ -1,14 +1,14 @@
 {
   "devDependencies": {
-    "expect": "^1.12.2",
-    "karma": "^0.13.13",
-    "karma-chrome-launcher": "^0.2.1",
-    "karma-mocha": "^0.2.0",
-    "karma-sinon": "^1.0.4",
-    "karma-sourcemap-loader": "^0.3.6",
+    "expect": "^1.20.0",
+    "karma": "^1.1.0",
+    "karma-chrome-launcher": "^1.0.0",
+    "karma-mocha": "^1.1.0",
+    "karma-sinon": "^1.0.0",
+    "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.7.0",
-    "mocha": "^2.3.4",
-    "sinon": "^1.17.2"
+    "mocha": "^2.5.0",
+    "sinon": "^1.17.0"
   },
   "scripts": {
     "test": "karma start"

data/lib/generators/react_webpack_rails/templates/packages/redux.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "react-redux": "^4.4.4",
-    "redux": "^3.4.0",
-    "rwr-redux": "^0.2.0"
+    "react-redux": "^4.4.0",
+    "redux": "^3.5.0",
+    "rwr-redux": "^0.4.0"
   }
 }

data/lib/generators/react_webpack_rails/templates/packages/server-side.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "forever": "^0.15.0",
     "http": "*",
-    "httpdispatcher": "^0.4.0"
+    "httpdispatcher": "^1.0.0"
   },
   "scripts": {
     "rwr-node-dev-server": "forever forever/development.json",

data/lib/react_webpack_rails/version.rb

@@ -1,3 +1,3 @@
 module ReactWebpackRails
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/lib/react_webpack_rails/view_helpers.rb

@@ -2,33 +2,40 @@ require_relative 'services/camelize_keys'
 
 module ReactWebpackRails
   module ViewHelpers
-    def react_element(integration_name, payload = {}, html_options = {}, &block)
+    def rwr_element(integration_name, payload = {}, html_options = {}, &block)
       data = {
         integration_name: integration_name,
         payload: payload,
-        react_element: true
+        rwr_element: true
       }
       html_options = html_options.merge(data: data)
       html_tag = html_options.delete(:tag) || :div
       content_tag(html_tag, '', html_options, &block)
     end
 
+    def react_element(integration_name, payload = {}, html_options = {}, &block)
+      message = 'since v0.5.0: react_element is depricated. Use rwr_element instead'
+      ActiveSupport::Deprecation.warn message
+
+      rwr_element(integration_name, payload, html_options, &block)
+    end
+
     def react_component(name, raw_props = {}, options = {})
       props = raw_props.as_json
       props = Services::CamelizeKeys.call(props) if Rails.application.config.react.camelize_props
       if server_side(options.delete(:server_side))
         result = NodeIntegrationRunner.new('react-component', props: props, name: name).run
-        react_element('react-component', { props: props, name: name }, options) do
+        rwr_element('react-component', { props: props, name: name }, options) do
           result.html_safe
         end
       else
-        react_element('react-component', { props: props, name: name }, options)
+        rwr_element('react-component', { props: props, name: name }, options)
       end
     end
 
     def react_router(name)
       deprecation_warning
-      react_element('react-router', name: name)
+      rwr_element('react-router', name: name)
     end
 
     private

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-webpack-rails",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Js part of react_webpack_rails - webpack based React & Rails integration.",
   "main": "js/lib/index.js",
   "files": [
@@ -37,15 +37,15 @@
     "react-dom": "^15.0.1"
   },
   "devDependencies": {
-    "babel-cli": "^6.4.0",
-    "babel-core": "^6.4.0",
-    "babel-preset-es2015": "^6.3.0",
-    "babel-preset-react": "^6.3.0",
-    "eslint": "^1.10.3",
-    "eslint-config-airbnb": "^3.1.0",
-    "eslint-plugin-react": "^3.15.0",
-    "expect": "^1.13.4",
-    "history": "^1.17.0",
-    "mocha": "^2.3.4"
+    "babel-cli": "^6.10.0",
+    "babel-core": "^6.10.0",
+    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-react": "^6.11.0",
+    "eslint": "^2.13.0",
+    "eslint-config-airbnb": "^9.0.0",
+    "eslint-plugin-react": "^5.2.0",
+    "expect": "^1.20.0",
+    "history": "^3.0.0",
+    "mocha": "^2.5.0"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react_webpack_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Rafał Gawlik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,13 +97,11 @@ files:
 - js/src/env.js
 - js/src/index.js
 - js/src/integrations-manager.js
-- js/src/integrations/react-router.js
 - js/src/integrations/react.js
 - js/src/nodes.js
 - js/src/version.js
 - js/test/env.spec.js
 - js/test/integrations-manager.spec.js
-- js/test/integrations/react-router.spec.js
 - js/test/integrations/react.spec.js
 - js/test/nodes.spec.js
 - lib/assets/javascripts/react_integration.js.erb
@@ -111,7 +109,6 @@ files:
 - lib/generators/react_webpack_rails/install/example_generator.rb
 - lib/generators/react_webpack_rails/install/hot_reload_generator.rb
 - lib/generators/react_webpack_rails/install/karma_setup_generator.rb
-- lib/generators/react_webpack_rails/install/react_router_generator.rb
 - lib/generators/react_webpack_rails/install/redux_generator.rb
 - lib/generators/react_webpack_rails/install/server_side_generator.rb
 - lib/generators/react_webpack_rails/install_generator.rb
@@ -127,7 +124,6 @@ files:
 - lib/generators/react_webpack_rails/templates/packages/core.json
 - lib/generators/react_webpack_rails/templates/packages/hot-reload.json
 - lib/generators/react_webpack_rails/templates/packages/js-specs.json
-- lib/generators/react_webpack_rails/templates/packages/react-router.json
 - lib/generators/react_webpack_rails/templates/packages/redux.json
 - lib/generators/react_webpack_rails/templates/packages/server-side.json
 - lib/generators/react_webpack_rails/templates/partial/_react_hot_assets.html.erb

data/js/src/integrations/react-router.js

@@ -1,60 +0,0 @@
-import ReactDOM from 'react-dom';
-
-function deprecationWarning() {
-  if (typeof console !== 'undefined' && console.warn) {
-    const msg = [
-      'Deprecation warning - since v0.3.0: current integration with react-router was extracted and moved to external plugin.',
-      'Use https://github.com/netguru/rwr-react_router instead.',
-    ];
-
-    console.warn(msg.join('\n'));
-  }
-}
-
-class ReactRouterIntegration {
-  constructor() {
-    this.routers = {};
-    this.enabled = false;
-    this.registerRouter = this.registerRouter.bind(this);
-    this.getRouter = this.getRouter.bind(this);
-    this.renderRouter = this.renderRouter.bind(this);
-  }
-
-  registerRouter(name, route) {
-    deprecationWarning();
-    this.routers[name] = route;
-  }
-
-  getRouter(name) {
-    return this.routers[name];
-  }
-
-  renderRouter(name, node) {
-    if (this.enabled === true) {
-      throw new Error(
-        `Error when rendering ${name}\n\trenderRouter: can't render more than one router.`
-      );
-    }
-    this.enabled = true;
-    ReactDOM.render(this.getRouter(name), node);
-  }
-
-  unmountRouter(node) {
-    ReactDOM.unmountComponentAtNode(node);
-    this.enabled = false;
-  }
-
-  get integrationWrapper() {
-    return {
-      mount: function _mount(node, payload) {
-        this.renderRouter(payload.name, node);
-      }.bind(this),
-
-      unmount: function _unmount(node) {
-        this.unmountRouter(node);
-      }.bind(this),
-    };
-  }
-}
-
-export default new ReactRouterIntegration;

data/js/test/integrations/react-router.spec.js

@@ -1,133 +0,0 @@
-import expect, { spyOn } from 'expect';
-import ReactDOM from 'react-dom';
-import subject from '../../src/integrations/react-router';
-
-const HelloRouter = {};
-
-describe('ReactIntegration', function () {
-  afterEach(function () {
-    subject.routers = {};
-    subject.enabled = false;
-  });
-
-  describe('.constructor', function () {
-    it('intializes empty components dictionary', function () {
-      expect(subject.routers).toEqual({});
-    });
-
-    it('by default sets router presence flag to false', function () {
-      expect(subject.enabled).toBe(false);
-    });
-  });
-
-  describe('#registerRouter', function () {
-    it('adds router to the routers storage', function () {
-      subject.registerRouter('HelloRouter', HelloRouter);
-      expect(subject.routers.HelloRouter).toBe(HelloRouter);
-    });
-  });
-
-  describe('#getRouter', function () {
-    it('returns route by name', function () {
-      subject.registerRouter('HelloRouter', HelloRouter);
-      expect(subject.getRouter('HelloRouter')).toBe(HelloRouter);
-    });
-
-    it('returns undefined if route is not found', function () {
-      expect(subject.getRouter('HelloRouter')).toBe(undefined);
-    });
-  });
-
-  describe('#renderRouter', function () {
-    beforeEach(function () {
-      subject.registerRouter('HelloRouter', HelloRouter);
-    });
-
-    context('when router is present', function () {
-      it('throws an error', function () {
-        expect(function () {
-          subject.renderRouter('HelloRouter', { node: 'someNode' });
-        })
-        .withContext(subject.enabled = true)
-        .toThrow(/Error when rendering HelloRouter/);
-      });
-    });
-
-    context('when router does not exist', function () {
-      let ReactDOMSpy;
-      const node = { nodeType: 1, nodeName: 'DIV' };
-      beforeEach(function () {
-        ReactDOMSpy = spyOn(ReactDOM, 'render');
-      });
-
-      afterEach(function () {
-        expect.restoreSpies();
-      });
-
-      it('sets router presence flag to true', function () {
-        subject.renderRouter('HelloRouter', node);
-
-        expect(subject.enabled).toBe(true);
-      });
-
-      it('calls ReactDOM renderer once', function () {
-        subject.renderRouter('HelloRouter', { nodeType: 1, nodeName: 'DIV' });
-
-        expect(ReactDOMSpy.calls.length).toEqual(1);
-        expect(ReactDOMSpy).toHaveBeenCalledWith(HelloRouter, { nodeType: 1, nodeName: 'DIV' });
-      });
-    });
-  });
-
-  describe('#unmountRouter', function () {
-    let ReactDOMSpy;
-    beforeEach(function () {
-      ReactDOMSpy = spyOn(ReactDOM, 'unmountComponentAtNode');
-    });
-
-    afterEach(function () {
-      expect.restoreSpies();
-    });
-
-    it('unmounts router component at specified node', function () {
-      subject.unmountRouter({ node: 'someNode' });
-
-      expect(ReactDOMSpy.calls.length).toEqual(1);
-      expect(ReactDOMSpy).toHaveBeenCalledWith({ node: 'someNode' });
-    });
-
-    it('allows to add new router', function () {
-      subject.unmountRouter({ node: 'someNode' });
-      expect(subject.enabled).toBe(false);
-    });
-  });
-
-  describe('#integrationWrapper', function () {
-    const node = { nodeType: 1, nodeName: 'DIV' };
-
-    describe('function mount', function () {
-      it('calls renderComponent', function () {
-        const mountSpy = spyOn(subject, 'renderRouter');
-
-        const payload = { name: 'routerName' };
-        subject.integrationWrapper.mount(node, payload);
-
-        expect(mountSpy.calls.length).toEqual(1);
-        expect(mountSpy).toHaveBeenCalledWith(
-          'routerName',
-          { nodeType: 1, nodeName: 'DIV' }
-        );
-      });
-    });
-
-    describe('function unmount', function () {
-      it('calls unmountComponent', function () {
-        const unmountSpy = spyOn(subject, 'unmountRouter');
-        subject.integrationWrapper.unmount(node);
-
-        expect(unmountSpy.calls.length).toEqual(1);
-        expect(unmountSpy).toHaveBeenCalledWith({ nodeType: 1, nodeName: 'DIV' });
-      });
-    });
-  });
-});

data/lib/generators/react_webpack_rails/install/react_router_generator.rb

@@ -1,21 +0,0 @@
-module ReactWebpackRails
-  module Install
-    require 'generators/react_webpack_rails/merge_helpers'
-
-    class ReactRouterGenerator < Rails::Generators::Base
-      include MergeHelpers
-      desc 'Add react-router setup'
-      source_root File.expand_path('../../templates', __FILE__)
-
-      class_option :tmp_package,
-                   type: :boolean,
-                   default: false,
-                   desc: 'Force update tmp/package.json instead package.json'
-
-      def package
-        merge_options = options.tmp_package ? { package_file: 'tmp/package.json', force: true } : {}
-        merge_into_package 'packages/react-router.json', merge_options
-      end
-    end
-  end
-end

data/lib/generators/react_webpack_rails/templates/packages/react-router.json

@@ -1,5 +0,0 @@
-{
-  "dependencies": {
-    "react-router": "^1.0.0"
-  }
-}