breakfast 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5389039ab3ec0abe8611d3b64f0bfa0e2ee07816
-  data.tar.gz: 274ac056540aa03d1a90a03311e7c653bf97d226
+SHA256:
+  metadata.gz: 8442c74d4c9830ebb2877bb85f5d9a908de18f64030061dacf8f01583218f13f
+  data.tar.gz: 5d95dee904bdf649c9ce5ba6a5db135bea2106f0bcb61ba373e2985985314926
 SHA512:
-  metadata.gz: 9b3f9e68709f9350fde5e3700b2617d526530697e749a2fc2c3715949ebd85125c307a675016c611ea4beb20c2cb3c46eddc433aef3938bdd761372176497aed
-  data.tar.gz: bf08a28cbbd4bef660e60ae5bea5c0131697c20268d8bd9531ea4f48824e107b190203d2944dcfb0708dfecb67cf261bee193fcf636e11ed1048ba43d405acd9
+  metadata.gz: 8dd46fee6d3ba0e80a017a60904f263d80a58e336ab677cd4ce6fc9beabc6105bd99350770cf598cf5ab003014524cc969e72c06bd9e1142b78933a4028840df
+  data.tar.gz: cc2944a98c04347b766a0418b7131e07029e5f1aaa68c7f96fb8b17fe8a5dc3eb7123e5f75537fa50862378608550006af9dbef1751be72504b4c5af954f77b7

data/CHANGELOG.md

@@ -1,19 +1,30 @@
 # CHANGE LOG
 
+### 0.6.3 - 2018-08-14
+
+#### Fixed
+
+- Potential double yarn install
+- assets:precompile not defined properly (when no Sprockets)
+
 ### 0.6.2 - 2017-05-11
+
 #### Fixed
+
 - Typo in install generator. Add brunch-babel package
 
   @haffla
 
-
 ### 0.6.1 - 2017-05-04
+
 #### Fixed
-- Potential Heroku bug where assets would be cleared out on deploy.
 
+- Potential Heroku bug where assets would be cleared out on deploy.
 
 ### 0.6.0 - 2017-03-12
+
 #### Upgrading to `0.6.0` from `0.5.x`
+
 - Update gem with `bundle update breakfast`
 - Update the JS package with `yarn upgrade breakfast-rails`
 - If deploying with Capistrano, remove `require "breakfast/capistrano"` from
@@ -22,60 +33,71 @@
   and have `require 'capistrano/rails'` or `require 'capistrano/rails/assets'`
   in your `Capfile`.
 - If deploying with Heroku, run the following commands:
-  1. heroku buildpacks:clear
-  2. heroku buildpacks:set heroku/nodejs --index 1
-  3. heroku buildpacks:set heroku/ruby --index 2
+  1.  heroku buildpacks:clear
+  2.  heroku buildpacks:set heroku/nodejs --index 1
+  3.  heroku buildpacks:set heroku/ruby --index 2
+
 #### Fixed
+
 - Puma hanging in clustered mode. Breakfast would fail to cleanly exit on Puma
   exit, causing the server to hang indefinitely.
 - Bumped Rails version dependency, can be used with Rails 5.0 and greater.
   (Allows usage with Rails 5.1)
+
 #### Removed
+
 - Capistrano rake tasks. Previous behavior has been included into the Rails
   asset:precompile task. Using the standard [Capistrano Rails](https://github.com/capistrano/rails)
   gem is all that required now.
 - Need for a custom Heroku buildpack.
 
-
 ### 0.5.1 - 2017-02-06
+
 #### Changed
+
 If `public/assets` does not exist Breakfast will now create the folder before
 attempting to write to it.
 
-
 ### 0.5.0 - 2017-02-03
+
 #### Added
+
 - Adds support for [Yarn](https://yarnpkg.com/).
 - New installs now require Yarn
 - Capistrano options `:breakfast_yarn_path` && `:breakfast_yarn_install_command`
 
 #### Removed
+
 - NPM client requirement
 - Capistrano options `:breakfast_npm_path` && `:breakfast_npm_install_command`
   have been removed.
 
 ### Upgrading
+
 #### Upgrading to `0.5.0` from `0.4.0`
+
 - Update gem with `bundle update breakfast`
 - Bump the `breakfast-rails` version in `package.json` to `0.5.0`
 - Ensure [Yarn](https://yarnpkg.com/docs/install) is installed
 - Run `yarn install`
 
-*Note* If you are deploying with Capistrano then Yarn is expected to be
+_Note_ If you are deploying with Capistrano then Yarn is expected to be
 installed on
 
-
 ### 0.4.0 - 2016-11-14
+
 #### Upgrading to `0.4.0` from `0.3.0`
+
 - Update gem with `bundle update breakfast`
 - Bump the `breakfast-rails` version in `package.json` to `0.4.0`
 - Run `npm install`
 
-*Note* Now by default asset fingerprinting will be on by default in production.
+_Note_ Now by default asset fingerprinting will be on by default in production.
 A copy of each with the original filename will be present as well, so any
 hard-coded links to assets will still work correctly.
 
 #### Added
+
 - Asset Digests. Now when deploying assets will have fingerprints added to their
   file names. This allows browsers to aggressively cache your assets.
 - New Option: `breakfast.manifest.digest`. Defaults to false in development /
@@ -104,24 +126,26 @@ hard-coded links to assets will still work correctly.
   ```
 
 #### Changes
-- Fixed small CSS issue if box-sizing is not set border-box globally.
 
+- Fixed small CSS issue if box-sizing is not set border-box globally.
 
 #### Contributors
+
 Many many thanks to the contributors for this release!
+
 - [@patkoperwas](https://github.com/patkoperwas)
 - [@mikeastock](https://github.com/mikeastock)
 - [@HParker](https://github.com/HParker)
 
-
 ## 0.3.1 - 2016-10-19
+
 - Better support for determining if Server is running. Using puma, passneger,
   etc. instead of the default rails server command now work.
 
-
 ## 0.3.0 - 2016-09-28
 
 ### Upgrading from `0.2.0`
+
 - Update gem with `bundle update breakfast`
 - Bump the `breakfast-rails` version in `package.json` to `0.3.1`
 - Run `npm install`
@@ -139,6 +163,7 @@ Many many thanks to the contributors for this release!
   (probably `config/environments/development.rb`).
 
 ### Added
+
 - New status bar that allows the user to switch reload strategies on the fly
 - Support for Haml & Slim files (without .html extension)
 - Reloading on ruby file changes.
@@ -147,14 +172,17 @@ Many many thanks to the contributors for this release!
 - NPM binary path for Capistrano
 
 ### Changes
+
 - config.breakfast.view_folders change to config.breakfast.source_code_folders.
   Change brought about by need to trigger reloads when Ruby source code changes.
 
 ### Removed
+
 - config.breakfast.view_folders is no longer supported. Deprecated in favor of
   source_code_folders option.
 
 #### Contributors
+
 Many many thanks to the contributors for this release!
 
 - [@patkoperwas](https://github.com/patkoperwas)

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in breakfast.gemspec
-gem "pry"
 gemspec

data/README.md

@@ -20,6 +20,9 @@ View updates in the [CHANGELOG](https://github.com/devlocker/breakfast/blob/mast
 ### Latest Patch `0.6.2`
 #### Fixed
 - Typo in install generator. Add brunch-babel package
+- Add support for [Wiselinks](https://github.com/igor-alexandrov/wiselinks)
+  reloader.
+  [_@haffla_](https://github.com/devlocker/breakfast/pull/23)
 
 ### Latest Release `0.6.0`
 #### Fixed

data/lib/breakfast/version.rb

@@ -1,3 +1,3 @@
 module Breakfast
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/lib/generators/breakfast/install_generator.rb

@@ -60,8 +60,20 @@ module Breakfast
       end
 
       def install_required_packages
-        run "yarn add actioncable breakfast-rails jquery jquery-ujs turbolinks"
-        run "yarn add --dev brunch babel babel-brunch clean-css-brunch sass-brunch uglify-js-brunch"
+        packages = %w(
+          actioncable
+          babel
+          babel-brunch
+          breakfast-rails
+          brunch
+          clean-css-brunch
+          jquery
+          jquery-ujs
+          sass-brunch
+          turbolinks
+          uglify-js-brunch
+        )
+        run "yarn add #{packages.join(' ')}"
       end
 
       def create_directory_structure

data/lib/tasks/breakfast.rake

@@ -58,9 +58,16 @@ end
 
 if Rake::Task.task_defined?("assets:precompile")
   Rake::Task["assets:precompile"].enhance do
-    Rake::Task["breakfast:yarn:install"].execute
-    Rake::Task["breakfast:assets:compile"].execute
+    unless File.exist?("./bin/yarn") && Rake::Task.task_defined?("yarn:install")
+      # Rails 5.1 includes a yarn install command - don't yarn install twice.
+      Rake::Task["breakfast:yarn:install"].invoke
+    end
+    Rake::Task["breakfast:assets:compile"].invoke
   end
+else
+  Rake::Task.define_task(
+    "assets:precompile" => ["breakfast:yarn", "breakfast:assets:compile"]
+  )
 end
 
 module Breakfast

data/node_package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "breakfast-rails",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Assets for the Breakfast Gem",
   "main": "./lib/breakfast-rails.js",
   "scripts": {

data/node_package/src/live-reload.js

@@ -52,13 +52,10 @@ class LiveReloader {
   htmlReload(strategy) {
     switch (strategy) {
       case 'turbolinks':
-        const location = window.top.location;
-
-        if (this.turbolinksAvailable() && !this.onErrorPage()) {
-          Turbolinks.visit(location);
-        } else {
-          location.reload();
-        }
+        this.reloadTurbolinks();
+        break;
+      case 'wiselinks':
+        this.reloadWiselinks();
         break;
       case 'page':
         window.top.location.reload();
@@ -71,13 +68,10 @@ class LiveReloader {
   rubyReload(strategy) {
     switch (strategy) {
       case 'turbolinks':
-        const location = window.top.location;
-
-        if (this.turbolinksAvailable() && !this.onErrorPage()) {
-          Turbolinks.visit(location);
-        } else {
-          location.reload();
-        }
+        this.reloadTurbolinks();
+        break;
+      case 'wiselinks':
+        this.reloadWiselinks();
         break;
       case 'page':
         window.top.location.reload();
@@ -87,8 +81,22 @@ class LiveReloader {
     }
   }
 
-  turbolinksAvailable() {
-    return (typeof Turbolinks !== 'undefined');
+  reloadTurbolinks() {
+    const location = window.top.location;
+
+    if (this.settings.turbolinksEnabled() && !this.onErrorPage()) {
+      Turbolinks.visit(location);
+    } else {
+      location.reload();
+    }
+  }
+
+  reloadWiselinks() {
+    if (this.settings.wiselinksEnabled() && !this.onErrorPage()) {
+      wiselinks.reload();
+    } else {
+      window.top.location.reload();
+    }
   }
   // If user is on an error page and they fix the error and re-render using
   // turbolinks than the CSS from the Rails error page will hang around. Will

data/node_package/src/settings.js

@@ -43,6 +43,14 @@ class Settings {
   storedSettings() {
     return (JSON.parse(localStorage.getItem(LOCAL_STORAGE_KEY)) || {});
   }
+
+  turbolinksEnabled() {
+    return typeof Turbolinks !== 'undefined';
+  }
+
+  wiselinksEnabled() {
+    return typeof Wiselinks !== 'undefined';
+  }
 }
 
 module.exports = Settings;

data/node_package/src/status-bar.js

@@ -23,8 +23,10 @@ class StatusBar {
   init() {
     let eventName;
 
-    if (typeof Turbolinks !== 'undefined') {
+    if (this.settings.turbolinksEnabled()) {
       eventName = 'turbolinks:load';
+    } else if (this.settings.wiselinksEnabled()) {
+      eventName = 'page:done';
     } else {
       eventName = 'DOMContentLoaded';
     }
@@ -94,7 +96,8 @@ class StatusBar {
         <span>html: </span><span class="breakfast-type">${ this.settings.strategies.html }</span>
         <div class="breakfast-menu">
           ${ this.renderLink('html', 'page', 'Page Reload') }
-          ${ this.renderLink('html', 'turbolinks', 'Turbolinks Reload') }
+          ${ this.renderLink('html', 'turbolinks', 'Turbolinks Reload', this.settings.turbolinksEnabled()) }
+          ${ this.renderLink('html', 'wiselinks', 'Wiselinks Reload', this.settings.wiselinksEnabled()) }
           ${ this.renderLink('html', 'off', 'Off') }
         </div>
       </div>
@@ -103,16 +106,21 @@ class StatusBar {
         <span>ruby: </span><span class="breakfast-type">${ this.settings.strategies.rb }</span>
         <div class="breakfast-menu">
           ${ this.renderLink('rb', 'page', 'Page Reload') }
-          ${ this.renderLink('rb', 'turbolinks', 'Turbolinks Reload') }
+          ${ this.renderLink('rb', 'turbolinks', 'Turbolinks Reload', this.settings.turbolinksEnabled()) }
+          ${ this.renderLink('rb', 'wiselinks', 'Wiselinks Reload', this.settings.wiselinksEnabled()) }
           ${ this.renderLink('rb', 'off', 'Off') }
         </div>
       </div>
     `);
   }
 
-  renderLink(type, strategy, text) {
+  renderLink(type, strategy, text, enabled = true) {
     const active = this.settings.strategies[type] === strategy;
 
+    if (!enabled) {
+      return '';
+    }
+
     return (`
       <a
         class="breakfast-menu-option ${ active ? 'breakfast-active' : '' }"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: breakfast
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Patrick Koperwas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Integrates Brunch into Rails