active_period 7.1.1 → 7.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfac8dacceda500a1902d5294bc1085a70471c3b8d9abf0c0bf039c5e6a5bdba
-  data.tar.gz: a016fb107d49981e8eb89caf285012277c30b21a46928c460bc7ad9c5f5e80ec
+  metadata.gz: e197dc4558fd215fc7090f5a14ad074e769457abfa7665b4b2393e5ba2a23d52
+  data.tar.gz: 54c3de6172706d0f08e2885b6401b3f1c964526498193a63c13af4fbfab6eb99
 SHA512:
-  metadata.gz: f164a66d035b1f4488a5851fdc9205c2a1836c35c145d63f551fe52038749d86e0c11d6d57eb266aa0c980516e28211a004b0fbe7019335a9ffd29ee0687f22d
-  data.tar.gz: ec860e7598cf0263def6444a9a119efb04aa3631d9f5c1106a7ca690adb9a0c7d1e413ccfd567cb4e9be61de4613c9a77e54dbe06979dc434fd342e92cf50fd4
+  metadata.gz: a228d61ffcb56d1f9206127e22775e2a3ec109822ce0b8242e6e778d8edb08531dd9b2834cc7def80cb42ec7cf148b2abc8776059228c5fb7b7d9cb90ec68562
+  data.tar.gz: 25550cbd55706774bfd34e68690be5d39b2e01b6681f33b3134d3c7169949c9e1d017ac40cadd24d041eef2c85d3ce6c05dbb8fe76761d6a2fabebe501230e24

data/Gemfile.lock

@@ -1,19 +1,18 @@
 PATH
   remote: .
   specs:
-    active_period (7.1.0)
-      activesupport (>= 5, <= 7)
+    active_period (7.1.1)
+      activesupport (>= 5, < 8)
       i18n (~> 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     builder (3.2.4)
     concurrent-ruby (1.1.10)
     cucumber (7.0.0)
@@ -61,7 +60,6 @@ GEM
       ffi (~> 1.1)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby

data/config/locales/fr.yml

@@ -15,8 +15,8 @@ fr:
       param_must_be_a_range:            Le paramètre doit hériter de la class Range
     free_period:
       default_format:                   Du %{from} au %{to} %{ending}
-      beginless_format:                 Jusqu'au %{from} %{ending}
-      endless_format:                   Depuis le %{to}
+      beginless_format:                 Jusqu'au %{to} %{ending}
+      endless_format:                   Depuis le %{from}
       boundless_format:                 Sans limite de temps
     standard_period:
       base_class_is_abstract:     StandardPeriod est une class abstraite qui ne doit pas être utiliser directement

data/lib/active_period/version.rb

@@ -1,5 +1,5 @@
 module ActivePeriod
 
-  VERSION = '7.1.1'.freeze
+  VERSION = '7.1.2'.freeze
 
 end

data/lib/period.rb

@@ -50,32 +50,56 @@ module Period
     alias tomorrow next_day
     alias today this_day
 
-    # Experimental non-documented feature
+    LAST_OR_NEXT_REGEX = /^(:?last|next)_(\d+)_(day|week|month|quarter|year)s?(_from_now)?$/
+    LAST_AND_NEXT_REGEX = /^last_(\d+)_(day|week|month|quarter|year)s?_to_next_(\d+)_(day|week|month|quarter|year)s?$/
+
+    # Experimenta l non-documented feature
     # Inpired form ActiveRecord dynamic find_by_x like User.find_by_name
     # Example: Period.last_3_weeks_from_now == Period.mew(2.weeks.ago.beginning_of_week..Time.now.end_of_week)
-    # Note : Maybe it should return a collection of StandardPeriod
     def method_missing(method_name, *arguments, &block)
-      super unless method_name.match?(/(last|next)_\d+_(day|week|month|quarter|year)s?(_from_now)?/)
-      last_next, count, klass = method_name.to_s.split('_')
+      if method_name.match? LAST_OR_NEXT_REGEX
+        missing_last_or_next(method_name)
+      elsif method_name.match? LAST_AND_NEXT_REGEX
+        missing_last_and_next(method_name)
+      else
+        super
+      end
+    end
+
+    def missing_last_or_next(method_name)
+      last_next, count, klass, from_now = method_name.to_s.scan(LAST_OR_NEXT_REGEX).flatten
       klass = klass.singularize
 
       case last_next
       when 'last'
         from = count.to_i.send(klass).ago.send("beginning_of_#{klass}")
         to = env_time.now
-        to -= 1.send(klass) unless method_name.match?(/from_now$/)
+        to -= 1.send(klass) unless from_now
         to = to.send("end_of_#{klass}")
       when 'next'
         from = env_time.now
-        from += 1.send(klass) unless method_name.match?(/from_now$/)
+        from += 1.send(klass) unless from_now
         from = from.send("beginning_of_#{klass}")
         to = count.to_i.send(klass).from_now.send("end_of_#{klass}")
       end
       self.new(from..to)
     end
 
+    def missing_last_and_next(method_name)
+      last_count, last_klass, next_count, next_klass = method_name.to_s.scan(LAST_AND_NEXT_REGEX).flatten
+      last_klass = last_klass.singularize
+      next_klass = next_klass.singularize
+
+      from = last_count.to_i.send(last_klass).ago.send("beginning_of_#{last_klass}")
+      to = next_count.to_i.send(next_klass).from_now.send("end_of_#{next_klass}")
+
+      self.new(from..to)
+    end
+
     def respond_to_missing?(method_name, include_private = false)
-      method_name.match?(/(last|next)_\d+_(day|week|month|quarter|year)s?(_from_now)?/) || super
+      method_name.match?(/(last|next)_\d+_(day|week|month|quarter|year)s?(_from_now)?/) ||
+      method_name.match?(/(last)_\d+_(day|week|month|quarter|year)s?_to_next_\d+_(day|week|month|quarter|year)s?/ ) ||
+      super
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_period
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.2
 platform: ruby
 authors:
 - billau_l
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-24 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Manage time ranges without brain damage.