ruby2js 3.5.0 → 3.6.1

data/lib/ruby2js/filter/nokogiri.rb

@@ -7,33 +7,7 @@ module Ruby2JS
       include SEXP
       extend SEXP
 
-      CJS_SETUP = {
-        jsdom: s(:casgn, nil, :JSDOM, 
-          s(:attr, s(:send, nil, :require, s(:str, "jsdom")), :JSDOM))
-      }
-
-      ESM_SETUP = {
-        jsdom: s(:import, ["jsdom"], [s(:attr, nil, :JSDOM)])
-      }
-
-      def initialize(*args)
-        @nokogiri_setup = nil
-        super
-      end
-
-      def process(node)
-        return super if @nokogiri_setup
-        @nokogiri_setup = Set.new
-        result = super
-
-        if @nokogiri_setup.empty?
-          result
-        else
-          setup = @esm ? ESM_SETUP : CJS_SETUP;
-          s(:begin, 
-            *@nokogiri_setup.to_a.map {|token| setup[token]}, result)
-        end
-      end
+      IMPORT_JSDOM = s(:import, ["jsdom"], [s(:attr, nil, :JSDOM)])
 
       def on_send(node)
         target, method, *args = node.children
@@ -55,7 +29,7 @@ module Ruby2JS
           [:HTML, :HTML5].include? method and
           target == s(:const, nil, :Nokogiri)
         then
-          @nokogiri_setup << :jsdom
+          prepend_list << IMPORT_JSDOM
           S(:attr, s(:attr, s(:send, s(:const, nil, :JSDOM), :new,
             *process_all(args)), :window), :document)
 
@@ -65,7 +39,7 @@ module Ruby2JS
           target.children.first == s(:const, nil, :Nokogiri) and
           [:HTML, :HTML5].include? target.children.last
         then
-          @nokogiri_setup << :jsdom
+          prepend_list << IMPORT_JSDOM
           S(:attr, s(:attr, s(:send, s(:const, nil, :JSDOM), :new,
             *process_all(args)), :window), :document)
 
@@ -73,40 +47,40 @@ module Ruby2JS
           method == :at and 
           args.length == 1 and args.first.type == :str
         then
-          S(:send, target, :querySelector, process(args.first))
+          S(:send, process(target), :querySelector, process(args.first))
 
         elsif \
           method == :search and 
           args.length == 1 and args.first.type == :str
         then
-          S(:send, target, :querySelectorAll, process(args.first))
+          S(:send, process(target), :querySelectorAll, process(args.first))
 
         elsif method === :parent and args.length == 0
-          S(:attr, target, :parentNode)
+          S(:attr, process(target), :parentNode)
 
         elsif method === :name and args.length == 0
-          S(:attr, target, :nodeName)
+          S(:attr, process(target), :nodeName)
 
         elsif [:text, :content].include? method and args.length == 0
-          S(:attr, target, :textContent)
+          S(:attr, process(target), :textContent)
 
         elsif method == :content= and args.length == 1
-          S(:send, target, :textContent=, *process_all(args))
+          S(:send, process(target), :textContent=, *process_all(args))
 
         elsif method === :inner_html and args.length == 0
-          S(:attr, target, :innerHTML)
+          S(:attr, process(target), :innerHTML)
 
         elsif method == :inner_html= and args.length == 1
-          S(:send, target, :innerHTML=, *process_all(args))
+          S(:send, process(target), :innerHTML=, *process_all(args))
 
         elsif method === :to_html and args.length == 0
-          S(:attr, target, :outerHTML)
+          S(:attr, process(target), :outerHTML)
 
         elsif \
           [:attr, :get_attribute].include? method and 
           args.length == 1 and args.first.type == :str
         then
-          S(:send, target, :getAttribute, process(args.first))
+          S(:send, process(target), :getAttribute, process(args.first))
 
         elsif \
           [:key?, :has_attribute].include? method and 
@@ -180,14 +154,14 @@ module Ruby2JS
           [:add_next_sibling, :next=, :after].include? method and
           args.length == 1
         then
-          S(:send, s(:attr, target, :parentNode), :insertBefore,
+          S(:send, s(:attr, process(target), :parentNode), :insertBefore,
             process(args.first), s(:attr, target, :nextSibling))
 
         elsif \
           [:add_previous_sibling, :previous=, :before].include? method and
           args.length == 1
         then
-          S(:send, s(:attr, target, :parentNode), :insertBefore,
+          S(:send, s(:attr, process(target), :parentNode), :insertBefore,
             process(args.first), target)
 
         elsif method == :prepend_child and args.length == 1

data/lib/ruby2js/filter/return.rb

@@ -21,6 +21,8 @@ module Ruby2JS
       def on_def(node)
         node = super
         return node unless node.type == :def
+        return node if [:constructor, :initialize].include?(node.children.first)
+
         children = node.children[1..-1]
 
         children[-1] = s(:nil) if children.last == nil

data/lib/ruby2js/filter/securerandom.rb

@@ -0,0 +1,33 @@
+require 'ruby2js'
+require 'set'
+
+# Experimental secure random support
+
+module Ruby2JS
+  module Filter
+    module SecureRandom
+      include SEXP
+      extend SEXP
+
+      IMPORT_BASE62_RANDOM = s(:import, ['base62-random'],
+        s(:attr, nil, :base62_random))
+
+      def on_send(node)
+        target, method, *args = node.children
+
+        if target == s(:const, nil, :SecureRandom)
+          if method == :alphanumeric and args.length == 1
+            prepend_list << IMPORT_BASE62_RANDOM
+            node.updated(nil, [nil, :base62_random, *args])
+          else
+            super
+          end
+        else
+          super
+        end
+      end
+    end
+
+    DEFAULTS.push SecureRandom
+  end
+end

data/lib/ruby2js/filter/vue.rb

@@ -106,6 +106,7 @@ module Ruby2JS
         computed = []
         setters = []
         options = []
+        watch = nil
         el = nil
         mixins = []
 
@@ -205,6 +206,9 @@ module Ruby2JS
                 end
 
                 @vue_h = args.children.first.children.last
+              elsif method == :watch and args.children.length == 0 and block.type == :hash
+                watch = process(block)
+                next
               elsif method == :initialize
                 method = :data
 
@@ -332,6 +336,11 @@ module Ruby2JS
           hash << s(:pair, s(:sym, :computed), s(:hash, *computed))
         end
 
+        # append watch to hash
+        if watch
+          hash << s(:pair, s(:sym, :watch), watch)
+        end
+
         # convert class name to camel case
         cname = cname.children.last
         camel = cname.to_s.gsub(/[^\w]/, '-').

data/lib/ruby2js/rails.rb

@@ -1,6 +1,6 @@
 # Example usage:
 #
-#   $ echo gem 'ruby2js', require: 'ruby2js/rails' > Gemfile
+#   $ echo "gem 'ruby2js', require: 'ruby2js/rails'" >> Gemfile
 #   $ bundle update
 #   $ rails generate controller Say hello
 #   $ echo 'alert "Hello world!"' > app/views/say/hello.js.rb
@@ -13,8 +13,8 @@
 #
 # Asset Pipeline:
 #
-#  Ruby2JS registers ".rbs" (RuBy Script) extension.
-#  You can add "ruby_thing.js.rbs" to your javascript folder
+#  Ruby2JS registers ".rb.js" extension.
+#  You can add "ruby_thing.js.rb" to your app/javascript folder
 #  and '= require ruby_thing' from other js sources.
 #
 #  (options are not yet supported, but by requiring the appropriate files
@@ -26,15 +26,17 @@ module Ruby2JS
     class Template
       cattr_accessor :default_format
       self.default_format = Mime[:js]
-      def self.call(template)
-        "Ruby2JS.convert(#{template.source.inspect}).to_s"
+      def self.call(template, source)
+        "Ruby2JS.convert(#{template.source.inspect}, file: source).to_s"
       end
     end
 
-    ActionView::Template.register_template_handler :rb, Template
+    ActiveSupport.on_load(:action_view) do
+      ActionView::Template.register_template_handler :rb, Template
+    end
 
     class SprocketProcessor
-      def initialize( file)
+      def initialize(file = nil)
         @file = file
       end
       def render(context , _)
@@ -46,10 +48,14 @@ module Ruby2JS
     class Engine < ::Rails::Engine
       engine_name "ruby2js"
 
+      config.app_generators.javascripts true
+      config.app_generators.javascript_engine :rb
+
       config.assets.configure do |env|
-        env.register_engine '.rbs', SprocketProcessor, mime_type: 'text/javascript', silence_deprecation: true
+        env.register_mime_type 'text/ruby', extensions: ['.js.rb', '.rb']
+        env.register_transformer 'text/ruby', 'text/javascript', SprocketProcessor
+        env.register_preprocessor 'text/javascript', SprocketProcessor
       end
-
     end
 
   end

data/lib/ruby2js/serializer.rb

@@ -42,6 +42,7 @@ module Ruby2JS
 
   class Serializer
     attr_reader :timestamps
+    attr_accessor :file_name
 
     def initialize
       @sep = '; '
@@ -56,6 +57,7 @@ module Ruby2JS
       @timestamps = {}
 
       @ast = nil
+      @file_name = ''
     end
 
     def timestamp(file)
@@ -363,7 +365,7 @@ module Ruby2JS
 
       @sourcemap = {
         version: 3,
-        file: @ast.loc.expression.source_buffer.name,
+        file: @file_name,
         sources: sources.map(&:name),
         mappings: @mappings
       }

data/lib/ruby2js/version.rb

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

data/ruby2js.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
-  s.authors = ["Sam Ruby".freeze]
+  s.authors = ["Sam Ruby".freeze, "Jared White".freeze]
   s.description = "    The base package maps Ruby syntax to JavaScript semantics.\n    Filters may be provided to add Ruby-specific or framework specific\n    behavior.\n".freeze
   s.email = "rubys@intertwingly.net".freeze
   s.files = %w(ruby2js.gemspec README.md) + Dir.glob("{lib}/**/*")

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ruby2js
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Sam Ruby
-autorequire:
+- Jared White
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-31 00:00:00.000000000 Z
+date: 2021-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -121,10 +122,10 @@ files:
 - lib/ruby2js/es2021/strict.rb
 - lib/ruby2js/execjs.rb
 - lib/ruby2js/filter.rb
+- lib/ruby2js/filter/active_functions.rb
 - lib/ruby2js/filter/camelCase.rb
 - lib/ruby2js/filter/cjs.rb
 - lib/ruby2js/filter/esm.rb
-- lib/ruby2js/filter/esm_migration.rb
 - lib/ruby2js/filter/functions.rb
 - lib/ruby2js/filter/jquery.rb
 - lib/ruby2js/filter/matchAll.rb
@@ -134,6 +135,7 @@ files:
 - lib/ruby2js/filter/react.rb
 - lib/ruby2js/filter/require.rb
 - lib/ruby2js/filter/return.rb
+- lib/ruby2js/filter/securerandom.rb
 - lib/ruby2js/filter/tagged_templates.rb
 - lib/ruby2js/filter/underscore.rb
 - lib/ruby2js/filter/vue.rb
@@ -149,7 +151,7 @@ homepage: http://github.com/rubys/ruby2js
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -164,8 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Minimal yet extensible Ruby to JavaScript conversion.
 test_files: []

data/lib/ruby2js/filter/esm_migration.rb

@@ -1,72 +0,0 @@
-require 'ruby2js'
-
-module Ruby2JS
-  module Filter
-    module ESMMigration
-      include SEXP
-
-      def initialize(*args)
-        @esm_include = nil
-        super
-      end
-
-      def process(node)
-        return super if @esm_include
-        @esm_include = Set.new
-        @esm_exclude = Set.new
-        @esm_export = nil
-        result = super
-
-        esm_walk(result)
-
-        inventory = (@esm_include - @esm_exclude).to_a.sort
-
-        if inventory.empty? and not @esm_export
-          result
-        else
-          list = inventory.map do |name|
-             if name == "React" and defined? Ruby2JS::Filter::React
-               s(:import, "#{name.downcase}", s(:const, nil, name))
-             elsif not %w(JSON Object).include? name
-               s(:import, "./#{name.downcase}.js", s(:const, nil, name))
-             end
-          end
-
-          list.push result
-
-          if @esm_export
-            list.push s(:export, :default, s(:const, nil, @esm_export))
-          end
-
-          s(:begin, *list.compact)
-        end
-      end
-
-      # gather constants
-      def esm_walk(node)
-        # extract ivars and cvars
-        if node.type == :const and node.children.first == nil
-          @esm_include << node.children.last.to_s
-        elsif node.type == :xnode
-          name = node.children.first
-          @esm_include << name unless name.empty? or name =~ /^[a-z]/
-        elsif node.type == :casgn and node.children.first == nil
-          @esm_exclude << node.children[1].to_s
-        elsif node.type == :class and node.children.first.type == :const
-          if node.children.first.children.first == nil
-            name = node.children.first.children.last.to_s
-            @esm_exclude << name
-            @esm_export ||= name
-          end
-        end
-
-        # recurse
-        node.children.each do |child|
-          esm_walk(child) if Parser::AST::Node === child
-        end
-      end
-    end
-
-    DEFAULTS.push ESMMigration
-  end
-end