opal-rails 1.1.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d61bba3aec7f4e72f6415ff750bc0a41af46a8ce59a701c566b8f85fb5468d7
-  data.tar.gz: ce19e5c523a251b03a06ef8b2b322e45238909d6bdb4b6a169bcf8c08e6f8223
+  metadata.gz: aee279d2054d467d1e1c9088a1342fe8d75e7ec2affce2504b61b9b885cdb38b
+  data.tar.gz: 4828f47994349fff41a915fd3e21ea7b83052b3eb1ca5c56d3b09fe77676f22d
 SHA512:
-  metadata.gz: fc73e4fc9f70678e509496a0bb17d05b2da13072b0e1568067a82d5839ee0c5f2054646883eb8506d79a86314b5f1b755a7f5d6dc4f2bee88fbafcb907ceabe4
-  data.tar.gz: 3d653b799aa04cd98e4272df376c62c3df95c29195279e0d734d272166018b84fcd922f490f5cb9a03d6cb6c32174b00bfd4ebf1459a24173db0c17a5b8e665d
+  metadata.gz: 44de5b40a2352e01fe1f830f35a79ffa4509078002bef98689fbd4827ed5e53b34b141155dddd982515debc70b018c1eece879ca2957bcbfc9c81bca9600b764
+  data.tar.gz: 8b89cfd6f4778b746f8977f0bb20729766603b97840b56068bfa3ad04113aa8ac9cd2859616885b226c0252dd4114e00b2053aaee828715cbcd0bf94e49b7e5e

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.7', '3.0'] # ['3.1'] - enable once Rails 7.0.1 is released
+        rails: ['rails_6_0', 'rails_6_1', 'rails_7_0']
+        opal: ['opal_1_0', 'opal_1_3', 'opal_1_4']
     runs-on: ubuntu-latest
 
     steps:
@@ -17,7 +24,7 @@ jobs:
         sudo apt-get install -y sqlite3 libsqlite3-dev
     - uses: actions/checkout@v1
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Install Dependencies

data/.gitignore

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

data/Appraisals

@@ -1,39 +1,40 @@
 current_ruby = Gem::Version.new(RUBY_VERSION)
-ruby_2_4_0 = Gem::Version.new('2.4.0')
 ruby_2_5_0 = Gem::Version.new('2.5.0')
+ruby_2_7_0 = Gem::Version.new('2.7.0')
 
 ENV['OPAL_VERSION'] = nil # ensure the env is clean
 
 github = -> repo_name { "https://github.com/#{repo_name}.git" }
 
 {
+  opal_1_4: -> gemfile do
+    gemfile.gem 'opal', '~> 1.4.0'
+    gemfile.gem 'opal-sprockets'
+  end,
 
-  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_3: -> gemfile do
+    gemfile.gem 'opal', '~> 1.3.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"
+  appraise "rails_6_0_#{opal_version}" do
+    gem "rails", "~> 6.0.0"
     gem_opal[self]
-  end if current_ruby >= ruby_2_4_0
+  end if current_ruby >= ruby_2_5_0
 
-  appraise "rails_5_2_#{opal_version}" do
-    gem "rails", "~> 5.2.0"
+  appraise "rails_6_1_#{opal_version}" do
+    gem "rails", "~> 6.1.0"
     gem_opal[self]
-  end if current_ruby >= ruby_2_4_0
+  end if current_ruby >= ruby_2_5_0
 
-  appraise "rails_6_0_#{opal_version}" do
-    gem "rails", "~> 6.0.0"
+  appraise "rails_7_0_#{opal_version}" do
+    gem "rails", "~> 7.0.0"
     gem_opal[self]
-  end if current_ruby >= ruby_2_5_0
+  end if current_ruby >= ruby_2_7_0
 end

data/CHANGELOG.md

@@ -20,6 +20,55 @@ Whitespace conventions:
 
 
 
+## [2.0.2](https://github.com/opal/opal-rails/compare/v2.0.1...v2.0.2) - 2021-12-29
+
+
+### Added
+
+- Allow Rails 7
+
+
+## [2.0.1](https://github.com/opal/opal-rails/compare/v2.0.0...v2.0.1) - 2021-03-03
+
+
+### Added
+
+- The install generator now will add an `opal.rb` initializer with a default compiler configuration and the template assign support disabled
+
+### Fixed
+
+- The install generator was missing a newline when changing the app layout
+
+
+## [2.0.0](https://github.com/opal/opal-rails/compare/v1.1.2...v2.0.0) - 2021-02-23
+
+*This is a major version, since a number of dependencies are going to be opt-in and support for older Rails
+and Sprockets versions is dropped*
+
+### 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
+
+
+### 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/Gemfile

@@ -2,10 +2,15 @@ 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'
+gem 'net-smtp'

data/README.md

@@ -1,6 +1,6 @@
 # Opal Rails
 
-[![Build Status](https://github.com/opal/opal-rails/workflows/CI/badge.svg)](https://github.com/opal/opal-rails/actions)
+[![Build Status](https://github.com/opal/opal-rails/actions/workflows/build.yml/badge.svg)](https://github.com/opal/opal-rails/actions/workflows/build.yml)
 [![Maintainability](https://api.codeclimate.com/v1/badges/31dda24adcecb836348f/maintainability)](https://codeclimate.com/github/opal/opal-rails/maintainability)
 [![Gem Version](https://badge.fury.io/rb/opal-rails.svg)](http://badge.fury.io/rb/opal-rails)
 ![fun guaranteed](https://img.shields.io/badge/fun-guaranteed-brightgreen.svg)
@@ -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,36 +23,46 @@ 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
 ```
 
 
 ### Configuration
 
-Add your configuration in `config/initializers/assets.rb` with the following contents:
+#### For the compiler
+
+Add your configuration for the compiler:
+
+`config/initializers/opal.rb`
 
 ```ruby
 # Compiler options
-Rails.application.config.opal.method_missing           = true
-Rails.application.config.opal.optimized_operators      = true
-Rails.application.config.opal.arity_check              = !Rails.env.production?
-Rails.application.config.opal.const_missing            = true
+Rails.application.config.opal.method_missing_enabled   = true
+Rails.application.config.opal.const_missing_enabled    = true
+Rails.application.config.opal.arity_check_enabled      = true
+Rails.application.config.opal.freezing_stubs_enabled   = true
 Rails.application.config.opal.dynamic_require_severity = :ignore
+```
+
+Check out the full list of the available configuration options at: [lib/opal/config.rb](https://github.com/opal/opal/blob/master/lib/opal/config.rb).
 
-# Other options
+#### For template assigns
 
-# Send local and instance variables down to the view after converting
-# thier value with `.to_json`
+Add your configuration for rendering assigns when using the template handler from actions:
+
+`config/initializers/opal.rb`
+
+```ruby
 Rails.application.config.opal.assigns_in_templates = true
 Rails.application.config.opal.assigns_in_templates = :locals # only locals
 Rails.application.config.opal.assigns_in_templates = :ivars # only instance variables
 ```
 
-For a full list of the available configuration options for the compiler please refer to: [lib/opal/config.rb](https://github.com/opal/opal/blob/master/lib/opal/config.rb).
 
+Local and instance variables will be sent down to the view after converting their values to JSON.
 
 
 ## Usage
@@ -190,7 +201,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 +266,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/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/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 g 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/config.ru

@@ -2,9 +2,8 @@
 
 require 'bundler/setup'
 require 'rails'
-rails_version = Rails::VERSION::MAJOR
 ENV["RAILS_ENV"] = "test"
 ENV['DATABASE_URL'] = 'sqlite3::memory:'
-require_relative "test_apps/rails#{rails_version}"
+require_relative "test_apps/rails"
 
 run RailsApp::Application

data/gemfiles/rails_6_0_opal_1_0.gemfile

@@ -2,11 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "c_lexer"
+gem "net-smtp"
 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_0_opal_1_3.gemfile

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

data/gemfiles/rails_6_0_opal_1_4.gemfile

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

data/gemfiles/rails_6_1_opal_1_0.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "net-smtp"
+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/gemfiles/rails_6_1_opal_1_3.gemfile

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

data/gemfiles/rails_6_1_opal_1_4.gemfile

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

data/gemfiles/rails_7_0_opal_1_0.gemfile

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