i18n_date_range 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eddd20b29da075a3aa8e3f4c274c14a942887039bd1b85f28b25cf85945d815f
-  data.tar.gz: 032275f6d7c6ed1dd90525d6545730502b7358a4085409167e640b8c55a94cb2
+  metadata.gz: cccdf8466a4a86af47c5ce4f8e6401dbe867f4ae004b0cdfe9fcb51a816340cd
+  data.tar.gz: cb6b34ae5f3be8f43c686ff11cb55c0aba2934bd15cdded13d2d96d7da51e65d
 SHA512:
-  metadata.gz: f33b04aa867d4dd0152301e8d7beaaf04f2a6a7aca1610982a64e96e858fbac7d6296dea2defe17974132ab49268b6087be5e361c5162b78c88bd6ad418f862b
-  data.tar.gz: bcabbaf98c0f77319b99e3957758d60f269fb5dd6479b970c325b9da76aa5ea0e00aae8852a524c4eb6a9a31ead3c5149de4cc1d99c07d38836c0c798ed2fdc4
+  metadata.gz: 960d6c324b8009054801a59a4439c0b7d97959a3d7df274e5d9ec41088a5311f764cf3b94a8631c33a654c715786c06fc56cfef30908ad434322b6dc67205abc
+  data.tar.gz: fd60aef7c2ba372ead575dc9793267a2ac8afacce6b4bce1989c26d45da48300ba80f8ee99b3990a1958fc786dc03abfbb5d03e50f87b3483bba943673b0f7d9

data/.rubocop.yml

@@ -1,3 +1,5 @@
+require: rubocop-rails
+
 AllCops:
   TargetRubyVersion: 2.6
 

data/Gemfile

@@ -5,6 +5,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in i18n_date_range.gemspec
 gemspec
 
+gem "combustion"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rubocop", "~> 1.21"
+gem "rubocop-rails", require: false

data/Gemfile.lock

@@ -0,0 +1,228 @@
+PATH
+  remote: .
+  specs:
+    i18n_date_range (0.2.0)
+      rails
+      rails-i18n
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
+      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)
+      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)
+      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)
+      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)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.0.8)
+      activesupport (= 7.0.8)
+      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)
+      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)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.8)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    base64 (0.1.1)
+    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)
+    crass (1.0.6)
+    date (3.3.3)
+    diff-lcs (1.5.0)
+    erubi (1.12.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    loofah (2.21.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      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)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      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)
+      ast (~> 2.4.1)
+      racc
+    racc (1.7.1)
+    rack (2.2.8)
+    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)
+      bundler (>= 1.15.0)
+      railties (= 7.0.8)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    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
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-rails (6.0.3)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
+    rspec-support (3.12.1)
+    rubocop (1.56.2)
+      base64 (~> 0.1.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.2.2.3)
+      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)
+      parser (>= 3.2.1.0)
+    rubocop-rails (2.21.0)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.33.0, < 2.0)
+    ruby-progressbar (1.13.0)
+    thor (1.2.2)
+    timeout (0.4.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.4.2)
+    websocket-driver (0.7.6)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.11)
+
+PLATFORMS
+  x86_64-darwin-20
+  x86_64-darwin-22
+
+DEPENDENCIES
+  bundler
+  combustion
+  i18n_date_range!
+  rails
+  rails-i18n
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  rspec-rails
+  rubocop (~> 1.21)
+  rubocop-rails
+
+BUNDLED WITH
+   2.4.6

data/README.md

@@ -26,79 +26,20 @@ Format can be `:short` or `:long` (default is :short)
 "Short" format means without the explicit day name (September 8, 2024).  
 "Long" format means with it (Friday, September 8, 2024).  
 
-## Examples (in French)
-
-    // Example 1
-    <% date_from = Date.today %>
-    <%= date_range_i18n(date_from) %>
-
-=> 8 septembre 2023
-
-    // Example 1 bis
-    <% date_from = Date.today %>
-    <%= date_range_i18n(date_from, nil, :long) %>
-
-=> vendredi 8 septembre 2023
-
-    // Example 2
-    <% 
-    date_from = Date.today 
-    date_to = Date.today + 1.day
-    %>
-    <%= date_range_i18n(date_from, date_to) %>
-
-=> Du 8 au 9 septembre 2023
-
-    // Example 2 bis
-    <% 
-    date_from = Date.today 
-    date_to = Date.today + 1.day
-    %>
-    <%= date_range_i18n(date_from, date_to, :long) %>
-
-=> Du vendredi 8 au samedi 9 septembre 2023
-
-    // Example 3
-    <% 
-    date_from = Date.today 
-    date_to = Date.today + 1.month
-    %>
-    <%= date_range_i18n(date_from, date_to) %>
-
-=> Du 8 septembre au 8 octobre 2023
-
-    // Example 3 bis
-    <% 
-    date_from = Date.today 
-    date_to = Date.today + 1.month
-    %>
-    <%= date_range_i18n(date_from, date_to, :long) %>
-
-=> Du vendredi 8 septembre au dimanche 8 octobre 2023
-
-    // Example 4
-    <% 
-    date_from = Date.today 
-    date_to = Date.today + 1.year
-    %>
-    <%= date_range_i18n(date_from, date_to) %>
-
-=> Du 8 septembre 2023 au 8 septembre 2024
-
-    // Example 4 bis
-    <% 
-    date_from = Date.today 
-    date_to = Date.today + 1.year
-    %>
-    <%= date_range_i18n(date_from, date_to, :long) %>
-
-=> Du vendredi 8 septembre 2023 au dimanche 8 septembre 2024
-
 ## Change texts or formats
 
 This gem is based on I18n. Feel free to overwrite any key you want.  
 Refer to [config/locales/fr.yml](config/locales/fr.yml) to see what can be edited.
 
+## Tests
+
+Tests are done with RSpec, and Combustion is used to simulate the Rails app.
+Rubocop is used to check the syntax.
+
+- `bundle exec rspec` to launch the tests
+- `rake rubocop` to launch Rubocop
+- `rake` to launch both (default)
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/noesya/i18n_date_range.

data/config/locales/en-GB.yml

@@ -6,10 +6,10 @@ en-GB:
   date:
     formats:
       short:
-        day: "%e"
-        day_month: "%e %B"
-        day_month_year: "%e %B %Y"
+        day: "%-d"
+        day_month: "%-d %B"
+        day_month_year: "%-d %B %Y"
       long:
-        day: "%A %e"
-        day_month: "%A, %e %B"
-        day_month_year: "%A, %e %B %Y"
+        day: "%A %-d"
+        day_month: "%A, %-d %B"
+        day_month_year: "%A, %-d %B %Y"

data/config/locales/en.yml

@@ -6,10 +6,10 @@ en:
   date:
     formats:
       short:
-        day: "%e"
-        day_month: "%B %e"
-        day_month_year: "%B %e, %Y"
+        day: "%-d"
+        day_month: "%B %-d"
+        day_month_year: "%B %-d, %Y"
       long:
-        day: "%A %e"
-        day_month: "%A, %B %e"
-        day_month_year: "%A, %B %e, %Y"
+        day: "%A %-d"
+        day_month: "%A, %B %-d"
+        day_month_year: "%A, %B %-d, %Y"

data/config/locales/fr.yml

@@ -6,10 +6,10 @@ fr:
   date:
     formats:
       short:
-        day: "%e"
-        day_month: "%e %B"
-        day_month_year: "%e %B %Y"
+        day: "%-d"
+        day_month: "%-d %B"
+        day_month_year: "%-d %B %Y"
       long:
-        day: "%A %e"
-        day_month: "%A %e %B"
-        day_month_year: "%A %e %B %Y"
+        day: "%A %-d"
+        day_month: "%A %-d %B"
+        day_month_year: "%A %-d %B %Y"

data/config.ru

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler"
+
+Bundler.require :default, :development
+
+Combustion.initialize! :all
+run Combustion::Application

data/i18n_date_range.gemspec

@@ -5,7 +5,7 @@ require_relative "lib/i18n_date_range/version"
 Gem::Specification.new do |spec|
   spec.name          = "i18n_date_range"
   spec.version       = I18nDateRange::VERSION
