rwr-redux 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be4eca4b78faa9b282e09216f8ec630c6f0a7d8a
-  data.tar.gz: 29de0a81deca613280206c60bc132a4fe1f98209
+  metadata.gz: 50f41380d2060a620d37eb31a11264e40914c233
+  data.tar.gz: 9265820c4fa8ec67b0db8288b94ded5401df805f
 SHA512:
-  metadata.gz: 737588a1d5ed71c6b5fb27a134ca725bbde6675dd514d8e5225e8d25a3a78f4ded25b4d568cab6635ae25bff9f242358654de8cb3b24040dc0c1923e5afcdafd
-  data.tar.gz: 30d26a731a95b6cf4dcc4e22db9f51d2068f734ff18e03c44f8a49bd7c2a404e6d04c576a51975d2bd25755d281cefa574cc6feff2f972ab8c5fae9b1cf3f7b3
+  metadata.gz: f85aa615b4956186a80d980b1f11ce6af9f5736121406179dc370c1016a559b060dd939bda192e81614cba3eaa8e5ddd0e4f86eda39f25533449ff47c2d9f837
+  data.tar.gz: 1f8e40644371cc5e856300842a9499505f19e9a9d02ca3f00ddf8d397556a7d9bf3a1aae2fa50be5aebb41cd9dff117404355c90536d4bf66f9512cb52fc0c03

data/.travis.yml

@@ -0,0 +1,36 @@
+branches:
+  except:
+    - docs
+
+language: ruby
+
+cache:
+  bundler: true
+  directories:
+    - node_modules
+    - spec/rails4_dummy_app/node_modules
+
+matrix:
+  include:
+    - rvm: 2.2.4
+      gemfile: spec/rails4_dummy_app/Gemfile
+      env: TEST_SUITE=rails4
+    - rvm: 2.2.4
+      gemfile: Gemfile
+      env: TEST_SUITE=gem
+    - rvm: 2.2.4
+      env: TEST_SUITE=node
+
+before_script:
+  - nvm install 4.1
+  - nvm use 4.1
+  - npm install -g npm@^2.0
+  - npm install -g webpack@^1.12.1
+  - bundle exec rake setup:$TEST_SUITE
+  - 'export CHROME_BIN=chromium-browser'
+  - "export DISPLAY=:99.0" # Setup display for selenium driver
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 4 # give xvfb some time to start
+
+script:
+  - bundle exec rake test:$TEST_SUITE

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.5.0
+* add passing props from view to Redux Container
+
 ## 0.2.0
 * add server side rendering
 * add redux-router helpers:

data/js/src/integrations/redux-container.js

@@ -26,20 +26,20 @@ class ReduxContainer {
     return this.containers[name];
   }
 
