annotato 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e80ca78ee10d8d0ade55aea343a5cf37c9831190611eca4adbc913e82183dbb0
-  data.tar.gz: ede81923b6cb487f342b2b23db71aa9fdf56cdd82daf0c7af3b6e0a29de185f9
+  metadata.gz: 40145b6423788c1e730c30b88fb7d0858f4e5103b5cf6848b888b58dbed9883b
+  data.tar.gz: 84c1713c14000ad436410c8c2ae408d312a439f82158a6fc1a7cccfdf378e537
 SHA512:
-  metadata.gz: 9a7b2c8a7008c0703d0eae63d2c586d56b32adac93e2bbe912df16b496f26e5d590013c6a842a00bdd792801879efcb3846082fcb8089313c366c0365090f15c
-  data.tar.gz: 83da6bec671419c9f8ead2fadf173e59caaf7593d63d5d53eab3cbc125dc48ada3554e08836a7061d639ae79a73cd38415443291c232eee92f73c000f1de8c8d
+  metadata.gz: 2b3103a08cccb5d2658e969eafddf36977b65e88f94cc72d35a1e485f841f67216071ee9bd37955a81d9c29844da11e4a3777d47dbf645e07ae861d4553f8d57
+  data.tar.gz: f38edaf28cc9ca220f2825219ffc619d8638301719bebecbc60aae6d7bdadf01811fd9a84ce4e5d05b2d0432f908608d991c2e6be8e40fcaaef8f34bbebd8440

data/Gemfile.lock

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

data/lib/annotato/column_formatter.rb

@@ -1,65 +1,77 @@
 # frozen_string_literal: true
 
-require "json"
+require 'json'
 
 module Annotato
   class ColumnFormatter
     def self.format(model, connection)
       table_name = model.table_name
       primary_key = model.primary_key
-      unique_indexes = connection.indexes(table_name).select(&:unique)
       enums = model.defined_enums
+      unique_indexes = connection.indexes(table_name).select(&:unique)
+      columns = connection.columns(table_name)
 
-      columns_raw = connection.columns(table_name).map do |col|
+      raw_data = columns.map do |col|
         name = col.name
         type = col.sql_type
-        options = []
+        default = col.default
+        opts = []
 
-        default = format_default(col.default)
-        options << default if default
-        options << "not null" unless col.null
-        options << "primary key" if name == primary_key
-        options << "is an Array" if type.end_with?("[]")
-        options << "unique" if unique_indexes.any? { |idx| idx.columns == [name] }
-        options << "enum" if enums.key?(name)
+        opts << "default(#{default.inspect})" unless default.nil?
+        opts << "not null" unless col.null
+        opts << "primary key" if name == primary_key
+        opts << "is an Array" if type.end_with?("[]")
+        opts << "unique" if unique_indexes.any? { |idx| idx.columns == [name] }
+        opts << "enum" if enums.key?(name)
 
-        [name, type, options.join(", ")]
+        [name, type, default, opts]
       end
 
-      name_width = columns_raw.map { |name, _, _| name.length }.max
-      type_width = columns_raw.map { |_, type, _| type.length }.max
+      name_width = raw_data.map { |name, *_| name.length }.max
+      type_width = raw_data.map { |_, type, *_| type.length }.max
 
-      columns_raw.map do |name, type, opts|
-        line = "#  %-#{name_width}s :%-#{type_width}s" % [name, type]
-        line += " #{opts}" unless opts.empty?
-        line.rstrip
-      end
-    end
+      raw_data.flat_map do |name, type, default, opts|
+        base_line = "#  %-#{name_width}s :%-#{type_width}s" % [name, type]
+        indent = ' ' * (base_line.length + 1)
 
-    def self.format_default(value)
-      return nil if value.nil?
+        if multiline_default?(default)
+          formatted_defaults = format_multiline_default(default)
+          remaining_opts = opts.reject { |o| o.start_with?("default(") }
 
-      if json_like?(value)
-        stripped = value.strip
-        begin
-          parsed = JSON.parse(stripped)
-          if parsed.is_a?(Array) && parsed.all? { |e| e.is_a?(String) }
-            lines = parsed.map { |e| %Q(  "#{e}",) }
-            lines[-1] = lines[-1].chomp(',') if lines.last # <-- тут зміна
-            ["default([", *lines, "])"].join("\n# ")
-          else
-            "default(#{stripped.gsub(/\s+/, ' ')})"
+          lines = []
+          lines << "#{base_line} default(["
+          formatted_defaults.each do |v|
+            lines << "#{'#' + indent}#{v}"
           end
-        rescue JSON::ParserError
-          "default(#{stripped.gsub(/\s+/, ' ')})"
+
+          closing = "#{'#' + ' ' * (indent.length - 1)}]),"
+          closing += " #{remaining_opts.join(', ')}" unless remaining_opts.empty?
+          lines << closing.rstrip
+          lines
+        else
+          line = base_line
+          line += " #{opts.join(', ')}" unless opts.empty?
+          line.rstrip
         end
-      else
-        "default(#{value.inspect})"
       end
     end
 
-    def self.json_like?(value)
-      value.is_a?(String) && value.strip.match?(/\A[\[{].*[\]}]\z/m)
+    def self.multiline_default?(value)
+      value.is_a?(String) && value.strip.start_with?("[") && value.strip.end_with?("]") && value.include?(",")
+    end
+
+    def self.format_multiline_default(value)
+      parsed = JSON.parse(value)
+      return [value] unless parsed.is_a?(Array)
+
+      items = parsed.is_a?(Array) && parsed[0].is_a?(Array) ? parsed[0] : parsed
+
+      items.map.with_index do |item, idx|
+        comma = idx == items.size - 1 ? "" : ","
+        "#{item.to_json}#{comma}"
+      end
+    rescue JSON::ParserError
+      [value]
     end
   end
 end

data/lib/annotato/version.rb

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

metadata

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