annotato 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d021b5310b11518f5cf32bb8cf5dd0c375043faa5f1b10fa494fcf009b971c0a
-  data.tar.gz: 4c89d53facb4a5220961753ce65d8ee67dc92a1f5262d1ca87fd5e2770eb21a3
+  metadata.gz: 3fc032579335784d2fef64d554eb97d7a726749535dc6ceb7af6fb2977387cc4
+  data.tar.gz: 2f4541f7bf902702312863801f9d056d9a8fd4cd18ac74c488ad0421bcbb3ce5
 SHA512:
-  metadata.gz: 29812430a61c397651d746e919adec987d421b3200d6b416f52095ce22f4b31e7f9efecca8d86636a93fec5c9f47d42d499ebfcf4ba0722ac30cdaceccc1c2bf
-  data.tar.gz: c59e5a6dbad103793614a44a5eb15731d3c48f1c8c6a49eb997fbd2ddd1c48c65a09827a989bb49c4db25382cdb3344c50a06ef68f5f734587f21908e325fbfd
+  metadata.gz: 6e83a8511599b40aaf3ddd613273b3a99f2fe4d6478e8601636f45b5629fffcb59899947c7fb615dd63d856fcc0faf64394e4bf0f42b9ad475ecaf2451074581
+  data.tar.gz: ebbcc2bb08d245dc19030a48a5f4e6a3b6c58f20c2f12b7bcd535fc85cc03eec67fb4c06bc9310db9f5c969c12f72fe106f01b422f5c630d6a79fc4a0e8da3d6

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/annotato/column_formatter.rb

@@ -13,13 +13,8 @@ module Annotato
         type = col.sql_type
         options = []
 
-        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
+        if formatted = format_default(col.default)
+          options << formatted
         end
 
         options << "not null" unless col.null
@@ -42,15 +37,16 @@ module Annotato
     end
 
     def self.json_like?(value)
-      value.is_a?(String) && value.strip.start_with?("{") && value.strip.end_with?("}")
+      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}"
+    def self.format_default(value)
+      return nil if value.nil?
+
+      if json_like?(value)
+        "default(#{value.strip.gsub(/\s+/, ' ')})"
+      else
+        "default(#{value.inspect})"
       end
     end
   end

data/lib/annotato/version.rb

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

metadata

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