-  createContainer(name) {
+  createContainer(name, props) {
     const constructor = this.getContainer(name);
-    return createElement(constructor);
+    return createElement(constructor, props);
   }
 
-  createRootComponent(name, storeName) {
-    const container = this.createContainer(name);
+  createRootComponent(name, { props, storeName }) {
+    const container = this.createContainer(name, props);
     const store = ReduxStore.getStore(storeName);
 
     return createElement(Provider, { store }, container);
   }
 
-  renderContainer(name, node, storeName) {
-    const rootComponent = this.createRootComponent(name, storeName);
+  renderContainer(name, payload, node) {
+    const rootComponent = this.createRootComponent(name, payload);
     render(rootComponent, node);
   }
 
@@ -47,8 +47,8 @@ class ReduxContainer {
     unmountComponentAtNode(node);
   }
 
-  renderContainerToString(name, storeName) {
-    const rootComponent = this.createRootComponent(name, storeName);
+  renderContainerToString(name, payload) {
+    const rootComponent = this.createRootComponent(name, payload);
     const result = renderToString(rootComponent);
 
     return JSON.stringify({ body: result });
@@ -57,7 +57,7 @@ class ReduxContainer {
   get integrationWrapper() {
     return {
       mount: function _mount(node, payload) {
-        this.renderContainer(payload.name, node, payload.storeName);
+        this.renderContainer(payload.name, payload, node);
       }.bind(this),
 
       unmount: function _unmount(node) {
@@ -65,8 +65,7 @@ class ReduxContainer {
       }.bind(this),
 
       nodeRun: function _prerender(payload) {
-        const { name, storeName } = payload;
-        return this.renderContainerToString(name, storeName);
+        return this.renderContainerToString(payload.name, payload);
       }.bind(this),
     };
   }

data/js/src/version.js

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

data/js/test/integrations/redux-container.spec.js

@@ -57,7 +57,7 @@ describe('ReduxContainer', function () {
   describe('#createContainer', function () {
     it('creates redux container', function () {
       subject.registerContainer('AppContainer', AppContainer);
-      const container = subject.createContainer('AppContainer');
+      const container = subject.createContainer('AppContainer', { points: 2 });
 
       expect(React.isValidElement(container)).toBe(true);
       expect(container.type).toBe(AppContainer);
@@ -67,11 +67,18 @@ describe('ReduxContainer', function () {
   describe('#createRootComponent', function () {
     it('creates redux root component', function () {
       const initialState = { fake: 'state' };
+      const payload = {
+        name: 'ContainerName',
+        props: { points: 2 },
+        storeName: 'StoreName',
+      };
+
       ReduxStore.registerStore('StoreName', store);
       ReduxStore.mountStore('StoreName', initialState);
 
       subject.registerContainer('AppContainer', AppContainer);
-      const rootComponent = subject.createRootComponent('AppContainer', 'ValidStore');
+      const rootComponent = subject.createRootComponent(
+          payload.name, payload);
 
       expect(React.isValidElement(rootComponent)).toBe(true);
     });
@@ -81,11 +88,16 @@ describe('ReduxContainer', function () {
     it('calls #createRootComponent and ReactDOM.render functions', function () {
       const subjectSpy = spyOn(subject, 'createRootComponent');
       const reactSpy = spyOn(ReactDOM, 'render');
+      const payload = {
+        name: 'ContainerName',
+        props: { points: 2 },
+        storeName: 'StoreName',
+      };
 
-      subject.renderContainer('ContainerName', 'node', 'StoreName');
+      subject.renderContainer(payload.name, payload, 'node');
 
       expect(subjectSpy.calls.length).toEqual(1);
-      expect(subjectSpy).toHaveBeenCalledWith('ContainerName', 'StoreName');
+      expect(subjectSpy).toHaveBeenCalledWith(payload.name, payload);
       expect(reactSpy.calls.length).toEqual(1);
     });
   });
@@ -106,11 +118,16 @@ describe('ReduxContainer', function () {
     it('calls #createRootComponent and ReactDOM.renderToString', function () {
       const subjectSpy = spyOn(subject, 'createRootComponent');
       const reactSpy = spyOn(ReactDOMServer, 'renderToString');
+      const payload = {
+        name: 'ContainerName',
+        props: { points: 2 },
+        storeName: 'StoreName',
+      };
 
-      subject.renderContainerToString('ContainerName', 'StoreName');
+      subject.renderContainerToString(payload.name, payload);
 
       expect(subjectSpy.calls.length).toEqual(1);
-      expect(subjectSpy).toHaveBeenCalledWith('ContainerName', 'StoreName');
+      expect(subjectSpy).toHaveBeenCalledWith(payload.name, payload);
       expect(reactSpy.calls.length).toEqual(1);
     });
 
@@ -128,7 +145,11 @@ describe('ReduxContainer', function () {
 
   describe('#integrationWrapper', function () {
     const node = { nodeType: 1, nodeName: 'DIV' };
-    const payload = { name: 'ContainerName', storeName: 'StoreName' };
+    const payload = {
+      name: 'ContainerName',
+      props: { points: 2 },
+      storeName: 'StoreName',
+    };
 
     describe('mount', function () {
       it('calls #renderContainer', function () {
@@ -136,7 +157,7 @@ describe('ReduxContainer', function () {
         subject.integrationWrapper.mount(node, payload);
 
         expect(mountSpy.calls.length).toEqual(1);
-        expect(mountSpy).toHaveBeenCalledWith(payload.name, node, payload.storeName);
+        expect(mountSpy).toHaveBeenCalledWith(payload.name, payload, node);
       });
     });
 
@@ -156,7 +177,7 @@ describe('ReduxContainer', function () {
         subject.integrationWrapper.nodeRun(payload);
 
         expect(nodeRunSpy.calls.length).toEqual(1);
-        expect(nodeRunSpy).toHaveBeenCalledWith(payload.name, payload.storeName);
+        expect(nodeRunSpy).toHaveBeenCalledWith(payload.name, payload);
       });
     });
   });

data/lib/react_webpack_rails/redux_integration/services/redux_container.rb

@@ -9,7 +9,7 @@ module ReactWebpackRails
         end
 
         def payload
-          { name: element_name, storeName: store_name }
+          { name: element_name, props: props, storeName: store_name }
         end
 
         def options

data/lib/react_webpack_rails/redux_integration/services/redux_element.rb

@@ -5,6 +5,7 @@ module ReactWebpackRails
         def initialize(integration_name, element_name, base_options, path = nil)
           @integration_name = integration_name
           @element_name = element_name
+          @props = base_options[:props]
           @store_name = base_options[:store_name]
           @server_side = base_options[:server_side]
           @base_options = base_options
@@ -17,12 +18,12 @@ module ReactWebpackRails
         end
 
         def options
-          base_options.except(:store_name, :server_side)
+          base_options.except(:props, :store_name, :server_side)
         end
 
         private
 
-        attr_reader :integration_name, :element_name, :store_name, :server_side, :base_options, :path
+        attr_reader :integration_name, :element_name, :store_name, :server_side, :base_options, :path, :props
 
         def node_integration
           NodeIntegrationRunner.new(integration_name, payload).run

data/lib/react_webpack_rails/redux_integration/version.rb

@@ -1,5 +1,5 @@
 module ReactWebpackRails
   module ReduxIntegration
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

data/lib/react_webpack_rails/redux_integration/view_helpers.rb

@@ -11,13 +11,13 @@ module ReactWebpackRails
           NodeIntegrationRunner.new('redux-store', name: name, props: props).run
         end
 
-        react_element('redux-store', { name: name, props: props }, options)
+        rwr_element('redux-store', { name: name, props: props }, options)
       end
 
       def redux_container(name, options = {})
         container = Services::ReduxContainer.new('redux-container', name, options)
 
-        react_element('redux-container', container.payload, container.options) do
+        rwr_element('redux-container', container.payload, container.options) do
           container.result['body'].html_safe
         end
       end
@@ -26,7 +26,7 @@ module ReactWebpackRails
         router = Services::ReduxRouter.new('redux-router', name, options, request.path)
         result = handle_response_code(router.result, name, request.path)
 
-        react_element('redux-router', router.payload, router.options) do
+        rwr_element('redux-router', router.payload, router.options) do
           result
         end
       end
@@ -46,7 +46,7 @@ module ReactWebpackRails
         when 302
           controller.redirect_to(result['redirectUri'])
         else
-          raise ActionController::RoutingError, routing_error(name, path)
+          raise ActionController::RoutingError.new(routing_error(name, path))
         end
       end
 

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwr-redux",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Redux integration for react_webpack_rails",
   "main": "js/lib/index.js",
   "files": [
@@ -31,9 +31,9 @@
   "homepage": "https://github.com/netguru/rwr-redux",
   "dependencies": {
     "react-redux": "^4.4.5",
-    "react-router": "^2.4.1",
-    "react-router-redux": "^4.0.4",
-    "react-webpack-rails": "^0.4.1",
+    "react-router": "^2.6.1",
+    "react-router-redux": "^4.0.5",
+    "react-webpack-rails": "^0.5.0",
     "redux": "^3.5.2"
   },
   "devDependencies": {

data/redux_integration.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.3'
   spec.add_development_dependency 'pry'
 
-  spec.add_dependency 'react_webpack_rails', '>= 0.1.0'
+  spec.add_dependency 'react_webpack_rails', '>= 0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rwr-redux
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Kacper Goliński
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.5.0
 description: Redux integration for react_webpack_rails
 email:
 - react@netguru.co
@@ -92,6 +92,7 @@ files:
 - ".eslintrc"
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -142,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Redux integration for react_webpack_rails