-  spec.authors       = ["pabois"]
+  spec.authors       = ["pabois", "arnaudlevy"]
   spec.email         = ["pierreandre.boissinot@noesya.coop"]
 
   spec.summary       = "Add helper to display a date range"
@@ -29,6 +29,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # For more information and examples about making a new gem, checkout our
-  # guide at: https://bundler.io/guides/creating_gem.html
+  spec.add_dependency "rails"
+  spec.add_dependency "rails-i18n"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "combustion"
+  spec.add_development_dependency "rails"
+  spec.add_development_dependency "rails-i18n"
+  spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-rails"
 end

data/lib/i18n_date_range/i18n_date_range_generator.rb

@@ -1,46 +1,55 @@
+# frozen_string_literal: true
+
+# Computing range to choose the correct form
 class I18nDateRangeGenerator
   attr_reader :from_date, :to_date, :format
-  
-  def self.generate(from_date, to_date, format)
+
+  def self.generate(from_date, to_date, format = :short)
     new(from_date, to_date, format).to_s
   end
 
-  def initialize(from_date, to_date, format)
+  def initialize(from_date, to_date, format = :short)
     @from_date = from_date
     @to_date = to_date
     @format = format
   end
-  
+
   def to_s
-    to_date.blank? ? without_to : with_to
+    to_date.blank? || same_date? ? without_to : with_to
   end
 
   protected
 
+  def same_date?
+    to_date == from_date
+  end
+
   def without_to
     I18n.t(
-      'date_range.without_to', 
+      "date_range.without_to",
       from: format_date(from_date, :day_month_year)
-    ) 
+    ).capitalize
   end
 
   def with_to
     I18n.t(
-      'date_range.with_to', 
-      from: format_date(from_date, from_format), 
+      "date_range.with_to",
+      from: format_date(from_date, from_format),
       to: format_date(to_date, :day_month_year)
-    )
+    ).capitalize
   end
 
   def from_format
     return :day_month_year if different_year?
+
     return :day_month if different_month?
+
     :day
   end
 
   def format_date(date, key)
     I18n.l(
-      date, 
+      date,
       format: "#{format}.#{key}".to_sym
     )
   end
@@ -52,5 +61,4 @@ class I18nDateRangeGenerator
   def different_month?
     from_date.month != to_date.month
   end
-
-end
+end

data/lib/i18n_date_range/i18n_date_range_helper.rb

@@ -1,7 +1,10 @@
-module I18nDateRangeHelper
+# frozen_string_literal: true
 
+# Rails helper
+# Format can be :short (default) or :long
+# <%= date_range_i18n(start, end, :long)
+module I18nDateRangeHelper
   def date_range_i18n(from, to = nil, format = :short)
     I18nDateRangeGenerator.generate(from, to, format)
   end
-  
-end
+end

data/lib/i18n_date_range/version.rb

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

data/lib/i18n_date_range.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "rails"
 require_relative "i18n_date_range/version"
 require_relative "i18n_date_range/i18n_date_range_generator"
 require_relative "i18n_date_range/i18n_date_range_helper"
@@ -7,9 +8,10 @@ require_relative "i18n_date_range/i18n_date_range_helper"
 module I18nDateRange
   class Error < StandardError; end
 
+  # Integration in Rails
   class Engine < ::Rails::Engine
     isolate_namespace I18nDateRange
 
-    ActiveSupport.on_load( :action_view ){ include I18nDateRangeHelper }
+    ActiveSupport.on_load(:action_view) { include I18nDateRangeHelper }
   end
 end

metadata

@@ -1,15 +1,142 @@
 --- !ruby/object:Gem::Specification
 name: i18n_date_range
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - pabois
+- arnaudlevy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-08 00:00:00.000000000 Z
-dependencies: []
+date: 2023-09-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Add a new helper to display properly a date range (ex: From 8 to 9 September
   2023)'
 email:
@@ -23,11 +150,13 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- config.ru
 - config/locales/en-GB.yml
 - config/locales/en.yml
 - config/locales/fr.yml