tapioca 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a99e7a4475e2991e305c461774e45e128d430632e96581fc541680b61275e4e1
-  data.tar.gz: 8ee7b9b225dd752edf606a98aee1b8490687f351dae642b24060549740d2ab5a
+  metadata.gz: 4eea2d365ede4ba5398d65a2042c7dc86270ec7309cb0bc9747357f44ea1c675
+  data.tar.gz: 7f7252a0619b138664fe5d30acf0858fb09eb9403d513a06266cc58c464dd3b2
 SHA512:
-  metadata.gz: 3ab85b1422fba3aa79de02fad9e164b2013cef3a388ad196e4c11f0c2c6dc142b6a540a430f4a4ace9f3ebe92da2f29fbe733e13ceb481277e7d7e2691db9f0c
-  data.tar.gz: b9f2c2cca77916e08fcbb1ca021818b51bc5edd8d899b2f5e89dae3bfddd38dd8e403b16bacd8c8db37dc630448458d7d6f52e6445cb9ecb96c6bba16c4c20e7
+  metadata.gz: 1ac4530bd50af56e2acee0a630571dbc7452cf10e55ec89088ddb5ed8f9a350fae0b4031602fa13b5b319390172e55bdebe6a3d3b6a722e88fe7902aceb5bb61
+  data.tar.gz: 26a6365606966861c36ffcea2b247a7dfc5395925d04a9d89f35273ce6ae9c3f29ee3d94002c3dd49c46f05acda9e202025a79cf9e4dd0fbebe49ff542d575ae

data/Gemfile

@@ -35,4 +35,5 @@ group(:development, :test) do
   gem("config", require: false)
   gem("aasm", require: false)
   gem("bcrypt", require: false)
+  gem("xpath", require: false)
 end

data/lib/tapioca/compilers/dsl/active_record_relations.rb

@@ -532,7 +532,7 @@ module Tapioca
                   ],
                   return_type: "T::Boolean"
                 )
-              when :find, :find_by!
+              when :find
                 create_common_method(
                   "find",
                   parameters: [
@@ -548,6 +548,14 @@ module Tapioca
                   ],
                   return_type: "T.nilable(#{constant_name})"
                 )
+              when :find_by!
+                create_common_method(
+                  "find_by!",
+                  parameters: [
+                    create_rest_param("args", type: "T.untyped"),
+                  ],
+                  return_type: constant_name
+                )
               when :first, :last, :take
                 create_common_method(
                   method_name,

data/lib/tapioca/compilers/dsl/rails_generators.rb

@@ -64,12 +64,12 @@ module Tapioca
 
         sig { override.returns(T::Enumerable[Module]) }
         def gather_constants
-          all_modules.select do |const|
+          all_classes.select do |const|
             name = qualified_name_of(const)
 
             name &&
               !name.match?(BUILT_IN_MATCHER) &&
-              const < ::Rails::Generators::Base
+              ::Rails::Generators::Base > const
           end
         end
 

data/lib/tapioca/compilers/dsl/smart_properties.rb

@@ -71,14 +71,15 @@ module Tapioca
           )
           return if properties.keys.empty?
 
-          instance_methods = constant.instance_methods(false).map(&:to_s).to_set
-
           root.create_path(constant) do |k|
-            properties.values.each do |property|
-              generate_methods_for_property(k, property) do |method_name|
-                !instance_methods.include?(method_name.to_sym)
+            smart_properties_methods_name = "SmartPropertiesGeneratedMethods"
+            k.create_module(smart_properties_methods_name) do |mod|
+              properties.values.each do |property|
+                generate_methods_for_property(mod, property)
               end
             end
+
+            k.create_include(smart_properties_methods_name)
           end
         end
 
@@ -95,26 +96,21 @@ module Tapioca
 
         sig do
           params(
-            klass: RBI::Scope,
-            property: ::SmartProperties::Property,
-            block: T.proc.params(arg: String).returns(T::Boolean)
+            mod: RBI::Scope,
+            property: ::SmartProperties::Property
           ).void
         end
-        def generate_methods_for_property(klass, property, &block)
+        def generate_methods_for_property(mod, property)
           type = type_for(property)
 
           if property.writable?
             name = property.name.to_s
             method_name = "#{name}="
 
-            klass.create_method(
-              method_name,
-              parameters: [create_param(name, type: type)],
-              return_type: type
-            ) if block.call(method_name)
+            mod.create_method(method_name, parameters: [create_param(name, type: type)], return_type: type)
           end
 
-          klass.create_method(property.reader.to_s, return_type: type) if block.call(property.reader.to_s)
+          mod.create_method(property.reader.to_s, return_type: type)
         end
 
         BOOLEANS = T.let([

data/lib/tapioca/compilers/dsl/url_helpers.rb

@@ -151,9 +151,14 @@ module Tapioca
 
         sig { params(mod: Module, helper: Module).returns(T::Boolean) }
         def includes_helper?(mod, helper)
-          superclass_ancestors = mod.superclass&.ancestors if Class === mod
-          superclass_ancestors ||= []
-          (mod.ancestors - superclass_ancestors).include?(helper)
+          superclass_ancestors = []
+
+          if Class === mod
+            superclass = superclass_of(mod)
+            superclass_ancestors = ancestors_of(superclass) if superclass
+          end
+
+          (ancestors_of(mod) - superclass_ancestors).any? { |ancestor| helper == ancestor }
         end
       end
     end

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2021-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler