react_on_rails 6.0.2 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3f17df25c652f79c9d0cdcd0c1eddce4f95a4b5
-  data.tar.gz: 66c4677132c33fef5bb89e910c1eec4bad9aff74
+  metadata.gz: 615fcfc969daad3b212316bc07fd6d8fe32927a0
+  data.tar.gz: 71229b73198cf6207699eae5532daf527416a7ad
 SHA512:
-  metadata.gz: c4fd4a9a1e77b75619bae1367c895f69649e097771678b64e6d24a52f2807a34d2c8b5b351ec66f8c0add94e5aa5aa5130e4f3ca1fa73269fc2809678540235c
-  data.tar.gz: 5531be7c1597d4374020b1cae591dbf05a5cc4767d2e4f52d1c299674674b1505107bb1a6563bfc0e81291b4d44ced63393539ac484e3646e31eeb88c7a4ab49
+  metadata.gz: e60b88505284d82b6c1380f0196496f21c12ebec8521277a358435f3afac95bfd2cee86db1a0cc13215fafe579be9784855640cf40f9d86b862d0f86b6e43a99
+  data.tar.gz: 2bc9b19b2fed46618a5de9248a8611501a6f3b9760503e0dbd57c3367e454ffc2e5ae29762adb7a78b6ff6228404aac9a8593900bac6b70beb67fb2f86b503f6

data/.travis.yml

@@ -12,14 +12,16 @@ gemfile:
   - spec/dummy/Gemfile
 
 env:
-  - export RAILS_ENV=test DRIVER=selenium_chrome
+  - export RAILS_ENV=test DRIVER=selenium_chrome CHROME_BIN=/usr/bin/google-chrome
 
 before_install:
   - sudo apt-get update
   - curl -L https://github.com/docker/compose/releases/download/1.4.0/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
-  - sudo apt-get install -y xvfb
+  - sudo apt-get install -y xvfb libappindicator1 fonts-liberation
+  - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+  - sudo dpkg -i google-chrome*.deb
 
 install:
   - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 5.10.0

data/CHANGELOG.md

@@ -2,8 +2,13 @@
 All notable changes to this project will be documented in this file. Items under `Unreleased` is upcoming features that will be out in next version.
 
 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]
 
+## [6.0.3]
+##### Fixed
+- Added assets symlinking support on Heroku [#446](https://github.com/shakacode/react_on_rails/pull/446) by [Alexey Karasev](https://github.com/alleycat-at-git).
+
 ## [6.0.2]
 ##### Fixed
 - Fix colisions in ids of DOM nodes generated by `react_component` by indexing in using an UUID rather than an auto-increment value. This means that it should be overriden using the `id` parameter of `react_component` if one wants to generate a predictable id (_e.g._ for testing purpose). See [Issue #437](https://github.com/shakacode/react_on_rails/issues/437). Fixed in [#438](https://github.com/shakacode/react_on_rails/pull/438) by [Michael Baudino](https://github.com/michaelbaudino).
@@ -340,7 +345,8 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.0.2...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.0.3...master
+[6.0.3]: https://github.com/shakacode/react_on_rails/compare/6.0.2...6.0.3
 [6.0.2]: https://github.com/shakacode/react_on_rails/compare/6.0.1...6.0.2
 [6.0.1]: https://github.com/shakacode/react_on_rails/compare/6.0.0...6.0.1
 [6.0.0]: https://github.com/shakacode/react_on_rails/compare/5.2.0...6.0.0

data/lib/react_on_rails/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ReactOnRails
-  VERSION = "6.0.2".freeze
+  VERSION = "6.0.3".freeze
 end

data/lib/tasks/assets.rake

@@ -7,13 +7,15 @@ module ReactOnRails
     end
 
     def symlink_file(target, symlink)
-      if not File.exist?(symlink) or File.lstat(symlink).symlink?
-        if File.exist?(target)
-          puts "React On Rails: Symlinking #{target} to #{symlink}"
-          FileUtils.ln_s target, symlink, force: true
+      target_path = ReactOnRails::assets_path.join(target)
+      symlink_path = ReactOnRails::assets_path.join(symlink)
+      if not File.exist?(symlink_path) or File.lstat(symlink_path).symlink?
+        if File.exist?(target_path)
+          puts "React On Rails: Symlinking #{target_path} to #{symlink_path}"
+          `cd #{ReactOnRails::assets_path} && ln -s #{target} #{symlink}`
         end
       else
-        puts "React On Rails: File #{symlink} already exists. Failed to symlink #{target}"
+        puts "React On Rails: File #{symlink_path} already exists. Failed to symlink #{target_path}"
       end
     end
   end
@@ -37,13 +39,10 @@ namespace :react_on_rails do
         manifest_data["assets"].each do |logical_path, digested_path|
           regex = ReactOnRails.configuration.symlink_non_digested_assets_regex
           if logical_path =~ regex
-            full_digested_path = ReactOnRails::assets_path.join(digested_path)
-            full_nondigested_path = ReactOnRails::assets_path.join(logical_path)
-            extension = full_digested_path.extname
-            full_digested_gz_path = full_digested_path.sub_ext("#{extension}.gz")
-            full_nondigested_gz_path = full_nondigested_path.sub_ext("#{extension}.gz")
-            ReactOnRails::symlink_file(full_digested_path, full_nondigested_path)
-            ReactOnRails::symlink_file(full_digested_gz_path, full_nondigested_gz_path)
+            digested_gz_path = "#{digested_path}.gz"
+            logical_gz_path = "#{logical_path}.gz"
+            ReactOnRails::symlink_file(digested_path, logical_path)
+            ReactOnRails::symlink_file(digested_gz_path, logical_gz_path)
           end
         end
       end
@@ -115,11 +114,3 @@ Rake::Task["assets:precompile"]
       Rake::Task["react_on_rails:assets:delete_broken_symlinks"].invoke
     end
 
-# puts "Enhancing assets:precompile with react_on_rails:assets:compile_environment"
-# Rake::Task["assets:precompile"]
-#   .clear_prerequisites
-#   .enhance([:environment]) do
-#   Rake::Task["react_on_rails:assets:compile_environment"].invoke
-#   Rake::Task["react_on_rails:assets:symlink_non_digested_assets"].invoke
-#   Rake::Task["react_on_rails:assets:delete_broken_symlinks"].invoke
-# end

data/package.json

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react_on_rails
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.3
 platform: ruby
 authors:
 - Justin Gordon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool