opal-sprockets 0.4.8.1.0.3.7 → 1.0.2

data/spec/sprockets/processor_spec.rb

@@ -1,79 +1,75 @@
 require 'spec_helper'
 require 'opal/sprockets/processor'
 
-describe Opal::Processor do
+describe Opal::Sprockets::Processor do
   let(:pathname) { Pathname("/Code/app/mylib/opal/foo.#{ext}") }
-  let(:environment) { double(Sprockets::Environment,
-    cache: nil,
-    :[] => nil,
-    resolve: pathname.expand_path.to_s,
-    engines: double(keys: %w[.rb .js .opal]),
-  ) }
-  let(:sprockets_context) { double(Sprockets::Context,
-    logical_path: "foo.#{ext}",
-    environment: environment,
-    pathname: pathname,
+  let(:data) { "foo" }
+  let(:input) { {
+    environment: Opal::Sprockets::Environment.new.tap {|e| e.append_path "/Code/app/mylib/opal"},
+    data: data,
     filename: pathname.to_s,
-    root_path: '/Code/app/mylib',
-    is_a?: true,
-  ) }
+    load_path: "/Code/app/mylib/opal",
+    metadata: {},
+    cache: Sprockets::Cache.new
+  } }
+
+  before do
+    allow(Sprockets::SourceMapUtils).to receive(:format_source_map)
+    allow(Sprockets::SourceMapUtils).to receive(:combine_source_maps)
+  end
 
   %w[.rb .opal].each do |ext|
-    let(:ext) { ext }
+    describe %{with extension "#{ext}"} do
+      let(:ext) { ext }
 
-    describe %Q{with extension "#{ext}"} do
       it "is registered for '#{ext}' files" do
-        expect(Sprockets.engines[ext]).to eq(described_class)
+        mime_type = Sprockets.mime_types.find { |_,v| v[:extensions].include? ".rb" }.first
+        transformers = Sprockets.transformers[mime_type]
+        transformer = transformers["application/javascript"]
+        expect(transformer.processors).to include(described_class)
       end
 
-      it "compiles and evaluates the template on #render" do
-        template = described_class.new { |t| "puts 'Hello, World!'\n" }
-        expect(template.render(sprockets_context)).to include('"Hello, World!"')
+      it "compiles the code" do
+        result = described_class.call(input.merge data: "puts 'Hello, World!'\n")
+
+        expect(result[:data]).to include('"Hello, World!"')
       end
-    end
-  end
 
-  describe '.stubbed_files' do
-    around do |e|
-      config.stubbed_files.clear
-      e.run
-      config.stubbed_files.clear
-    end
+      describe '.stubbed_files' do
+        it 'requires non-stubbed files' do
+          result = described_class.call(input.merge(data: 'require "set"'))
 
-    let(:stubbed_file) { 'foo' }
-    let(:template) { described_class.new { |t| "require #{stubbed_file.inspect}" } }
-    let(:config) { Opal::Config }
+          expect(result[:required].first).to include("stdlib/set.rb")
+        end
 
-    it 'usually require files' do
-      expect(sprockets_context).to receive(:require_asset).with(stubbed_file)
-      template.render(sprockets_context)
-    end
+        it 'skips require of stubbed file' do
+          Opal::Config.stubbed_files << 'set'
+          result = described_class.call(input.merge(data: "require 'set'"))
 
-    it 'skips require of stubbed file' do
-      config.stubbed_files << stubbed_file.to_s
-      expect(sprockets_context).not_to receive(:require_asset).with(stubbed_file)
-      template.render(sprockets_context)
-    end
+          expect(result[:required]).not_to include("set.rb")
+        end
 
-    it 'marks a stubbed file as loaded' do
-      config.stubbed_files << stubbed_file.to_s
-      asset = double(dependencies: [], pathname: Pathname('bar'), logical_path: 'bar')
-      allow(environment).to receive(:[]).with('bar.js') { asset }
-      allow(environment).to receive(:engines) { {'.rb' => described_class, '.opal' => described_class} }
+        it 'marks a stubbed file as loaded' do
+          Opal::Config.stubbed_files << 'set'
+          result = described_class.call(input.merge(data: "require 'set'"))
 
-      code = ::Opal::Sprockets.load_asset('bar')
-      expect(code).to match(stubbed_file)
-    end
-  end
+          expect(result[:data]).not_to include(::Opal::Sprockets.load_asset('set'))
+        end
+      end
 
-  describe '.cache_key' do
-    it 'can be reset' do
-      Opal::Config.arity_check_enabled = true
-      old_cache_key = described_class.cache_key
-      Opal::Config.arity_check_enabled = false
-      expect(described_class.cache_key).to eq(old_cache_key)
-      described_class.reset_cache_key!
-      expect(described_class.cache_key).not_to eq(old_cache_key)
+      describe '.cache_key' do
+        it 'can be reset' do
+          old_cache_key = described_class.cache_key
+          Opal::Config.arity_check_enabled = !Opal::Config.arity_check_enabled
+          stale_cache_key = described_class.cache_key
+
+          described_class.reset_cache_key!
+          reset_cache_key = described_class.cache_key
+
+          expect(stale_cache_key).to eq(old_cache_key)
+          expect(reset_cache_key).not_to eq(old_cache_key)
+        end
+      end
     end
   end
 end

data/spec/sprockets/server_spec.rb

@@ -20,60 +20,130 @@ describe Opal::Sprockets::Server do
   end
 
   it 'serves assets with complex sprockets requires' do
-    asset = app.sprockets['complex_sprockets']
+    asset = app.sprockets['complex_sprockets', accept: "application/javascript"]
     expect(asset).to be_truthy
 
-    assets = asset.to_a.map do |sub_asset|
-      sub_asset.logical_path.gsub(/\.self\.js$/, '.js')
+    assets = asset.metadata[:included].map do |sub_asset|
+      URI.parse(sub_asset).path.split(%r'/fixtures/|/stdlib/').last
     end
 
     %w[
-      base64.js
-      no_requires.js
-      jst_file.js
-      required_tree_test/required_file1.js
-      required_tree_test/required_file2.js
+      base64.rb
+      no_requires.rb
+      jst_file.jst.ejs
+      required_tree_test/required_file1.rb
+      required_tree_test/required_file2.rb
       file_with_directives.js
     ].each do |logical_path|
       expect(assets).to include(logical_path)
     end
   end
 
+  it 'recompiles the asset when its dependencies change' do
+    does_include = proc do |it, what, what_not=[], what_else=nil, what_else_not=nil|
+      expect(it).to include what_else if what_else
+      expect(it).not_to include what_else_not if what_else_not
+      what.each { |i| expect(it).to include %{modules["required_tree_test/required_file#{i}"]} }
+      what_not.each { |i| expect(it).not_to include %{modules["required_tree_test/required_file#{i}"]} }
+    end
+
+    ["default", "debug"].each do |pipeline|
+      asset = app.sprockets['require_tree_test', pipeline: pipeline, accept: "application/javascript"]
+      expect(asset).to be_truthy
+      does_include.(asset.to_s, [1,2], [3], nil, "UNIQUESTRING")
+      get "/assets/require_tree_test.#{pipeline}.js"
+      does_include.(last_response.body, [1,2], [3], nil, "UNIQUESTRING")
+
+      sleep 1 # Make sure to modify mtime
+
+      File.write(__dir__+"/../fixtures/required_tree_test/required_file2.rb", "p 'UNIQUESTRING1'")
+
+      asset = app.sprockets['require_tree_test', pipeline: pipeline, accept: "application/javascript"]
+      expect(asset).to be_truthy
+      does_include.(asset.to_s, [1,2], [3], "UNIQUESTRING1")
+      get "/assets/require_tree_test.#{pipeline}.js"
+      does_include.(last_response.body, [1,2], [3], "UNIQUESTRING1")
+
+      sleep 1 # Make sure to modify mtime
+
+      File.write(__dir__+"/../fixtures/required_tree_test/required_file2.rb", "p 'UNIQUESTRING2'")
+
+      asset = app.sprockets['require_tree_test', pipeline: pipeline, accept: "application/javascript"]
+      expect(asset).to be_truthy
+      does_include.(asset.to_s, [1,2], [3], "UNIQUESTRING2")
+      get "/assets/require_tree_test.#{pipeline}.js"
+      does_include.(last_response.body, [1,2], [3], "UNIQUESTRING2")
+
+      sleep 1 # Make sure to modify mtime
+
+      File.write(__dir__+"/../fixtures/required_tree_test/required_file2.rb", "p 'UNIQUESTRING3'")
+      File.write(__dir__+"/../fixtures/required_tree_test/required_file3.rb", "p 3")
+
+      asset = app.sprockets['require_tree_test', pipeline: pipeline, accept: "application/javascript"]
+      expect(asset).to be_truthy
+      does_include.(asset.to_s, [1,2,3], [], "UNIQUESTRING3")
+      get "/assets/require_tree_test.#{pipeline}.js"
+      does_include.(last_response.body, [1,2], [], "UNIQUESTRING3") # fails with 3 - it doesn't get new files
+
+      sleep 1 # Make sure to modify mtime
+    ensure
+      File.write(__dir__+"/../fixtures/required_tree_test/required_file2.rb", "p 2\n")
+      File.unlink(__dir__+"/../fixtures/required_tree_test/required_file3.rb") rescue nil
+    end
+  end
+
   describe 'source maps' do
-    RSpec::Matchers.define :include_inline_source_map do
+    RSpec::Matchers.define :include_source_map do
       match do |actual_response|
         actual_response.ok? &&
-        actual_response.body.lines.last.start_with?('//# sourceMappingURL=data:application/json;base64,')
+        actual_response.body.lines.last.start_with?('//# sourceMappingURL=')
       end
     end
 
-    def extract_inline_map(response)
+    def extract_map(path, response)
       last_line   = response.body.lines.last
-      b64_encoded = last_line.split('//# sourceMappingURL=data:application/json;base64,', 2)[1]
-      json_string = Base64.decode64(b64_encoded)
+      if last_line.start_with? "//# sourceMappingURL=data:application/json;base64,"
+        b64_encoded = last_line.split('//# sourceMappingURL=data:application/json;base64,', 2)[1]
+        json_string = Base64.decode64(b64_encoded)
+      else
+        map_file = last_line.split('//# sourceMappingURL=', 2)[1].chomp
+        map_file = relative_path(path, map_file)
+        map_file = get map_file
+        json_string = map_file.body
+      end
       JSON.parse(json_string, symbolize_names: true)
     end
 
+    def relative_path(path, file)
+      URI.join("http://example.com/", path, file).path
+    end
+
     it 'serves map for a top level file' do
-      get '/assets/opal_file.js'
-      expect(last_response).to include_inline_source_map
+      path = '/assets/opal_file.debug.js'
+      get path
+      expect(last_response).to include_source_map
 
-      map = extract_inline_map(last_response)
+      map = extract_map(path, last_response)
 
-      expect(map[:sources]).to eq(['opal_file.rb']).or eq(['opal_file'])
-      expect(map[:sourcesContent]).to eq(["require 'opal'\nputs 'hi from opal!'\n"])
+      expect(map[:file]).to eq('opal_file.rb')
+      expect(map[:sections].last[:map][:sources]).to eq(['opal_file.source.rb'])
+
+      expect(get(relative_path(path, map[:sections].last[:map][:sources][0])).body.chomp)
+        .to eq("require 'opal'\nputs 'hi from opal!'")
     end
 
     it 'serves map for a subfolder file' do
-      get '/assets/source_map/subfolder/other_file.self.js'
-      expect(last_response).to include_inline_source_map
+      path = '/assets/source_map/subfolder/other_file.debug.js'
+      get path
+      expect(last_response).to include_source_map
+
+      map = extract_map(path, last_response)
 
-      map = extract_inline_map(last_response)
+      expect(map[:file]).to eq('source_map/subfolder/other_file.rb')
+      expect(map[:sections].first[:map][:sources]).to eq(['other_file.source.rb'])
 
-      expect(map[:sources])
-        .to eq(['source_map/subfolder/other_file.rb'])
-        .or eq(['source_map/subfolder/other_file'])
-      expect(map[:sourcesContent]).to eq(["puts 'other!'\n"])
+      expect(get(relative_path(path, map[:sections][0][:map][:sources][0])).body.chomp)
+        .to eq("puts 'other!'")
     end
   end
 end

data/spec/sprockets_spec.rb

@@ -15,7 +15,7 @@ describe Opal::Sprockets 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.loaded(["foo","bar"].concat(typeof(OpalLoaded) === "undefined" ? [] : OpalLoaded));})
       expect(code).to include('Opal.require("baz");')
     end
 
@@ -42,7 +42,7 @@ describe Opal::Sprockets do
     it 'detects deprecated env with multiple names' do
       code = described_class.load_asset('foo', 'bar', env)
       expect(code).to eq([
-        'Opal.loaded(OpalLoaded || []);',
+        'Opal.loaded(typeof(OpalLoaded) === "undefined" ? [] : OpalLoaded);',
         'Opal.require("foo");',
         'Opal.require("bar");',
       ].join("\n"))

data/spec/tilt/opal_spec.rb

@@ -5,7 +5,7 @@ describe Opal::TiltTemplate do
   %w[rb js.rb opal js.opal].each do |ext|
     let(:ext) { ext }
 
-    describe %Q{with extension ".#{ext}"} do
+    describe %{with extension ".#{ext}"} do
       it "is registered for '.#{ext}' files" do
         expect(Tilt["test.#{ext}"]).to be <= described_class
       end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: opal-sprockets
 version: !ruby/object:Gem::Version
-  version: 0.4.8.1.0.3.7
+  version: 1.0.2
 platform: ruby
 authors:
 - Elia Schito
 - Adam Beynon
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2019-09-14 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -17,28 +17,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +115,51 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Sprockets support for Opal.
+- !ruby/object:Gem::Dependency
+  name: ejs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email: elia@schito.me
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
+- bin/console
+- bin/rake
+- bin/rspec
+- bin/setup
 - example/Gemfile
 - example/Gemfile.lock
 - example/app/application.rb
@@ -129,17 +167,20 @@ files:
 - example/config.ru
 - example/index.html.erb
 - lib/opal-sprockets.rb
+- lib/opal/environment.rb
+- lib/opal/processor.rb
 - lib/opal/sprockets.rb
+- lib/opal/sprockets/assets_helper.rb
 - lib/opal/sprockets/environment.rb
 - lib/opal/sprockets/erb.rb
-- lib/opal/sprockets/path_reader.rb
+- lib/opal/sprockets/mime_types.rb
 - lib/opal/sprockets/processor.rb
 - lib/opal/sprockets/server.rb
 - lib/opal/sprockets/version.rb
 - opal-sprockets.gemspec
 - spec/fixtures/complex_sprockets.js.rb.erb
 - spec/fixtures/file_with_directives.js
-- spec/fixtures/jst_file.js.jst
+- spec/fixtures/jst_file.jst.ejs
 - spec/fixtures/no_requires.rb
 - spec/fixtures/opal_file.rb
 - spec/fixtures/require_tree_test.rb
@@ -150,19 +191,20 @@ files:
 - spec/fixtures/source_map/subfolder/other_file.rb
 - spec/fixtures/sprockets_file.js.rb
 - spec/fixtures/sprockets_require_tree_test.rb
-- spec/shared/path_finder_shared.rb
-- spec/shared/path_reader_shared.rb
 - spec/spec_helper.rb
 - spec/sprockets/erb_spec.rb
-- spec/sprockets/path_reader_spec.rb
 - spec/sprockets/processor_spec.rb
 - spec/sprockets/server_spec.rb
 - spec/sprockets_spec.rb
 - spec/tilt/opal_spec.rb
 homepage: https://github.com/opal/opal-sprockets#readme
-licenses: []
-metadata: {}
-post_install_message: 
+licenses:
+- MIT
+metadata:
+  homepage_uri: https://github.com/opal/opal-sprockets#readme
+  source_code_uri: https://github.com/opal/opal-sprockets
+  changelog_uri: https://github.com/opal/opal-sprockets/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,21 +212,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Sprockets support for Opal.
 test_files:
 - spec/fixtures/complex_sprockets.js.rb.erb
 - spec/fixtures/file_with_directives.js
-- spec/fixtures/jst_file.js.jst
+- spec/fixtures/jst_file.jst.ejs
 - spec/fixtures/no_requires.rb
 - spec/fixtures/opal_file.rb
 - spec/fixtures/require_tree_test.rb
@@ -195,11 +240,8 @@ test_files:
 - spec/fixtures/source_map/subfolder/other_file.rb
 - spec/fixtures/sprockets_file.js.rb
 - spec/fixtures/sprockets_require_tree_test.rb
-- spec/shared/path_finder_shared.rb
-- spec/shared/path_reader_shared.rb
 - spec/spec_helper.rb
 - spec/sprockets/erb_spec.rb
-- spec/sprockets/path_reader_spec.rb
 - spec/sprockets/processor_spec.rb
 - spec/sprockets/server_spec.rb
 - spec/sprockets_spec.rb