decode 0.17.2 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7d6009f4ff23fb9cceecfe8d661848867bfd1528f31fa99a45aa52f7fb5d4f8
-  data.tar.gz: d9ddb59b516d3b8306ff6dc6dddbc1263c9761e1ae4a2cf187040442f6865299
+  metadata.gz: a838fd5f42db321e8afe7627740faca8a0bce85e66016b1a9f5eac4c1b800e13
+  data.tar.gz: 2d2e88c8dfbddaf2507f8b94ef7b3678247640ff48768dd8971afe4bca32a579
 SHA512:
-  metadata.gz: 592f7031ec864569dad6001f919e65990cea614278ad12f3479491df39a422b4c0a3f9f7dcc197b6c03d113fee8438e6606b1a624343ac0ae4ea76f36a43a792
-  data.tar.gz: 561e6b926e5b3ab9ef258b0fe915d4758f64514f1512a6f5f2b155327e601bf10022a819d7b307ffa4e31a8884d7635fdc5fd40606deb6f5c775835cd0b6f423
+  metadata.gz: 2fd7f4dc09a37c14d87750e3cf12ed22f6352877a382ab6a08f8571b48d774761fa2deb6dcc7382bb43868361774816d018c086f3ae2e0b0908a89c8e9704154
+  data.tar.gz: e6b60875db3b53417736599852a9354eabbdc08503b3dda594bd364df7c98fa84702303917f27c7850054ab40d0f5c25b018a0a9919bf07a9e7d922cd8b480fb

data/lib/decode/definition.rb

@@ -97,13 +97,17 @@ module Decode
 				@path
 			elsif @parent
 				# Merge with parent:
-				@path = [*@parent.path, @name].freeze
+				@path = [*@parent.path, *path_name].freeze
 			else
 				# At top:
-				@path = [@name].freeze
+				@path = path_name.freeze
 			end
 		end
 		
+		def path_name
+			[@name]
+		end
+		
 		alias lexical_path path
 		
 		# A short form of the definition.

data/lib/decode/index.rb

@@ -51,7 +51,6 @@ module Decode
 		
 		# A (prefix) trie of lexically scoped definitions.
 		# @attribute [Trie]
-		
 		attr :trie
 		
 		# Updates the index by parsing the specified files.

data/lib/decode/language/ruby/class.rb

@@ -37,18 +37,22 @@ module Decode
 				# The short form of the class.
 				# e.g. `class Animal`.
 				def short_form
-					"class #{@name}"
+					"class #{path_name.last}"
 				end
 				
 				# The long form of the class.
 				# e.g. `class Dog < Animal`.
 				def long_form
-					if super_node = @node.children[1]
-						@node.location.keyword.join(
-							super_node.location.expression
-						).source
+					if super_class = self.super_class
+						"#{qualified_form} < #{super_class}"
 					else
-						self.short_form
+						qualified_form
+					end
+				end
+				
+				def super_class
+					if super_node = @node.children[1]
+						super_node.location.expression.source
 					end
 				end
 				
@@ -57,6 +61,10 @@ module Decode
 				def qualified_form
 					"class #{self.qualified_name}"
 				end
+				
+				def path_name
+					@name.to_s.split('::').map(&:to_sym)
+				end
 			end
 			
 			# A Ruby-specific singleton class.

data/lib/decode/language/ruby/module.rb

@@ -37,17 +37,22 @@ module Decode
 				# The short form of the module.
 				# e.g. `module Barnyard`.
 				def short_form
-					"module #{@name}"
+					"module #{path_name.last}"
 				end
 				
-				# The long form is the same as the short form.
-				alias long_form short_form
+				def long_form
+					qualified_form
+				end
 				
 				# The fully qualified name of the class.
 				# e.g. `module ::Barnyard::Dog`.
 				def qualified_form
 					"module #{self.qualified_name}"
 				end
+				
+				def path_name
+					@name.to_s.split('::').map(&:to_sym)
+				end
 			end
 		end
 	end

data/lib/decode/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Decode
-	VERSION = "0.17.2"
+	VERSION = "0.17.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decode
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -36,7 +36,7 @@ cert_chain:
   RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
   HiLJ8VOFx6w=
   -----END CERTIFICATE-----
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2022-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Code analysis for documentation generation.