react_webpack_rails 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dedadf24fa2870a3a88a55a64aa0eb3621da825
-  data.tar.gz: dbf9547a683c1796873a5fd36f5b6def0f04a537
+  metadata.gz: ab94298add2a819ece6deb843faba11d9854eb57
+  data.tar.gz: 3f287303ddad42a74f2f1940e730648a1fb22c72
 SHA512:
-  metadata.gz: 52b54c004400fbfbc56901524e73e5dbc9bfecfad0fe436da5e7d8830f03b0bbdea2c53cf24c560866245704152449205c16bcd5d415f5b4b0c561be3cdb5a4c
-  data.tar.gz: 5fe97c37924eb22bbda98aef4603980658917fc10a0027f3a5554c5982c7448231a352b058ba135615aac290c04c0d3523d4f54376b86a166ab7fe280bdaf32d
+  metadata.gz: 19e00ab4020c5446abc04f4591ae2dd2a1d9ae41904d73596d4761ce6164f7481ef9cd1c62620aa9fb8a0970f4e03d326cb174c5a9bf2b5d7cbc334a6296d0a7
+  data.tar.gz: 168c1019d826949b794ada7d57628729cda4757a2e94d790b50dd73c3eb47d3c9f717a8201b4e25834c05f78bf9b87d3b4403970a78b9cb53da78d7a75183388

data/README.md

@@ -19,6 +19,7 @@ See [0.4-stable](https://github.com/netguru/react_webpack_rails/tree/0.4-stable)
 * [rwr-alt](https://github.com/netguru/rwr-alt) plugin that makes it possible to populate and share Alt stores between react component located in different parts of rails views.
 * [rwr-redux](https://github.com/netguru/rwr-redux) allows to use redux state containers in a rails views.
 * [rwr-react_router](https://github.com/netguru/rwr-react_router) react-router integration.
+* [rwr-view_helpers](https://github.com/netguru/rwr-view_helpers) handy view helpers.
 
 ## Installation
 

data/js/src/integrations/react.js

@@ -13,10 +13,20 @@ class ReactIntegration {
     this.renderComponentToString = this.renderComponentToString.bind(this);
   }
 
-  registerComponent(name, component) {
+  registerComponent(...args) {
+    if (typeof args[0] === 'object') {
+      const component = args[0];
+      this.components = Object.assign({}, this.components, component);
+    }
+
+    const [name, component] = args;
     this.components[name] = component;
   }
 
+  registerComponents(components) {
+    this.components = Object.assign({}, this.components, components);
+  }
+
   getComponent(name) {
     return this.components[name];
   }

data/js/src/version.js

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

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

@@ -15,6 +15,18 @@ class HelloComponent extends React.Component {
   }
 }
 
+class FooComponent extends React.Component {
+  static propTypes() {
+    return {
+      username: PropTypes.string.isRequired,
+    };
+  }
+
+  render() {
+    return (<div>Foo! Bar!</div>);
+  }
+}
+
 describe('ReactIntegration', function () {
   afterEach(function () {
     subject.components = {};
@@ -27,10 +39,23 @@ describe('ReactIntegration', function () {
   });
 
   describe('#registerComponent', function () {
-    it('adds component to the components storage', function () {
+    it('registers component using separate args', function () {
       subject.registerComponent('HelloWorld', HelloComponent);
       expect(subject.components.HelloWorld).toBe(HelloComponent);
     });
+
+    it('registers component using Object', function () {
+      subject.registerComponent({ HelloComponent });
+      expect(subject.components.HelloComponent).toBe(HelloComponent);
+    });
+  });
+
+  describe('#registerComponents', function () {
+    it('adds multiple components', function () {
+      subject.registerComponents({ HelloComponent, FooComponent });
+      expect(subject.components.HelloComponent).toBe(HelloComponent);
+      expect(subject.components.FooComponent).toBe(FooComponent);
+    });
   });
 
   describe('#getComponent', function () {

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

@@ -0,0 +1,31 @@
+module ReactWebpackRails
+  module Install
+    require 'generators/react_webpack_rails/merge_helpers'
+
+    class ViewHelpersGenerator < Rails::Generators::Base
+      include MergeHelpers
+      desc 'Add View Helpers 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/view-helpers.json', merge_options
+      end
+
+      def add_rwr_view_helpers
+        append_file 'Gemfile' do
+          <<-'RB'.strip_heredoc
+            gem 'rwr-view_helpers', '~> 0.1.1'
+          RB
+        end
+      end
+    end
+  end
+end

data/lib/generators/react_webpack_rails/install_generator.rb

@@ -23,14 +23,20 @@ module ReactWebpackRails
                  type: :boolean,
                  default: false,
                  desc: 'Run redux generator'
+    class_option :view_helpers,
+                 type: :boolean,
+                 default: true,
+                 desc: 'Run view helpers generator'
 
     def generate_core
       generate 'react_webpack_rails:install:core --tmp-package'
     end
 
-    def generate_hot_reload
-      return unless options.hot_reload
-      generate 'react_webpack_rails:install:hot_reload --tmp-package'
+    def generate_example
+      return unless options.example
+      example_generator = 'react_webpack_rails:install:example'
+      example_generator += ' --server-side' if options.server_side
+      generate example_generator
     end
 
     def generate_server_side
@@ -38,25 +44,28 @@ module ReactWebpackRails
       generate 'react_webpack_rails:install:server_side --tmp-package'
     end
 
+    def generate_hot_reload
+      return unless options.hot_reload
+      generate 'react_webpack_rails:install:hot_reload --tmp-package'
+    end
+
     def generate_karma_setup
       return unless options.karma_setup
       generate 'react_webpack_rails:install:karma_setup --tmp-package'
     end
 
-    def generate_example
-      return unless options.example
-      example_generator = 'react_webpack_rails:install:example'
-      example_generator += ' --server-side' if options.server_side
-      generate example_generator
-    end
-
     def generate_redux
       return unless options.redux
       generate 'react_webpack_rails:install:redux --tmp_package'
     end
 
+    def generate_view_helpers
+      return unless options.view_helpers
+      generate 'react_webpack_rails:install:view_helpers --tmp_package'
+    end
+
     def copy_package
-      create_file 'package.json', File.read(Rails.root.join('tmp/package.json'))
+      create_file 'package.json', File.read(Rails.root.join('tmp', 'package.json'))
     end
 
     def cleanup
@@ -64,7 +73,6 @@ module ReactWebpackRails
     end
 
     def install_gems
-      return unless options.redux
       run 'bundle install'
     end
 

data/lib/generators/react_webpack_rails/templates/packages/view-helpers.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "rwr-view-helpers": "^0.1.1"
+  }
+}

data/lib/generators/react_webpack_rails/templates/react/node_server.js

@@ -1,38 +1,49 @@
-global.__RWR_ENV__ = {};
 require('babel-core/register');
-const IM = require('react-webpack-rails').integrationsManager;
 require('./index');
 
+const fs = require('fs');
+const path = require('path');
 const http = require('http');
 const dispatcher = require('httpdispatcher');
+const { integrationsManager } = require('react-webpack-rails');
+
 const PORT = 8081;
+const ASSETS_MAPPING_PATH = 'tmp/cache/assets-mapping.json';
 
-function handleRequest(request, response){
-  try {
-    console.log(`started: ${request.method} "${request.url}" at ${new Date().toLocaleTimeString()}`);
-    dispatcher.dispatch(request, response);
-  } catch(ex) {
-    console.log(ex)
-    response.writeHead(500);
-    response.end(ex.name + ': ' + ex.message);
-  }
+global.__RWR_ENV__ = {};
+global.__RWR_VIEW_HELPERS__ = { imagePaths: {} };
+
+fs.readFile(ASSETS_MAPPING_PATH, (err, data) => {
+  if (err) { return err; }
+  const imagePaths = data.toString('utf-8');
+  global.__RWR_VIEW_HELPERS__.imagePaths = JSON.parse(imagePaths);
+});
+
+const handleRequest = (req, res) => {
+  const { method, url } = req;
+  const reqStartTime = (new Date()).toLocaleTimeString();
+
+  console.log(`${method} "${url}" - ${reqStartTime}`);
+  dispatcher.dispatch(req, res);
 }
 
-dispatcher.onPost("/run", function(request, response) {
+dispatcher.onPost('/run', (req, res) => {
   try {
-    const data = JSON.parse(request.body);
-    const result = IM.runNodeIntegration(data);
-    response.writeHead(200, {'Content-Type': 'text/plain'});
-    response.end(result);
-  } catch(ex) {
-    console.log(ex)
-    response.writeHead(500);
-    response.end("nodeRun failed:\n" + ex.name + ': ' + ex.message);
-  }
-});
+    const data = JSON.parse(req.body);
+    const result = integrationsManager.runNodeIntegration(data);
 
-const server = http.createServer(handleRequest);
+    res.writeHead(200, { 'Content-Type': 'text/plain' });
+    res.end(result);
+  } catch(e) {
+    console.error(e);
 
-server.listen(PORT, function(){
-  console.log("Server listening on: http://localhost:%s", PORT);
+    res.writeHead(500);
+    res.end(`nodeRun failed:\n ${e.name}: ${e.message}`);
+  }
 });
+
+http
+  .createServer(handleRequest)
+  .listen(PORT, () => {
+    console.log(`Server listening on: http://localhost:${PORT}`)
+  });

data/lib/react_webpack_rails/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-webpack-rails",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Js part of react_webpack_rails - webpack based React & Rails integration.",
   "main": "js/lib/index.js",
   "files": [
@@ -27,14 +27,10 @@
     "url": "https://github.com/netguru/react_webpack_rails/issues"
   },
   "homepage": "https://github.com/netguru/react_webpack_rails#readme",
-  "peerDependencies": {
-    "react": "^15.0.0",
-    "react-dom": "^15.0.0"
-  },
   "dependencies": {
     "babel-polyfill": "^6.3.0",
-    "react": "^15.0.1",
-    "react-dom": "^15.0.1"
+    "react": "^15.0.0",
+    "react-dom": "^15.0.0"
   },
   "devDependencies": {
     "babel-cli": "^6.10.0",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react_webpack_rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Rafał Gawlik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ files:
 - lib/generators/react_webpack_rails/install/karma_setup_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/view_helpers_generator.rb
 - lib/generators/react_webpack_rails/install_generator.rb
 - lib/generators/react_webpack_rails/merge_helpers.rb
 - lib/generators/react_webpack_rails/package_merge.rb
@@ -126,6 +127,7 @@ files:
 - lib/generators/react_webpack_rails/templates/packages/js-specs.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/packages/view-helpers.json
 - lib/generators/react_webpack_rails/templates/partial/_react_hot_assets.html.erb
 - lib/generators/react_webpack_rails/templates/react/components/hello-world-test.jsx
 - lib/generators/react_webpack_rails/templates/react/components/hello-world.jsx