annotato 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d021b5310b11518f5cf32bb8cf5dd0c375043faa5f1b10fa494fcf009b971c0a
-  data.tar.gz: 4c89d53facb4a5220961753ce65d8ee67dc92a1f5262d1ca87fd5e2770eb21a3
+  metadata.gz: 729bf5dd5fcf8ea70b736597058e2366a41a9f1624e9ab57a6411b3f6baf5ef8
+  data.tar.gz: 29f8d517f2e6de6c3d9f3234114cb862f08ddb73df00b9fa901291212e779747
 SHA512:
-  metadata.gz: 29812430a61c397651d746e919adec987d421b3200d6b416f52095ce22f4b31e7f9efecca8d86636a93fec5c9f47d42d499ebfcf4ba0722ac30cdaceccc1c2bf
-  data.tar.gz: c59e5a6dbad103793614a44a5eb15731d3c48f1c8c6a49eb997fbd2ddd1c48c65a09827a989bb49c4db25382cdb3344c50a06ef68f5f734587f21908e325fbfd
+  metadata.gz: 53a24228391462f73d506d5a2d4ce02c87daab0e4763f4877b53eb96d1a51e7579bc6bd7941c57e1d34fc2846f3830a3d1feba31d95bcb04a51814748bfcc7c3
+  data.tar.gz: 83ac809ddc119d52dec3887aff155e899135653cb085182dbfbebcb945a8c12bdd23e2cbb36d4f417f2e943e7425c8805d439eea100e475061ab7afef613c2e2

data/Gemfile

@@ -12,4 +12,5 @@ gem "rspec", "~> 3.0"
 
 group :development, :test do
   gem "simplecov", require: false
+  gem "pry", require: false
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    annotato (0.1.2)
+    annotato (0.1.4)
       rails (>= 6.0)
 
 GEM
@@ -82,6 +82,7 @@ GEM
     benchmark (0.4.0)
     bigdecimal (3.1.9)
     builder (3.3.0)
+    coderay (1.1.3)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.3)
     crass (1.0.6)
@@ -109,6 +110,7 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.4)
+    method_source (1.1.0)
     mini_mime (1.1.5)
     minitest (5.25.5)
     net-imap (0.5.8)
@@ -128,6 +130,9 @@ GEM
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
+    pry (0.15.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     psych (5.2.5)
       date
       stringio
@@ -214,6 +219,7 @@ PLATFORMS
 DEPENDENCIES
   annotato!
   irb
+  pry
   rake (~> 13.0)
   rspec (~> 3.0)
   simplecov

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.4

data/lib/annotato/column_formatter.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "json"
+
 module Annotato
   class ColumnFormatter
     def self.format(model, connection)
@@ -13,15 +15,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
-        end
-
+        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?("[]")
@@ -41,17 +36,30 @@ module Annotato
       end
     end
 
-    def self.json_like?(value)
-      value.is_a?(String) && value.strip.start_with?("{") && value.strip.end_with?("}")
-    end
+    def self.format_default(value)
+      return nil if value.nil?
 
-    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}"
+      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(',') # remove trailing comma
+            ["default([", *lines, "])"].join("\n# ")
+          else
+            "default(#{stripped.gsub(/\s+/, ' ')})"
+          end
+        rescue JSON::ParserError
+          "default(#{stripped.gsub(/\s+/, ' ')})"
+        end
+      else
+        "default(#{value.inspect})"
       end
     end
+
+    def self.json_like?(value)
+      value.is_a?(String) && value.strip.match?(/\A[\[{].*[\]}]\z/m)
+    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.4"
 end

metadata

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