react_on_rails 6.8.2 → 6.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 330b3bfdba74e7185714c89c06b0e6ed85511d55
-  data.tar.gz: fbbb20768dad8d656c5d9d53132f6507a976d31f
+  metadata.gz: 9328c100671c200027cdc7d8230de79916044a23
+  data.tar.gz: bfa2ba3f71de5f4951ca0b2d0b8bbe0ece0afc8b
 SHA512:
-  metadata.gz: c1e98356761f51eaef235c49efcab92333bb5e75683639ecc68e2a3658b0db4b8a314a4b48be5f66b9644af0f16e7eee4955c2f9f4780315ef8210e824393ba0
-  data.tar.gz: afad9d48c7aa908c641e052123e8ca265077aedeeb7d89ab56cc89331990cc20f9fc29dbc8711ec0e131cec7880634e48315183f9aeaabd2c533a1c568510613
+  metadata.gz: 5328449a8ec4805624926acbe23359748c4bbf3f7680b798c392b85d653bbe3fe6c4cfcf2dac43ce12d9a9adaa698992116cf075486aa1671ea76afbb6744c94
+  data.tar.gz: fa1ebc8f3eb2db3caa2f9d4957d20b3bfd76ada8a064f0a8035dbd28bddd5662e3855c3003936048b7783e90692bbcd4dc3aac1fdbf90ca0549f13fcfebf3686

data/CHANGELOG.md

@@ -4,8 +4,21 @@ All notable changes to this project's source code will be documented in this fil
 Contributors: please follow the recommendations outlined at [keepachangelog.com](http://keepachangelog.com/). Please use the existing headings and styling as a guide, and add a link for the version diff at the bottom of the file. Also, please update the `Unreleased` link to compare to the latest release version.
 
 ## [Unreleased]
-*Please add entries here for your pull requests.*
+
+## [6.9.0] - 2017-03-29
+
+## Fixed
+- Fixed error in the release script. [#767](https://github.com/shakacode/react_on_rails/issues/767) by [isolo](https://github.com/isolo).
+
 ## Changed
+- Use <script type="application/json"> for props and store instead of hidden div. [#775] (https://github.com/shakacode/react_on_rails/pull/775) by [cheremukhin23](https://github.com/cheremukhin23).
+
+## Added
+- Add option to specify i18n_yml_dir in order to include only subset of locale files when generating translations.js & default.js for react-intl.
+[#777](https://github.com/shakacode/react_on_rails/pull/777) by [danijel](https://github.com/danijel).
+
+## [6.8.2] - 2017-03-24
+## Fixed
 - Change webpack output path to absolute and update webpack to version ^2.3.1. [#771](https://github.com/shakacode/react_on_rails/pull/771) by [cheremukhin23](https://github.com/cheremukhin23).
 
 ## [6.8.1] - 2017-03-21
@@ -491,7 +504,9 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.8.1...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.9.0...master
+[6.9.0]: https://github.com/shakacode/react_on_rails/compare/6.8.2...6.9.0
+[6.8.2]: https://github.com/shakacode/react_on_rails/compare/6.8.1...6.8.2
 [6.8.1]: https://github.com/shakacode/react_on_rails/compare/6.8.0...6.8.1
 [6.8.0]: https://github.com/shakacode/react_on_rails/compare/6.7.2...6.8.0
 [6.7.2]: https://github.com/shakacode/react_on_rails/compare/6.7.1...6.7.2

data/KUDOS.md

@@ -6,6 +6,10 @@ I'm looking for quotes on why you like using React on Rails. You might mention a
 Github issue [#766](https://github.com/shakacode/react_on_rails/issues/766).
 ![2017-03-23_17-43-17](https://cloud.githubusercontent.com/assets/1118459/24279884/badab166-0ff0-11e7-87ab-94253f55a3d9.png)
 
+## March 21, 2017
+Twitter from [@rfc2616](https://twitter.com/rfc2616)
+![2017-03-24_20-20-20](https://cloud.githubusercontent.com/assets/1118459/24319983/7adfd57a-10cf-11e7-9a50-5c23d5d5bcab.png)
+
 ### March 2, 2017
 ![2017-03-05_21-34-34](https://cloud.githubusercontent.com/assets/1118459/23600716/0d8c40d6-01ec-11e7-998d-4ce9e6abcacb.png)
 

data/app/helpers/react_on_rails_helper.rb

@@ -103,13 +103,10 @@ module ReactOnRailsHelper
 
     # Setup the page_loaded_js, which is the same regardless of prerendering or not!
     # The reason is that React is smart about not doing extra work if the server rendering did its job.
-
-    component_specification_tag =
-      content_tag(:div,
-                  "",
-                  class: "js-react-on-rails-component",
-                  style: options.style,
-                  data: options.data)
+    component_specification_tag = content_tag(:script,
+                                              json_safe_and_pretty(options.data).html_safe,
+                                              type: "application/json",
+                                              class: "js-react-on-rails-component")
 
     # Create the HTML rendering part
     result = server_rendered_react_component_html(options.props, options.name, options.dom_id,
@@ -174,7 +171,7 @@ module ReactOnRailsHelper
   end
 
   def sanitized_props_string(props)
-    props.is_a?(String) ? json_escape(props) : props.to_json
+    props.is_a?(String) ? ERB::Util.json_escape(props) : props.to_json
   end
 
   # Helper method to take javascript expression and returns the output from evaluating it.
@@ -225,30 +222,36 @@ module ReactOnRailsHelper
 
   private
 
+  def json_safe_and_pretty(something)
+    if Rails.env.development?
+      ERB::Util.json_escape(JSON.pretty_generate(something.as_json))
+    else
+      ERB::Util.json_escape(something.to_json)
+    end
+  end
+
   # prepend the rails_context if not yet applied
   def prepend_render_rails_context(render_value)
     return render_value if @rendered_rails_context
 
-    data = {
-      rails_context: rails_context(server_side: false)
-    }
+    data = rails_context(server_side: false)
 
     @rendered_rails_context = true
 
-    rails_context_content = content_tag(:div,
-                                        "",
-                                        id: "js-react-on-rails-context",
-                                        style: ReactOnRails.configuration.skip_display_none ? nil : "display:none",
-                                        data: data)
+    rails_context_content = content_tag(:script,
+                                        json_safe_and_pretty(data).html_safe,
+                                        type: "application/json",
+                                        id: "js-react-on-rails-context")
+
     "#{rails_context_content}\n#{render_value}".html_safe
   end
 
   def render_redux_store_data(redux_store_data)
-    result = content_tag(:div,
-                         "",
-                         class: "js-react-on-rails-store",
-                         style: ReactOnRails.configuration.skip_display_none ? nil : "display:none",
-                         data: redux_store_data)
+    result = content_tag(:script,
+                         json_safe_and_pretty(redux_store_data[:props]).html_safe,
+                         type: "application/json",
+                         "data-js-react-on-rails-store" => redux_store_data[:store_name].html_safe)
+
     prepend_render_rails_context(result)
   end
 

data/docs/basics/i18n.md

@@ -16,21 +16,28 @@ You can refer to [react-webpack-rails-tutorial](https://github.com/shakacode/rea
   ```
 
 2. Add `config.i18n_dir` in `config/initializers/react_on_rails.rb`
-  
+
   `react-intl` requires locale files in json format. React on Rails will generate `translations.js` & `default.js` automatically after you configured your `config.i18n_dir` in `config/initializers/react_on_rails.rb`.
 
   ```ruby
   # Replace the following line to the location where you keep translation.js & default.js.
   config.i18n_dir = Rails.root.join("PATH_TO", "YOUR_JS_I18N_FOLDER")
   ```
-  
+
+  Optionally you can also set `config.i18n_yml_dir` if you do not what to use all the locale files from rails.
+  ```ruby
+  # Replace the following line to the location where you keep your client i18n yml files
+  # By default(without this option), all yaml files from Rails.root.join("config", "locales") and installed gems are loaded
+  config.i18n_yml_dir = Rails.root.join("PATH_TO", "YOUR_YAML_I18N_FOLDER")
+  ```
+
   `translations.js`: All your locales in json format.
   `default.js`: Default settings in json format.
 
 3. Add `translations.js` and `default.js` to your `.gitignore` and `.eslintignore`.
-  
-4. Javascript locale files must be generated before `yarn build`. 
-  
+
+4. Javascript locale files must be generated before `yarn build`.
+
   Once you setup `config.i18n_dir` as in the previous step, react_on_rails will automatically do this for testing (if using the `ReactOnRails::TestHelper.configure_rspec_to_compile_assets` and for production deployments if using the [default precompile rake hook](../additional-reading/heroku-deployment.md). For development, you should adjust your startup scripts (Procfiles) so that they run `bundle exec rake react_on_rails:locale` before running any webpack watch process (`yarn run build:development`).
 
 5. In React, you need to initialize `react-intl`, and set parameters for it.

data/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt

@@ -65,14 +65,16 @@ ReactOnRails.configure do |config|
   # Replace the following line to the location where you keep translation.js & default.js for use
   # by the npm packages react-intl. Be sure this directory exists!
   # config.i18n_dir = Rails.root.join("client", "app", "libs", "i18n")
+  #
+  # Replace the following line to the location where you keep your client i18n yml files
+  # that will source for automatic generation on translations.js & default.js
+  # By default(without this option) all yaml files from Rails.root.join("config", "locales") and installed gems are loaded
+  # config.i18n_yml_dir = Rails.root.join("config", "locales", "client")
 
   ################################################################################
   # MISCELLANEOUS OPTIONS
   ################################################################################
 
-  # Default is false, enable if your content security policy doesn't include `style-src: 'unsafe-inline'`
-  config.skip_display_none = false
-
   # The server render method - either ExecJS or NodeJS
   <%- if options.node? -%>
   config.server_render_method = "NodeJS"

data/lib/react_on_rails/configuration.rb

@@ -9,9 +9,11 @@ module ReactOnRails
   def self.setup_config_values
     ensure_webpack_generated_files_exists
     configure_generated_assets_dirs_deprecation
+    configure_skip_display_none_deprecation
     ensure_generated_assets_dir_present
     ensure_server_bundle_js_file_has_no_path
     check_i18n_directory_exists
+    check_i18n_yml_directory_exists
   end
 
   def self.check_i18n_directory_exists
@@ -23,6 +25,15 @@ module ReactOnRails
         "out if not using this i18n with React on Rails."
   end
 
+  def self.check_i18n_yml_directory_exists
+    return unless @configuration.i18n_yml_dir.present?
+    return if Dir.exist?(@configuration.i18n_yml_dir)
+
+    raise "Error configuring /config/react_on_rails.rb: invalid value for `config.i18n_yml_dir`. "\
+        "Directory does not exist: #{@configuration.i18n_yml_dir}. Set to value to nil or comment it "\
+        "out if not using this i18n with React on Rails, or if you want to use all translation files."
+  end
+
   def self.ensure_generated_assets_dir_present
     return unless @configuration.generated_assets_dir.blank?
 
@@ -61,6 +72,11 @@ module ReactOnRails
     @configuration.server_bundle_js_file = File.basename(@configuration.server_bundle_js_file)
   end
 
+  def self.configure_skip_display_none_deprecation
+    return if @configuration.skip_display_none.nil?
+    puts "[DEPRECATION] ReactOnRails: remove skip_display_none from configuration."
+  end
+
   def self.configuration
     @configuration ||= Configuration.new(
       generated_assets_dirs: nil,
@@ -76,13 +92,16 @@ module ReactOnRails
       development_mode: Rails.env.development?,
       server_renderer_pool_size: 1,
       server_renderer_timeout: 20,
-      skip_display_none: false,
+      skip_display_none: nil,
+
+      # skip_display_none is deprecated
       webpack_generated_files: [],
       rendering_extension: nil,
       server_render_method: "",
       symlink_non_digested_assets_regex: /\.(png|jpg|jpeg|gif|tiff|woff|ttf|eot|svg|map)/,
       npm_build_test_command: "",
       i18n_dir: "",
+      i18n_yml_dir: "",
       npm_build_production_command: ""
     )
   end
@@ -91,11 +110,11 @@ module ReactOnRails
     attr_accessor :server_bundle_js_file, :prerender, :replay_console,
                   :trace, :development_mode,
                   :logging_on_server, :server_renderer_pool_size,
-                  :server_renderer_timeout, :raise_on_prerender_error,
-                  :skip_display_none, :generated_assets_dirs, :generated_assets_dir,
+                  :server_renderer_timeout, :skip_display_none, :raise_on_prerender_error,
+                  :generated_assets_dirs, :generated_assets_dir,
                   :webpack_generated_files, :rendering_extension, :npm_build_test_command,
                   :npm_build_production_command,
-                  :i18n_dir,
+                  :i18n_dir, :i18n_yml_dir,
                   :server_render_method, :symlink_non_digested_assets_regex
 
     def initialize(server_bundle_js_file: nil, prerender: nil, replay_console: nil,
@@ -106,7 +125,7 @@ module ReactOnRails
                    generated_assets_dir: nil, webpack_generated_files: nil,
                    rendering_extension: nil, npm_build_test_command: nil,
                    npm_build_production_command: nil,
-                   i18n_dir: nil,
+                   i18n_dir: nil, i18n_yml_dir: nil,
                    server_render_method: nil, symlink_non_digested_assets_regex: nil)
       self.server_bundle_js_file = server_bundle_js_file
       self.generated_assets_dirs = generated_assets_dirs
@@ -114,6 +133,7 @@ module ReactOnRails
       self.npm_build_test_command = npm_build_test_command
       self.npm_build_production_command = npm_build_production_command
       self.i18n_dir = i18n_dir
+      self.i18n_yml_dir = i18n_yml_dir
 
       self.prerender = prerender
       self.replay_console = replay_console

data/lib/react_on_rails/locales_to_js.rb

@@ -39,14 +39,23 @@ module ReactOnRails
     end
 
     def locale_files
-      @locale_files ||=
-        (Rails.application && Rails.application.config.i18n.load_path).presence
+      @locale_files ||= begin
+        if i18n_yml_dir.present?
+          Dir["#{i18n_yml_dir}/**/*.yml"]
+        else
+          (Rails.application && Rails.application.config.i18n.load_path).presence
+        end
+      end
     end
 
     def i18n_dir
       @i18n_dir ||= ReactOnRails.configuration.i18n_dir
     end
 
+    def i18n_yml_dir
+      @i18n_yml_dir ||= ReactOnRails.configuration.i18n_yml_dir
+    end
+
     def default_locale
       @default_locale ||= I18n.default_locale.to_s || "en"
     end

data/lib/react_on_rails/react_component/options.rb

@@ -6,7 +6,6 @@ module ReactOnRails
       include Utils::Required
 
       NO_PROPS = {}.freeze
-      HIDDEN = "display:none".freeze
 
       def initialize(name: required("name"), options: required("options"))
         @name = name
@@ -14,7 +13,8 @@ module ReactOnRails
       end
 
       def props
-        options.fetch(:props) { NO_PROPS }
+        props = options.fetch(:props) { NO_PROPS }
+        props.is_a?(String) ? JSON.parse(ERB::Util.json_escape(props)) : props
       end
 
       def name
@@ -54,11 +54,6 @@ module ReactOnRails
         }
       end
 
-      def style
-        return nil if ReactOnRails.configuration.skip_display_none
-        HIDDEN
-      end
-
       private
 
       attr_reader :options

data/lib/react_on_rails/version.rb

@@ -1,3 +1,3 @@
 module ReactOnRails
-  VERSION = "6.8.2".freeze
+  VERSION = "6.9.0".freeze
 end

data/package.json

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

data/rakelib/release.rake

@@ -43,6 +43,8 @@ task :release, [:gem_version, :dry_run, :tools_install] do |_t, args|
 
   # Having the examples prevents publishing
   Rake::Task["examples:clobber"].invoke
+  # Delete any react_on_rails.gemspec except the root one
+  sh_in_dir(gem_root, "find . -mindepth 2 -name 'react_on_rails.gemspec' -delete")
 
   # See https://github.com/svenfuchs/gem-release
   sh_in_dir(gem_root, "git pull --rebase")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 6.8.2
+  version: 6.9.0
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool