tax_jp 0.6.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbb52fa5b01f2d0979e724be2150e179801be9be75c50d04455aa4d8aa2801a9
-  data.tar.gz: 11b4350fc164f62ea97b6d712c84a57ce6dbb2503711ca4a5610e40756429a13
+  metadata.gz: f4c48f4dababdd1406820b05e2d32b68a4c0d5a776bd53f2724ae9ba02f98ebb
+  data.tar.gz: 77023c0b83977e472a36971ea43391cd4fc9cb7b2ca713c86fb7720ab0ae26c3
 SHA512:
-  metadata.gz: e89249955f5970e75cdfa55f295e913a66220c8260a94d2b22840b8402be197d9fd1af3440c953f5dcb556fb51813e9aad5e2f87f4f379e7222783b7d9a08726
-  data.tar.gz: 360a26bad5b2bc15f5d0cb088fcbf8f02fae3db093d51dc44dfba521d1885d9dfaf0987ad361705b725902f66d2438f4f258677d0a26913e1f889059624c59fe
+  metadata.gz: 6c9b08645697885999325d6ca626e2e0267d594adef02942bfee489eca8a6d3e449dc2355cc98afd2d684bd230dda9014cba31517e44123e27ce0afe263a0ad9
+  data.tar.gz: '06901d6c1e3e911947dec46debf199326a3ce139bc3cb8383738399db19c12d40dd72a3681c5867254963784ec8e797cb5f71e9d0d3a7907bca9000702b20889'

data/README.md

@@ -7,25 +7,35 @@
 * 源泉徴収
 * 減価償却率
 
-## Installation
+## インストール
 
-Add this line to your application's Gemfile:
+Gemfile に以下の記述を追加
 
 ```ruby
 gem 'tax_jp'
 ```
 
-And then execute:
+bundle を実行
 
     $ bundle
 
-Or install it yourself as:
+## 使い方
 
-    $ gem install tax_jp
+### Rails-5.2
 
-## Usage
+routes.rb に以下の記述を追加
 
-TODO: Write usage instructions here
+```ruby
+  mount TaxJp::Engine, at: '/tax_jp', as: 'tax_jp'
+```
+
+Railsを起動
+
+    $ rails s
+
+ブラウザで localhost:3000/tax_jp にアクセス
+
+![トップページ](https://raw.github.com/wiki/hybitz/tax_jp/images/top.png)
 
 ## Contributing
 

data/app/assets/javascripts/tax.js

@@ -7,9 +7,10 @@ tax.INCLUSIVE = 2; // 内税
 tax.EXCLUSIVE = 3; // 外税
 
 tax.consumptionTaxes = [
-    {date: Date.parse('2014-04-01'), rate: 0.08},
-    {date: Date.parse('1997-04-01'), rate: 0.05},
-    {date: Date.parse('1989-04-01'), rate: 0.03},
+    {date: Date.parse('2019-10-01'), rate: 0.1, reduced_rate: 0.08},
+    {date: Date.parse('2014-04-01'), rate: 0.08, reduced_rate: 0},
+    {date: Date.parse('1997-04-01'), rate: 0.05, reduced_rate: 0},
+    {date: Date.parse('1989-04-01'), rate: 0.03, reduced_rate: 0},
 ];
 
 tax.getRateOn = function(date, options) {
@@ -20,7 +21,11 @@ tax.getRateOn = function(date, options) {
 
   var ret = 0;
   for (var i = 0; this.consumptionTaxes.length; i ++) {
-    ret = this.consumptionTaxes[i].rate;
+    if (options.reduced) {
+      ret = this.consumptionTaxes[i].reduced_rate;
+    } else {
+      ret = this.consumptionTaxes[i].rate;
+    }
     if (date >= this.consumptionTaxes[i].date) {
       break;
     }
@@ -29,7 +34,7 @@ tax.getRateOn = function(date, options) {
   if (options.percent) {
     ret *= 100;
   }
-  
+
   return ret;
 };
 
@@ -39,9 +44,8 @@ tax.calcTaxAmount = function(taxType, rate, amount) {
   }
 
   if ( taxType == tax.INCLUSIVE ) {
-    return parseInt(amount * rate / (1 + rate));
-  }
-  else if ( taxType == tax.EXCLUSIVE ) {
+    return amount - parseInt(amount / (1 + rate));
+  } else if ( taxType == tax.EXCLUSIVE ) {
     return parseInt(amount * rate); 
   }
 

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

@@ -22,9 +22,9 @@
           <td class="text-center"><%= number_to_currency(ct.national_percent, unit: '', precision: 1) if ct.national_percent > 0 %></td>
           <td class="text-center"><%= number_to_currency(ct.local_percent, unit: '', precision: 1) if ct.local_percent > 0 %></td>
           <td class="text-center"><%= number_to_currency(ct.total_percent, unit: '') if ct.total_percent > 0 %></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
+          <td class="text-center"><%= number_to_currency(ct.national_reduced_percent, unit: '', precision: 2) if ct.national_reduced_percent > 0 %></td>
+          <td class="text-center"><%= number_to_currency(ct.local_reduced_percent, unit: '', precision: 2) if ct.local_reduced_percent > 0 %></td>
+          <td class="text-center"><%= number_to_currency(ct.total_reduced_percent, unit: '') if ct.total_reduced_percent > 0 %></td>
         </tr>
       <% end %>
    </tbody> 

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/data//345/212/264/345/203/215/344/277/235/351/231/272//351/233/207/347/224/250/344/277/235/351/231/272.tsv

@@ -4,4 +4,4 @@
 2010-04-01	2012-03-31	0.006	0.0095	0.007	0.0105	0.007	0.0115
 2012-04-01	2016-03-31	0.005	0.0085	0.006	0.0095	0.006	0.0105
 2016-04-01	2017-03-31	0.004	0.007	0.005	0.008	0.005	0.009
-2017-04-01	2019-03-31	0.003	0.006	0.004	0.007	0.004	0.008
+2017-04-01	2020-03-31	0.003	0.006	0.004	0.007	0.004	0.008

data/data//346/266/210/350/262/273/347/250/216.yml

@@ -2,14 +2,23 @@
   national: 0.03
   local: 0.00
   total: 0.03
+  national_reduced: 0
+  local_reduced: 0
+  total_reduced: 0
 1997-04-01:
   national: 0.04
   local: 0.01
   total: 0.05
+  national_reduced: 0
+  local_reduced: 0
+  total_reduced: 0
 2014-04-01:
   national: 0.063
   local: 0.017
   total: 0.08
+  national_reduced: 0
+  local_reduced: 0
+  total_reduced: 0
 2019-10-01:
   national: 0.078
   local: 0.022

data/data//347/244/276/344/274/232/344/277/235/351/231/272/346/226/231//345/201/245/345/272/267/344/277/235/351/231/272-20190301-20200229.tsv

@@ -0,0 +1,48 @@
+都道府県	一般保険料率（％）	介護保険料率（％）	特定保険料率（％）	基本保険料率（％）
+北海道	10.31	1.73	3.51	6.8
+青森県	9.87	1.73	3.51	6.36
+岩手県	9.8	1.73	3.51	6.29
+宮城県	10.1	1.73	3.51	6.59
+秋田県	10.14	1.73	3.51	6.63
+山形県	10.03	1.73	3.51	6.52
+福島県	9.74	1.73	3.51	6.23
+茨城県	9.84	1.73	3.51	6.33
+栃木県	9.92	1.73	3.51	6.41
+群馬県	9.84	1.73	3.51	6.33
+埼玉県	9.79	1.73	3.51	6.28
+千葉県	9.81	1.73	3.51	6.3
+東京都	9.9	1.73	3.51	6.39
+神奈川県	9.91	1.73	3.51	6.4
+新潟県	9.63	1.73	3.51	6.12
+富山県	9.71	1.73	3.51	6.2
+石川県	9.99	1.73	3.51	6.48
+福井県	9.88	1.73	3.51	6.37
+山梨県	9.9	1.73	3.51	6.39
+長野県	9.69	1.73	3.51	6.18
+岐阜県	9.86	1.73	3.51	6.35
+静岡県	9.75	1.73	3.51	6.24
+愛知県	9.9	1.73	3.51	6.39
+三重県	9.9	1.73	3.51	6.39
+滋賀県	9.87	1.73	3.51	6.36
+京都府	10.03	1.73	3.51	6.52
+大阪府	10.19	1.73	3.51	6.68
+兵庫県	10.14	1.73	3.51	6.63
+奈良県	10.07	1.73	3.51	6.56
+和歌山県	10.15	1.73	3.51	6.64
+鳥取県	10	1.73	3.51	6.49
+島根県	10.13	1.73	3.51	6.62
+岡山県	10.22	1.73	3.51	6.71
+広島県	10	1.73	3.51	6.49
+山口県	10.21	1.73	3.51	6.7
+徳島県	10.3	1.73	3.51	6.79
+香川県	10.31	1.73	3.51	6.8
+愛媛県	10.02	1.73	3.51	6.51
+高知県	10.21	1.73	3.51	6.7
+福岡県	10.24	1.73	3.51	6.73
+佐賀県	10.75	1.73	3.51	7.24
+長崎県	10.24	1.73	3.51	6.73
+熊本県	10.18	1.73	3.51	6.67
+大分県	10.21	1.73	3.51	6.7
+宮崎県	10.02	1.73	3.51	6.51
+鹿児島県	10.16	1.73	3.51	6.65
+沖縄県	9.95	1.73	3.51	6.44

data/lib/tax_jp/consumption_tax.rb

@@ -7,12 +7,16 @@ module TaxJp
 
     attr_reader :valid_from
     attr_reader :national, :local, :total
+    attr_reader :national_reduced, :local_reduced, :total_reduced
 
     def initialize(valid_from, values)
       @valid_from = valid_from
       @national = values['national']
       @local = values['local']
       @total = values['total']
+      @national_reduced = values['national_reduced']
+      @local_reduced = values['local_reduced']
+      @total_reduced = values['total_reduced']
     end
 
     def self.all
@@ -53,5 +57,16 @@ module TaxJp
       total * 100
     end
 
+    def national_reduced_percent
+      national_reduced * 100
+    end
+
+    def local_reduced_percent
+      local_reduced * 100
+    end
+
+    def total_reduced_percent
+      total_reduced * 100
+    end
   end
 end

data/lib/tax_jp/gengou.rb

@@ -4,40 +4,41 @@ module TaxJp
   class Gengou
     @@_gengou = TaxJp::Utils.load_yaml('元号.yml')
   
-    def self.to_seireki(gengou, year_jp)
-      target_gengou = nil
-      @@_gengou.invert.keys.each do |start_gengou|
-        if start_gengou == gengou.to_s
-          target_gengou = start_gengou
-          break
-        end
-      end
-      
+    def self.to_seireki(gengou, date_jp)
+      target_gengou = @@_gengou.invert.keys.find{|start_gengou| start_gengou == gengou.to_s }
       return nil unless target_gengou
-      
-      start_year = @@_gengou.invert[target_gengou].to_i
-      return (start_year + year_jp.to_i - 1).to_s
+
+      start_date = @@_gengou.invert[target_gengou]
+      Date.new(start_date.year + date_jp.year - 1, date_jp.month, date_jp.day)
     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.1'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tax_jp
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 1.1.1
 platform: ruby
 authors:
 - ichylinux
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -79,28 +79,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.6
 description: 税金計算ライブラリ
 email:
 - ichylinux@gmail.com
@@ -178,6 +178,7 @@ files:
 - data/社会保険料/健康保険-20160301-20170228.tsv
 - data/社会保険料/健康保険-20170301-20180228.tsv
 - data/社会保険料/健康保険-20180301-20190228.tsv
+- data/社会保険料/健康保険-20190301-20200229.tsv
 - data/社会保険料/厚生年金.tsv
 - data/社会保険料/旧健康保険.tsv
 - data/社会保険料/等級-20001001-20080831.tsv
@@ -236,8 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 税金計算ライブラリ