react_on_rails 7.1.0.beta.2 → 7.1.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1273f61f1bc33677b1ab053a5432ab1797b3aa70
-  data.tar.gz: e553275faa1621d6b44f2691a27fe8b6fce64f0c
+  metadata.gz: 8937d7710f0d1a0c426c61b339b088d812f5ae62
+  data.tar.gz: 38981df2dd2fff9a935055ebe1904b9662796f13
 SHA512:
-  metadata.gz: 52473eeade602da8c27f78f9c35e0cd9e74d5fc6cd5d38004ada1895330169a2bd16f757ca4f450a501c5ef663fdb5824f0940955c0a4f14ed7a9d98a3805c16
-  data.tar.gz: d580c8d6f8cb1d164b60f8112a3d96c8664fdf025b7012ef8d4741a1f09e8eb68a82c8331db6b2d5abb1c12413d1e89c378688f246e16df20ab9f621e15bf72e
+  metadata.gz: 7563a966d91a544d9ecc9943e78ad219eb0a5b7d4c5c3e1cc3de6fa237def9395746f09a08cedb72c4d1276bbb43172a596c86dbd7b1f480bd37277c6842b82d
+  data.tar.gz: 4359cc293b9cdace819e1002d77e82459f8cf8a41c9600f72ca0bf80072fc054b3535cd6f93c557cf286ff4efb3bf8daf93c02ef660960efe630edce09e3c0f2

data/CHANGELOG.md

@@ -6,6 +6,9 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 ## [Unreleased]
 *Please add entries here for your pull requests.*
 
