tapioca 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbb47e890388bfea9f9413a20cc6768d16175f9b962291d04d35eaaf3e94e109
-  data.tar.gz: eb041465b3237e6f87872c1aeaf172fb0c28ebb445f1855f837dd1759888362f
+  metadata.gz: 81caba98bdbde19ffbb78a1860f994a8b5c39a82dcd48832ce0daabcd9f6d77b
+  data.tar.gz: 803fe5c9b0ac3838f984455adf53fd2a470e13a877ea218d80bb74b2c309afbe
 SHA512:
-  metadata.gz: 703f76a6df75973603aebc4e2589a81d124b98196372dccc170da3e720dd02676749a6439e9538862a327945b182f71f826beecd1b9b99d032c4e6067b9afb66
-  data.tar.gz: 7a86ffe6ef50693f8f22fdc9bd4c853b0d7d5d4296d85f6ba7e0207471f6a1654d561f9a97a148e48e8bec80559c0c68c9afd95374e1b5a40ec2785172e7e43c
+  metadata.gz: 75c2b49c410a6b9f558470a5ab6b59f464b41e4b03a88344fd8967d06e3b36b8b29669bd92c8103d106e234a91fb4ead51d617a365059342e03542cfe113c497
+  data.tar.gz: 4261f1657b92a65ba119f95e1e9be3211af056fe2ba5a5b225b0d920a2adda1fd7619d9e21bb8e034c3946b4cb931d8ef45beebd3bb429c2c5d8446bce09efa8

data/lib/tapioca/compilers/symbol_table/symbol_generator.rb

@@ -177,6 +177,7 @@ module Tapioca
 
             [
               compile_mixins(constant),
+              compile_mixes_in_class_methods(constant),
               methods,
             ].select { |b| b != "" }.join("\n\n")
           end
@@ -309,17 +310,61 @@ module Tapioca
               indented("extend(#{qualified_name_of(mod)})")
             end
 
-          mixes_class_methods = extend
-            .select do |mod|
-              qualified_name_of(mod) == "::ActiveSupport::Concern" &&
-                Module === resolve_constant("#{name_of(constant)}::ClassMethods")
+          (prepends + includes + extends).join("\n")
+        end
+
+        sig { params(constant: Module).returns(String) }
+        def compile_mixes_in_class_methods(constant)
+          return "" if constant.is_a?(Class)
+
+          mixins_from_modules = {}
+
+          Class.new do
+            # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
+            def method_missing(symbol, *args)
+            end
+
+            define_singleton_method(:include) do |mod|
+              before = singleton_class.ancestors
+              super(mod).tap do
+                mixins_from_modules[mod] = singleton_class.ancestors - before
+              end
             end
-            .first(1)
-            .flat_map do
-              ["", indented("mixes_in_class_methods(ClassMethods)")]
+
+            class << self
+              def method_missing(symbol, *args)
+              end
             end
+            # rubocop:enable Style/MethodMissingSuper, Style/MissingRespondToMissing
+          end.include(constant)
+
+          all_dynamic_extends = mixins_from_modules.delete(constant)
+          all_dynamic_includes = mixins_from_modules.keys
+          dynamic_extends_from_dynamic_includes = mixins_from_modules.values.flatten
+          dynamic_extends = all_dynamic_extends - dynamic_extends_from_dynamic_includes
 
-          (prepends + includes + extends + mixes_class_methods).join("\n")
+          result = all_dynamic_includes
+            .select { |mod| (name = name_of(mod)) && !name.start_with?("T::") }
+            .select(&method(:public_module?))
+            .map do |mod|
+              indented("include(#{qualified_name_of(mod)})")
+            end.join("\n")
+
+          mixed_in_module = dynamic_extends.find do |mod|
+            mod != constant && public_module?(mod)
+          end
+
+          return result if mixed_in_module.nil?
+
+          qualified_name = qualified_name_of(mixed_in_module)
+          return result if qualified_name == ""
+
+          [
+            result,
+            indented("mixes_in_class_methods(#{qualified_name})"),
+          ].select { |b| b != "" }.join("\n\n")
+        rescue
+          ""
         end
 
         sig { params(name: String, constant: Module).returns(T.nilable(String)) }
@@ -392,9 +437,12 @@ module Tapioca
           parameters = params.map do |(type, name)|
             name ||= :_
 
+            # Sanitize param names
+            name = name.to_s.gsub(/[^a-zA-Z0-9_]/, '_')
+
             case type
             when :req
-              name.to_s
+              name
             when :opt
               "#{name} = _"
             when :rest

data/lib/tapioca/compilers/symbol_table/symbol_loader.rb

@@ -33,7 +33,7 @@ module Tapioca
               file.write(Array(paths).join("\n"))
               file.flush
 
-              symbol_table_json_from("@#{file.path}")
+              symbol_table_json_from("@#{file.path.shellescape}")
             end, T.nilable(String))
 
             return Set.new if output.nil? || output.empty?
@@ -44,7 +44,7 @@ module Tapioca
 
           def ignored_symbols
             unless @ignored_symbols
-              output = symbol_table_json_from("''", table_type: "symbol-table-full-json")
+              output = symbol_table_json_from("-e ''", table_type: "symbol-table-full-json")
               json = JSON.parse(output)
               @ignored_symbols = SymbolTableParser.parse(json)
             end
@@ -55,16 +55,21 @@ module Tapioca
           def symbol_table_json_from(input, table_type: "symbol-table-json")
             IO.popen(
               [
-                SORBET,
+                sorbet_path,
                 # We don't want to pick up any sorbet/config files in cwd
                 "--no-config",
                 "--print=#{table_type}",
                 "--quiet",
                 input,
-              ].shelljoin,
+              ].join(' '),
               err: "/dev/null"
             ).read
           end
+
+          sig { returns(String) }
+          def sorbet_path
+            SORBET.to_s.shellescape
+          end
         end
 
         class SymbolTableParser

data/lib/tapioca/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Tapioca
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry