ruby2js 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0090bb89bac67efffe0ea4e840ee9d0aa07980105cf7c0d324ccf7eee632dc7c'
-  data.tar.gz: 9e52633ae1ff273e5573087912ded9169e55b68073c9410f9d42d1a58309ebd2
+  metadata.gz: f47273136ec49d8f88ed491733e632109215fbf3c1079b1e65e6243b0c11f4f5
+  data.tar.gz: bb55f810f8699df80b9d829c7ce0c7fc5928b931325d93e850c65579505d3760
 SHA512:
-  metadata.gz: d0a26c4f408ffeb8d5e5a8542eb2d7cb777c2915b952731efe2ff81ec4c8939aa4f369e61cd0ae6f43f2ab8a52b371853496d3fd796f3a06875220e8dc3a59f4
-  data.tar.gz: 05fe47f9f71f905647c9cbf2d7c0ec14e6712d50d72b2c4ca907a2d3d8bd93abda315afbb580c40a920e9494c9d521d7b48b6977658ecefe299b0170bb776bd4
+  metadata.gz: 5d9f5eb6c027f96ccdb8f5fdab851c25a471c39b7b51b52ff60a525d7647326e1e6df9e24ddbbae6359ddece254bdb87c22ecb03b584ce398303deb606117063
+  data.tar.gz: 7f524070a15ce3ca754fd95d90ffe7be3ea6709529a367f62b06a81cee115745db42b13bec7680f5354de7f88017906d291d428a19f9ddde557a4e6590f911c4

data/README.md

@@ -3,7 +3,6 @@ Ruby2JS
 
 Minimal yet extensible Ruby to JavaScript conversion.  
 
-[![Build Status](https://travis-ci.org/rubys/ruby2js.svg)](https://travis-ci.org/rubys/ruby2js)
 [![Gem Version](https://badge.fury.io/rb/ruby2js.svg)](https://badge.fury.io/rb/ruby2js)
 [![Gitter](https://badges.gitter.im/ruby2js/community.svg)](https://gitter.im/ruby2js/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 

data/lib/ruby2js/version.rb

@@ -2,7 +2,7 @@ module Ruby2JS
   module VERSION #:nodoc:
     MAJOR = 4
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/tasks/install/litelement.rb

@@ -1,11 +1,9 @@
-require_relative './webpack'
-
-run 'yarn add lit-element @ruby2js/webpack-loader'
+@ruby2js_options = {filters: ['lit-element']}
+@yarn_add='lit-element'
+eval IO.read "#{__dir__}/webpacker.rb"
 
 directory File.expand_path("app/javascript/elements", __dir__),
   Rails.root.join('app/javascript/elements').to_s
 
 append_to_file Rails.root.join('app/javascript/packs/application.js').to_s,
   "\nimport 'elements'\n"
-
-webpack_environment 'lit-element'

data/lib/tasks/install/react.rb

@@ -0,0 +1,2 @@
+@ruby2js_options = {filters: ['react']}
+eval IO.read "#{__dir__}/webpacker.rb"

data/lib/tasks/install/stimulus-webpacker.rb

@@ -1,8 +1,5 @@
-require_relative './webpack'
-
-run 'yarn add @ruby2js/webpack-loader'
-
-webpack_environment 'stimulus'
+@ruby2js_options = {filters: ['stimulus'], eslevel: 2022}
+eval IO.read "#{__dir__}/webpacker.rb"
 
 insert_into_file Rails.root.join("app/javascript/controllers/index.js").to_s,
   '(\\.rb)?', after: '_controller\\.js'

data/lib/tasks/install/webpacker.rb

@@ -0,0 +1,97 @@
+#
+# These instructions can be used standalone or in combination with other
+# instructions.
+#
+# If used standalone on a repository which did not previously have the Ruby2JS
+# webpack loader configured, it will add the '.js.rb' extension to
+# `config/webpacker.yml`, install the Ruby2JS webpack-loader and add a minimal
+# configuration which runs the Ruby2JS webpack loader then the babel loader to
+# `config/webpacker.yml`.
+#
+# Other instructions can require these instructions.  If they set the
+# @ruby2js_options instance variable before they do so, the options provided
+# will be merged and/or override the ones in the base configuration.  
+#
+# If these instructions are run against a Rails application that was
+# previously configured, the @ruby2js_options provided, if any, will be merged
+# with the options found in the configuration.
+#
+
+# default options
+options = @ruby2js_options || {}
+
+# define .js.rb as a extension to webpacker
+insert_into_file Rails.root.join("config/webpacker.yml").to_s,
+  "    - .js.rb\n", after: "\n    - .js\n"
+
+# install webpack loader
+run "yarn add @ruby2js/webpack-loader #{@yarn_add}"
+
+# default config
+config = <<~CONFIG
+  // Insert rb2js loader at the end of list
+  environment.loaders.append('rb2js', {
+    test: /\.js\.rb$/,
+    use: [
+      {
+        loader: "babel-loader",
+        options: environment.loaders.get('babel').use[0].options
+      },
+
+      {
+        loader: "@ruby2js/webpack-loader",
+        options: {
+          autoexports: "default",
+          eslevel: 2021,
+          filters: ["esm", "functions"]
+        }
+      },
+    ]
+  })
+CONFIG
+
+# read current configuration
+target = Rails.root.join("config/webpack/environment.js").to_s
+before = IO.read(target)
+
+# extract indentation and options either from the current configuration or the
+# default configuration.
+if before.include? '@ruby2js/webpack-loader'
+  match = /^(\s*)options: (\{.*?\n\1\})/m.match(before)
+else
+  match = /^(\s*)options: (\{.*?\n\1\})/m.match(config)
+end
+
+# evaluate base options.  Here it is handy that Ruby's syntax for hashes is
+# fairly close to JavaScript's object literals.  May run into problems in the
+# future if there ever is a need for {"x": y} as that would need to be
+# {"x" => y} in Ruby.
+base = eval(match[2])
+
+# Merge the options, initially having the new options override the original
+# options.
+merged = base.merge(options)
+
+# Intelligently combine options if they are the same type.
+options.keys.each do |key|
+  next unless base[key]
+
+  if options[key].is_a? Array and base[key].is_a? Array
+    merged[key] = (base[key] + options[key]).uniq
+  elsif options[key].is_a? Numeric and base[key].is_a? Numeric
+    merged[key] = [base[key], options[key]].max
+  elsif options[key].is_a? Hash and base[key].is_a? Hash
+    merged[key] = base[key].merge(options[key])
+  end
+end
+
+# Serialize options as JavaScript, matching original indentation.
+replacement =  Ruby2JS.convert(merged.inspect + "\n").to_s.
+  gsub(/^/, match[1]).strip
+
+# Update configuration
+if before.include? '@ruby2js/webpack-loader'
+  gsub_file target, match[2].to_s, replacement
+else
+  append_to_file target, "\n" + config.sub(match[2], replacement)
+end

data/lib/tasks/ruby2js_tasks.rake

@@ -12,6 +12,12 @@ namespace :ruby2js do
       template 'install/litelement.rb'
     end
 
+    desc "Install Ruby2JS with React support"
+    task :react do
+      template 'install/react.rb'
+      Rake::Task['webpacker:install:react'].invoke
+    end
+
     namespace :stimulus do
       desc "Install Ruby2JS with Stimulus Sprockets support"
       task :sprockets => :"stimulus:install:asset_pipeline" do
@@ -25,3 +31,12 @@ namespace :ruby2js do
     end
   end
 end
+
+namespace :webpacker do
+  namespace :install do
+    desc "Install everything needed for Ruby2JS"
+    task :ruby2js do
+      template 'install/webpacker.rb'
+    end
+  end
+end

data/lib/tasks/testrails.rb

@@ -18,7 +18,7 @@ install = File.basename(source, '.md').gsub('_', ':').gsub('-', '')
 # extract instructions from markdown source
 source = IO.read(source)
 gen = %r{\./bin/rails generate .*}.match(source)
-html = /.*`(.*?)`.*?```html\n(.*?)```/m.match(source)
+html = /.*`(.*?)`.*?```(?:html|erb)\n(.*?)```/m.match(source)
 ruby = /.*`(.*?)`.*?```ruby\n(.*?)```/m.match(source)
 link = %r{<(http://localhost:3000/.*?)>}.match(source)
 

data/lib/tasks/testrails/Gemfile

@@ -38,7 +38,7 @@ group :development do
   gem 'web-console', '>= 4.1.0'
   # Display performance information such as SQL time and flame graphs for each request in your browser.
   # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
-  # gem 'rack-mini-profiler', '~> 2.0'
+  gem 'rack-mini-profiler', '~> 2.0'
   gem 'listen', '~> 3.3'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
@@ -55,5 +55,4 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-gem 'ruby2js', path: "/srv/git/ruby2js", require: 'ruby2js/rails'
-gem 'stimulus-rails'
+gem 'ruby2js', path: "/srv/git/ruby2js", require: 'ruby2js/rails'

data/lib/tasks/testrails/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /srv/git/ruby2js
   specs:
-    ruby2js (4.0.2)
+    ruby2js (4.0.3)
       parser
       regexp_parser (~> 2.1.1)
 
@@ -119,6 +119,8 @@ GEM
       nio4r (~> 2.0)
     racc (1.5.2)
     rack (2.2.3)
+    rack-mini-profiler (2.3.1)
+      rack (>= 1.2.0)
     rack-proxy (0.6.5)
       rack
     rack-test (1.1.0)
@@ -178,8 +180,6 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    stimulus-rails (0.2.3)
-      rails (>= 6.0.0)
     thor (1.1.0)
     tilt (2.0.10)
     turbolinks (5.2.1)
@@ -218,13 +218,13 @@ DEPENDENCIES
   jbuilder (~> 2.7)
   listen (~> 3.3)
   puma (~> 5.0)
+  rack-mini-profiler (~> 2.0)
   rails (~> 6.1.3)
   ruby2js!
   sass-rails (>= 6)
   selenium-webdriver
   spring
   sqlite3 (~> 1.4)
-  stimulus-rails
   turbolinks (~> 5)
   tzinfo-data
   web-console (>= 4.1.0)

data/lib/tasks/testrails/app/assets/config/manifest.js

@@ -1,3 +1,2 @@
 //= link_tree ../images
 //= link_directory ../stylesheets .css
-//= link_tree ../javascripts

data/lib/tasks/testrails/app/assets/stylesheets/{greeter.scss → demo.scss}

@@ -1,3 +1,3 @@
-// Place all the styles related to the Greeter controller here.
+// Place all the styles related to the Demo controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: https://sass-lang.com/

data/lib/tasks/testrails/app/controllers/demo_controller.rb

@@ -0,0 +1,4 @@
+class DemoController < ApplicationController
+  def run
+  end
+end

data/lib/tasks/testrails/app/helpers/demo_helper.rb

@@ -0,0 +1,2 @@
+module DemoHelper
+end

data/lib/tasks/testrails/app/javascript/elements/index.js

@@ -0,0 +1,2 @@
+function importAll(r) { r.keys().forEach(r) }
+importAll(require.context("elements", true, /_elements?\.js(\.rb)?$/))

data/lib/tasks/testrails/app/javascript/elements/my_element_element.js.rb

@@ -0,0 +1,42 @@
+class MyElement < LitElement
+   def self.styles
+    %{
+      p {
+        font-family: Roboto;
+        font-size: 16px;
+        font-weight: 500;
+      }
+      .red {
+        color: red;
+      }
+      .blue {
+        color: blue;
+      }
+    }
+  end
+
+  def initialize
+    @message = 'Hello world! From my-element'
+    @myArray = %w(an array of test data)
+    @myBool = true
+  end
+
+  def render
+    %{
+      <p class="#{@myBool ? 'red' : 'blue'}">styled paragraph</p>
+      <p>#{@message}</p>
+      <ul>#{@myArray.map {|item| "<li>#{item}</li>"}}</ul>
+      #{@myBool ?
+        "<p>Render some HTML if myBool is true</p>" :
+        "<p>Render some other HTML if myBool is false</p>"}
+      <button @click="#{clickHandler}">Click</button>
+    }
+  end
+
+  def clickHandler(event)
+    puts event.target
+    @myBool = !@myBool
+  end
+end
+
+customElements.define('my-element', MyElement)

data/lib/tasks/testrails/app/javascript/packs/application.js

@@ -11,3 +11,5 @@ import "channels"
 Rails.start()
 Turbolinks.start()
 ActiveStorage.start()
+
+import 'elements'

data/lib/tasks/testrails/app/views/demo/run.html.erb

@@ -0,0 +1,3 @@
+<h1>Demo#run</h1>
+<p>Find me in app/views/demo/run.html.erb</p>
+<my-element></my-element>

data/lib/tasks/testrails/app/views/layouts/application.html.erb

@@ -8,7 +8,6 @@
 
     <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
-    <%= stimulus_include_tags %>
   </head>
 
   <body>

data/lib/tasks/testrails/config/credentials.yml.enc

@@ -1 +1 @@
-FGDgL2Xqft6nP/TqDI9zWuTcn5hfVQw131Vgg4k+rtnni9fpWI9lvbZmj1WBwRGQW6h8p66CnajXQNA1s8kIgaacYrci4svDA/H8P0BtPpi+YpNqroBNpQaML1GI9WFk0BP0b/L7FI8Zu25atZQRINqvclEUaPu33b7SsPWnnhCRdgai8d6Gt6C9FNG/YnQl0IGtH39rA2bkp5doR/8N/Lwsi/rE1SVtLQqF1pBX4AybhmnjNaTBBlSqrAywuw7SbglwLijKvkga62grUY1hZEdlHJE76YpyPjUMzk6UR7Ib6De43lsXX69sjfyut7q+SasK0BLUrqPCPLOlGnvrP6kxh7W7W7tuns8ibxvwYzsdLhN9MyeWUvgaMmOmMLvn4CLCK8Gq5uSg2vo4KTVUHs9kdF42pD8EiYKF--uOMXlUkjgBOCUAHc--11od8HmzDXzRSwk1iGUaEw==
+L9biEkkhRbZLcBqshIhB/5vYTTBmdw++mu1cu8xTMRFSWk1KkBI/SGdMwMW7kYQIScL3fWQGOLMWWgLLIl6V2s8GUAjtIoB62kOpvc3/U1XI8GjMB3tIfsUuxwd4PNMnB94TsFTi7pvEcPeC7v0b4KkvGnNAnrX8EcojePevVb3Nf8dr+PIW84rpVmmddw5aiRTfi2ly7QsyLD1yIjZHcK+RIt5zkkOnWkLoKBNDTJnvLgEDs80BV7uX/I5MIio6GEAW4Cnc6oJOZgSGvZ+SlPnOI/UjKFKH+VzTcpwMDCJcV7ubct/x2UzmYLfxScwV5cvMhKyrzzEz+NnT5DowIw0OBsmsyjTXXkXY6EHQTjHFCFhrLiBwB8CxjYMVeDbFLBqgGiy3mjruLiQKmU7pa5N6JBvAPFAzjAxm--7D/1kJUaOTlUhJwu--l7MFThHmm7QFTDL6WbUt2Q==

data/lib/tasks/testrails/config/environments/development.rb

@@ -56,7 +56,7 @@ Rails.application.configure do
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
-  # config.assets.debug = true
+  config.assets.debug = true
 
   # Suppress logger output for asset requests.
   config.assets.quiet = true

data/lib/tasks/testrails/config/master.key

@@ -1 +1 @@
-9fed5b5a663f4148722f6aaa531367b0
+e0771a243b44cdf0f294870c8978ebc5

data/lib/tasks/testrails/config/routes.rb

@@ -1,4 +1,4 @@
 Rails.application.routes.draw do
-  get 'greeter/hello'
+  get 'demo/run'
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
 end

data/lib/tasks/testrails/config/webpack/environment.js

@@ -1,3 +1,23 @@
 const { environment } = require('@rails/webpacker')
 
 module.exports = environment
+
+// Insert rb2js loader at the end of list
+environment.loaders.append('rb2js', {
+  test: /.js.rb$/,
+  use: [
+    {
+      loader: "babel-loader",
+      options: environment.loaders.get('babel').use[0].options
+    },
+
+    {
+      loader: "@ruby2js/webpack-loader",
+      options: {
+        autoexports: "default",
+        eslevel: 2021,
+        filters: ["esm", "functions", "lit-element"]
+      }
+    },
+  ]
+})

data/lib/tasks/testrails/config/webpacker.yml

@@ -35,6 +35,7 @@ default: &default
   extensions:
     - .mjs
     - .js
+    - .js.rb
     - .sass
     - .scss
     - .css

data/lib/tasks/testrails/log/development.log

@@ -1,34 +1,37 @@
-Started GET "/" for 127.0.0.1 at 2021-03-09 12:49:41 -0500
-   (1.0ms)  SELECT sqlite_version(*)
+Started GET "/" for 127.0.0.1 at 2021-03-10 15:16:07 -0500
+   (0.9ms)  SELECT sqlite_version(*)
 Processing by Rails::WelcomeController#index as */*
   Rendering /var/lib/gems/2.7.0/gems/railties-6.1.3/lib/rails/templates/rails/welcome/index.html.erb
-  Rendered /var/lib/gems/2.7.0/gems/railties-6.1.3/lib/rails/templates/rails/welcome/index.html.erb (Duration: 6.4ms | Allocations: 406)
-Completed 200 OK in 18ms (Views: 9.7ms | ActiveRecord: 0.0ms | Allocations: 3683)
+  Rendered /var/lib/gems/2.7.0/gems/railties-6.1.3/lib/rails/templates/rails/welcome/index.html.erb (Duration: 5.6ms | Allocations: 444)
+Completed 200 OK in 17ms (Views: 9.0ms | ActiveRecord: 0.0ms | Allocations: 3689)
 
 
-Started GET "/greeter/hello" for ::1 at 2021-03-09 12:49:42 -0500
-Processing by GreeterController#hello as HTML
+Started GET "/demo/run" for ::1 at 2021-03-10 15:16:08 -0500
+Processing by DemoController#run as HTML
   Rendering layout layouts/application.html.erb
-  Rendering greeter/hello.html.erb within layouts/application
-  Rendered greeter/hello.html.erb within layouts/application (Duration: 1.3ms | Allocations: 84)
+  Rendering demo/run.html.erb within layouts/application
+  Rendered demo/run.html.erb within layouts/application (Duration: 0.9ms | Allocations: 109)
 [Webpacker] Compiling...
 [Webpacker] Compiled all packs in /srv/git/ruby2js/lib/tasks/testrails/public/packs
-[Webpacker] Hash: e332c6419728fac579d5
+[Webpacker] Hash: 79f25e549a8ad9e804d4
 Version: webpack 4.46.0
-Time: 1616ms
-Built at: 03/09/2021 12:49:45 PM
+Time: 3606ms
+Built at: 03/10/2021 3:16:13 PM
                                      Asset       Size       Chunks                         Chunk Names
-    js/application-f826770d917d8a37c1d8.js    125 KiB  application  [emitted] [immutable]  application
-js/application-f826770d917d8a37c1d8.js.map    139 KiB  application  [emitted] [dev]        application
+    js/application-2e05371e63dba85442a3.js    342 KiB  application  [emitted] [immutable]  application
+js/application-2e05371e63dba85442a3.js.map    351 KiB  application  [emitted] [dev]        application
                              manifest.json  364 bytes               [emitted]              
-Entrypoint application = js/application-f826770d917d8a37c1d8.js js/application-f826770d917d8a37c1d8.js.map
+Entrypoint application = js/application-2e05371e63dba85442a3.js js/application-2e05371e63dba85442a3.js.map
 [./app/javascript/channels sync recursive _channel\.js$] ./app/javascript/channels sync _channel\.js$ 160 bytes {application} [built]
 [./app/javascript/channels/index.js] 211 bytes {application} [built]
-[./app/javascript/packs/application.js] 492 bytes {application} [built]
+[./app/javascript/elements sync recursive _elements?\.js(\.rb)?$] ./app/javascript/elements sync _elements?\.js(\.rb)?$ 191 bytes {application} [built]
+[./app/javascript/elements/index.js] 121 bytes {application} [built]
+[./app/javascript/elements/my_element_element.js.rb] 4.83 KiB {application} [optional] [built]
+[./app/javascript/packs/application.js] 511 bytes {application} [built]
 [./node_modules/webpack/buildin/module.js] (webpack)/buildin/module.js 552 bytes {application} [built]
-    + 3 hidden modules
+    + 22 hidden modules
 
-  Rendered layout layouts/application.html.erb (Duration: 3016.1ms | Allocations: 44814)
-Completed 200 OK in 3028ms (Views: 3020.4ms | ActiveRecord: 0.0ms | Allocations: 48630)
+  Rendered layout layouts/application.html.erb (Duration: 4921.3ms | Allocations: 17175)
+Completed 200 OK in 4926ms (Views: 4923.3ms | ActiveRecord: 0.0ms | Allocations: 20916)