+## [7.0.4] - 2017-04-27
+- Return empty json when nil in json_safe_and_pretty [#824](https://github.com/shakacode/react_on_rails/pull/824) by [dzirtusss](https://github.com/dzirtusss)
+
 ## [7.0.3] - 2017-04-27
 Same as 7.0.1.
 
@@ -553,7 +556,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/7.0.3...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/7.0.4...master
+[7.0.4]: https://github.com/shakacode/react_on_rails/compare/7.0.3...7.0.4
 [7.0.3]: https://github.com/shakacode/react_on_rails/compare/7.0.1...7.0.3
 [7.0.1]: https://github.com/shakacode/react_on_rails/compare/7.0.0...7.0.1
 [7.0.0]: https://github.com/shakacode/react_on_rails/compare/6.10.1...7.0.0

data/PROJECTS.md

@@ -20,6 +20,7 @@
 * **[Foxford.ru](http://foxford.ru/)**: Online School ![2016-12-17_13-23-21](https://cloud.githubusercontent.com/assets/1118459/21290377/1adacdf2-c45c-11e6-97c1-f726ab749b2d.png)
 * **[CareerBuilder for Employers](https://hiring.careerbuilder.com/)**: CareerBuilder's marketing/ecommerce website. We've integrated React on Rails and have deployed the application via Cloud 66, and are busy integrating this into other projects!
 * **[Josephine](https://www.josephine.com)**: The private network for home cooked meals.
+* **[first](https://first.io/)**: Data-driven Relational Marketing for Real Estate.
 
 ## Open Source Projects Live
 * [github.com/empirical-org/Empirical-Core](https://github.com/empirical-org/Empirical-Core): [Quill.org](https://quill.org/) Provides free tools to make your students better writers.

data/README.md

@@ -2,7 +2,7 @@
 
 **For a complete example of this gem, see our live demo at [www.reactrails.com](http://www.reactrails.com). ([Source Code](https://github.com/shakacode/react-webpack-rails-tutorial))**
 
-**Speaking!**: Justin is speaking [GORUCO](http://goruco.com/#speakers) on Saturday, June 24, 2017 in NYC: "Front-End Sadness to Happiness: The React on Rails Story". [Email Justin](mailto:justin@shakacode.com) to give this talk at your local meetup or company. [Subscribe](https://app.mailerlite.com/webforms/landing/l1d9x5) to be notified of local and *online* presentations of this talk. 
+**Speaking!**: Justin is speaking [GORUCO](http://goruco.com/#speakers) on Saturday, June 24, 2017 in NYC: "Front-End Sadness to Happiness: The React on Rails Story". [Email Justin](mailto:justin@shakacode.com) to give this talk at your local meetup or company. [Subscribe](https://app.mailerlite.com/webforms/landing/l1d9x5) to be notified of local and *online* presentations of this talk.
 
 **Aloha from Justin Gordon** ([bio](http://www.railsonmaui.com/about)) and the [ShakaCode](http://www.shakacode.com) Team! We're actively looking for new projects involving React, React-Native, and Rails, including conversion of AngularJs to React. Please [contact me](mailto:justin@shakacode.com) if we could potentially help you in any way. Besides consulting on bigger projects, [ShakaCode](http://www.shakacode.com) is doing ScreenHero plus Slack/Github based [coaching](http://www.shakacode.com/work/shakacode-coaching-plan.pdf) for React on Rails. See our blog post [Can ShakaCode Help You?](https://blog.shakacode.com/can-shakacode-help-you-4a5b1e5a8a63#.jex6tg9w9) for more information.
 
@@ -49,7 +49,7 @@ For more testimonials, see [Live Projects](PROJECTS.md) and [Kudos](./KUDOS.md).
 * [284 Ruby Rogues: React on Rails with Justin Gordon and Rob Wise](https://devchat.tv/ruby-rogues/284-rr-react-on-rails-with-justin-gordon-and-rob-wise)
 
 # NEWS
-* 2017-04-25: 7.0.0 Shipped! Performance improvements! Please upgrade! Only "breaking" change is that you have to update both the node module and the Ruby gem. 
+* 2017-04-25: 7.0.0 Shipped! Performance improvements! Please upgrade! Only "breaking" change is that you have to update both the node module and the Ruby gem.
 * 2017-04-09: 8.0.0 beta work to include webpacker_lite gem has begun. See [#786](https://github.com/shakacode/react_on_rails/issues/786).
 * *See [NEWS.md](NEWS.md) for more notes over time.*
 
@@ -106,6 +106,10 @@ Universal React with Rails: Part I](https://medium.com/@alexfedoseev/isomorphic-
 
 We're definitely not doing that. With react_on_rails, webpack is mainly generating a nice JavaScript file for inclusion into `application.js`. We're going to KISS. And that's all relative given how much there is to get right in an enterprise class web application.
 
+## Upgrade
+
+To upgrade existing apps to react on rails 7 see the [Installation Overview](docs/basics/installation-overview.md)
+
 ## Getting Started
 
 **For more detailed instructions**, see the [React on Rails Basic Tutorial](docs/tutorial.md).
@@ -113,7 +117,7 @@ We're definitely not doing that. With react_on_rails, webpack is mainly generati
 1. Add the following to your Gemfile and `bundle install`.
 
   ```ruby
-  gem "react_on_rails", "~> 6"
+  gem "react_on_rails", "~> 7"
   ```
 
 2. Commit this to git (you cannot run the generator unless you do this or pass the option `--ignore-warnings`).
@@ -144,9 +148,9 @@ We're definitely not doing that. With react_on_rails, webpack is mainly generati
   foreman start -f Procfile.dev
   ```
 
-8. Visit [localhost:5000/hello_world](http://localhost:5000/hello_world). Note, `foreman` defaults to PORT 5000 unless you set the value of PORT in your environment. For example, you can `export PORT=3000` to use the Rails default port of 3000.
+8. Visit [localhost:3000/hello_world](http://localhost:3000/hello_world). Note, `foreman` defaults to PORT 5000 unless you set the value of PORT in your environment. For example, you can `export PORT=3000` to use the Rails default port of 3000. For the hello_world example this is already set.
 
-### Installation Summary
+### Installation Overview
 
 See the [Installation Overview](docs/basics/installation-overview.md) for a concise set summary of what's in a React on Rails installation.
 
@@ -159,20 +163,20 @@ Configure the `config/initializers/react_on_rails.rb`. You can adjust some neces
 + *Normal Mode (React component will be rendered on client):*
 
   ```erb
-  <%= react_component("HelloWorldApp", props: @some_props) %>
+  <%= react_component("HelloWorld", props: @some_props) %>
   ```
 + *Server-Side Rendering (React component is first rendered into HTML on the server):*
 
   ```erb
-  <%= react_component("HelloWorldApp", props: @some_props, prerender: true) %>
+  <%= react_component("HelloWorld", props: @some_props, prerender: true) %>
   ```
 
-+ The `component_name` parameter is a string matching the name you used to expose your React component globally. So, in the above examples, if you had a React component named "HelloWorldApp," you would register it with the following lines:
++ The `component_name` parameter is a string matching the name you used to expose your React component globally. So, in the above examples, if you had a React component named "HelloWorld," you would register it with the following lines:
 
   ```js
   import ReactOnRails from 'react-on-rails';
-  import HelloWorldApp from './HelloWorldApp';
-  ReactOnRails.register({ HelloWorldApp });
+  import HelloWorld from './HelloWorld';
+  ReactOnRails.register({ HelloWorld });
   ```
 
   Exposing your component in this way is how React on Rails is able to reference your component from a Rails view. You can expose as many components as you like, as long as their names do not collide. See below for the details of how you expose your components via the react_on_rails webpack configuration.
@@ -181,7 +185,7 @@ Configure the `config/initializers/react_on_rails.rb`. You can adjust some neces
 
   ```ruby
     # Rails View
-    <%= react_component("HelloWorldApp", props: { name: "Stranger" }) %>
+    <%= react_component("HelloWorld", props: { name: "Stranger" }) %>
   ```
 
   ```javascript
@@ -222,7 +226,7 @@ In the following screenshot you can see the 3 parts of React on Rails rendering:
 2. The wrapper div `<div id="HelloWorld-react-component-0">` specifies the div where to place the React rendering. It encloses the server-rendered HTML for the React component
 3. Additional JavaScript is placed to console log any messages, such as server rendering errors. Note, these server side logs can be configured to only be sent to the server logs.
 
-**Note**: 
+**Note**:
 
 * If server rendering is not used (prerender: false), then the major difference is that the HTML rendered for the React component only contains the outer div: `<div id="HelloWorld-react-component-0"/>`. The first specification of the React component is just the same.
 * The below image is not yet updated for version 7.0.0 which uses a `<script>` tag for the props. Instead of a hidden div, we have the props inside of the a `<script>` tag.
@@ -323,7 +327,7 @@ Place your JavaScript code inside of the provided `client/app` folder. Use modul
 This is an example of how to expose a component to the `react_component` view helper.
 
   ```javascript
-  // client/app/bundles/HelloWorld/startup/HelloWorldApp.jsx
+  // client/app/bundles/HelloWorld/startup/HelloWorld.jsx
   import HelloWorld from '../components/HelloWorld';
   import ReactOnRails from 'react-on-rails';
   ReactOnRails.register({ HelloWorld });
@@ -333,7 +337,7 @@ This is an example of how to expose a component to the `react_component` view he
 
 You may want different initialization for your server rendered components. For example, if you have animation that runs when a component is displayed, you might need to turn that off when server rendering. However, the `railsContext` will tell you if your JavaScript code is running client side or server side. So code that required a different server bundle previously may no longer require this!
 
-If you do want different code to run, you'd setup a separate webpack compilation file and you'd specify a different, server side entry file. ex. 'serverHelloWorldApp.jsx'. Note, you might be initializing HelloWorld with version specialized for server rendering.
+If you do want different code to run, you'd setup a separate webpack compilation file and you'd specify a different, server side entry file. ex. 'serverHelloWorld.jsx'. Note, you might be initializing HelloWorld with version specialized for server rendering.
 
 #### Generator Functions
 Why would you create a function that returns a React component? For example, you may want the ability to use the passed-in props to initialize a redux store or setup react-router. Or you may want to return different components depending on what's in the props. ReactOnRails will automatically detect a registered generator function.

data/app/helpers/react_on_rails_helper.rb

@@ -231,7 +231,7 @@ module ReactOnRailsHelper
   end
 
   def json_safe_and_pretty(hash_or_string)
-    return if hash_or_string.nil?
+    return "{}" if hash_or_string.nil?
     unless hash_or_string.class.in?([Hash, String])
       raise "#{__method__} only accepts String or Hash as argument "\
             "(#{hash_or_string.class} given)."

data/docs/basics/installation-overview.md

@@ -1,6 +1,6 @@
 # Installation Overview
 
-Here's an overview of installation if you're not using the generator. 
+Here's an overview of installation if you're not using the generator.
 
 Note, the best way to understand how to use ReactOnRails is to study the examples:
 
@@ -9,23 +9,26 @@ Note, the best way to understand how to use ReactOnRails is to study the example
 
 ## Configure the `/client` Directory
 
-This directory has no references to Rails outside of the destination directory for the files created by the various Webpack config files. 
+This directory has no references to Rails outside of the destination directory for the files created by the various Webpack config files.
 
 The only requirements within this directory for basic React on Rails integration are:
 
 1. Your webpack configuration files:
-   1. Create outputs in a directory like `/app/assets/webpack`, which is customizable in your `config/initializers/react_on_rails.rb`.
+   1. Create outputs in a directory like `/public/webpack`, which is customizable in your `config/initializers/react_on_rails.rb`.
    1. Provide server rendering if you wish to use that feature.
 1. Your JavaScript code "registers" any components and stores per the ReactOnRails APIs of ReactOnRails.register(components) and ReactOnRails.registerStore(stores). See API docs in [README.md](../../README.md) and the [ReactOnRails.js source](../../node_package/src/ReactOnRails.js).
 1. Set your registration file as an "entry" point in your Webpack configs.
+1. Add the [Manifest plugin](https://github.com/danethurber/webpack-manifest-plugin) to your config. For examples see [dummy config](../../spec/dummy/client/webpack.client.base.config.js).
+The default path: `public/webpack` can be loaded with webpackConfigLoader as shown in the dummy example.
 1. You create scripts in `client/package.json` per the example apps. These are used for building your Webpack assets. Also do this for your top level `package.json`.
 
 ## Rails Steps (outside of /client)
+1. Add  `gem "webpacker_lite"` to the Gemfile, run bundle. The gem provides the `stylesheet_pack_tag` and `javascript_pack_tag` helpers which is used to load the bundled assets to your layouts.[Dummy Example](../../spec/dummy/app/views/layouts/application.html.erb)
 1. Configure the `config/initializers/react_on_rails.rb`. You can adjust some necessary settings and defaults. See file [spec/dummy/config/initializers/react_on_rails.rb](../../spec/dummy/config/initializers/react_on_rails.rb) for a detailed example of configuration, including comments on the different values to configure.
 1. Configure your Procfiles per the example apps. These are at the root of your Rails installation.
 1. Configure `config/initializers/assets.rb` probably like [spec/dummy/config/initializers/assets.rb](../../spec/dummy/config/initializers/assets.rb). This example shows what's necessary if you're enabling the hot-reloading Rails development option.
 1. Configure your top level JavaScript files for inclusion in your layout. You'll want a version that you use for static assets, and you want a file for any files in your setup that are not part of your webpack build. The reason for this is for use with hot-reloading. If you are not using hot reloading, then you only need to configure your `application.js` file to include your Webpack generated files. For more information on hot reloading, see [Hot Reloading of Assets For Rails Development](../additional-reading/hot-reloading-rails-development.md)
- 
+
 1. Configure your `lib/tasks/assets.rake` file to run webpack during asset precompilation.
 1. If you are deploying to Heroku, see [heroku-deployment.md](/docs/additional-reading/heroku-deployment.md)
 

data/lib/generators/react_on_rails/templates/base/base/Procfile.dev.tt

@@ -1,2 +1,2 @@
 web: rails s -p 3000
-client: sh -c 'rm app/assets/webpack/* || true && cd client && bundle exec rake react_on_rails:locale && yarn run build:development'
+client: sh -c 'rm -rf public/webpack/* || true && cd client && bundle exec rake react_on_rails:locale && yarn run build:development'

data/lib/react_on_rails/configuration.rb

@@ -4,7 +4,7 @@ module ReactOnRails
     setup_config_values
   end
 
-  DEFAULT_GENERATED_ASSETS_DIR = File.join(%w[public webpack], Rails.env).freeze
+  DEFAULT_GENERATED_ASSETS_DIR = File.join(%w(public webpack), Rails.env).freeze
 
   def self.setup_config_values
     ensure_webpack_generated_files_exists

data/lib/react_on_rails/version.rb

@@ -1,3 +1,3 @@
 module ReactOnRails
-  VERSION = "7.1.0.beta.2".freeze
+  VERSION = "7.1.0.beta.3".freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-on-rails",
-  "version": "7.1.0-beta.2",
+  "version": "7.1.0-beta.3",
   "description": "react-on-rails JavaScript for react_on_rails Ruby gem",
   "main": "node_package/lib/ReactOnRails.js",
   "directories": {

data/rakelib/run_rspec.rake

@@ -66,7 +66,7 @@ namespace :run_rspec do
   end
 
   desc "run all tests no examples"
-  task all_but_examples: [:gem, :dummy, :dummy_no_turbolinks, :dummy_turbolinks_2, :empty, :js_tests] do
+  task all_but_examples: [:gem, :dummy_no_turbolinks, :dummy_turbolinks_2, :dummy, :empty, :js_tests] do
     puts "Completed all RSpec tests"
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 7.1.0.beta.2
+  version: 7.1.0.beta.3
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool