support_table_data 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6aa6d124e04e60a539f6a56207da866bb6aa0d277484104f6685d9499b41d504
-  data.tar.gz: f3c9791bf9e6b2a46416cca2a154abdb1fe18e108f3e386670818939cabac1a2
+  metadata.gz: 9977faeef0b935eb106be5e5cf9a6ba81a0ba1ab1f9e90fa6b694ce32fe3fd40
+  data.tar.gz: 31a8019bce856f7555f7a2fbb28a913fad287dbc4c554d36cb3983f2b564e3db
 SHA512:
-  metadata.gz: cec5bdca6906dac42489e2f43798bf647eebaf6fd1df1d314bb259cf46170c6f7833aeccd7f7d59917ea0406699f6cc99905afc5977bd907c1e19f750dc0b3e5
-  data.tar.gz: eb748280d59753b9bde5618900d0f25ae8e01c3ace0a37cdb5021cad1f1751832b14cc6e4bd624b200398178cd8bd3636e5d8d128c829180fe3c547d67ac88db
+  metadata.gz: 7cc917037da50fd3f79ffe67db151bafb4c0042729946eb62974b46a3cf5332a8e3b6ab2ff4a31df20d6d2273f111ba7aaad14509a352b1fa986eb120e7b4b68
+  data.tar.gz: 50ab7d9230f0b7f104f542121e1cf3d1b7ffb4f6082fda2af68c9829e9b2b8eb3b2e04c126ef81f82395800ea8a0802229d8fdd313c21e77d8704b1597d87ca0

data/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.6.1
+
+### Fixed
+
+- Fixed issue with YARD and RBS documentation tasks possibly raising an error if a named value method is deprecated and wrapped to return an error. Types are now inferred directly from the data rather than calling a method.
+
 ## 1.6.0
 
 ### Added

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

data/lib/support_table_data/documentation/rbs_doc.rb

@@ -42,7 +42,7 @@ module SupportTableData
         lines << "def self.#{name}: () -> #{klass.name}"
         lines << "def #{name}?: () -> bool"
         klass.support_table_attribute_helpers.each do |attribute_name|
-          return_type = TypeInference.rbs_type(TypeInference.value_type(klass, "#{name}_#{attribute_name}"))
+          return_type = TypeInference.rbs_type(TypeInference.value_type(klass, name, attribute_name))
           lines << "def self.#{name}_#{attribute_name}: () -> #{return_type}"
         end
         lines

data/lib/support_table_data/documentation/type_inference.rb

@@ -3,26 +3,28 @@
 module SupportTableData
   module Documentation
     # Infers documentation types for the dynamically-defined attribute helpers
-    # by calling the generated method and inspecting the class of the value
-    # it returns. The values returned by these helpers are frozen literals from
-    # the parsed data file, so this does not require a database connection.
-    #
-    # This module must not be used on finder helpers (e.g. `Color.red`), which
-    # call `find_by!` and would hit the database.
+    # by reading the canonical value out of the parsed data file and
+    # inspecting its class. This avoids invoking the generated method, which
+    # may have been wrapped (e.g. deprecated) to raise.
     module TypeInference
       module_function
 
-      # Determine the documentation type for an attribute helper by calling
-      # the method and looking at the class of the returned value. Returns
-      # nil when the method is not defined.
+      # Determine the documentation type for a named-instance attribute
+      # helper by looking up the attribute value in the model's named
+      # instance data and returning its class. Returns nil when the
+      # attribute is not defined for the named instance.
       #
       # @param klass [Class] The model class
-      # @param method_name [String, Symbol] The class method name to call
+      # @param name [String, Symbol] The named instance name
+      # @param attribute_name [String, Symbol] The attribute name
       # @return [Class, nil]
-      def value_type(klass, method_name)
-        return nil unless klass.respond_to?(method_name)
+      def value_type(klass, name, attribute_name)
+        return nil unless klass.respond_to?(:named_instance_data)
 
-        klass.public_send(method_name).class
+        data = klass.named_instance_data(name)
+        return nil unless data.is_a?(Hash) && data.key?(attribute_name.to_s)
+
+        data[attribute_name.to_s].class
       end
 
       # Map a Ruby value class to a YARD type string.

data/lib/support_table_data/documentation/yard_doc.rb

@@ -175,7 +175,7 @@ module SupportTableData
       end
 
       def attribute_yard_return_type(name, attribute_name)
-        TypeInference.yard_type(TypeInference.value_type(klass, "#{name}_#{attribute_name}"))
+        TypeInference.yard_type(TypeInference.value_type(klass, name, attribute_name))
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: support_table_data
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Brian Durand