kirico 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28534524bcc437fdf758e1d22da04ec2466196b0
-  data.tar.gz: cf58e75afffd2437f309309a0c94c270322bbb3f
+  metadata.gz: b032116ad8c9f2d4855e50dd82fd02660f8dfce3
+  data.tar.gz: 40cbf3b7fe3232fb3a505b4029f004b06d211abd
 SHA512:
-  metadata.gz: a4a204454daf43b2e2817a0f75ce67f5bdfd9fe6b08be3bea6fc3023e70c09ba8e574c4d1c6d5d299d2caaf4ec926a1fb1d51be0fe85602bf6a569ca2594265e
-  data.tar.gz: 7f46f860418f9bd7da4906d867420bee5ab507dfc3943d624985889bdb7f00d11adb627572c7792f33e039b17f897ce59103d1add80a2e9782e784581550249f
+  metadata.gz: 800ba09cda1c0b96563bee84256087597ec6e7ae733d903f34c857f40a45deb374d39dc4e63a4b70e4abcaa29b5f3733ee0da8af0002bb78c0bf7156a29648eb
+  data.tar.gz: 1fbae68e0d12f7fd80024df54bd341c7f77815e38afb0498ca6d4131883a34e7236141309c0009f4fdc3516ddab217e65334fc5aaf28458fbc82bbb1dd0d4a38

data/README.md

@@ -218,7 +218,7 @@ Copyright (c) 2017 Kensuke NAITO and SmartHR, Inc.
 
 # SmartHR について
 
-![SmartHR logo](https://cloud.githubusercontent.com/assets/2214179/24910676/79ef6ada-1f03-11e7-856a-9f9737942867.png)
+<img src="https://user-images.githubusercontent.com/2214179/30309095-3fb58b08-97c4-11e7-939b-b4b97414bb1d.png" width="300">
 
 kirico は株式会社 SmartHR によってメンテナンス、開発が行われています。  
 わたしたちは OSS の力を信じています。  

data/kirico.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kirico/version'

data/lib/kirico.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'kirico/version'
 require 'kirico/models/application_record'
 require 'kirico/models/company_count'

data/lib/kirico/config/locales/en.yml

@@ -4,6 +4,15 @@ en:
     messages:
       invalid_charset: "has invalid character(s): %{error_chars}"
       invalid_space_divider: "must be dividied by %{space_type}"
+      too_long_in_bytes:
+        one: is too long (maximum is 1 byte)
+        other: is too long (maximum is %{count} bytes)
+      too_short_in_bytes:
+        one: is too short (minimum is 1 byte)
+        other: is too short (minimum is %{count} bytes)
+      wrong_length_in_bytes:
+        one: is the wrong length (should be 1 byte)
+        other: is the wrong length (should be %{count} bytes)
       invalid_date: "is not a valid date"
       invalid_time: "is not a valid time"
       invalid_datetime: "is not a valid datetime"

data/lib/kirico/config/locales/ja.yml

@@ -4,9 +4,9 @@ ja:
     messages:
       invalid_charset: "に利用できない文字が入力されています。%{error_chars}"
       invalid_space_divider: "は%{space_type}で区切ってください。"
-      too_long: は%{count}文字以内で入力してください。
-      too_short: は%{count}文字以上で入力してください。
-      wrong_length: は%{count}文字で入力してください。
+      too_long_in_bytes: は%{count}バイト以内で入力してください。
+      too_short_in_bytes: は%{count}バイト以上で入力してください。
+      wrong_length_in_bytes: は%{count}バイトで入力してください。
       invalid_date: "は正しい形式で入力してください。"
       invalid_time: "は正しい形式で入力してください。"
       invalid_datetime: "は正しい形式で入力してください。"

data/lib/kirico/csv_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kirico
   class CSVGenerator
     def initialize(fd_management_record, company, data = [])

data/lib/kirico/models/application_record.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'virtus'
 require 'active_model'
 require 'kirico/models/helper'

data/lib/kirico/models/base_company_count.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'virtus'
 require 'active_model'
 

data/lib/kirico/models/base_fd_management_record.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'virtus'
 require 'active_model'
 require 'kirico/models/helper'

data/lib/kirico/models/company.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'virtus'
 require 'active_model'
 
@@ -18,14 +19,14 @@ module Kirico
     attribute :tel_number, String
 
     validates :area_code, charset: { accept: [:numeric] }, sjis_bytesize: { is: 2 }
-    validates :office_code, charset: { accept: [:numeric, :latin, :katakana] }, sjis_bytesize: { in: 1..4 }
+    validates :office_code, charset: { accept: %i(numeric latin katakana) }, sjis_bytesize: { in: 1..4 }
     validates :office_number, charset: { accept: [:numeric] }, sjis_bytesize: { in: 1..5 }
     validates :zip_code1, charset: { accept: [:numeric] }, sjis_bytesize: { is: 3 }
     validates :zip_code2, charset: { accept: [:numeric] }, sjis_bytesize: { is: 4 }
     validates :address, charset: { accept: [:all] }, sjis_bytesize: { in: 1..75 }
-    validates :name, charset: { accept: [:katakana, :kanji] }, sjis_bytesize: { in: 1..50 }
-    validates :owner_name, charset: { accept: [:katakana, :kanji] }, sjis_bytesize: { in: 1..25 }, space_divider: { space: :both_width }
-    validates :tel_number, charset: { accept: [:latin, :numeric] }, sjis_bytesize: { in: 1..12 }
+    validates :name, charset: { accept: %i(katakana kanji) }, sjis_bytesize: { in: 1..50 }
+    validates :owner_name, charset: { accept: %i(katakana kanji) }, sjis_bytesize: { in: 1..25 }, space_divider: { space: :both_width }
+    validates :tel_number, charset: { accept: %i(latin numeric) }, sjis_bytesize: { in: 1..12 }
 
     def initialize
       yield(self) if block_given?

data/lib/kirico/models/company_count.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'kirico/models/base_company_count'
 
 module Kirico

data/lib/kirico/models/company_identifier.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'virtus'
 
 module Kirico

data/lib/kirico/models/data_identifier.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'virtus'
 
 module Kirico

data/lib/kirico/models/data_record22187041.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # 住所変更届データレコード
 module Kirico
   class DataRecord22187041 < ApplicationRecord
@@ -22,18 +23,18 @@ module Kirico
     attribute :memo, String
 
     validates :area_code, charset: { accept: [:numeric] }, sjis_bytesize: { is: 2 }
-    validates :office_code, charset: { accept: [:numeric, :latin, :katakana] }, sjis_bytesize: { in: 1..4 }
+    validates :office_code, charset: { accept: %i(numeric latin katakana) }, sjis_bytesize: { in: 1..4 }
     validates :ip_code, charset: { accept: [:numeric] }, sjis_bytesize: { in: 1..6 }
     validates :basic_pension_number1, charset: { accept: [:numeric] }, sjis_bytesize: { is: 4 }, allow_blank: true
     validates :basic_pension_number2, charset: { accept: [:numeric] }, sjis_bytesize: { is: 6 }, allow_blank: true
     validates :zip_code1, charset: { accept: [:numeric] }, sjis_bytesize: { is: 3 }
     validates :zip_code2, charset: { accept: [:numeric] }, sjis_bytesize: { is: 4 }
-    validates :new_address_yomi, charset: { accept: [:numeric, :latin, :katakana] }, sjis_bytesize: { in: 1..75 }
+    validates :new_address_yomi, charset: { accept: %i(numeric latin katakana) }, sjis_bytesize: { in: 1..75 }
     validates :new_address, charset: { accept: [:all] }, sjis_bytesize: { in: 0..74 }, allow_blank: true
     validates :updated_at, timeliness: { on_or_before: :today, type: :date }
     validates :ip_name_yomi, charset: { accept: [:katakana] }, sjis_bytesize: { in: 1..25 }, space_divider: { space: :half_width }
     validates :ip_name, charset: { accept: [:all] }, sjis_bytesize: { in: 0..24 }, allow_blank: true, space_divider: { space: :full_width }
-    validates :old_address_yomi, charset: { accept: [:numeric, :latin, :katakana] }, sjis_bytesize: { in: 1..75 }
+    validates :old_address_yomi, charset: { accept: %i(numeric latin katakana) }, sjis_bytesize: { in: 1..75 }
     validates :old_address, charset: { accept: [:all] }, sjis_bytesize: { in: 0..74 }, allow_blank: true
     validates :memo, charset: { accept: [:all] }, sjis_bytesize: { in: 0..75 }, allow_blank: true
 

data/lib/kirico/models/data_record22257041.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 # 算定基礎届データレコード
 module Kirico
   class DataRecord22257041 < ApplicationRecord
     DOC_CODE = '22257041'
-    COVERED_MONTHS = [:apr, :may, :jun].freeze
+    COVERED_MONTHS = %i(apr may jun).freeze
 
     attribute :area_code, String
     attribute :office_code, String
@@ -36,12 +37,12 @@ module Kirico
     define_in_k_method :old_monthly_standard_income_hel_ins, :old_monthly_standard_income_pns_ins
 
     validates :area_code, charset: { accept: [:numeric] }, sjis_bytesize: { is: 2 }
-    validates :office_code, charset: { accept: [:numeric, :latin, :katakana] }, sjis_bytesize: { in: 1..4 }
+    validates :office_code, charset: { accept: %i(numeric latin katakana) }, sjis_bytesize: { in: 1..4 }
     validates :ip_code, charset: { accept: [:numeric] }, sjis_bytesize: { in: 1..6 }
     validates :applied_at, timeliness: { on_or_after: -> { Date.new(1989, 1, 8) }, type: :date }
     validates :ip_name_yomi, charset: { accept: [:katakana] }, sjis_bytesize: { in: 1..25 }, space_divider: { space: :half_width }
     validates :ip_name, charset: { accept: [:all] }, sjis_bytesize: { in: 0..24 }, allow_blank: true, space_divider: { space: :full_width }
-    validates :gender_type, inclusion: { in: [:gender_type_1, :gender_type_2, :gender_type_3, :gender_type_5, :gender_type_6, :gender_type_7] }
+    validates :gender_type, inclusion: { in: %i(gender_type_1 gender_type_2 gender_type_3 gender_type_5 gender_type_6 gender_type_7) }
     validates :old_monthly_standard_income_hel_ins, numericality: { greater_than_or_equal_to: 1_000, less_than_or_equal_to: 9_999_999 }, allow_blank: true
     validates :old_monthly_standard_income_pns_ins, numericality: { greater_than_or_equal_to: 1_000, less_than_or_equal_to: 9_999_999 }, allow_blank: true
     validates :old_applied_at, timeliness: { on_or_after: -> { Date.new(1989, 1, 8) }, type: :date }
@@ -53,9 +54,9 @@ module Kirico
       validates "#{month}_income_goods", numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 9_999_999 }
     end
     validates :avg_adjustment, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 9_999_999 }, allow_blank: true
-    validates :ip_type, inclusion: { in: [:ip_type_0, :ip_type_1, :ip_type_2] }
+    validates :ip_type, inclusion: { in: %i(ip_type_0 ip_type_1 ip_type_2) }
     validates :retroacted_payment, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 9_999_999 }, allow_blank: true
-    validates :income_updated_type, inclusion: { in: [:income_updated_type_0, :income_updated_type_1] }, allow_blank: true
+    validates :income_updated_type, inclusion: { in: %i(income_updated_type_0 income_updated_type_1) }, allow_blank: true
     validates :income_diff_amount, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 9_999_999 }, allow_blank: true
     validates :income_updated_at, timeliness: { on_or_after: -> { Date.new(1989, 1, 8) }, type: :date }, allow_blank: true
     validates :memo, charset: { accept: [:all] }, sjis_bytesize: { in: 0..75 }, allow_blank: true

data/lib/kirico/models/fd_management_record.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'kirico/models/base_fd_management_record'
 
 module Kirico
@@ -7,7 +8,7 @@ module Kirico
     attribute :office_code, String
 
     validates :area_code, charset: { accept: [:numeric] }, sjis_bytesize: { is: 2 }
-    validates :office_code, charset: { accept: [:numeric, :latin, :katakana] }, sjis_bytesize: { in: 1..4 }
+    validates :office_code, charset: { accept: %i(numeric latin katakana) }, sjis_bytesize: { in: 1..4 }
 
     def to_csv
       [

data/lib/kirico/models/form.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'virtus'
 require 'active_model'
 
@@ -40,7 +41,7 @@ module Kirico
 
     # 子のエラーを自身のエラーとして設定する
     def validate_children
-      [:fd, :company, :company_count].each do |attribute|
+      %i(fd company company_count).each do |attribute|
         rec = send(attribute)
         next if rec.nil? || rec.valid?
         rec.errors.full_messages.each do |msg|

data/lib/kirico/models/helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'era_ja'
 require 'active_support/core_ext/object'
 require 'yaml'

data/lib/kirico/models/sr_company_count.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'kirico/models/base_company_count'
 
 # 社会保険労務士: 事業所数情報
@@ -8,7 +9,7 @@ module Kirico
 
     attribute :name, String
 
-    validates :name, charset: { accept: [:katakana, :kanji] }, sjis_bytesize: { in: 1..25 }, space_divider: { space: :both_width }
+    validates :name, charset: { accept: %i(katakana kanji) }, sjis_bytesize: { in: 1..25 }, space_divider: { space: :both_width }
 
     def to_csv
       [name, COUNT].map { |attr| attr.to_s.encode('CP932') }.join(',')

data/lib/kirico/models/sr_fd_management_record.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'kirico/models/base_fd_management_record'
 
 # 社会保険労務士: FD 管理レコード

data/lib/kirico/validators/charset_validator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_model'
 require 'active_model/validator'
 

data/lib/kirico/validators/sjis_bytesize_validator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_model'
 require 'active_model/validator'
 
@@ -11,10 +12,10 @@ require 'active_model/validator'
 # 参考:  https://github.com/rails/rails/blob/fe1f4b2ad56f010a4e9b93d547d63a15953d9dc2/activemodel/lib/active_model/validations/length.rb
 module Kirico
   class SjisBytesizeValidator < ActiveModel::EachValidator
-    MESSAGES  = { is: :wrong_length, minimum: :too_short, maximum: :too_long }.freeze
+    MESSAGES  = { is: :wrong_length_in_bytes, minimum: :too_short_in_bytes, maximum: :too_long_in_bytes }.freeze
     CHECKS    = { is: :==, minimum: :>=, maximum: :<= }.freeze
 
-    RESERVED_OPTIONS = [:minimum, :maximum, :within, :is, :too_short, :too_long]
+    RESERVED_OPTIONS = %i(minimum maximum within is too_short too_long)
 
     def initialize(options)
       range = (options.delete(:in) || options.delete(:within))

data/lib/kirico/validators/space_divider_validator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_model'
 require 'active_model/validator'
 require 'active_model/validations/format'

data/lib/kirico/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kirico
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kirico
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - kakipo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport