code-ruby 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f549a94b79e05b4a9bcdaccb20f8aac62c12d0df2126be010cdd8837500b48c
-  data.tar.gz: 96d615d2927a7f25c35151ceb3c574bcaad56f47e9e3a127363421840a467cc9
+  metadata.gz: 22952473dbe9b9dae4c19097315ed02cd5ffd54760b4769e9bb103d1460f0a56
+  data.tar.gz: 91bcb3130986a3fbee06a08f5c814121f4efbe54bb4a8c193e399befceb4a465
 SHA512:
-  metadata.gz: ca729f38f8dbed018a444f541fa18630df17fc53c0638041279c308a7a7867fb1f22a1d7dfca279f120868e6fbb12cbf50651c4247e95d2c504ceb70353936d1
-  data.tar.gz: 41d3ce239359a6df336152f4a4fada3e5526549abe7a27e2cb929ecb46cb4319f36a248395ccca258aadb3be0d5ff80c86c3f8749ece21cb776b59174870ff43
+  metadata.gz: 444ad49c72cc55a137333d7906955a750de131d32e81dd971e4627217618c3b4be318b4483ad30d266e217cb677c379ecbc3aa1abf410db843e3262a9e8cf644
+  data.tar.gz: 154153bc86d78b3f34e1bab45ba094fa1b481146f7e654a049a90311d7483dba7850e86934bc1598193199d163ed788fdc201dfa3fc54e97c4b2376188a0abab

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (1.9.2)
+    code-ruby (1.9.3)
       activesupport
       base64
       bigdecimal

data/VERSION

@@ -1 +1 @@
-1.9.2
+1.9.3

data/lib/code/object/date.rb

@@ -97,9 +97,11 @@ class Code
           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 @@ class Code
           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 @@ class Code
         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))

data/lib/code/object/time.rb

@@ -188,9 +188,11 @@ class Code
           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 @@ class Code
           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 @@ class Code
         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))

data/spec/code_spec.rb

@@ -248,7 +248,9 @@ RSpec.describe Code do
     %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 @@ RSpec.describe Code do
     ["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"],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Dorian Marié