syamei 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1964e79f0545ff204316ba91d8481ffde0a4e9319100cbef1fca9a903b69db79
-  data.tar.gz: f70a295490ac640e9b368b8cf5824ccbcd76f2537358c6a9c4b2d551cf54607e
+  metadata.gz: ad9bfdd1a3f854766e0ea4074d02c270408c69cf6ecd60b9ba97369a1895e24a
+  data.tar.gz: 5f2f1a78e9ace3727db62a4d2391c11b52a00eac34b904c18cebcdf368ce3296
 SHA512:
-  metadata.gz: ea8df52e09b4f3f5bc0b1c33543d76862f0fc65305bfb655a3bc9860070a3319150575279265abaeaf3da23ace240070d2966b7d3adc13c5f178202bba472aaa
-  data.tar.gz: 26d275fb6c472c9c20f1dcd3cf29d05b3eb542bd6e23ea6cae54d226b9bc7d939f84481d3d611fbb50275f342275001b6f9a05c5188f3c238aec91f4799df7f4
+  metadata.gz: 48511983df0b6b100974f2f96fba6db27691755cb92498763a0b299edf5d2cb17aecfc593d286d700e7507929e303867f88e0603fff42733a2341c7cdd2a75af
+  data.tar.gz: 239740786c955db32ce450f92b689ef3a67c416e25221f6fd6eab24219b46aba6cdeab5832dadaec39aa81d88727825c0f8675f0b1773d75cca23a883b6bf0d3

data/lib/data/notations.yml

@@ -1,131 +1,38 @@
 notations:
-  full:
-    - '株式会社'
-    - '有限会社'
-    - '合名会社'
-    - '合資会社'
-    - '合同会社'
-    - '医療法人社団'
-    - '医療法人財団'
-    - '医療法人'
-    - '社会医療法人'
-    - '財団法人'
-    - '一般財団法人'
-    - '公益財団法人'
-    - '社団法人'
-    - '一般社団法人'
-    - '公益社団法人'
-    - '宗教法人'
-    - '学校法人'
-    - '社会福祉法人'
-    - '更生保護法人'
-    - '相互会社'
-    - '特定非営利活動法人'
-    - '独立行政法人'
-    - '地方独立行政法人'
-    - '弁護士法人'
-    - '有限責任中間法人'
-    - '無限責任中間法人'
-    - '行政書士法人'
-    - '司法書士法人'
-    - '税理士法人'
-    - '国立大学法人'
-    - '公立大学法人'
-    - '農事組合法人'
-    - '管理組合法人'
-    - '社会保険労務士法人'
-    - '営業所'
-    - '出張所'
-  abbreviation:
-    - '㈱'
-    - '\(株\)'
-    - '㈲'
-    - '\(有\)'
-    - '\(名\)'
-    - '\(資\)'
-    - '\(同\)'
-    - '\(医\)'
-    - '\(財\)'
-    - '\(一財\)'
-    - '\(公財\)'
-    - '\(社\)'
-    - '\(一社\)'
-    - '\(公社\)'
-    - '\(宗\)'
-    - '\(学\)'
-    - '\(福\)'
-    - '\(相\)'
-    - '\(特非\)'
-    - '\(独\)'
-    - '\(地独\)'
-    - '\(弁\)'
-    - '\(行\)'
-    - '\(司\)'
-    - '\(税\)'
-    - '\(中\)'
-    - '\(大\)'
-    - '\(営\)'
-    - '\(出\)'
-  kana:
-    - 'カ\)'
-    - '\(カ\)'
-    - '\(カ'
-    - 'ユ\)'
-    - '\(ユ\)'
-    - '\(ユ'
-    - 'メ\)'
-    - '\(メ\)'
-    - '\(メ'
-    - 'シ\)'
-    - '\(シ\)'
-    - '\(シ'
-    - 'ド\)'
-    - '\(ド\)'
-    - '\(ド'
-    - 'シユウ\)'
-    - 'ガク\)'
-    - 'フク\)'
-    - 'ホゴ\)'
-    - '\(ホゴ\)'
-    - '\(ホゴ'
-    - 'ソ\)'
-    - '\(ソ\)'
-    - '\(ソ'
-    - 'トクヒ\)'
-    - '\(トクヒ\)'
-    - '\(トクヒ'
-    - 'ドク\)'
-    - '\(ドク\)'
-    - '\(ドク'
-    - 'チドク\)'
-    - '\(チドク\)'
-    - '\(チドク'
-    - 'ベン\)'
-    - '\(ベン\)'
-    - '\(ベン'
-    - 'ギヨ\)'
-    - '\(ギヨ\)'
-    - '\(ギヨ'
-    - 'シホウ\)'
-    - '\(シホウ\)'
-    - '\(シホウ'
-    - 'ゼイ\)'
-    - '\(ゼイ\)'
-    - '\(ゼイ'
-    - 'ノウ\)'
-    - '\(ノウ\)'
-    - '\(ノウ'
-    - 'カンリ\)'
-    - '\(カンリ\)'
-    - '\(カンリ'
-    - 'ロウム\)'
-    - '\(ロウム\)'
-    - '\(ロウム'
-    - '\(ダイ\)'
-    - '\(ダイ'
-    - 'エイ\)'
-    - '\(エイ\)'
-    - '\(エイ'
-    - 'シユツ\)'
-    - '\(シユツ\)'
-    - '\(シユツ'
+  - ['出張所', '', '\(出\)', 'シユツ\)', '\(シユツ\)', '\(シユツ']
+  - ['管理組合法人', '', '', 'カンリ\)', '\(カンリ\)', '\(カンリ']
+  - ['司法書士法人', '', '\(司\)', 'シホウ\)', '\(シホウ\)', '\(シホウ']
+  - ['独立行政法人', '', '\(独\)', 'ドク\)', '\(ドク\)', '\(ドク']
+  - ['株式会社', '㈱', '\(株\)', 'カ\)', '\(カ\)', '\(カ']
+  - ['有限会社', '㈲', '\(有\)', 'ユ\)', '\(ユ\)', '\(ユ']
+  - ['合名会社', '', '\(名\)', 'メ\)', '\(メ\)', '\(メ']
+  - ['合資会社', '', '\(資\)', 'シ\)', '\(シ\)', '\(シ']
+  - ['合同会社', '', '\(同\)', 'ド\)', '\(ド\)', '\(ド']
+  - ['医療法人社団', '', '\(医\)', 'イ\)', '', '\(イ']
+  - ['医療法人財団', '', '\(医\)', 'イ\)', '', '\(イ']
+  - ['医療法人', '', '\(医\)', 'イ\)', '', '\(イ']
+  - ['社会医療法人', '', '\(医\)', 'イ\)', '', '\(イ']
+  - ['財団法人', '', '\(財\)', 'ザイ\)', '', '']
+  - ['一般財団法人', '', '\(一財\)', 'ザイ\)', '', '']
+  - ['公益財団法人', '', '\(公財\)', 'ザイ\)', '', '']
+  - ['社団法人', '', '\(社\)', 'シヤ\)', '', '']
+  - ['一般社団法人', '', '\(一社\)', 'シヤ\)', '', '']
+  - ['公益社団法人', '', '\(公社\)', 'シヤ\)', '', '']
+  - ['宗教法人', '', '\(宗\)', '', '', '']
+  - ['学校法人', '', '\(学\)', 'ガク\)', '', '']
+  - ['社会福祉法人', '', '\(福\)', 'フク\)', '', '']
+  - ['更生保護法人', '', '', 'ホゴ\)', '\(ホゴ\)', '\(ホゴ']
+  - ['相互会社', '', '\(相\)', 'ソ\)', '\(ソ\)', '\(ソ']
+  - ['特定非営利活動法人', '', '\(特非\)', 'トクヒ\)', '\(トクヒ\)', '\(トクヒ']
+  - ['地方独立行政法人', '', '\(地独\)', 'チドク\)', '\(チドク\)', '\(チドク']
+  - ['弁護士法人', '', '\(弁\)', 'ベン\)', '\(ベン\)', '\(ベン']
+  - ['有限責任中間法人', '', '\(中\)', 'チユウ\)', '\(チユウ\)', '\(チユウ']
+  - ['無限責任中間法人', '', '\(中\)', 'チユウ\)', '\(チユウ\)', '\(チユウ']
+  - ['行政書士法人', '', '\(行\)', 'ギヨ\)', '\(ギヨ\)', '\(ギヨ']
+  - ['税理士法人', '', '\(税\)', 'ゼイ\)', '\(ゼイ\)', '\(ゼイ']
+  - ['国立大学法人', '', '\(大\)', 'ダイ\)', '\(ダイ\)', '\(ダイ']
+  - ['公立大学法人', '', '\(大\)', 'ダイ\)', '\(ダイ\)', '\(ダイ']
+  - ['農事組合法人', '', '', 'ノウ\)', '\(ノウ\)', '\(ノウ']
+  - ['社会保険労務士法人', '', '', 'ロウム\)', '\(ロウム\)', '\(ロウム']
+  - ['営業所', '', '\(営\)', 'エイ\)', '\(エイ\)', '\(エイ']
+

data/lib/syamei.rb

@@ -4,21 +4,34 @@ require 'yaml'
 module Syamei
   class Error < StandardError; end
 
-  NOTATION = YAML.load_file(File.expand_path(File.join('..', 'data', 'notations.yml'), __FILE__))['notations']['full'].join('|')
-  ABBREVIATION = YAML.load_file(File.expand_path(File.join('..', 'data', 'notations.yml'), __FILE__))['notations']['abbreviation'].join('|')
-  KANA = YAML.load_file(File.expand_path(File.join('..', 'data', 'notations.yml'), __FILE__))['notations']['kana'].join('|')
+  DATA = YAML.load_file(File.expand_path(File.join('..', 'data', 'notations.yml'), __FILE__))['notations']
+  NOTATION = DATA.map { |n| n[0] }.compact.reject(&:empty?).flatten.uniq
+  SPECIAL = DATA.map { |n| n[1] }.compact.reject(&:empty?).flatten.uniq
+  ABBREVIATION = DATA.map { |n| n[2] }.compact.reject(&:empty?).flatten.uniq
+  KANA_HEAD = DATA.map { |n| n[3] }.compact.reject(&:empty?).flatten.uniq
+  KANA_MIDDLE = DATA.map { |n| n[4] }.compact.reject(&:empty?).flatten.uniq
+  KANA_TAIL = DATA.map { |n| n[5] }.compact.reject(&:empty?).flatten.uniq
 
   COMPLEX_TYPE = {
-    0 => [NOTATION, ABBREVIATION, KANA].join('|'),
-    1 => NOTATION,
-    2 => ABBREVIATION,
-    3 => KANA
+    0 => {
+        all: [NOTATION, SPECIAL, ABBREVIATION, KANA_HEAD, KANA_TAIL].join('|'),
+        head: [NOTATION, SPECIAL, ABBREVIATION, KANA_HEAD].join('|'),
+        tail: [NOTATION, SPECIAL, ABBREVIATION, KANA_TAIL].join('|')
+    },
+    1 => NOTATION.join('|'),
+    2 => SPECIAL.join('|'),
+    3 => {
+      all: KANA_TAIL.join('|'),
+      head: KANA_HEAD.join('|'),
+      tail: KANA_TAIL.join('|')
+    }
   }.freeze
 
   # 前株の存在チェック
   def self.with_beginning?(name, type = 0)
     return false if name.nil? || name.empty?
 
+    return name.match?(/^(#{COMPLEX_TYPE[type][:head]}).*$/) if type.zero? || type == 3
     name.match?(/^(#{COMPLEX_TYPE[type]}).*$/)
   end
 
@@ -26,6 +39,7 @@ module Syamei
   def self.with_end?(name, type = 0)
     return false if name.nil? || name.empty?
 
+    return name.match?(/.*(#{COMPLEX_TYPE[type][:tail]})$/) if type.zero? || type == 3
     name.match?(/.*(#{COMPLEX_TYPE[type]})$/)
   end
 
@@ -40,6 +54,7 @@ module Syamei
   def self.with_beginning(name, type = 0)
     return nil if name.nil? || name.empty?
 
+    return name.gsub(/(#{COMPLEX_TYPE[type][:tail]})$/, '').strip if type.zero? || type == 3
     name.gsub(/(#{COMPLEX_TYPE[type]})$/, '').strip
   end
 
@@ -47,6 +62,7 @@ module Syamei
   def self.with_end(name, type = 0)
     return nil if name.nil? || name.empty?
 
+    return name.gsub(/^(#{COMPLEX_TYPE[type][:head]})/, '').strip if type.zero? || type == 3
     name.gsub(/^(#{COMPLEX_TYPE[type]})/, '').strip
   end
 
@@ -59,25 +75,14 @@ module Syamei
     name
   end
 
-  # 前株と後株の置換
-  # def self.replace_begin_to_end(name, type=0)
-  #  # notation
-  #  # 前株消す
-  #  # 後株に付与
-  # end
-
-  # 後株と前株の置換
-  # def self.replace_end_to_begin(name, type=0)
-  #  # notation
-  #  # 後株消す
-  #  # 前株に付与
-  # end
-
   def self.notation(name, type = 0)
+    return nil if name.nil? || name.empty?
+
+    return name[/(#{COMPLEX_TYPE[type][:all]})/, 1] if type.zero? || type == 3
     name[/(#{COMPLEX_TYPE[type]})/, 1]
   end
 
   def self.list
-    COMPLEX_TYPE[0].gsub('|', '  ').gsub('\\', '')
+    COMPLEX_TYPE[0][:all].gsub('|', '  ').gsub('\\', '')
   end
 end

data/lib/syamei/version.rb

@@ -1,3 +1,3 @@
 module Syamei
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syamei
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Shuhei Yamashita
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,11 +61,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".idea/.gitignore"
-- ".idea/inspectionProfiles/Project_Default.xml"
-- ".idea/misc.xml"
-- ".idea/modules.xml"
-- ".idea/syamei.iml"
-- ".idea/vcs.xml"
 - ".rakeTasks"
 - ".rspec"
 - ".ruby-version"