simpler format

Author: dorianmariecom

lib/code/object/date.rb

@@ -97,9 +97,11 @@ def self.call(**args)
           sig(args)
           code_future?
         when "format"
-          sig(args) { [String, { locale: String.maybe }] }
+          sig(args) { [String.maybe, { locale: String.maybe }] }
 
-          if code_second.something?
+          if code_value.is_a?(Dictionary)
+            code_format(nil, locale: code_value.code_get(:locale))
+          elsif code_second.something?
             code_format(code_value, locale: code_second.code_get(:locale))
           else
             code_format(code_value)
@@ -414,9 +416,11 @@ def call(**args)
           sig(args)
           code_sunday?
         when "format"
-          sig(args) { [String, { locale: String.maybe }] }
+          sig(args) { [String.maybe, { locale: String.maybe }] }
 
-          if code_second.something?
+          if code_value.is_a?(Dictionary)
+            code_format(nil, locale: code_value.code_get(:locale))
+          elsif code_second.something?
             code_format(code_value, locale: code_second.code_get(:locale))
           else
             code_format(code_value)
@@ -700,9 +704,11 @@ def code_format(format, locale: nil)
         code_format = format.to_code
         code_locale = locale.to_code
 
-        locale = code_locale.raw.presence_in(LOCALES) || I18n.locale
+        requested_locale = code_locale.raw&.to_s
+        locale = requested_locale&.presence_in(LOCALES)&.to_sym || I18n.locale
+        locale = I18n.locale unless I18n.available_locales.include?(locale.to_sym)
 
-        format = code_format.raw
+        format = code_format.raw || :default
         format = format.to_sym if I18n.exists?("date.formats.#{format}", locale)
 
         String.new(I18n.l(raw, format: format, locale: locale))

lib/code/object/time.rb

@@ -188,9 +188,11 @@ def self.call(**args)
           sig(args)
           code_sunday?
         when "format"
-          sig(args) { [String, { locale: String.maybe }] }
+          sig(args) { [String.maybe, { locale: String.maybe }] }
 
-          if code_second.something?
+          if code_value.is_a?(Dictionary)
+            code_format(nil, locale: code_value.code_get(:locale))
+          elsif code_second.something?
             code_format(code_value, locale: code_second.code_get(:locale))
           else
             code_format(code_value)
@@ -463,9 +465,11 @@ def call(**args)
           sig(args)
           code_sunday?
         when "format"
-          sig(args) { [String, { locale: String.maybe }] }
+          sig(args) { [String.maybe, { locale: String.maybe }] }
 
-          if code_second.something?
+          if code_value.is_a?(Dictionary)
+            code_format(nil, locale: code_value.code_get(:locale))
+          elsif code_second.something?
             code_format(code_value, locale: code_second.code_get(:locale))
           else
             code_format(code_value)
@@ -809,9 +813,11 @@ def code_format(format, locale: nil)
         code_format = format.to_code
         code_locale = locale.to_code
 
-        locale = code_locale.raw.presence_in(LOCALES) || I18n.locale
+        requested_locale = code_locale.raw&.to_s
+        locale = requested_locale&.presence_in(LOCALES)&.to_sym || I18n.locale
+        locale = I18n.locale unless I18n.available_locales.include?(locale.to_sym)
 
-        format = code_format.raw
+        format = code_format.raw || :default
         format = format.to_sym if I18n.exists?("time.formats.#{format}", locale)
 
         String.new(I18n.l(raw, format: format, locale: locale))

spec/code_spec.rb

@@ -248,7 +248,9 @@ def evaluate_with_output(input)
     %w[Class.new(nothing) Nothing],
     %w[Class.new(true) Boolean],
     %w[Date Date],
+    ["Date.format == Date.format(:default)", "true"],
     %w[Date("0001-01-01").to_string :0001-01-01],
+    ["Date(\"2024-03-02\").format == Date(\"2024-03-02\").format(:default)", "true"],
     %w[Date("2024-03-02").to_string :2024-03-02],
     %w[Decimal(1) 1.0],
     %w[Decimal(1) 1],
@@ -296,6 +298,10 @@ def evaluate_with_output(input)
     ["Class.new(Time, Boolean)", "Time"],
     %w[Date("2024-3-2").to_string :2024-03-02],
     %w[Date("2024-3-2").to_string :2024-03-02],
+    ["Time.format.present?", "true"],
+    ["Class(Time.format(locale: :fr))", "String"],
+    ["Time.new(\"2024-03-05.06:10:59.UTC\").format(locale: :fr) == Time.new(\"2024-03-05.06:10:59.UTC\").format(:default, locale: :fr)", "true"],
+    ["Time.new(\"2024-03-05.06:10:59.UTC\").format == Time.new(\"2024-03-05.06:10:59.UTC\").format(:default)", "true"],
     ["Decimal(1, :2)", "100"],
     ["Decimal(:1, 2)", "100.0"],
     ["Decimal.new(1, :2)", "100"],