opal-rails 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fe52f8b8220d7217cdee145bf089a14e6992c1c187c1a62bba8585433d34081
-  data.tar.gz: 413cd3f385011549dbaa800d3aeb46df5677d0d25e6dfd2e15eedb96f0c58e8c
+  metadata.gz: 49586db0f49f4f31e3e289e1f813275e1b81ab083aa5e771887e5e93bc08b83b
+  data.tar.gz: 02d8db2458c45f4fe2554028571288b2664f8cfc64bba320a62d59a9ea120567
 SHA512:
-  metadata.gz: 87b789a075dd3f62c76e4dae46686ea291a2949a197a03cfd2c38aac96fc19b16c04e0e8903ed406e5aa9e679969a7e7bde793e6e436c54a63a6b12398eb98fd
-  data.tar.gz: 855c4c73ad06af2c8334aaf7db85c886600210349568b9ced0cc9e49bf952dddd4143c7083fbd69e5f5816cf78e448fa86186606daf0012829edda5063aedc8c
+  metadata.gz: ec6e2d6ce3226094ef31bcb2b75a5317b7d0a1e05cb3af627022dfd00697787ad1ed6fdd739cfb485a741685e4cfd8b746d3fb29a1e4a29b6bcc1b6163aef362
+  data.tar.gz: eac8d359fbd8589edd16c7df490a619fe9d2e3a09640ab0d1d14ece16cd5f6d1fa31cb2d82f9bacb8ffe8bf6bf164a565ff72181e89f109f45566992d8a72631

data/.github/workflows/{main.yml → build.yml}

@@ -1,13 +1,20 @@
-name: CI
-on: [push]
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - ci-check
+      - "*/ci-check"
+      - master
 
 jobs:
   build:
     strategy:
       matrix:
-        ruby: ['2.5.x', '2.6.x']
-        rails: ['rails_5_1', 'rails_5_2', 'rails_6_0']
-        opal: ['opal_1_0', 'opal_master']
+        ruby: ['2.5.x', '2.6.x', '2.7.x', '3.0.x']
+        rails: ['rails_6_0', 'rails_6_1']
+        opal: ['opal_1_0', 'opal_1_1']
     runs-on: ubuntu-latest
 
     steps:

data/.gitignore

@@ -1,3 +1,4 @@
+/sandbox
 /.bundle/
 /log/*.log
 /pkg/

data/Appraisals

@@ -7,33 +7,24 @@ ENV['OPAL_VERSION'] = nil # ensure the env is clean
 github = -> repo_name { "https://github.com/#{repo_name}.git" }
 
 {
-
-  opal_master: -> gemfile do
-    gemfile.gem 'opal', git: github['opal/opal'], branch: :master
-    gemfile.gem 'opal-rspec', git: github['opal/opal-rspec'], branch: :master
-    gemfile.gem 'opal-sprockets', git: github['opal/opal-sprockets'], branch: :master
+  opal_1_1: -> gemfile do
+    gemfile.gem 'opal', '~> 1.1.0'
+    gemfile.gem 'opal-sprockets'
   end,
 
   opal_1_0: -> gemfile do
     gemfile.gem 'opal', '~> 1.0.0'
-    gemfile.gem 'opal-rspec', git: github['opal/opal-rspec'], branch: :master
-    gemfile.gem 'opal-jquery', git: github['opal/opal-jquery'], branch: :master
     gemfile.gem 'opal-sprockets'
   end,
 
 }.each do |opal_version, gem_opal|
-  appraise "rails_5_1_#{opal_version}" do
-    gem "rails", "~> 5.1.0"
-    gem_opal[self]
-  end if current_ruby >= ruby_2_4_0
-
-  appraise "rails_5_2_#{opal_version}" do
-    gem "rails", "~> 5.2.0"
-    gem_opal[self]
-  end if current_ruby >= ruby_2_4_0
-
   appraise "rails_6_0_#{opal_version}" do
     gem "rails", "~> 6.0.0"
     gem_opal[self]
   end if current_ruby >= ruby_2_5_0
+
+  appraise "rails_6_1_#{opal_version}" do
+    gem "rails", "~> 6.1.0"
+    gem_opal[self]
+  end if current_ruby >= ruby_2_5_0
 end

data/CHANGELOG.md

@@ -18,7 +18,23 @@ Whitespace conventions:
 - 1 spaces before normal text
  -->
 
+## [2.0](https://github.com/opal/opal-rails/compare/v1.1.2...v2.0.0) - unreleased
 
+*Bumping a major version, since this version will make a number of dependencies opt-in and drop older Rails and Sprockets versions*
+
+### Added
+
+- Added support for Rails v6.1
+- Added a generator for the initial setup (`bin/rails generate opal:install`) that will configure sprockets and create the main `application.js.rb`
+
+### Changed
+
+- Now the template handler will encode/decode local and instance variables with ActiveSupport::JSON
+
+### Removed
+
+- Removed support for Rails 5.x
+- `opal-jquery` and `opal-activesupport` are no longer dependencies of `opal-rails`, if you need them you'll need to require and setup them manually
 
 
 ## [1.1.2](https://github.com/opal/opal-rails/compare/v1.1.1...v1.1.2) - 2019-09-26

data/Gemfile

@@ -2,10 +2,13 @@ source 'https://rubygems.org'
 gemspec
 github = -> repo { "https://github.com/#{repo}.git" }
 
-if ENV['OPAL_VERSION'] == 'master'
+case ENV['OPAL_VERSION']
+when 'local'
+  gem 'opal', path: '../opal'
+  gem 'opal-rspec', path: '../opal-rspec'
+  gem 'opal-sprockets', path: '../opal-sprockets'
+  gem 'pry'
+when 'master'
   gem 'opal', git: github['opal/opal'], branch: :master
-  gem 'opal-rspec', git: github['opal/opal-rspec'], branch: :master
   gem 'opal-sprockets', git: github['opal/opal-sprockets'], branch: :master
 end
-
-gem 'c_lexer'

data/README.md

@@ -8,12 +8,13 @@
 
 _Rails bindings for [Opal](http://opalrb.com). ([Changelog](https://github.com/opal/opal-rails/blob/master/CHANGELOG.md))_
 
-### Looking Webpack support? 👀
+### Looking for Webpack support? 👀
 
 If you want to integrate Opal via Webpack please refer to [opal-webpack-loader](https://github.com/isomorfeus/opal-webpack-loader#installation) installation instructions.
 
 ℹ️ Webpack and ES6 modules are not yet officially supported, but we're working on it thanks to the awesome work done in _opal-webpack-loader_.
 
+
 ## Installation
 
 In your `Gemfile`
@@ -22,10 +23,10 @@ In your `Gemfile`
 gem 'opal-rails'
 ```
 
-or when you build your new Rails app:
+Add `app/assets/javascript` to your asset-pipeline manifest in `app/assets/config/manifest.js`:
 
-```bash
-rails new <app-name> --javascript=opal
+```
+bin/rails opal:install
 ```
 
 
@@ -190,7 +191,6 @@ Of course you need to require `haml-rails` separately since its presence is not
       Element.find('.comments').effect(:fade_in)
     end
   end
-
 ```
 
 
@@ -256,10 +256,34 @@ Opal.use_gem 'cannonbol'
 ```
 
 
+## Contributing
+
+Run the specs:
+
+```
+bin/setup
+bin/rake
+```
+
+Inspect the test app:
+
+```
+bin/rackup
+# visit localhost:9292
+```
+
+Tinker with a sandbox app:
+
+```
+bin/sandbox # will re-create the app
+bin/rails s # will start the sandbox app server
+# visit localhost:3000
+```
+
 
 ## License
 
-© 2012-2019 Elia Schito
+© 2012-2021 Elia Schito
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal

data/bin/rackup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rackup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rack", "rackup")

data/bin/rails

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+if %w[e engine].include? ARGV.first
+  ARGV.shift # remove the first argument
+  exec "#{__dir__}/rails-engine", *ARGV
+else
+  exec "#{__dir__}/rails-sandbox", *ARGV
+end

data/bin/rails-engine

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/opal/rails/engine', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/bin/rails-sandbox

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+app_root = 'sandbox'
+
+unless File.exist? "#{app_root}/bin/rails"
+  warn 'Creating the sandbox app...'
+  Dir.chdir "#{__dir__}/.." do
+    system "#{__dir__}/sandbox" or begin # rubocop:disable Style/AndOr
+      warn 'Automatic creation of the sandbox app failed'
+      exit 1
+    end
+  end
+end
+
+Dir.chdir app_root
+exec 'bin/rails', *ARGV

data/bin/rake

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/bin/sandbox

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+gem_name="$(ruby -rpathname -e"puts Pathname(ARGV.first).join('../..').expand_path.glob('*.gemspec').first.basename('.gemspec')" -- $0)"
+
+# Stay away from the bundler env of the containing extension.
+function unbundled {
+  ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- $@
+}
+
+rm -rf ./sandbox
+unbundled bundle exec rails new sandbox \
+  --skip-bundle \
+  --skip-git \
+  --skip-keeps \
+  --skip-rc \
+  --skip-spring \
+  --skip-test \
+  $@
+
+if [ ! -d "sandbox" ]; then
+  echo 'sandbox rails application failed'
+  exit 1
+fi
+
+cd ./sandbox
+cat <<RUBY >> Gemfile
+gem '$gem_name', path: '..'
+RUBY
+
+unbundled bundle install --gemfile Gemfile
+unbundled bin/rails webpacker:install
+
+
+cd .. # Back to the project root.
+bin/sandbox-setup # Run any custom setup.
+
+echo
+echo "🚀 Sandbox app successfully created for $gem_name!"
+

data/bin/sandbox-setup

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require 'pathname'
+
+root = Pathname('sandbox')
+
+system 'bin/rails opal:install'
+system 'bin/rails g controller home index -f'
+
+root.join('config/routes.rb').write <<~RUBY
+  Rails.application.routes.draw do
+    root to: "home#index"
+  end
+RUBY

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+gem install bundler --conservative
+
+bundle update

data/gemfiles/rails_6_0_opal_1_0.gemfile

@@ -2,11 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "c_lexer"
 gem "rails", "~> 6.0.0"
 gem "opal", "~> 1.0.0"
-gem "opal-rspec", git: "https://github.com/opal/opal-rspec.git", branch: :master
-gem "opal-jquery", git: "https://github.com/opal/opal-jquery.git", branch: :master
 gem "opal-sprockets"
 
 gemspec path: "../"

data/gemfiles/rails_6_0_opal_1_1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+gem "opal", "~> 1.1.0"
+gem "opal-sprockets"
+
+gemspec path: "../"

data/gemfiles/rails_6_1_opal_1_0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.1.0"
+gem "opal", "~> 1.0.0"
+gem "opal-sprockets"
+
+gemspec path: "../"

data/gemfiles/rails_6_1_opal_1_1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.1.0"
+gem "opal", "~> 1.1.0"
+gem "opal-sprockets"
+
+gemspec path: "../"

data/lib/assets/javascripts/opal_ujs.js.rb

@@ -1,4 +1 @@
-require 'jquery'
-require 'jquery_ujs'
-require 'opal'
-require 'opal-jquery'
+warn "`opal_ujs` is deprecated and no longer works"

data/lib/generators/opal/assets/assets_generator.rb

@@ -0,0 +1,7 @@
+class Opal::AssetsGenerator < ::Rails::Generators::NamedBase
+  source_root File.expand_path('templates', __dir__)
+
+  def copy_opal
+    template 'javascript.js.rb', File.join('app/assets/javascripts', class_path, "#{file_name}.js.rb")
+  end
+end

data/lib/generators/opal/install/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Explain the generator
+
+Example:
+    bin/rails generate install Thing
+
+    This will create:
+        what/will/it/create

data/lib/generators/opal/install/install_generator.rb

@@ -0,0 +1,12 @@
+class Opal::InstallGenerator < Rails::Generators::Base
+  source_root File.expand_path('templates', __dir__)
+
+  def configure_sprockets
+    append_to_file 'app/assets/config/manifest.js', '//= link_directory ../javascript .js'
+    template "application.js.rb", "app/assets/javascript/application.js.rb"
+
+    # Add the javascript tag to the application head tag
+    gsub_file 'app/views/layouts/application.html.erb', %r{^( *)</head>},
+      '\1  <%= javascript_include_tag "application", "data-turbolinks-track": "reload" %>\1</head>'
+  end
+end

data/lib/generators/opal/install/templates/application.js.rb

@@ -0,0 +1,12 @@
+require "opal"
+
+# Uncomment the following to print out you're hello-world with Opal:
+#
+#   puts "hello world!"
+#
+# The following will append a hello-world to your <body> element:
+#
+#   require "native"
+#   $$[:document].addEventListener :DOMContentLoaded do
+#     $$[:document][:body][:innerHTML] += '<h2>Hello World!</h2>'
+#   end

data/lib/opal/rails.rb

@@ -1,9 +1,5 @@
 require 'opal'
-require 'opal-jquery'
-require 'opal-activesupport'
 
 require 'opal/rails/engine'
 require 'opal/rails/template_handler'
 require 'opal/rails/version'
-
-require 'jquery-rails'

data/lib/opal/rails/template_handler.rb

@@ -1,3 +1,5 @@
+require 'active_support/json'
+
 module Opal
   module Rails
     class TemplateHandler
@@ -17,11 +19,11 @@ module Opal
           code << 'Object.new.instance_eval {'
 
           if config.assign_locals_in_templates?
-            code << JSON.parse(local_assigns.to_json).map { |key, val| "\#{key} = \#{val.inspect};" }.join
+            code << ActiveSupport::JSON.decode(ActiveSupport::JSON.encode(local_assigns)).map { |key, val| "\#{key} = \#{val.inspect};" }.join
           end
 
           if config.assign_instance_variables_in_templates?
-            code << JSON.parse(@_assigns.to_json).map { |key, val| "@\#{key} = \#{val.inspect};" }.join
+            code << ActiveSupport::JSON.decode(ActiveSupport::JSON.encode(@_assigns)).map { |key, val| "@\#{key} = \#{val.inspect};" }.join
           end
 
           code << #{string}

data/lib/opal/rails/version.rb

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

data/opal-rails.gemspec

@@ -1,41 +1,46 @@
-# coding: utf-8
-$:.push File.expand_path('../lib', __FILE__)
-require 'opal/rails/version'
-
-Gem::Specification.new do |s|
-  s.name        = 'opal-rails'
-  s.version     = Opal::Rails::VERSION
-  s.authors     = ['Elia Schito']
-  s.email       = ['elia@schito.me']
-  s.homepage    = 'https://github.com/opal/opal-rails#readme'
-  s.summary     = %q{Rails bindings for opal JS engine}
-  s.description = %q{Rails bindings for opal JS engine}
-  s.license     = 'MIT-LICENSE'
-
-  s.rubyforge_project = 'opal-rails'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ['lib']
-
-  required_ruby_version = '>= 2.3'
-
-  s.add_dependency 'rails',               '>= 5.1', '< 6.1'
-  s.add_dependency 'sprockets-rails',     '>= 2.3.3', '< 4.0'
-  s.add_dependency 'jquery-rails'
-
-  s.add_dependency 'opal',                '~> 1.0.0'
-  s.add_dependency 'opal-jquery',         '~> 0.4.4'
-  s.add_dependency 'opal-sprockets',      '~> 0.4.6'
-  s.add_dependency 'opal-activesupport',  '>= 0.0.5'
-
-  s.add_development_dependency 'execjs'
-  s.add_development_dependency 'launchy'
-  s.add_development_dependency 'capybara', '~> 3.25'
-  s.add_development_dependency 'apparition'
-  s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'appraisal', '~> 2.1'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'puma'
+# frozen_string_literal: true
+
+require_relative 'lib/opal/rails/version'
+
+Gem::Specification.new do |spec|
+  spec.name        = 'opal-rails'
+  spec.version     = Opal::Rails::VERSION
+  spec.authors     = ['Elia Schito']
+  spec.email       = ['elia@schito.me']
+
+  spec.summary     = %q{Rails bindings for opal JS engine}
+  spec.description = %q{Rails bindings for opal JS engine}
+  spec.homepage    = 'https://github.com/opal/opal-rails#readme'
+  spec.license     = 'MIT-LICENSE'
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/opal/opal-rails#readme'
+  spec.metadata['changelog_uri'] = 'https://github.com/opal/opal-rails/blob/master/CHANGELOG.md'
+
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5')
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
+
+  spec.files = files.grep_v(%r{^(test|spec|features)/})
+  spec.test_files = files.grep(%r{^(test|spec|features)/})
+  spec.bindir = "exe"
+  spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'rails',               '>= 6.0', '< 7'
+  spec.add_dependency 'sprockets-rails',     '>= 3.0'
+
+  spec.add_dependency 'opal',                '~> 1.0'
+  spec.add_dependency 'opal-sprockets',      '~> 1.0'
+
+  spec.add_development_dependency 'execjs'
+  spec.add_development_dependency 'launchy'
+  spec.add_development_dependency 'capybara', '~> 3.25'
+  spec.add_development_dependency 'apparition'
+  spec.add_development_dependency 'rspec-rails'
+  spec.add_development_dependency 'appraisal', '~> 2.1'
+  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'puma'
 end

data/spec/helpers/opal_helper_spec.rb

@@ -1,7 +1,9 @@
 require 'spec_helper'
 
-describe OpalHelper, type: :helper do
-  # subject(:helper) { double(javascript_include_tag: '<super>').extend described_class }
+# We need the view type because helpers specs are to are too minimalistic
+# and are missing some initialization stuff.
+describe OpalHelper, :js, type: :view do
+  let(:helper) { view }
 
   describe '#opal_tag' do
     it 'compiles to js' do
@@ -21,7 +23,7 @@ describe OpalHelper, type: :helper do
     allow(Rails.application).to receive(:assets).and_return(nil)
 
     loading_code = [
-      %<if(window.Opal && Opal.modules["application"]){Opal.loaded(OpalLoaded || []);>,
+      %<if(window.Opal && Opal.modules["application"]){Opal.loaded(typeof(OpalLoaded) === "undefined" ? [] : OpalLoaded);>,
       %<Opal.require("application");}>,
     ].join("\n")
 

data/spec/integration/source_map_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 require 'opal/source_map'
 
 describe Opal::SourceMap do
-  let(:js_asset_path) { '/assets/source_map_example.self.js' }
+  let(:js_asset_path) { '/assets/source_map_example.debug.js' }
 
   before do
     expect(Rails.application.config.opal.source_map_enabled).to be_truthy
@@ -21,13 +21,16 @@ describe Opal::SourceMap do
       Base64.decode64(response.body.lines.last.split(inline_map_prefix, 2)[1])
     else
       source_map_regexp = %r{^//[@#] sourceMappingURL=([^\n]+)}
+
       header_map_path = response.headers['X-SourceMap'].presence
       comment_map_path = response.body.scan(source_map_regexp).flatten.first.to_s.strip.presence
 
-      map_path = header_map_path || comment_map_path
+      map_path = (header_map_path || comment_map_path)&.strip
+
+      get URI.join("http://example.com/", js_asset_path, map_path).path
 
-      get map_path
       expect(response).to be_successful, "url: #{map_path}\nstatus: #{response.status}"
+
       response.body
     end
   end
@@ -36,7 +39,8 @@ describe Opal::SourceMap do
 
   it 'has the source map be there' do
     expect(map).to be_present
-    expect(map[:sources]).to be_present
-    expect(map[:mappings]).to be_present
+    expect(map[:sections].size).to eq(1)
+    expect(map[:sections][0][:map][:sources]).to be_present
+    expect(map[:sections][0][:map][:mappings]).to be_present
   end
 end

data/test_apps/{application_controller.rb → app/application_controller.rb}

@@ -14,7 +14,7 @@ HTML
 
 WITH_ASSIGNMENTS = File.read "#{__dir__}/assets/javascripts/with_assignments.js.rb"
 
-require_relative '../app/helpers/opal_helper'
+require_relative '../../app/helpers/opal_helper'
 
 class ApplicationController < ActionController::Base
   include Rails.application.routes.url_helpers

data/test_apps/app/assets/config/manifest.js

@@ -0,0 +1 @@
+//= link_directory ../javascripts .js

data/test_apps/{assets → app/assets}/javascripts/application.js.rb

@@ -1,6 +1,7 @@
 require 'opal'
 require 'opal_ujs'
 require 'opal-parser'
+require 'json'
 
 require_tree '.'
 `window.opal_loaded = true`

data/test_apps/rails6.rb

@@ -1,6 +1,5 @@
 # FROM: http://www.rubytutorial.io/how-to-test-your-gem-against-multiple-rails/
 
-# test/apps/rails5.rb
 require 'rails'
 require 'rails/all'
 require 'action_view/testing/resolvers'
@@ -37,7 +36,6 @@ module RailsApp
       get '/favicon.ico' => -> { [404,{},[]] }
     end
 
-    config.assets.paths << File.join(__dir__, 'assets/javascripts')
     config.assets.debug = true
     config.assets.digest = true
 
@@ -46,5 +44,5 @@ module RailsApp
   end
 end
 
-require_relative './application_controller'
+require_relative './app/application_controller'
 RailsApp::Application.initialize!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Elia Schito
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,110 +16,62 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: opal-jquery
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: opal-sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.6
-- !ruby/object:Gem::Dependency
-  name: opal-activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +191,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/main.yml"
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".powder"
 - ".rspec"
@@ -249,14 +201,26 @@ files:
 - README.md
 - Rakefile
 - app/helpers/opal_helper.rb
+- bin/rackup
+- bin/rails
+- bin/rails-engine
+- bin/rails-sandbox
+- bin/rake
+- bin/rspec
+- bin/sandbox
+- bin/sandbox-setup
+- bin/setup
 - config.ru
-- gemfiles/rails_5_1_opal_1_0.gemfile
-- gemfiles/rails_5_1_opal_master.gemfile
-- gemfiles/rails_5_2_opal_1_0.gemfile
-- gemfiles/rails_5_2_opal_master.gemfile
 - gemfiles/rails_6_0_opal_1_0.gemfile
-- gemfiles/rails_6_0_opal_master.gemfile
+- gemfiles/rails_6_0_opal_1_1.gemfile
+- gemfiles/rails_6_1_opal_1_0.gemfile
+- gemfiles/rails_6_1_opal_1_1.gemfile
 - lib/assets/javascripts/opal_ujs.js.rb
+- lib/generators/opal/assets/assets_generator.rb
+- lib/generators/opal/assets/templates/javascript.js.rb
+- lib/generators/opal/install/USAGE
+- lib/generators/opal/install/install_generator.rb
+- lib/generators/opal/install/templates/application.js.rb
 - lib/opal-rails.rb
 - lib/opal/rails.rb
 - lib/opal/rails/engine.rb
@@ -264,8 +228,6 @@ files:
 - lib/opal/rails/slim_filter.rb
 - lib/opal/rails/template_handler.rb
 - lib/opal/rails/version.rb
-- lib/rails/generators/opal/assets/assets_generator.rb
-- lib/rails/generators/opal/assets/templates/javascript.js.rb
 - opal-rails.gemspec
 - spec/helpers/opal_helper_spec.rb
 - spec/integration/assigns_spec.rb
@@ -276,19 +238,22 @@ files:
 - spec/support/reset_assets_cache.rb
 - spec/support/reset_config.rb
 - spec/support/test_app.rb
-- test_apps/application_controller.rb
-- test_apps/assets/javascripts/application.js.rb
-- test_apps/assets/javascripts/bar.rb
-- test_apps/assets/javascripts/foo.js.rb
-- test_apps/assets/javascripts/source_map_example.js.rb
-- test_apps/assets/javascripts/with_assignments.js.rb
-- test_apps/rails5.rb
+- test_apps/app/application_controller.rb
+- test_apps/app/assets/config/manifest.js
+- test_apps/app/assets/javascripts/application.js.rb
+- test_apps/app/assets/javascripts/bar.rb
+- test_apps/app/assets/javascripts/foo.js.rb
+- test_apps/app/assets/javascripts/source_map_example.js.rb
+- test_apps/app/assets/javascripts/with_assignments.js.rb
 - test_apps/rails6.rb
 homepage: https://github.com/opal/opal-rails#readme
 licenses:
 - MIT-LICENSE
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/opal/opal-rails#readme
+  source_code_uri: https://github.com/opal/opal-rails#readme
+  changelog_uri: https://github.com/opal/opal-rails/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -296,15 +261,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 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.3
+signing_key:
 specification_version: 4
 summary: Rails bindings for opal JS engine
 test_files:

data/gemfiles/rails_5_1_opal_1_0.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "c_lexer"
-gem "rails", "~> 5.1.0"
-gem "opal", "~> 1.0.0"
-gem "opal-rspec", git: "https://github.com/opal/opal-rspec.git", branch: :master
-gem "opal-jquery", git: "https://github.com/opal/opal-jquery.git", branch: :master
-gem "opal-sprockets"
-
-gemspec path: "../"

data/gemfiles/rails_5_1_opal_master.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "c_lexer"
-gem "rails", "~> 5.1.0"
-gem "opal", git: "https://github.com/opal/opal.git", branch: :master
-gem "opal-rspec", git: "https://github.com/opal/opal-rspec.git", branch: :master
-gem "opal-sprockets", git: "https://github.com/opal/opal-sprockets.git", branch: :master
-
-gemspec path: "../"

data/gemfiles/rails_5_2_opal_1_0.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "c_lexer"
-gem "rails", "~> 5.2.0"
-gem "opal", "~> 1.0.0"
-gem "opal-rspec", git: "https://github.com/opal/opal-rspec.git", branch: :master
-gem "opal-jquery", git: "https://github.com/opal/opal-jquery.git", branch: :master
-gem "opal-sprockets"
-
-gemspec path: "../"

data/gemfiles/rails_5_2_opal_master.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "c_lexer"
-gem "rails", "~> 5.2.0"
-gem "opal", git: "https://github.com/opal/opal.git", branch: :master
-gem "opal-rspec", git: "https://github.com/opal/opal-rspec.git", branch: :master
-gem "opal-sprockets", git: "https://github.com/opal/opal-sprockets.git", branch: :master
-
-gemspec path: "../"

data/gemfiles/rails_6_0_opal_master.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "c_lexer"
-gem "rails", "~> 6.0.0"
-gem "opal", git: "https://github.com/opal/opal.git", branch: :master
-gem "opal-rspec", git: "https://github.com/opal/opal-rspec.git", branch: :master
-gem "opal-sprockets", git: "https://github.com/opal/opal-sprockets.git", branch: :master
-
-gemspec path: "../"

data/lib/rails/generators/opal/assets/assets_generator.rb

@@ -1,12 +0,0 @@
-require 'rails/generators/named_base'
-
-module Opal
-  module Generators
-    class AssetsGenerator < ::Rails::Generators::NamedBase
-      source_root __dir__+'/templates'
-      def copy_opal
-        template 'javascript.js.rb', File.join('app/assets/javascripts', class_path, "#{file_name}.js.rb")
-      end
-    end
-  end
-end

data/test_apps/rails5.rb

@@ -1,50 +0,0 @@
-# FROM: http://www.rubytutorial.io/how-to-test-your-gem-against-multiple-rails/
-
-# test/apps/rails5.rb
-require 'rails'
-require 'rails/all'
-require 'action_view/testing/resolvers'
-
-require 'opal-rails' # our gem
-
-module RailsApp
-  class Application < Rails::Application
-    config.root                                       = __dir__
-    config.cache_classes                              = true
-    config.eager_load                                 = false
-    config.public_file_server.enabled                 = true
-    config.public_file_server.headers                 = { 'Cache-Control' => 'public, max-age=3600' }
-    config.consider_all_requests_local                = true
-    config.action_controller.perform_caching          = false
-    config.action_dispatch.show_exceptions            = false
-    config.action_controller.allow_forgery_protection = false
-    config.active_support.deprecation                 = :stderr
-    config.secret_key_base                            = '49837489qkuweoiuoqwe'
-
-    if config.active_record.sqlite3
-      config.active_record.sqlite3.represent_boolean_as_integer = true
-    end
-
-    config.middleware.delete Rack::Lock
-    config.middleware.delete ActionDispatch::Flash
-
-    routes.append do
-      get '/' => 'application#index'
-      get '/application/with_assignments' => 'application#with_assignments'
-
-      # just to reduce noise
-      get '/apple-touch-icon-precomposed.png' => -> { [404,{},[]] }
-      get '/favicon.ico' => -> { [404,{},[]] }
-    end
-
-    config.assets.paths << File.join(__dir__, 'assets/javascripts')
-    config.assets.debug = true
-    config.assets.digest = true
-
-    # Opal specific:
-    config.opal.source_map_enabled = true
-  end
-end
-
-require_relative './application_controller'
-RailsApp::Application.initialize!