meibo 0.23.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00ecbfbaef30129e7c786dbcd4fa12b328d98f14cfeea61ac324a29fae66b69e
-  data.tar.gz: 83dd173fe04db639a914c6c2d41ba73fd3119b39ac51c4fe00a691e26f99ea80
+  metadata.gz: 7d13051f54e9e4f678df529710d8241c5d1222772775484c3e6febce4dce309e
+  data.tar.gz: 347825b32f8c292f8de1857e40bc33ab58452d1e1b4429205835e2e785ef48a5
 SHA512:
-  metadata.gz: 9233be4a0d226ad7f40a23a8de2a665835a118e2ff0ba1b16ac1f438e50afb76be445eaea3b94d6bdce4819ac7be08d3bf94e41415cb06f4fd0ab7f5371bebdf
-  data.tar.gz: a59035b09ab0c6de6ef109b079ca063ab43d7cb6294e4657809c19a6dd7461737e68bdaece2d79dee620df4618ab08301bfcbffb668c1f570b7b90bc7a3f59a4
+  metadata.gz: a13bf3cf70f6a21ecad8d1c9f5ad555fa31f80cb4189035e985eb3328637644449c23b5498699581b639823f1d66ac7832fe211979545a33963fdae551162c30
+  data.tar.gz: 7b4cdd9a43409053306a461660212dee2c74646ddbc998b8a11929b1e9c6e1bb44a9b80552da038f5f0b3aaa02710386b099a157bc5d3549839b930aa83ce6f4

data/.rubocop_todo.yml

@@ -50,7 +50,7 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 222
+  Max: 237
 
 # Offense count: 16
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    meibo (0.23.0)
+    meibo (0.25.0)
       csv (>= 3.1.4)
       rubyzip
       zeitwerk

data/lib/meibo/converter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "date"
+require "set"
 require "time"
 
 module Meibo
@@ -12,6 +13,7 @@ module Meibo
       date
       datetime
       enum
+      mext_grade_code
       integer
       status
       user_ids
@@ -36,8 +38,8 @@ module Meibo
 
       private
 
-      def build_converter(fields:, converters:, write_or_parser:)
-        converter_list = TYPES.filter_map do |converter_type|
+      def build_converter_list(fields:, converters:, write_or_parser:)
+        TYPES.filter_map do |converter_type|
           fields_to_be_converted = converters[converter_type]
           method_name = "build_#{converter_type}_field_#{write_or_parser}_converter"
           if fields_to_be_converted && respond_to?(method_name, true)
@@ -50,14 +52,22 @@ module Meibo
             end
           end
         end
+      end
+
+      def converter_list_to_convert_proc(converter_list)
         lambda do |field, field_info|
           # NOTE: convert blank sourcedId to nil
-          field = nil if field.respond_to?(:empty?) && field.empty?
+          field = nil if field == "NULL" || field == "" # rubocop:disable Style/MultipleComparison
           converter_list.each { |converter| field = converter[field, field_info] }
           field
         end
       end
 
+      def build_converter(fields:, converters:, write_or_parser:)
+        converter_list = build_converter_list(fields: fields, converters: converters, write_or_parser: write_or_parser).freeze
+        converter_list_to_convert_proc(converter_list)
+      end
+
       def build_boolean_field_parser_converter(boolean_field_indexes)
         boolean_field_indexes = boolean_field_indexes.dup.freeze
         lambda do |field, field_info|
@@ -142,6 +152,17 @@ module Meibo
         end
       end
 
+      def build_mext_grade_code_field_parser_converter(grade_field_indexes)
+        valid_grade = %w[P1 P2 P3 P4 P5 P6 J1 J2 J3 H1 H2 H3 E1 E2 E3].to_set
+        lambda do |grades, field_info|
+          next grades unless grade_field_indexes.include?(field_info.index)
+
+          raise InvalidDataTypeError unless grades.all? { |grade| valid_grade.include?(grade) }
+
+          grades
+        end
+      end
+
       def build_integer_field_parser_converter(integer_field_indexes)
         integer_field_indexes = integer_field_indexes.dup.freeze
         lambda do |field, field_info|

data/lib/meibo/japan_profile/classroom.rb

@@ -10,7 +10,8 @@ module Meibo
         ).freeze,
         converters: superclass.converters.merge(
           boolean: [:special_needs].freeze,
-          enum: { class_type: TYPES.values.freeze }.freeze
+          enum: { class_type: TYPES.values.freeze }.freeze,
+          mext_grade_code: [:grades].freeze
         ).freeze
       )
 

data/lib/meibo/japan_profile/course.rb

@@ -6,7 +6,7 @@ module Meibo
       DataModel.define(
         self,
         attribute_name_to_header_field_map: superclass.attribute_name_to_header_field_map,
-        converters: superclass.converters.merge(enum: { course_code: [""].freeze }.freeze)
+        converters: superclass.converters.merge(enum: { course_code: [""].freeze }.freeze, mext_grade_code: [:grades].freeze)
       )
 
       # NOTE: courseCodeは空文字固定

data/lib/meibo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Meibo
-  VERSION = "0.23.0"
+  VERSION = "0.25.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meibo
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Seiei Miyagi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -142,7 +142,7 @@ metadata:
   allowed_push_host: https://rubygems.org/
   homepage_uri: https://github.com/hanachin/meibo
   source_code_uri: https://github.com/hanachin/meibo
-  changelog_uri: https://github.com/hanachin/meibo/blob/meibo/v0.23.0/CHANGELOG.md
+  changelog_uri: https://github.com/hanachin/meibo/blob/meibo/v0.25.0/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []