ruby2js 4.0.2 → 4.1.1

data/lib/ruby2js/filter/tagged_templates.rb

@@ -15,17 +15,19 @@ module Ruby2JS
 
         tagged_methods = @options[:template_literal_tags] || [:html, :css]
 
-        if tagged_methods.include?(method) && !args.empty?
+        if tagged_methods.include?(method) && args.length == 1
           strnode = process args.first
           if strnode.type == :str
             # convert regular strings to literal strings
             strnode = strnode.updated(:dstr, [s(:str, strnode.children.first.chomp("\n"))])
-          else
+          elsif strnode.type == :dstr
             # for literal strings, chomp a newline off the end
             if strnode.children.last.type == :str && strnode.children.last.children[0].end_with?("\n")
              children = [*strnode.children.take(strnode.children.length - 1), s(:str, strnode.children.last.children[0].chomp)]
              strnode = s(:dstr, *children)
             end
+          else
+            return super
           end
 
           S(:taglit, s(:sym, method), strnode)

data/lib/ruby2js/rails.rb

@@ -0,0 +1,10 @@
+require 'rails'
+require_relative './sprockets'
+
+class Ruby2JSRailtie < Rails::Railtie
+  rake_tasks do
+    Dir[File.expand_path('../tasks/*.rake', __dir__)].each do |file|
+      load file
+    end
+  end
+end

data/lib/ruby2js/version.rb

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

data/lib/tasks/README.md

@@ -0,0 +1,4 @@
+This directory contains rails install tasks and a test program which will run
+the rails examples from the docs/src/_examples/rails directory.
+
+run `./testrails.rb` for usage instructions.

data/lib/tasks/install/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/install/config/webpack/loaders/ruby2js.js

@@ -0,0 +1,20 @@
+const { environment } = require('@rails/webpacker')
+
+module.exports = {
+  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"]
+      }
+    }
+  ]
+}

data/lib/tasks/install/litelement.rb

@@ -0,0 +1,9 @@
+@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"

data/lib/tasks/install/preact.rb

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

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-sprockets.rb

@@ -0,0 +1,32 @@
+create_file Rails.root.join('config/initializers/ruby2js.rb').to_s,
+  <<~CONFIG
+    require 'ruby2js/filter/esm'
+    require 'ruby2js/filter/functions'
+    require 'ruby2js/filter/stimulus'
+
+    Ruby2JS::SprocketsTransformer.options = {
+      autoexports: :default,
+      eslevel: 2020
+    }
+
+    require 'stimulus/importmap_helper'
+
+    module Stimulus::ImportmapHelper
+      def find_javascript_files_in_tree(path)
+         exts = {'.js' => '.js', '.jsm' => '.jsm'}.merge(
+           Sprockets.mime_exts.map {|key, value|
+             next unless Sprockets.transformers[value]["application/javascript"]
+             [key, '.js']
+           }.compact.to_h)
+
+         Dir[path.join('**/*')].map {|file|
+           file_ext, web_ext = Sprockets::PathUtils.match_path_extname(file, exts)
+           next unless file_ext
+
+           next unless File.file? file
+
+           Pathname.new(file.chomp(file_ext) + web_ext)
+         }.compact
+      end
+    end
+  CONFIG

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

@@ -0,0 +1,5 @@
+@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,80 @@
+#
+# 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}"
+
+target = Rails.root.join("config/webpack/loaders/ruby2js.js").to_s
+
+# default config
+if not File.exist? target
+  # may be called via eval, or directly.  Resolve source either way.
+  source_paths.unshift __dir__
+  source_paths.unshift File.dirname(caller.first)
+  directory "config/webpack/loaders", File.dirname(target)
+end
+
+# load config
+insert_into_file Rails.root.join("config/webpack/environment.js").to_s,
+  "environment.loaders.prepend('ruby2js', require('./loaders/ruby2js'))\n"
+
+# read current configuration
+before = IO.read(target)
+
+# extract indentation and options
+match = /^(\s*)options: (\{.*?\n\1\})/m.match(before)
+
+# 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
+unless before.include? replacement
+  gsub_file target, match[2].to_s, replacement
+end

data/lib/tasks/nodetest.js

@@ -0,0 +1,47 @@
+// minimal sanity test to verify usage of Ruby2JS under Node
+
+const assert = require('assert');
+
+const Ruby2JS = require('@ruby2js/ruby2js');
+// const Ruby2JS =
+// require('/home/rubys/git/ruby2js/docs/src/demo/ruby2js.js');
+
+function to_js(string, options={}) {
+  return Ruby2JS.convert(string, options).toString()
+}
+
+assert.strictEqual(
+  to_js('foo = 1'),
+  'var foo = 1');
+
+assert.strictEqual(
+  to_js('foo = 1', {eslevel: 2015}),
+  'let foo = 1');
+
+assert.strictEqual(
+  to_js('foo.empty?', {filters: ['functions']}),
+  'foo.length == 0');
+
+let ast = Ruby2JS.convert('String', {file: 'a.rb'}).ast
+assert.strictEqual(ast.constructor, Ruby2JS.AST.Node)
+assert.strictEqual(ast.type, "const")
+assert.strictEqual(ast.children.length, 2)
+assert.strictEqual(ast.children[0], Ruby2JS.nil)
+assert.strictEqual(ast.children[1], "String")
+
+let sourcemap = Ruby2JS.convert('a=1', {file: 'a.rb'}).sourcemap
+assert.strictEqual(sourcemap.version, 3)
+assert.strictEqual(sourcemap.file, 'a.rb')
+assert.strictEqual(sourcemap.sources.length, 1)
+assert.strictEqual(sourcemap.sources[0], 'a.rb')
+assert.strictEqual(sourcemap.mappings, 'QAAE')
+
+console.log(to_js(`
+class C < LitElement
+  def render
+    x.empty?
+    '<h1>title</h1>'
+  end
+end
+
+`, {eslevel: 2020, filters: ['lit-element', 'esm', 'functions']}))

data/lib/tasks/ruby2js_tasks.rake

@@ -0,0 +1,47 @@
+Thor::Actions::WARNINGS[:unchanged_no_flag] = 'unchanged'
+
+def template(location)
+  system "#{RbConfig.ruby} #{Rails.root.join("bin")}/rails app:template " + 
+    "LOCATION=#{File.expand_path(location, __dir__)}"
+end
+
+namespace :ruby2js do
+  namespace :install do
+    desc "Install Ruby2JS with LitElement support"
+    task :litelement do
+      template 'install/litelement.rb'
+    end
+
+    desc "Install Ruby2JS with Preact support"
+    task :preact do
+      template 'install/preact.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
+        template 'install/stimulus-sprockets.rb'
+      end
+
+      desc "Install Ruby2JS with Stimulus Webpacker support"
+      task :webpacker => :"stimulus:install" do
+        template 'install/stimulus-webpacker.rb'
+      end
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.1.1
 platform: ruby
 authors:
 - Sam Ruby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -135,6 +135,7 @@ files:
 - lib/ruby2js/filter/functions.rb
 - lib/ruby2js/filter/jquery.rb
 - lib/ruby2js/filter/jsx.rb
+- lib/ruby2js/filter/lit-element.rb
 - lib/ruby2js/filter/matchAll.rb
 - lib/ruby2js/filter/minitest-jasmine.rb
 - lib/ruby2js/filter/node.rb
@@ -150,11 +151,23 @@ files:
 - lib/ruby2js/haml.rb
 - lib/ruby2js/jsx.rb
 - lib/ruby2js/namespace.rb
+- lib/ruby2js/rails.rb
 - lib/ruby2js/serializer.rb
 - lib/ruby2js/sinatra.rb
 - lib/ruby2js/sprockets.rb
 - lib/ruby2js/strict.rb
 - lib/ruby2js/version.rb
+- lib/tasks/README.md
+- lib/tasks/install/app/javascript/elements/index.js
+- lib/tasks/install/config/webpack/loaders/ruby2js.js
+- lib/tasks/install/litelement.rb
+- lib/tasks/install/preact.rb
+- lib/tasks/install/react.rb
+- lib/tasks/install/stimulus-sprockets.rb
+- lib/tasks/install/stimulus-webpacker.rb
+- lib/tasks/install/webpacker.rb
+- lib/tasks/nodetest.js
+- lib/tasks/ruby2js_tasks.rake
 - ruby2js.gemspec
 homepage: http://github.com/rubys/ruby2js
 licenses: