annotato 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc032579335784d2fef64d554eb97d7a726749535dc6ceb7af6fb2977387cc4
-  data.tar.gz: 2f4541f7bf902702312863801f9d056d9a8fd4cd18ac74c488ad0421bcbb3ce5
+  metadata.gz: e80ca78ee10d8d0ade55aea343a5cf37c9831190611eca4adbc913e82183dbb0
+  data.tar.gz: ede81923b6cb487f342b2b23db71aa9fdf56cdd82daf0c7af3b6e0a29de185f9
 SHA512:
-  metadata.gz: 6e83a8511599b40aaf3ddd613273b3a99f2fe4d6478e8601636f45b5629fffcb59899947c7fb615dd63d856fcc0faf64394e4bf0f42b9ad475ecaf2451074581
-  data.tar.gz: ebbcc2bb08d245dc19030a48a5f4e6a3b6c58f20c2f12b7bcd535fc85cc03eec67fb4c06bc9310db9f5c969c12f72fe106f01b422f5c630d6a79fc4a0e8da3d6
+  metadata.gz: 9a7b2c8a7008c0703d0eae63d2c586d56b32adac93e2bbe912df16b496f26e5d590013c6a842a00bdd792801879efcb3846082fcb8089313c366c0365090f15c
+  data.tar.gz: 83da6bec671419c9f8ead2fadf173e59caaf7593d63d5d53eab3cbc125dc48ada3554e08836a7061d639ae79a73cd38415443291c232eee92f73c000f1de8c8d

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.3)
+    annotato (0.1.5)
       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/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,10 +15,8 @@ module Annotato
         type = col.sql_type
         options = []
 
-        if formatted = format_default(col.default)
-          options << formatted
-        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?("[]")
@@ -36,18 +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?
 
       if json_like?(value)
-        "default(#{value.strip.gsub(/\s+/, ' ')})"
+        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+/, ' ')})"
+          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.3"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: annotato
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Serhii Bodnaruk
@@ -40,7 +40,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - annotato.gemspec
 - bin/console
 - bin/setup

data/VERSION

@@ -1 +0,0 @@
-0.1.3