annotato 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 003a8311576a66ee46f22d1b23d586d44225e0f162071a241cec1374ce80249f
-  data.tar.gz: a714326713db198ec79ca4df5f1f81d9157e859fc9e6822939d72251c9f05a83
+  metadata.gz: d021b5310b11518f5cf32bb8cf5dd0c375043faa5f1b10fa494fcf009b971c0a
+  data.tar.gz: 4c89d53facb4a5220961753ce65d8ee67dc92a1f5262d1ca87fd5e2770eb21a3
 SHA512:
-  metadata.gz: 8db71510d95ad8bf436688fe1c64292dda80dff2bda4b6580b97e0ecb65c6a47804c703e457326495b5ea83e6bb75828d6f6d32a0affda9fdc74a7353ce08d54
-  data.tar.gz: 388ffb2c750400a6b59add8be79a216e5f6ac0fec1819c96a7b10febb3e248abe06c43d55cd929027ef77459462eaaf99b6414fd9999822f8e6d6f3c2f088b54
+  metadata.gz: 29812430a61c397651d746e919adec987d421b3200d6b416f52095ce22f4b31e7f9efecca8d86636a93fec5c9f47d42d499ebfcf4ba0722ac30cdaceccc1c2bf
+  data.tar.gz: c59e5a6dbad103793614a44a5eb15731d3c48f1c8c6a49eb997fbd2ddd1c48c65a09827a989bb49c4db25382cdb3344c50a06ef68f5f734587f21908e325fbfd

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/lib/annotato/column_formatter.rb

@@ -13,7 +13,15 @@ module Annotato
         type = col.sql_type
         options = []
 
-        options << "default(#{col.default.inspect})" unless col.default.nil?
+        if !col.default.nil?
+          if col.default.to_s.length > 60 && json_like?(col.default)
+            formatted_default = format_json_default(col.default)
+            options << "default(\n#{formatted_default}\n#  )"
+          else
+            options << "default(#{col.default.inspect})"
+          end
+        end
+
         options << "not null" unless col.null
         options << "primary key" if name == primary_key
         options << "is an Array" if type.end_with?("[]")
@@ -32,5 +40,18 @@ module Annotato
         line.rstrip
       end
     end
+
+    def self.json_like?(value)
+      value.is_a?(String) && value.strip.start_with?("{") && value.strip.end_with?("}")
+    end
+
+    def self.format_json_default(json_str)
+      begin
+        parsed = JSON.parse(json_str)
+        parsed.map { |k, v| "#    \"#{k}\": #{v}" }.join(",\n")
+      rescue JSON::ParserError
+        "#    #{json_str.strip}"
+      end
+    end
   end
 end

data/lib/annotato/enum_formatter.rb

@@ -6,14 +6,20 @@ module Annotato
       return [] if model.defined_enums.empty?
 
       model.defined_enums.map do |attr, values|
-        # Check if all values equal keys (strings)
-        if values.values.all? { |v| v == v.to_s && values.keys.include?(v) }
-          enum_str = values.keys.join(", ")
-        else
-          enum_str = values.map { |k, v| "#{k} (#{v})" }.join(", ")
+        lines = ["#  #{attr}: {"]
+
+        formatted_values = values.map do |key, val|
+          if key.to_s == val.to_s
+            "#{key}"
+          else
+            "#{key} (#{val})"
+          end
         end
 
-        "#  #{attr}: { #{enum_str} }"
+        lines += formatted_values.map { |v| "#    #{v}," }
+        lines[-1] = lines[-1].chomp(',') # remove trailing comma from last line
+        lines << "#  }"
+        lines.join("\n")
       end
     end
   end

data/lib/annotato/version.rb

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

metadata

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