eco-helpers 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 763e0c31825790c4529dca3c90c5b673fc948605f4fb0fad3c73ad5caabe1473
-  data.tar.gz: edabe853c610dfe4b003600e953c1a2c6e16ebf69881073d08c69af7dd08fecb
+  metadata.gz: 80de08cdef4ada108f4853214720d30985461e43309b9d442932975e7400bf20
+  data.tar.gz: c9174f97cd87f2c092f3ec892397fa53711a7efd61d8bbd456b3e68d62d8cf03
 SHA512:
-  metadata.gz: 1e4bb559627452bddeb611a25234c02f7d9d0406af0c9c3fa585d467f4c49118d65a7462566d9e41ac737b11c52d2e344aa4242f45bc671142c3cca6e1fc8cfa
-  data.tar.gz: c47d33d0c37a32b3dd26a280000f91a77860cdb99ca64a15387cf5d1038de1b0fe757b4c57aef80ccd76be7576d3835408d3b58007f39a9d6cddbcbfa36996a2
+  metadata.gz: dfc1092476a865d1902eaf1d241b27f4a141b72d287524f41107d13b9e447a1a83d04f278e1a04046e1435b7ce5b919e597a030c7c4eb8ccadb9431e90ace039
+  data.tar.gz: 4bf36063e2b8eca6051343a9b18ecbe61ac3e04c1789be8dc269d59f36c444690475ff0fdf42113ca74e035a41bef0d12e6d574a9845966ebbb73d4b303ef47d

data/CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 ## [2.7.2] - 2024-04-xx
 
 ### Added
+  - **Parsers**
+    - Native **number parser**, added _warning_ when number cannot be parsed
+
 ### Changed
 ### Fixed
 

data/lib/eco/api/common/people/default_parsers/date_parser.rb

@@ -16,30 +16,22 @@ class Eco::API::Common::People::DefaultParsers::DateParser < Eco::API::Common::L
 
   def parse_date(value, attr:)
     return value.map {|val| parse_date(val, attr: attr)}.compact if value.is_a?(Enumerable)
+    return nil if blank?(value)
 
-    return nil if value.nil?
     value = value.to_s.strip
-    return nil if value.empty?
-
-    if date?(value)
-      Date.parse(value).then do |date|
-        next date if valid_range?(date)
-        wrong!(value, attr: attr, desc: 'Date out of range (1900-2099). Given: ')
-        nil
-      end
-    else
-      wrong!(value, attr: attr)
-      nil
-    end
+    return wrong!(value, attr: attr) unless date?(value)
+
+    date = Date.parse(value)
+    return date if valid_range?(date)
+
+    wrong!(value, attr: attr, desc: 'Date out of range (1900-2099). Given: ')
   rescue TypeError, Date::Error
     nil
   end
 
   def serialize_date(value)
     return value.map {|val| serialize_date(val)}.compact if value.is_a?(Enumerable)
-
-    return nil   if value.nil?
-    return nil   if value.to_s.strip.empty?
+    return nil   if blank?(value)
     return value if value.is_a?(String)
     return nil   unless [Date, Time].any? {|type| value.is_a?(type)}
     value&.strftime('%Y-%m-%d')
@@ -47,18 +39,6 @@ class Eco::API::Common::People::DefaultParsers::DateParser < Eco::API::Common::L
     nil
   end
 
-  def wrong!(value, attr:, desc: "Can't make a date out of")
-    return if wrong(attr).key?(value)
-    wrong(attr)[value] = value
-    log(:warn) { "#{desc} '#{value}' for '#{attr}'" }
-  end
-
-  def wrong(attr = nil)
-    @wrong ||= {}
-    return @wrong if attr.nil?
-    @wrong[attr] ||= {}
-  end
-
   def date?(value)
     return true if value.nil?
     return true if value.to_s.strip.empty?
@@ -74,6 +54,19 @@ class Eco::API::Common::People::DefaultParsers::DateParser < Eco::API::Common::L
     max_date >= date
   end
 
+  def wrong!(value, attr:, desc: "Can't make a date out of")
+    return if wrong(attr).key?(value)
+    wrong(attr)[value] = value
+    log(:warn) { "#{desc} '#{value}' for '#{attr}'" }
+    nil
+  end
+
+  def wrong(attr = nil)
+    @wrong ||= {}
+    return @wrong if attr.nil?
+    @wrong[attr] ||= {}
+  end
+
   def min_date
     @min_date ||= Date.parse(MIN_DATE)
   end
@@ -81,4 +74,10 @@ class Eco::API::Common::People::DefaultParsers::DateParser < Eco::API::Common::L
   def max_date
     @max_date ||= Date.parse(MAX_DATE)
   end
+
+  def blank?(value)
+    return true if value.nil?
+    return true if value.to_s.strip.empty?
+    false
+  end
 end

data/lib/eco/api/common/people/default_parsers/numeric_parser.rb

@@ -1,8 +1,8 @@
 class Eco::API::Common::People::DefaultParsers::NumericParser < Eco::API::Common::Loaders::Parser
   attribute :number
 
-  def parser(value, _deps)
-    parse_number(value)
+  def parser(value, deps)
+    parse_number(value, attr: deps['attr'])
   end
 
   def serializer(value, _deps)
@@ -11,13 +11,13 @@ class Eco::API::Common::People::DefaultParsers::NumericParser < Eco::API::Common
 
   private
 
-  def parse_number(value)
-    return value.map {|val| parse_number(val)}.compact if value.is_a?(Enumerable)
+  def parse_number(value, attr:)
+    return value.map {|val| parse_number(val, attr: attr)}.compact if value.is_a?(Enumerable)
+    return nil if blank?(value)
 
-    return nil if value.nil?
     value = value.to_s.strip
-    return nil if value.empty?
-    return nil unless number?(value)
+    return wrong!(value, attr: attr) unless number?(value)
+
     value.to_f
   rescue ArgumentError, TypeError
     nil
@@ -28,4 +28,23 @@ class Eco::API::Common::People::DefaultParsers::NumericParser < Eco::API::Common
   rescue ArgumentError, TypeError
     false
   end
+
+  def wrong!(value, attr:, desc: "Can't make a number out of")
+    return if wrong(attr).key?(value)
+    wrong(attr)[value] = value
+    log(:warn) { "#{desc} '#{value}' for '#{attr}'" }
+    nil
+  end
+
+  def wrong(attr = nil)
+    @wrong ||= {}
+    return @wrong if attr.nil?
+    @wrong[attr] ||= {}
+  end
+
+  def blank?(value)
+    return true if value.nil?
+    return true if value.to_s.strip.empty?
+    false
+  end
 end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.7.1"
+  VERSION = "2.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Oscar Segura