fe_core_ext 0.13.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d73ff1e3330a404b7c2d2b1b8194770774963351df63355a9248e9ea386f1ab
-  data.tar.gz: ec4a5a0d73267c7888f4d34281a72eeba98666a1dbaddb3fe0039fe8aba248e5
+  metadata.gz: 5a02ed1927dc5c71d08be535561898efd8b3942bb3c4c5fe496b017fbeea10db
+  data.tar.gz: 75a8ebae9e7b28cedab17678af81607f23e7823dc0da626189b71a7c201494d8
 SHA512:
-  metadata.gz: 9e90a09d47bdd8f4fb5d66048cb4b3fee78716dbf7d5833ecb5705bd1f14c27ce8c6a4ee8c637dea1ee450d7d6418fae8791ac37b4bbc836c3d3d0451c2bae08
-  data.tar.gz: aea51cb43dbf5331531d93db23f8acc015ee4b35881953f36137d5f6e41cbd3b817b60f8bab445ec68e3eeead2a9bbdbd938e7aaeeb0238559bef8196003922d
+  metadata.gz: 934b8426763094548f9790ba4f5d3aad54f6f352ffcdbac9a39b8f07963258f123638b8161ace32cee8486449a1063f1b3fadb0e3b1adedbdb9bf53a06a91843
+  data.tar.gz: 788b536fdfd5e7c6462aabd4077ca85388ae7e65983f16bf818d0fd36642757cd5919ab0241f494f8e20bd1acfa987820c217c4bcbc7a3deadbd57dd7c9d0b8d

data/lib/fe_core_ext/core_ext/date.rb

@@ -34,22 +34,33 @@ module FeCoreExt::CoreExt::DateClassMethods
   end
 
   def parse_heisei(string)
-    string.match('平成(\d+)年(\d+)月(\d+)日') {
+    string.match('平成(\d+)年(\d+)月(\d+)日') do
       Date.new($1.to_i + 1988, $2.to_i, $3.to_i)
-    }
+    end
   end
 
   def parse_reiwa(string)
-    string.match('令和(\S+)年(\d+)月(\d+)日') {
+    string.match('令和(\S+)年(\d+)月(\d+)日') do
       year = 1 if $1 == '元'
       year ||= $1.to_i
       Date.new(year + 2018, $2.to_i, $3.to_i)
-    }
+    end
   end
 
   def parse_gengo(string)
     parse_heisei(string) || parse_reiwa(string)
   end
+
+  def parse_nengappi(string)
+    string.match(/(\d{4})年(\d+)月(\d+)日/) do
+       Date.new($1.to_i, $2.to_i, $3.to_i) 
+    end
+  end
+
+  def parse_ja(string)
+    parse_nengappi(string) || parse_gengo(string)
+  end
+
 end
 
 class Date

data/lib/fe_core_ext/core_ext/string.rb

@@ -12,11 +12,21 @@ module FeCoreExt::CoreExt::String
     delete(',').to_i
   end
 
+  def to_integer_new
+    return unless valid_number?
+    delete(',').to_i
+  end
+
   def to_decimal
     return if not_number?
     delete(',').to_d
   end
 
+  def to_decimal_new
+    return unless valid_number?
+    delete(',').to_d
+  end
+
   def to_pathname
     Pathname(self)
   end
@@ -25,6 +35,10 @@ module FeCoreExt::CoreExt::String
     to_i == 0 && match('0').nil?
   end
 
+  def valid_number?
+    match?(/^[\d\,\.]+$/)
+  end
+
   ## deprecated
   def zen_to_han
     tr('０-９Ａ-Ｚａ-ｚ　＆・－（）', '0-9A-Za-z &･\-()')

data/lib/fe_core_ext/version.rb

@@ -1,3 +1,3 @@
 module FeCoreExt
-  VERSION = '0.13.1'
+  VERSION = '0.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fe_core_ext
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Tetsu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport