i18n_date_range 0.2.2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afebdd0ed4c442670f29f0d6a69fd7940c04746782e8e6b75eabc524f7ec4152
-  data.tar.gz: 8fb9d60ccf6ec85efc202dbc1f14356c867c8930220c4675b6a04316712475fb
+  metadata.gz: f38a2147e122551310ee5d28d3df45ef4dab7f5f29cfe8671e48d11e4a4f9691
+  data.tar.gz: 62bdeedfe23d3faab4abebeaffafe2848da2747556720c99888e4fea10b3d695
 SHA512:
-  metadata.gz: 4eb6409e48b3a9b0d574ecd56d765c724483d3333da87e7eca1ea1309dd9cb03fefa23281f2563f467184ef0c75dad61bba714de877230c8eb5eb68f597ee2bf
-  data.tar.gz: 59f39bba2423aa30649a6cc85c2d0940a1d7b54b12312a5ac99682b178decf3308c0dc6b92480409422890b964771dc39cc8b6fe28d398350c3c7a45d25fef0a
+  metadata.gz: f27c07f2d24572906268d24238de7422c727ae1e778107668d92f30b1ae82860f6325b1d6995be45c0177df1601fa7a45ad8c9d88a8b31b48105460e43054671
+  data.tar.gz: 10f90d2035b0c156fae99d838c81b4a2b4194a2c59e1b7c84248f4953071a0924dba1165d38a65911b79cfb2ec2864f1a2080e6f61732812b6f93cc80c1cdeeb

data/Gemfile.lock

@@ -1,97 +1,113 @@
 PATH
   remote: .
   specs:
-    i18n_date_range (0.2.2)
+    i18n_date_range (1.0.1)
       rails
       rails-i18n
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
+    actioncable (7.1.1)
+      actionpack (= 7.1.1)
+      activesupport (= 7.1.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8)
-      actionpack (= 7.0.8)
-      activejob (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.1)
+      actionpack (= 7.1.1)
+      activejob (= 7.1.1)
+      activerecord (= 7.1.1)
+      activestorage (= 7.1.1)
+      activesupport (= 7.1.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.8)
-      actionpack (= 7.0.8)
-      actionview (= 7.0.8)
-      activejob (= 7.0.8)
-      activesupport (= 7.0.8)
+    actionmailer (7.1.1)
+      actionpack (= 7.1.1)
+      actionview (= 7.1.1)
+      activejob (= 7.1.1)
+      activesupport (= 7.1.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.8)
-      actionview (= 7.0.8)
-      activesupport (= 7.0.8)
-      rack (~> 2.0, >= 2.2.4)
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.1)
+      actionview (= 7.1.1)
+      activesupport (= 7.1.1)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.8)
-      actionpack (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.1)
+      actionpack (= 7.1.1)
+      activerecord (= 7.1.1)
+      activestorage (= 7.1.1)
+      activesupport (= 7.1.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.8)
-      activesupport (= 7.0.8)
+    actionview (7.1.1)
+      activesupport (= 7.1.1)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.8)
-      activesupport (= 7.0.8)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.1)
+      activesupport (= 7.1.1)
       globalid (>= 0.3.6)
-    activemodel (7.0.8)
-      activesupport (= 7.0.8)
-    activerecord (7.0.8)
-      activemodel (= 7.0.8)
-      activesupport (= 7.0.8)
-    activestorage (7.0.8)
-      actionpack (= 7.0.8)
-      activejob (= 7.0.8)
-      activerecord (= 7.0.8)
-      activesupport (= 7.0.8)
+    activemodel (7.1.1)
+      activesupport (= 7.1.1)
+    activerecord (7.1.1)
+      activemodel (= 7.1.1)
+      activesupport (= 7.1.1)
+      timeout (>= 0.4.0)
+    activestorage (7.1.1)
+      actionpack (= 7.1.1)
+      activejob (= 7.1.1)
+      activerecord (= 7.1.1)
+      activesupport (= 7.1.1)
       marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.8)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
     base64 (0.1.1)
+    bigdecimal (3.1.4)
     builder (3.2.4)
     combustion (1.3.7)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     crass (1.0.6)
     date (3.3.3)
     diff-lcs (1.5.0)
+    drb (2.1.1)
+      ruby2_keywords
     erubi (1.12.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    io-console (0.6.0)
+    irb (1.8.3)
+      rdoc
+      reline (>= 0.3.8)
     json (2.6.3)
     language_server-protocol (3.17.0.3)
-    loofah (2.21.3)
+    loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -100,43 +116,50 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.2)
-    method_source (1.0.0)
     mini_mime (1.1.5)
     minitest (5.20.0)
-    net-imap (0.3.7)
+    mutex_m (0.1.2)
+    net-imap (0.4.3)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.1)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
     nokogiri (1.15.4-x86_64-darwin)
       racc (~> 1.4)
     parallel (1.23.0)
-    parser (3.2.2.3)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
+    psych (5.1.1.1)
+      stringio
     racc (1.7.1)
-    rack (2.2.8)
+    rack (3.0.8)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.8)
-      actioncable (= 7.0.8)
-      actionmailbox (= 7.0.8)
-      actionmailer (= 7.0.8)
-      actionpack (= 7.0.8)
-      actiontext (= 7.0.8)
-      actionview (= 7.0.8)
-      activejob (= 7.0.8)
-      activemodel (= 7.0.8)
-      activerecord (= 7.0.8)
-      activestorage (= 7.0.8)
-      activesupport (= 7.0.8)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails (7.1.1)
+      actioncable (= 7.1.1)
+      actionmailbox (= 7.1.1)
+      actionmailer (= 7.1.1)
+      actionpack (= 7.1.1)
+      actiontext (= 7.1.1)
+      actionview (= 7.1.1)
+      activejob (= 7.1.1)
+      activemodel (= 7.1.1)
+      activerecord (= 7.1.1)
+      activestorage (= 7.1.1)
+      activesupport (= 7.1.1)
       bundler (>= 1.15.0)
-      railties (= 7.0.8)
+      railties (= 7.1.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -147,16 +170,21 @@ GEM
     rails-i18n (7.0.8)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.0.8)
-      actionpack (= 7.0.8)
-      activesupport (= 7.0.8)
-      method_source
+    railties (7.1.1)
+      actionpack (= 7.1.1)
+      activesupport (= 7.1.1)
+      irb
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.1)
+    rake (13.1.0)
+    rdoc (6.5.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.8.2)
+    reline (0.3.9)
+      io-console (~> 0.5)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -179,34 +207,36 @@ GEM
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
     rspec-support (3.12.1)
-    rubocop (1.56.2)
-      base64 (~> 0.1.1)
+    rubocop (1.57.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-rails (2.21.0)
+    rubocop-rails (2.22.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
     ruby-progressbar (1.13.0)
-    thor (1.2.2)
+    ruby2_keywords (0.0.5)
+    stringio (3.0.8)
+    thor (1.3.0)
     timeout (0.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
+    webrick (1.8.1)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   x86_64-darwin-20

data/config/locales/en-GB.yml

@@ -1,15 +1,19 @@
 en-GB:
   date_range:
-    with_to: "From %{from} to %{to}"
-    without_to: "%{from}"
+    one_line:
+      with_to: "From %{from} to %{to}"
+      without_to: "%{from}"
+    two_lines:
+      with_to: "%{from}<br>%{to}"
+      without_to: "%{from}"
 
   date:
     formats:
-      rg_short:
+      range_short:
         day: "%-d"
         day_month: "%-d %B"
         day_month_year: "%-d %B %Y"
-      rg_long:
+      range_long:
         day: "%A %-d"
         day_month: "%A, %-d %B"
-        day_month_year: "%A, %-d %B %Y"
+        day_month_year: "%A, %-d %B %Y"

data/config/locales/en.yml

@@ -1,15 +1,19 @@
 en:
   date_range:
-    with_to: "From %{from} to %{to}"
-    without_to: "%{from}"
+    one_line:
+      with_to: "From %{from} to %{to}"
+      without_to: "%{from}"
+    two_lines:
+      with_to: "%{from}<br>%{to}"
+      without_to: "%{from}"
 
   date:
     formats:
-      rg_short:
+      range_short:
         day: "%-d"
         day_month: "%B %-d"
         day_month_year: "%B %-d, %Y"
-      rg_long:
+      range_long:
         day: "%A %-d"
         day_month: "%A, %B %-d"
-        day_month_year: "%A, %B %-d, %Y"
+        day_month_year: "%A, %B %-d, %Y"

data/config/locales/fr.yml

@@ -1,15 +1,19 @@
 fr:
   date_range:
-    with_to: "Du %{from} au %{to}"
-    without_to: "%{from}"
+    one_line:
+      with_to: "Du %{from} au %{to}"
+      without_to: "%{from}"
+    two_lines:
+      with_to: "%{from}<br>%{to}"
+      without_to: "%{from}"
 
   date:
     formats:
-      rg_short:
+      range_short:
         day: "%-d"
         day_month: "%-d %B"
         day_month_year: "%-d %B %Y"
-      rg_long:
+      range_long:
         day: "%A %-d"
         day_month: "%A %-d %B"
-        day_month_year: "%A %-d %B %Y"
+        day_month_year: "%A %-d %B %Y"

data/lib/i18n_date_range/i18n_date_range_generator.rb

@@ -2,16 +2,17 @@
 
 # Computing range to choose the correct form
 class I18nDateRangeGenerator
-  attr_reader :from_date, :to_date, :format
+  attr_reader :from_date, :to_date, :format, :layout
 
-  def self.generate(from_date, to_date, format = :short)
-    new(from_date, to_date, format).to_s
+  def self.generate(from_date, to_date, format: :short, layout: :one_line)
+    new(from_date, to_date, format: format, layout: layout).to_s
   end
 
-  def initialize(from_date, to_date, format = :short)
+  def initialize(from_date, to_date, format: :short, layout: :one_line)
     @from_date = from_date
     @to_date = to_date
     @format = format
+    @layout = layout
   end
 
   def to_s
@@ -26,14 +27,14 @@ class I18nDateRangeGenerator
 
   def without_to
     I18n.t(
-      "date_range.without_to",
+      "date_range.#{layout}.without_to",
       from: format_date(from_date, :day_month_year)
     ).capitalize
   end
 
   def with_to
     I18n.t(
-      "date_range.with_to",
+      "date_range.#{layout}.with_to",
       from: format_date(from_date, from_format),
       to: format_date(to_date, :day_month_year)
     ).capitalize
@@ -50,7 +51,7 @@ class I18nDateRangeGenerator
   def format_date(date, key)
     I18n.l(
       date,
-      format: "rg_#{format}.#{key}".to_sym
+      format: "range_#{format}.#{key}".to_sym
     )
   end
 

data/lib/i18n_date_range/i18n_date_range_helper.rb

@@ -3,8 +3,11 @@
 # Rails helper
 # Format can be :short (default) or :long
 # <%= date_range_i18n(start, end, :long)
+# Layout can be :one_line (default) or :two_lines, other might be necessary in the future
 module I18nDateRangeHelper
-  def date_range_i18n(from, to = nil, format = :short)
-    I18nDateRangeGenerator.generate(from, to, format)
+
+  def date_range_i18n(from, to = nil, format: nil, layout: nil)
+    I18nDateRangeGenerator.generate(from, to, format: format, layout: layout)
   end
+
 end

data/lib/i18n_date_range/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module I18nDateRange
-  VERSION = "0.2.2"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: i18n_date_range
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.1
 platform: ruby
 authors:
 - pabois
 - arnaudlevy
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2023-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -172,7 +172,7 @@ metadata:
   homepage_uri: https://github.com/noesya/i18n_date_range
   source_code_uri: https://github.com/noesya/i18n_date_range
   changelog_uri: https://github.com/noesya/i18n_date_range/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -187,8 +187,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: Add helper to display a date range
 test_files: []