arel_extensions 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a07429d6f459dff77dc3fa56aa258f1fee94ecb7401772ec3ceaea8dc0a8c4d7
-  data.tar.gz: d1600677cf0e63777bd8d8b656f4e17f0fa534e23579cfe3c18044e855a6115b
+  metadata.gz: e4f994a5cce5bea002ac1274171d392e20f9119b45609484fc7b6a97c71aeef5
+  data.tar.gz: 7dae52792c8713f7c129c5c8870939cfc397ec8e2fb07a980bdba318a4c5fcd5
 SHA512:
-  metadata.gz: 752646ca62337cff68c38bcda876d5aa1f7cf6cb8f31906b6d6335237aa1a074daf4891b94b45486d758f1af035d87aac2449951aab683d35f84c123b10c39f8
-  data.tar.gz: d3002160ab13dc1ecbdac0d863a72847a4b3f151cfe12ada6d694b4fb02d70a7e16facbe455d474a5e2ce51ca5686c8abfee26962b91f04023e2fdeb335e22e0
+  metadata.gz: 77c8c7c4767f2c2ee617e001c2966bf6d6ad53daa2026ceb71efd337ebdfe1a2e2af080734f522f659a71ad1569052bd1c4730cde4d34f7577899245b50915a3
+  data.tar.gz: 71d6d5420d2515caecddc02613819bb2b2b06a5aed6f66d06e8d9397f2af6b478f97b6798746f91cc116fb4199aca4f4c61c98b45a0aa6cca9b8a0e821b90f83

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.3.2".freeze
+  VERSION = "1.3.3".freeze
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -14,13 +14,14 @@ module ArelExtensions
 
       LOADED_VISITOR::DATE_FORMAT_DIRECTIVES = {
         '%Y' => 'YYYY', '%C' => '', '%y' => 'YY', '%m' => 'MM', '%B' =>   '', '%b' => '', '%^b' => '', # year, month
-        '%d' => 'DD', '%e' => '', '%j' =>   '', '%w' => 'dw', '%A' => '', # day, weekday
-        '%H' => 'hh', '%k' => '', '%I' =>   '', '%l' =>   '', '%P' => '', '%p' => '', # hours
+        '%V' => 'iso_week', '%G' => '',                                                                # ISO week number and year of week
+        '%d' => 'DD', '%e' => '', '%j' =>   '', '%w' => 'dw', '%A' => '',                              # day, weekday
+        '%H' => 'hh', '%k' => '', '%I' =>   '', '%l' =>   '', '%P' => '', '%p' => '',                  # hours
         '%M' => 'mi', '%S' => 'ss', '%L' => 'ms', '%N' => 'ns', '%z' => 'tz'
       }.freeze
 
       LOADED_VISITOR::DATE_FORMAT_FORMAT = {
-        'YY' => '0#', 'MM' => '0#', 'DD' => '0#', 'hh' => '0#', 'mi' => '0#', 'ss' => '0#'
+        'YY' => '0#', 'MM' => '0#', 'DD' => '0#', 'hh' => '0#', 'mi' => '0#', 'ss' => '0#', 'iso_week' => '0#'
       }
 
       LOADED_VISITOR::DATE_FORMAT_REGEX =

data/lib/arel_extensions/visitors/mysql.rb

@@ -8,6 +8,7 @@ module ArelExtensions
 
       DATE_FORMAT_DIRECTIVES = { # ISO C / POSIX
         '%Y' => '%Y', '%C' =>   '', '%y' => '%y', '%m' => '%m', '%B' => '%M', '%b' => '%b', '%^b' => '%b',  # year, month
+        '%V' => '%v', '%G' => '%x',                                                                         # ISO week number and year of week
         '%d' => '%d', '%e' => '%e', '%j' => '%j', '%w' => '%w', '%A' => '%W',                               # day, weekday
         '%H' => '%H', '%k' => '%k', '%I' => '%I', '%l' => '%l', '%P' => '%p', '%p' => '%p',                 # hours
         '%M' => '%i', '%S' => '%S', '%L' =>   '', '%N' => '%f', '%z' => ''

data/lib/arel_extensions/visitors/oracle.rb

@@ -6,6 +6,7 @@ module ArelExtensions
       DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'IW', 'y' => 'YEAR', 'wd' => 'D', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
       DATE_FORMAT_DIRECTIVES = {
         '%Y' => 'YYYY', '%C' => 'CC', '%y' => 'YY', '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
+        '%V' => 'IW', '%G' => 'IYYY',                                                                       # ISO week number and year of week
         '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%A' => 'Day',                             # day, weekday
         '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM',                   # hours
         '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz'                                # seconds, subseconds

data/lib/arel_extensions/visitors/postgresql.rb

@@ -9,9 +9,10 @@ module ArelExtensions
       DATE_FORMAT_DIRECTIVES = {
         '%Y' => 'YYYY', '%C' => 'CC', '%y' => 'YY',
         '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
-        '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%A' => 'Day', # day, weekday
+        '%V' => 'IW', '%G' => 'IYYY',                                                     # ISO week number and year of week
+        '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%A' => 'Day',           # day, weekday
         '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM', # hours
-        '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz', # seconds, subseconds
+        '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz',             # seconds, subseconds
         '%%' => '%',
       }.freeze
 

data/test/with_ar/all_agnostic_test.rb

@@ -438,6 +438,39 @@ module ArelExtensions
         end
       end
 
+      def test_format_iso_week
+        skip "Unsupported ISO week number for DB=#{ENV['DB']}" if ['sqlite'].include?(ENV['DB'])
+        assert_equal '10', t(@lucas, @updated_at.format('%V'))
+        {
+          '2024-01-01 10:42:00' => '01', # Monday
+          '2030-01-01 10:42:00' => '01', # Tuesday
+          '2025-01-01 10:42:00' => '01', # Wednesday
+          '2026-01-01 10:42:00' => '01', # Thursday
+          '2027-01-01 10:42:00' => '53', # Friday
+          '2028-01-01 10:42:00' => '52', # Saturday
+          '2034-01-01 10:42:00' => '52', # Sunday
+        }.each do |date, exp|
+          assert_equal exp, t(@lucas, Arel::Nodes.build_quoted(date).cast(:datetime).format('%V'))
+        end
+      end
+
+      def test_format_iso_year_of_week
+        skip "Unsupported ISO year of week for DB=#{ENV['DB']}" if ['mssql', 'sqlite'].include?(ENV['DB'])
+        assert_equal '2014', t(@lucas, @updated_at.format('%G'))
+
+        {
+          '2024-01-01 10:42:00' => '2024', # Monday
+          '2030-01-01 10:42:00' => '2030', # Tuesday
+          '2025-01-01 10:42:00' => '2025', # Wednesday
+          '2026-01-01 10:42:00' => '2026', # Thursday
+          '2027-01-01 10:42:00' => '2026', # Friday
+          '2028-01-01 10:42:00' => '2027', # Saturday
+          '2034-01-01 10:42:00' => '2033', # Sunday
+        }.each do |date, exp|
+          assert_equal exp, t(@lucas, Arel::Nodes.build_quoted(date).cast(:datetime).format('%G'))
+        end
+      end
+
       def test_coalesce
         assert_equal 'Camille concat', t(@camille, @name.coalesce(nil, "default") + ' concat')
 

data/version_v1.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.3.2".freeze
+  VERSION = "1.3.3".freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.1.2".freeze
+  VERSION = "2.1.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel