bullet_train 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67f18258ccc08e8f9c7ab4febd061776dbd014c14a851ff53a24b08b8f52740a
-  data.tar.gz: d4a1eaccc46bdc38aac7ea2996f9908b899ddd7310e041a566015a59ff36e50e
+  metadata.gz: 3e8839a83798a6b0f6cb390b45cf7b32b2d332b23474472d296d4d5d56182074
+  data.tar.gz: 5a37fae85e7079df274dc18d398dcdbedc4a8e1c316dfd701b2fec8e4f7ec844
 SHA512:
-  metadata.gz: 255cfc9f4e0abcf1c25ff7d1e562f0a7c9bce5d11eefa1847feaae5247b04fa0a48679733d382216c0081cda8add87963a8a5c616cf438264cec1e7e0a316247
-  data.tar.gz: b777a4c8d8f978ed1037c433b976351793dfadfdb59dfde8f23d4fdec72031d1dea52c9e36e664f2f560c9617fe8382017ff3ec5f9760b1afb17e77cea332297
+  metadata.gz: b2f84890b0ec4c6cb993f0dc08e0487ed48b787761a9e5130a6f9d8203e4e6e86459a4f06f2aa19bcf28813b5ec7efbe3f7366decda3334eccd6e09b25092532
+  data.tar.gz: c67cd314e9e323b09523b2babb42fdd0068de0544e6ac84fde651d89e8db7a678de33f58f88d0e23467972c1d768fad5bb9a7435b967f46dc3b8961d19ab12a4

data/app/helpers/account/dates_helper.rb

@@ -1,17 +1,54 @@
 module Account::DatesHelper
-  def display_date(timestamp, format: :default, date_format: nil)
+  def display_date(timestamp, custom_date_format = nil, format: :default, date_format: nil)
+    return nil unless timestamp
     format = date_format if date_format
-    localize(local_time(timestamp).to_date, format: format) if timestamp
+
+    if format && format == :default
+      # e.g. October 11, 2018
+      if custom_date_format
+        local_time(timestamp).strftime(custom_date_format)
+      elsif local_time(timestamp).year == local_time(Time.now).year
+        local_time(timestamp).strftime("%B %-d")
+      else
+        local_time(timestamp).strftime("%B %-d, %Y")
+      end
+    else
+      localize(local_time(timestamp).to_date, format: format)
+    end
   end
 
-  def display_time(timestamp, format: :default, time_format: nil)
+  def display_time(timestamp, custom_time_format = nil, format: :default, time_format: nil)
+    return nil unless timestamp
     format = time_format if time_format
-    localize(local_time(timestamp).to_time, format: format) if timestamp
+
+    if format && format == :default
+      # e.g. 4:22 PM
+      local_time(timestamp).strftime(custom_time_format || "%l:%M %p")
+    else
+      localize(local_time(timestamp).to_time, format: format)
+    end
   end
 
-  def display_date_and_time(timestamp, format: :default, date_format: nil, time_format: nil)
+  def display_date_and_time(timestamp, custom_date_format = nil, custom_time_format = nil, format: :default, date_format: nil, time_format: nil)
+    return nil unless timestamp
     format = "#{date_format} #{time_format}" if date_format && time_format
-    localize(local_time(timestamp).to_datetime, format: format) if timestamp
+
+    if format && format == :default
+      # e.g. Today at 4:22 PM
+      # e.g. Yesterday at 2:12 PM
+      # e.g. April 24 at 7:39 AM
+      # today?
+      if local_time(timestamp).to_date == local_time(Time.now).to_date
+        "Today at #{display_time(timestamp, custom_time_format)}"
+      # yesterday?
+      elsif (local_time(timestamp).to_date) == (local_time(Time.now).to_date - 1.day)
+        "Yesterday at #{display_time(timestamp, custom_time_format)}"
+      else
+        "#{display_date(timestamp, custom_date_format)} at #{display_time(timestamp, custom_time_format)}"
+      end
+    else
+      localize(local_time(timestamp).to_datetime, format: format)
+    end
   end
 
   def local_time(timestamp)

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Andrew Culver
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 2023-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -753,8 +753,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Bullet Train
 test_files: []