ruby-rails-extensions 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 066eeb0d0c0c755afd91c41eaf18e9e1446635d8fcc80bf37e4d3b9fd76348dd
-  data.tar.gz: 321af547a582a1059aeea22b1a9582ab9fb6a513eb4c08041b52e96c6ded0586
+  metadata.gz: 4e8f9814c953c52a6b56ec84e47dcb454cfab59a93b0df09b9ab13c4316dde06
+  data.tar.gz: a048a5ade66c437bd04dabd3b144d91c60db8fc9743df5844731c7623ee8016a
 SHA512:
-  metadata.gz: 3bb6a7aab3a148d1c6267e014c782a7c1a227fa0c784ed8b2d52ecd370d025559c0a7aba414ad4b8a1b19256ea661bc647177203b8263a0a254cc4fe189b9f12
-  data.tar.gz: 6d3574d41a547413f41ce0b397646a7b2002a0585ba77d24eb5f4bada7d719c78c49be78348529b4a42cd6014d2a065dd1cc1c396ab45815c5c3e55f34ec2785
+  metadata.gz: b3cbde7896d269f925aa33a25be9e7d9819a2ef351a4681b56f3afc1794c8e5d6c8e4104fd7b0570c9cd0ed3e30dcb2e1722442edb3b3322e031022500dd25ee
+  data.tar.gz: 74694442b83d70c7c7562838879014ecee55a5e9b66392be54414c20f1c6f7457375f9907ae11c2cc9a0787836deaa618c3ccc444516c50678abc53626915245

data/CHANGELOG.md

@@ -1,6 +1,19 @@
 Unreleased Changes
 ------------------
 
+1.1.1 (2024-03-01)
+------------------
+
+* Bugs fixed:
+  * Custom methods added to `DateTime`/`Time` were not added correctly if also added to `Date`
+* Modules affected:
+  * 'current_month'
+  * 'current_week'
+  * 'day_of_week'
+  * 'display_user'
+  * 'input'
+  * 'safe_parse'
+
 1.1.0 (2023-09-27)
 ------------------
 

data/lib/ruby-rails-extensions/extensions/current_month.rb

@@ -2,7 +2,7 @@
 
 require 'date'
 
-Date.class_eval do
+DateTime.class_eval do
   unless method_defined?(:current_month)
     # :nodoc:
     def current_month
@@ -11,7 +11,7 @@ Date.class_eval do
   end
 end
 
-DateTime.class_eval do
+Date.class_eval do
   unless method_defined?(:current_month)
     # :nodoc:
     def current_month

data/lib/ruby-rails-extensions/extensions/current_week.rb

@@ -2,16 +2,16 @@
 
 require 'date'
 
-Date.class_eval do
+DateTime.class_eval do
   unless method_defined?(:current_week)
-    # @return Range<Date>
+    # @return Range<DateTime>
     def current_week
       beginning_of_week..end_of_week
     end
   end
 end
 
-DateTime.class_eval do
+Date.class_eval do
   unless method_defined?(:current_week)
     # @return Range<Date>
     def current_week

data/lib/ruby-rails-extensions/extensions/day_of_week.rb

@@ -2,7 +2,7 @@
 
 require 'date'
 
-Date.class_eval do
+DateTime.class_eval do
   unless method_defined?(:day_of_week)
     # @return [String] - Full day word
     def day_of_week
@@ -11,7 +11,7 @@ Date.class_eval do
   end
 end
 
-DateTime.class_eval do
+Date.class_eval do
   unless method_defined?(:day_of_week)
     # @return [String] - Full day word
     def day_of_week

data/lib/ruby-rails-extensions/extensions/display_user.rb

@@ -2,29 +2,29 @@
 
 require 'date'
 
-Date.class_eval do
+DateTime.class_eval do
   unless method_defined?(:display_user)
-    # @return [String] - mm/dd/yyyy or m/d/yy
+    # @return [String] - mm/dd/yyyy HH:MM:SS AM/PM or m/d/yy HH:MM:SS AM/PM
     def display_user(all = false)
-      strftime(all ? '%m/%d/%Y' : '%-m/%-d/%y')
+      strftime(all ? '%m/%d/%Y %r' : '%-m/%-d/%y %r')
     end
   end
 end
 
-DateTime.class_eval do
+Time.class_eval do
   unless method_defined?(:display_user)
     # @return [String] - mm/dd/yyyy or m/d/yy
     def display_user(all = false)
-      strftime(all ? '%m/%d/%Y %r' : '%-m/%-d/%y %r')
+      to_datetime.display_user(all)
     end
   end
 end
 
-Time.class_eval do
+Date.class_eval do
   unless method_defined?(:display_user)
     # @return [String] - mm/dd/yyyy or m/d/yy
     def display_user(all = false)
-      to_datetime.display_user(all)
+      strftime(all ? '%m/%d/%Y' : '%-m/%-d/%y')
     end
   end
 end

data/lib/ruby-rails-extensions/extensions/input.rb

@@ -2,20 +2,20 @@
 
 require 'date'
 
-Date.class_eval do
+DateTime.class_eval do
   unless method_defined?(:input)
-    # @return [String] - yyyy-mm-dd
-    def input(_all = false)
-      strftime('%F')
+    # @return [String] - yyyy-mm-dd[Thh:mm::ss]
+    def input(all = false)
+      strftime(all ? '%F %T' : '%F')
     end
   end
 end
 
-DateTime.class_eval do
+Date.class_eval do
   unless method_defined?(:input)
-    # @return [String] - yyyy-mm-dd[Thh:mm::ss]
-    def input(all = false)
-      strftime(all ? '%F %T' : '%F')
+    # @return [String] - yyyy-mm-dd
+    def input(_all = false)
+      strftime('%F')
     end
   end
 end

data/lib/ruby-rails-extensions/extensions/safe_parse.rb

@@ -1,18 +1,5 @@
 # frozen_string_literal: true
 
-Date.class_eval do
-  class << self
-    unless method_defined?(:safe_parse)
-      # Parses the `str` and returns `nil` if invalid
-      def safe_parse(str)
-        parse(str)
-      rescue
-        nil
-      end
-    end
-  end
-end
-
 Time.class_eval do
   class << self
     unless method_defined?(:safe_parse)
@@ -40,3 +27,16 @@ if defined?(ActiveSupport::TimeZone)
     end
   end
 end
+
+Date.class_eval do
+  class << self
+    unless method_defined?(:safe_parse)
+      # Parses the `str` and returns `nil` if invalid
+      def safe_parse(str)
+        parse(str)
+      rescue
+        nil
+      end
+    end
+  end
+end

data/lib/ruby-rails-extensions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyRailsExtensions
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-rails-extensions
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Brands Insurance
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2024-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop-rubomatic-rails