fe_core_ext 0.26.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 668e2a499cb49f8f3f0badcea7c0f2d713178b68f3d133df4c6be1b93a99d4b7
-  data.tar.gz: 12ed9f73f0efb48df385065d255c2c882e7c7f30c4ec23cfcffd34b3566dc2a3
+  metadata.gz: 90cc42e64a3355c2a471e3232cc907a8abbdb7e7a9fe74b62368e264ae680b55
+  data.tar.gz: dbf52bd2f8489954b26a523de1664a5143a84622d1eba120773e9f718845da6e
 SHA512:
-  metadata.gz: 4fcca145dfab9ad3f2edfde5a4035e19e72ba3ee0a04582789010ac5aeb3b471335488fb3a8f6c7f3960d105dcced98d2f51cd8c3952ff8e90d213256ff2574b
-  data.tar.gz: 7f6b562bc6924f4b478a5595e2bb4ace3180bc70a9a493409347fbe7e312ed5f88660b8bedb9144149be201a8c53057204f8edd23a764b92ebb603c890dbbb1a
+  metadata.gz: a33053eca4efeef215fa437ec6e938c24d09f62c0761423b6fee751380cb542644781c5fc0ec9e4c13b05a4c7d0a708486088fb25bab115dae7e2da74a25f908
+  data.tar.gz: f1de27fdbeb76b3ae768dc19681595ac152088cf40d34443bbd2b4815964492152d278a67a86d010cb8969f8658be80ed4b629dcf227b25c960a559dab3c58ce

data/lib/fe_core_ext/core_ext/array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bigdecimal'
 require 'bigdecimal/util'
 

data/lib/fe_core_ext/core_ext/csv.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bigdecimal'
 require 'bigdecimal/util'
 require 'csv'
@@ -19,4 +21,4 @@ class CSV
       field
     end
   end
-end
+end

data/lib/fe_core_ext/core_ext/date.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support'
 require 'active_support/time'
 
@@ -18,9 +20,9 @@ module FeCoreExt::CoreExt::Date
   end
 
   def nth_weekday(nth, weekday)
-    first_day = Date.new(self.year, self.month, 1)
-    weekdays_hash = {sun: 0, mon: 1, tue: 2, wed: 3, thu: 4, fri: 5, sat: 6}
-    weekday_dates = (first_day..first_day.end_of_month).select{|d| d.wday == weekdays_hash[weekday]}
+    first_day = Date.new(year, month, 1)
+    weekdays_hash = { sun: 0, mon: 1, tue: 2, wed: 3, thu: 4, fri: 5, sat: 6 }
+    weekday_dates = (first_day..first_day.end_of_month).select { |d| d.wday == weekdays_hash[weekday] }
     weekday_dates[nth - 1]
   end
 end
@@ -29,6 +31,7 @@ module FeCoreExt::CoreExt::DateClassMethods
   def parsable?(string)
     parsed_hash = _parse(string)
     return true if parsed_hash.has_key?(:year) && parsed_hash.has_key?(:mon)
+
     false
   end
 
@@ -39,15 +42,15 @@ module FeCoreExt::CoreExt::DateClassMethods
 
   def parse_heisei(string)
     string.match('平成(\d+)年(\d+)月(\d+)日') do
-      Date.new($1.to_i + 1988, $2.to_i, $3.to_i)
+      Date.new(::Regexp.last_match(1).to_i + 1988, ::Regexp.last_match(2).to_i, ::Regexp.last_match(3).to_i)
     end
   end
 
   def parse_reiwa(string)
     string.match('令和(\S+)年(\d+)月(\d+)日') do
-      year = 1 if $1 == '元'
-      year ||= $1.to_i
-      Date.new(year + 2018, $2.to_i, $3.to_i)
+      year = 1 if ::Regexp.last_match(1) == '元'
+      year ||= ::Regexp.last_match(1).to_i
+      Date.new(year + 2018, ::Regexp.last_match(2).to_i, ::Regexp.last_match(3).to_i)
     end
   end
 
@@ -57,14 +60,13 @@ module FeCoreExt::CoreExt::DateClassMethods
 
   def parse_nengappi(string)
     string.match(/(\d{4})年(\d+)月(\d+)日/) do
-       Date.new($1.to_i, $2.to_i, $3.to_i) 
+      Date.new(::Regexp.last_match(1).to_i, ::Regexp.last_match(2).to_i, ::Regexp.last_match(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/hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support'
 require 'active_support/core_ext/hash'
 

data/lib/fe_core_ext/core_ext/integer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FeCoreExt::CoreExt
 end
 

data/lib/fe_core_ext/core_ext/numeric.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FeCoreExt::CoreExt
 end
 

data/lib/fe_core_ext/core_ext/pathname.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'yaml'
 require 'fileutils'

data/lib/fe_core_ext/core_ext/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bigdecimal'
 require 'bigdecimal/util'
 require 'pathname'

data/lib/fe_core_ext/core_ext/time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support'
 require 'active_support/time'
 

data/lib/fe_core_ext/core_ext/uri.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 require 'fileutils'
 require 'open-uri'

data/lib/fe_core_ext/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FeCoreExt
-  VERSION = '0.26.0'
+  VERSION = '0.26.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fe_core_ext
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.26.1
 platform: ruby
 authors:
 - Tetsu