opal-sprockets 0.4.4.1.0.3.7 → 0.4.5.1.0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29134bcb2e75192d6c97a28a4d758196b42df277d04acdabbdbc445b58f05236
-  data.tar.gz: 54c92ccd5276b53ebcc7947cbc449419295614202023ccb97159b3b6fb0be0fb
+  metadata.gz: fe4fea42b4e089b7da5235e189941d2882c81e229f4016813ad1c431c1cb0937
+  data.tar.gz: da9543d5252c5ef2c906cf1bb6b6b9cda8fa654d3023800a7398ca39547b3160
 SHA512:
-  metadata.gz: b4d3288b3215ef08ca4c099c8ec16c06c97c2f8e20a30aa5e495e4183bb7ba0d9002a53de46ec9c0f576e826c3c06522477d353f602b6256b20f81f5151127a5
-  data.tar.gz: bb1cdf3ab5d589a609abb883e634fa61d457d93c461db889bd554065b28681a7c77f26bf9d036ee6e52e46b01093c31a52b3d7fdb0be8ca54675c3f9534debaa
+  metadata.gz: 86f846edd06ce32281a77233b7a160f2ff4ae197fd4b974fc7f58d551a68a84e27d93e693cdeb06f416b5620c459503b2cc2fca305f603ec28ee1afe96a61ca8
+  data.tar.gz: f8f35614551b30c6b9e49b0566cd61fb653860196c904a8b4c7b4d7b28fc3bca1f0b1068435e1cfa68fa87d6265b74928addef1effe8df66a909742d78e98778

data/.travis.yml

@@ -8,27 +8,14 @@ branches:
 
 matrix:
   include:
-    - rvm: 2.1.10
-      env: RACK_VERSION='< 2.0.0' SPROCKETS_VERSION='~> 3.4.1'
-    - rvm: 2.2.10
-      env: SPROCKETS_VERSION='~> 3.5.2'
-    - rvm: 2.3.7
-      env: SPROCKETS_VERSION='~> 3.6.3'
-    - rvm: 2.4.4
-      env: SPROCKETS_VERSION='~> 3.7.1'
-    - rvm: 2.5.1
-      env: SPROCKETS_VERSION='~> 3.7.1'
-
-    - rvm: 2.1.10
-      env: OPAL_VERSION='~> 0.11.3' RACK_VERSION='< 2.0.0' SPROCKETS_VERSION='~> 3.4.1'
-    - rvm: 2.2.10
-      env: OPAL_VERSION='~> 0.11.3' SPROCKETS_VERSION='~> 3.5.2'
-    - rvm: 2.3.7
-      env: OPAL_VERSION='~> 0.11.3' SPROCKETS_VERSION='~> 3.6.3'
-    - rvm: 2.4.4
-      env: OPAL_VERSION='~> 0.11.3' SPROCKETS_VERSION='~> 3.7.1'
-    - rvm: 2.5.1
-      env: OPAL_VERSION='~> 0.11.3' SPROCKETS_VERSION='~> 3.7.1'
+    - rvm: 2.3
+      env: OPAL_VERSION='~> 1.0.0'
+    - rvm: 2.4
+      env: OPAL_VERSION='~> 1.0.0'
+    - rvm: 2.5
+      env: OPAL_VERSION='~> 1.0.0'
+    - rvm: 2.6
+      env: OPAL_VERSION='~> 1.0.0'
 
 notifications:
   irc: "irc.freenode.org#opal"

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v0.4.5](https://github.com/opal/opal-sprockets/compare/v0.4.4.1.0.3.7...v0.4.5.1.0.3.7)
+
+*25 May 2019*
+
+- Opal is now loaded as part of the bootstrap process instead of being marked as preloaded by the processor
+- Simplified code for loading-related scripts
+
+
 ## [v0.4.4](https://github.com/opal/opal-sprockets/compare/v0.4.3.0.11.0.3.7...v0.4.4.1.0.3.7)
 
 *12 May 2019*

data/example/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'opal', '~> 0.11.0'
-gem 'opal-sprockets'
+require_relative "../lib/opal/sprockets/version.rb"
+gem 'opal', "~> #{Opal::Sprockets::OPAL_VERSION}"
+gem 'opal-sprockets', path: '..'

data/example/Gemfile.lock

@@ -1,22 +1,22 @@
+PATH
+  remote: ..
+  specs:
+    opal-sprockets (0.4.4.1.0.3.7)
+      opal (~> 1.0.0)
+      sprockets (~> 3.7)
+      tilt (>= 1.4)
+
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
-    concurrent-ruby (1.1.4)
-    hike (1.2.3)
-    opal (0.11.4)
+    concurrent-ruby (1.1.5)
+    opal (1.0.0)
       ast (>= 2.3.0)
-      hike (~> 1.2)
-      parser (= 2.3.3.1)
-      sourcemap (~> 0.1.0)
-    opal-sprockets (0.4.2.0.11.0.3.1)
-      opal (~> 0.11.0)
-      sprockets (~> 3.1)
-      tilt (>= 1.4)
-    parser (2.3.3.1)
-      ast (~> 2.2)
-    rack (2.0.6)
-    sourcemap (0.1.1)
+      parser (= 2.5.3.0)
+    parser (2.5.3.0)
+      ast (~> 2.4.0)
+    rack (2.0.7)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -26,8 +26,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  opal (~> 0.11.0)
-  opal-sprockets
+  opal (~> 1.0.0)
+  opal-sprockets!
 
 BUNDLED WITH
    1.17.3

data/lib/opal/sprockets.rb

@@ -14,31 +14,40 @@ module Opal
     #
     # @example Will output the following JavaScript:
     #
-    #   if (typeof(Opal) !== 'undefined') {
-    #     Opal.loaded("opal");
-    #     Opal.loaded("jquery.self");
-    #     Opal.load("application");
-    #   }
+    #   Opal.loaded("jquery.self", "yet_another_carousel.self");
+    #   Opal.load("opal", "application");
     #
     # @param name [String] The logical name of the main asset to be loaded (without extension)
     #
     # @return [String] JavaScript code
-    def self.load_asset(name, _sprockets = :deprecated)
-      if _sprockets != :deprecated && !@load_asset_warning_displayed
-        @load_asset_warning_displayed = true
-        warn "Passing a sprockets environment to Opal::Sprockets.load_asset no more needed.\n  #{caller(1, 3).join("\n  ")}"
+    def self.load_asset(*names)
+      if names.last.is_a?(::Sprockets::Environment)
+        unless @load_asset_warning_displayed
+          @load_asset_warning_displayed = true
+          warn "Passing a sprockets environment to Opal::Sprockets.load_asset no more needed.\n  #{caller(1, 3).join("\n  ")}"
+        end
+        names.pop
       end
 
-      name = name.sub(/(\.(js|rb|opal))*\z/, '')
-      stubbed_files     = ::Opal::Config.stubbed_files
+      names = names.map { |name| name.sub(/(\.(js|rb|opal))*\z/, '') }
+      stubbed = ::Opal::Config.stubbed_files.to_a
+
+      loaded = 'OpalLoaded || []'
+      loaded = "#{stubbed.to_json}.concat(#{loaded})" if stubbed.any?
 
-      loaded = ['opal', 'corelib/runtime'] + stubbed_files.to_a
+      [
+        "Opal.loaded(#{loaded});",
+        *names.map { |name| "Opal.load(#{name.to_json});" }
+      ].join("\n")
+    end
 
-      "if (typeof(Opal) !== 'undefined') { "\
-        "Opal.loaded(#{loaded.to_json}); "\
-        "if (typeof(OpalLoaded) !== 'undefined') Opal.loaded(OpalLoaded); "\
-        "if (Opal.modules[#{name.to_json}]) Opal.load(#{name.to_json}); "\
-      "}"
+    # Mark an asset as already loaded.
+    # This is useful for requiring JavaScript files which are not managed by Opal's laoding system.
+    #
+    # @param [String] name The "logical name" of the asset
+    # @return [String] JavaScript code
+    def self.loaded_asset(name)
+      %{if (typeof(OpalLoaded) === 'undefined') OpalLoaded = []; OpalLoaded.push(#{name.to_json});}
     end
 
     # Generate a `<script>` tag for Opal assets.
@@ -70,7 +79,7 @@ module Opal
         scripts << %{<script src="#{prefix}/#{name}.js"></script>}
       end
 
-      scripts << %{<script>#{::Opal::Sprockets.load_asset(name)}</script>}
+      scripts << %{<script>#{load_asset('opal', name)}</script>}
 
       scripts.join "\n"
     end

data/lib/opal/sprockets/processor.rb

@@ -32,14 +32,6 @@ module Opal
 
       compiler_options = self.compiler_options.merge(file: logical_path)
 
-      # Opal will be loaded immediately to as the runtime redefines some crucial
-      # methods such that need to be implemented as soon as possible:
-      #
-      # E.g. It forwards .toString() to .$to_s() for Opal objects including Array.
-      #      If .$to_s() is not implemented and some other lib is loaded before
-      #      corelib/* .toString results in an `undefined is not a function` error.
-      compiler_options.merge!(requirable: false) if logical_path == 'opal'
-
       compiler = Compiler.new(data, compiler_options)
       result = compiler.compile
 
@@ -165,10 +157,7 @@ module Opal::Sprockets::Processor
       if processed_by_opal[asset]
         input[:data]
       else
-        [
-          input[:data],
-          %{if (typeof(OpalLoaded) === 'undefined') OpalLoaded = []; OpalLoaded.push(#{input[:name].to_json});}
-        ].join(";\n")
+        "#{input[:data]}\n#{Opal::Sprockets.loaded_asset(input[:name])}"
       end
     end
   end

data/lib/opal/sprockets/version.rb

@@ -1,6 +1,6 @@
 module Opal
   module Sprockets
-    BASE_VERSION = '0.4.4'
+    BASE_VERSION = '0.4.5'
     OPAL_VERSION = '1.0.0'
     SPROCKETS_VERSION = '3.7'
 

data/spec/sprockets_spec.rb

@@ -11,22 +11,42 @@ describe Opal::Sprockets do
       expect(code).to include('Opal.load("console");')
     end
 
-    it 'marks as loaded "opal" plus all non opal assets' do
-      code = described_class.load_asset('corelib/runtime')
-      expect(code).to include('Opal.loaded(["opal","corelib/runtime"]);')
+    it 'marks as loaded stubs and all non-opal assets' do
+      allow(Opal::Config).to receive(:stubbed_files) { %w[foo bar] }
+
+      code = described_class.load_asset('baz')
+      expect(code).to include('Opal.loaded(["foo","bar"].concat(OpalLoaded || []));')
+      expect(code).to include('Opal.load("baz");')
     end
 
     it 'tries to load an asset if it is registered as opal module' do
       code = described_class.load_asset('foo')
-      expect(code).to include('if (Opal.modules["foo"]) Opal.load("foo");')
+      expect(code).to include('Opal.load("foo");')
+    end
+
+    it 'warns the user that passing an env is not needed, only once' do
+      expect(described_class).to receive(:warn).once
+      described_class.load_asset('foo', env)
+      described_class.load_asset('foo', env)
+      described_class.load_asset('foo', env)
+      described_class.load_asset('foo', 'bar', env)
+      described_class.load_asset('foo', 'bar', env)
     end
-  end
 
-  it 'warns the user that passing an env is not needed, only once' do
-    expect(described_class).to receive(:warn).once
-    described_class.load_asset('foo', env)
-    described_class.load_asset('foo', env)
-    described_class.load_asset('foo', env)
+    it 'accepts multiple names' do
+      code = described_class.load_asset('foo', 'bar')
+      expect(code).to include('Opal.load("foo");')
+      expect(code).to include('Opal.load("bar");')
+    end
+
+    it 'detects deprecated env with multiple names' do
+      code = described_class.load_asset('foo', 'bar', env)
+      expect(code).to eq([
+        'Opal.loaded(OpalLoaded || []);',
+        'Opal.load("foo");',
+        'Opal.load("bar");',
+      ].join("\n"))
+    end
   end
 
   describe '.javascript_include_tag' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-sprockets
 version: !ruby/object:Gem::Version
-  version: 0.4.4.1.0.3.7
+  version: 0.4.5.1.0.3.7
 platform: ruby
 authors:
 - Elia Schito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-12 00:00:00.000000000 Z
+date: 2019-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets