tax_jp 0.6.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23914854d9f1365751712d5b5132eeac54c266308a4146c7ab27368563f9adb2
-  data.tar.gz: 100bba9475671a3bb4870042f1b3bcdfb636bb8b742e1bd5152554b2a44b8ca4
+  metadata.gz: 904f7717769647f9da08993e625ac91281a7f1ff1bbe22d0874ad904f8244a10
+  data.tar.gz: a3acce33105643a945c4daf4f60365fdf00476edb74a76e2221a8e5cb6cbb6ee
 SHA512:
-  metadata.gz: 1205ad1fe331399e24d400eab1184c59da35e1e1b3b57296a0a5df4b6de0b471989e4b21b0e5b0504e06cda9ecd4560b32228043fafd81f081c71d6c846e6365
-  data.tar.gz: 8a5630c96abbfcf37150276531b1681da9c741ef4806c8482bf7df6edc38a497f647af8fccbd0a18787bf3457897dd4f2811aa7046b077131511e7bb195b9596
+  metadata.gz: a5ceecdd7705804be8ca91a32ab64bca1bd850ba252ade724a9d73236092a991a7f0a2e14d0f942a7f3d64d70515a5d8c4071813a26f256e62ecbf09ce93aeda
+  data.tar.gz: 4bd87db6417730cd1ea0a6baae4bcaea6aa8c33fb420d2a2913fe45ca786b5406af6206595f597e1af422f669178eee6d212150c683f879543dc7422bfbf17ac

data/app/views/tax_jp/social_insurances/index.html.erb

@@ -30,19 +30,19 @@
           <th class="text-center" colspan="4">厚生年金保険料（厚生年金基金加入員を除く）</th>
         </tr>
         <tr>
-          <th class="text-center">等級</th>
-          <th class="text-center">月額</th>
-          <th class="text-center">日額</th>
-          <th class="text-center">円以上</th>
-          <th class="text-center">円未満</th>
-          <th class="text-center">全額</th>
-          <th class="text-center">折半額</th>
-          <th class="text-center"><span class="text-nowrap">全額</span> <span class="text-nowrap">（介護保険２号）</span></th>
-          <th class="text-center"><span class="text-nowrap">折半額</span> <span class="text-nowrap">（介護保険２号）</span></th>
-          <th class="text-center">全額</th>
-          <th class="text-center">折半額</th>
-          <th class="text-center"><span class="text-nowrap">全額</span> <span class="text-nowrap">（坑内員／船員）</th>
-          <th class="text-center"><span class="text-nowrap">折半額</span> <span class="text-nowrap">（坑内員／船員）</th>
+          <th class="text-center align-middle">等級</th>
+          <th class="text-center align-middle">月額</th>
+          <th class="text-center align-middle">日額</th>
+          <th class="text-center align-middle">円以上</th>
+          <th class="text-center align-middle">円未満</th>
+          <th class="text-center align-middle">全額</th>
+          <th class="text-center align-middle">折半額</th>
+          <th class="text-center align-middle">全額<br>（介護保険２号）</th>
+          <th class="text-center align-middle">折半額<br>（介護保険２号）</th>
+          <th class="text-center align-middle">全額</th>
+          <th class="text-center align-middle">折半額</th>
+          <th class="text-center align-middle">全額<br>（坑内員／船員）</th>
+          <th class="text-center align-middle">折半額<br>（坑内員／船員）</th>
         </tr>
       </thead>
       <tbody>

data/data//345/205/203/345/217/267.yml

@@ -1,4 +1,6 @@
-1868: "明治"
-1912: "大正"
-1926: "昭和"
-1989: "平成"
+2019-05-01: 令和
+1989-01-08: 平成
+1926-12-25: 昭和
+1912-07-30: 大正
+1868-01-25: 明治
+1865-05-01: 慶応

data/lib/tax_jp/gengou.rb

@@ -4,7 +4,7 @@ module TaxJp
   class Gengou
     @@_gengou = TaxJp::Utils.load_yaml('元号.yml')
   
-    def self.to_seireki(gengou, year_jp)
+    def self.to_seireki(gengou, date_jp)
       target_gengou = nil
       @@_gengou.invert.keys.each do |start_gengou|
         if start_gengou == gengou.to_s
@@ -12,32 +12,40 @@ module TaxJp
           break
         end
       end
-      
+
       return nil unless target_gengou
-      
+
       start_year = @@_gengou.invert[target_gengou].to_i
       return (start_year + year_jp.to_i - 1).to_s
     end
   
-    def self.to_wareki(year, only_year: false)
-      return nil unless year.present?
+    def self.to_wareki(date, only_date: false, format: '%y年%m月%d日')
+      return nil unless date.present?
 
-      target_year = nil
-      @@_gengou.keys.sort.each do |start_year|
-        break if start_year.to_i > year.to_i
-        target_year = start_year
+      date = TaxJp::Utils.convert_to_date(date)
+
+      target_date = nil
+      @@_gengou.keys.each do |start_date|
+        target_date = TaxJp::Utils.convert_to_date(start_date)
+        break if date >= target_date
       end
 
-      return nil unless target_year
+      return nil unless target_date
 
-      gengou  = @@_gengou[target_year]
-      year_jp = year - target_year + 1
+      target_date = Date.strptime(target_date)
+      year, month, day = *(date.split('-').map{|x| x.to_i})
+      year_jp = year - target_date.year + 1
 
-      if only_year
-        year_jp.to_s
+      ret = Date.new(year_jp, month, day)
+      if only_date
+        ret = ret.strftime(format)
       else
-        gengou + (year_jp == 1 ? '元' : year_jp.to_s)
+        gengou  = @@_gengou[target_date]
+        year_jp = year_jp == 1 ? '元' : year_jp.to_s
+        ret = ret.strftime(format.gsub('%y', "#{gengou}#{year_jp}"))
       end
+
+      ret
     end
 
   end

data/lib/tax_jp/utils.rb

@@ -42,7 +42,11 @@ module TaxJp
         if value.is_a?(Date)
           ret = value.strftime('%Y-%m-%d')
         elsif value.is_a?(String)
-          ret = value
+          if value =~ /[0-9]{4}-[0-9]{2}-[0-9]{2}/
+            ret = value
+          else
+            raise ArgumentError.new(value)
+          end
         else
           raise TypeError.new(value.class)
         end

data/lib/tax_jp/version.rb

@@ -1,3 +1,3 @@
 module TaxJp
-  VERSION = '0.6.2'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tax_jp
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 1.0.0
 platform: ruby
 authors:
 - ichylinux
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap