annotato 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f4f23141ac1d1c1d74db46f6e08a7897f013145cecedf862bf0daf1d5cf0e7c
-  data.tar.gz: 1b6c975c452b3673e346aed16aef4574bd7ccabd6cd1b1a4a01140e6b18e3a69
+  metadata.gz: 7495fe2d16ba0203b006d5cdae3e4106d0cb3f11b28b76086f9ce01b8b5d32a3
+  data.tar.gz: d5099b1821edd37536742c8eab1d30df30ac445e949ae5620a13907338e095c9
 SHA512:
-  metadata.gz: 9f3e75090cc665121ecb20fd2ae0c626f10fd3572f7f25a35559130769e6a8093226f94e6c9b43eec88b51dd148c00401fd74687f36b7d8bc62e39532ac672ce
-  data.tar.gz: 6faa3c85c724fb087868ab7768699bdf6f5f07aa943362367110680899b7eb69842e7ebab396cfc3f6e17b3d70cc0bff1e7c3d83335601b0475452d1a3ca4e71
+  metadata.gz: 958ef330cd3a75c32518e90648e1e50771552d9edc24ddbf862497c09ca0d05ac6d1a1f1c59d97252e52fb7760a97bebd9a423f73b41789eb49035a1f8f189ca
+  data.tar.gz: c303fd131c8dee8c2e78dcb71dae2c640338acad8e3ea5f7efe846f0d081a4fa35c5da02caae39de42c2cc9e95d04c0363753fc608e1dcc18148b56567ba7873

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    annotato (0.2.2)
+    annotato (0.2.4)
       rails (>= 6.0)
 
 GEM

data/lib/annotato/column_formatter.rb

@@ -26,11 +26,12 @@ module Annotato
         type = col.sql_type
 
         # Build the left-hand side and calculate indent.
-        left  = "#  %-#{name_width}s :%-#{type_width}s" % [name, type]
-        # " default(" is 9 chars; +2 gives the extra gap.
+        # Strip trailing padding spaces immediately — output must never have trailing whitespace.
+        left = ("#  %-#{name_width}s :%-#{type_width}s" % [name, type]).rstrip
+        # indent_size aligns multiline default content under the opening "default(" token.
         indent_size = left.length + 1
         indent_str  = " " * indent_size
-        closing_indent_str  = " " * (indent_size - 2)
+        closing_indent_str = " " * (indent_size - 2)
 
         # Gather all options, pulling out default_lines if multiline.
         opts         = []
@@ -64,10 +65,9 @@ module Annotato
           opts_str = opts.join(", ")
           line = opts_str.empty? ? left : "#{left} #{opts_str}"
           if line.length > WrapHelper::MAX_LINE && !opts_str.empty?
-            cont_indent = " " * (left.length + 1)
-            [left, "# #{cont_indent}#{opts_str}"]
+            [left, "#    #{opts_str}"]
           else
-            [line.rstrip]
+            [line]
           end
         end
       end

data/lib/annotato/enum_formatter.rb

@@ -8,19 +8,18 @@ module Annotato
   class EnumFormatter
     def self.format(conn, columns)
       # Collect columns backed by a native PG enum type.
-      # A native enum type is one that exists in pg_type with typtype = 'e'.
       enum_columns = columns.select { |col| pg_enum_type?(conn, col.sql_type) }
       return [] if enum_columns.empty?
 
-      enum_columns.map do |col|
+      enum_columns.flat_map do |col|
         labels = pg_enum_labels(conn, col.sql_type)
         lines = ["#  #{col.name} (#{col.sql_type}): ["]
-        lines += labels.map.with_index { |label, i|
+        labels.each_with_index do |label, i|
           comma = i == labels.size - 1 ? "" : ","
-          "#    #{label}#{comma}"
-        }
+          lines << "#    #{label}#{comma}"
+        end
         lines << "#  ]"
-        lines.join("\n")
+        lines
       end
     end
 
@@ -40,7 +39,7 @@ module Annotato
       conn.exec_query(
         "SELECT e.enumlabel FROM pg_enum e " \
         "JOIN pg_type t ON e.enumtypid = t.oid " \
-        "WHERE t.typname = $1 " \
+        "WHERE t.typname = $1 AND t.typtype = 'e' " \
         "ORDER BY e.enumsortorder",
         "SQL",
         [type_name]

data/lib/annotato/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Annotato
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: annotato
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Serhii Bodnaruk