opal-rails 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d61bba3aec7f4e72f6415ff750bc0a41af46a8ce59a701c566b8f85fb5468d7
-  data.tar.gz: ce19e5c523a251b03a06ef8b2b322e45238909d6bdb4b6a169bcf8c08e6f8223
+  metadata.gz: 9fe52f8b8220d7217cdee145bf089a14e6992c1c187c1a62bba8585433d34081
+  data.tar.gz: 413cd3f385011549dbaa800d3aeb46df5677d0d25e6dfd2e15eedb96f0c58e8c
 SHA512:
-  metadata.gz: fc73e4fc9f70678e509496a0bb17d05b2da13072b0e1568067a82d5839ee0c5f2054646883eb8506d79a86314b5f1b755a7f5d6dc4f2bee88fbafcb907ceabe4
-  data.tar.gz: 3d653b799aa04cd98e4272df376c62c3df95c29195279e0d734d272166018b84fcd922f490f5cb9a03d6cb6c32174b00bfd4ebf1459a24173db0c17a5b8e665d
+  metadata.gz: 87b789a075dd3f62c76e4dae46686ea291a2949a197a03cfd2c38aac96fc19b16c04e0e8903ed406e5aa9e679969a7e7bde793e6e436c54a63a6b12398eb98fd
+  data.tar.gz: 855c4c73ad06af2c8334aaf7db85c886600210349568b9ced0cc9e49bf952dddd4143c7083fbd69e5f5816cf78e448fa86186606daf0012829edda5063aedc8c

data/CHANGELOG.md

@@ -21,6 +21,16 @@ Whitespace conventions:
 
 
 
+## [1.1.2](https://github.com/opal/opal-rails/compare/v1.1.1...v1.1.2) - 2019-09-26
+
+
+### Fixed
+
+- Default `skip_onload` to `true` when `javascript_asset_tag` is in debug mode, otherwise some assets may be loaded in the browser after the main source, thus being never loading by the Opal runtime.
+
+
+
+
 ## [1.1.1](https://github.com/opal/opal-rails/compare/v1.1.0...v1.1.1) - 2019-09-14
 
 

data/app/helpers/opal_helper.rb

@@ -10,20 +10,21 @@ module OpalHelper
   end
 
   def javascript_include_tag(*sources)
-    options = sources.extract_options!
+    options = sources.extract_options!.symbolize_keys
+    debug = options[:debug] != false
     skip_loader = options.delete(:skip_opal_loader)
-    skip_onload = options.delete(:force_opal_loader_tag)
+    force_opal_loader_tag = options.delete(:force_opal_loader_tag) || debug
 
-    return super(*sources, options) if skip_loader
+    return super(*sources, options) if skip_loader && !force_opal_loader_tag
 
     script_tags = "".html_safe
     sources.each do |source|
       load_asset_code = Opal::Sprockets.load_asset(source)
       loading_code = "if(window.Opal && Opal.modules[#{source.to_json}]){#{load_asset_code}}"
 
-      if skip_onload
+      if force_opal_loader_tag
         script_tags << super(source, options)
-        script_tags << javascript_tag(loading_code)
+        script_tags << "\n".html_safe + javascript_tag(loading_code)
       else
         script_tags << super(source, options.merge(onload: loading_code))
       end

data/lib/opal/rails/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Rails
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end

data/spec/helpers/opal_helper_spec.rb

@@ -20,17 +20,29 @@ describe OpalHelper, type: :helper do
     # sprockets-rails v3 sets Rails.application.assets to nil in production mode
     allow(Rails.application).to receive(:assets).and_return(nil)
 
-    loading_code = %Q{Opal.require("application");}
+    loading_code = [
+      %<if(window.Opal && Opal.modules["application"]){Opal.loaded(OpalLoaded || []);>,
+      %<Opal.require("application");}>,
+    ].join("\n")
+
     escaped_loading_code = ERB::Util.h loading_code
+    loading_code_in_script_tag = [
+      %(<script>), %(//<![CDATA[), loading_code, %(//]]>), %(</script>),
+    ].join("\n")
+
+    expect(helper.javascript_include_tag('application', debug: true)).to include(loading_code_in_script_tag)
+    expect(helper.javascript_include_tag('application', debug: true)).not_to include(escaped_loading_code)
 
-    expect(helper.javascript_include_tag('application', debug: true)).to  include(escaped_loading_code)
     expect(helper.javascript_include_tag('application', debug: false)).to include(escaped_loading_code)
+    expect(helper.javascript_include_tag('application', debug: false)).not_to include(loading_code_in_script_tag)
+
     expect(helper.javascript_include_tag('application', skip_opal_loader: true)).not_to include(escaped_loading_code)
-    expect(helper.javascript_include_tag('application', skip_opal_loader: true)).not_to include(escaped_loading_code)
+    expect(helper.javascript_include_tag('application', skip_opal_loader: false)).to include(loading_code_in_script_tag)
+
+    expect(helper.javascript_include_tag('application', force_opal_loader_tag: true, debug: true)).to include(loading_code_in_script_tag)
+    expect(helper.javascript_include_tag('application', force_opal_loader_tag: true, debug: false)).to include(loading_code_in_script_tag)
 
-    expect(helper.javascript_include_tag('application', force_opal_loader_tag: true, debug: true)).to  include(loading_code)
-    expect(helper.javascript_include_tag('application', force_opal_loader_tag: true, debug: false)).to include(loading_code)
-    expect(helper.javascript_include_tag('application', force_opal_loader_tag: true, skip_opal_loader: true)).not_to include(loading_code)
-    expect(helper.javascript_include_tag('application', force_opal_loader_tag: true, skip_opal_loader: true)).not_to include(loading_code)
+    expect(helper.javascript_include_tag('application', force_opal_loader_tag: true, skip_opal_loader: true)).not_to include(escaped_loading_code)
+    expect(helper.javascript_include_tag('application', force_opal_loader_tag: true, skip_opal_loader: true)).to include(loading_code_in_script_tag)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Elia Schito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-14 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails