meibo 0.22.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a33eff8e804e9e53783c3362da8d3cc6808a728915cfd03f9ac11387c30f7fe
-  data.tar.gz: 2a981345145594726702674e49e8c471b15cf4fc915beb047428e2736289a597
+  metadata.gz: 00f82e2a36647d4e79e1bc9df6a1a69b0c3bbc9a09d77fe89fa05680d8cf2998
+  data.tar.gz: 5c363d7995a6e8c57afe83e6e77635ca7011c7c62528c486e5973b5c8a01ecbf
 SHA512:
-  metadata.gz: efc2d0285dd92b3f78caf114f0457f469d1ced8fb14afc1994d0800d2d94504f5978bfab5beb6cca01e1758277245c65177e49a90c72e9ba329a37e21c82d686
-  data.tar.gz: 12e6995e8e4176926375b166b7cd1762f8ecc7466ee51d8faaf9808ddf81bdb99a34cc420e1ee16e880de757d3c27fe81eb71f4fccaafa916427dfa03ae5e944
+  metadata.gz: c2960714575f4ea47e52851b183245e775d043a9a02bd5eed559843a98abbcc303c74496693c999fa0bc5dc3ac421b626983e1bc75b54510f805b4087826a899
+  data.tar.gz: f809d3d5e3149c35cd2f43af3bc4795664cd59a7d458f955e33d6ea00dd481ba3d9270365167ab1b27b48fd2f6b983a361915789109cc5c447c4753590b977d4

data/.rubocop_todo.yml

@@ -29,7 +29,8 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 57
+  Exclude:
+    - 'lib/meibo/factory_bot/**/*.rb'
 
 # Offense count: 4
 # Configuration parameters: CountComments, CountAsOne.
@@ -49,7 +50,7 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 222
+  Max: 231
 
 # Offense count: 16
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    meibo (0.22.0)
+    meibo (0.24.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
@@ -142,6 +144,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/factory_bot/role.rb

@@ -75,7 +75,16 @@ FactoryBot.define do
     end
 
     trait :jp do
-      initialize_with { Meibo::JapanProfile::Role.new(**attributes) }
+      jp_version { "1.1" }
+
+      initialize_with do
+        case jp_version
+        when "1.1"
+          Meibo::Role.new(**attributes)
+        when "1.0"
+          Meibo::JapanProfile::RoleJpM0.new(**attributes)
+        end
+      end
     end
   end
 end

data/lib/meibo/factory_bot/user.rb

@@ -5,11 +5,19 @@ require "securerandom"
 
 FactoryBot.define do
   factory :meibo_user, class: "Meibo::User" do
-    initialize_with { new(**attributes) }
+    initialize_with do
+      case oneroster_version
+      when "1.2.1"
+        new(**attributes)
+      when "1.2", "1.2.0"
+        Meibo::UserM0.new(**attributes)
+      end
+    end
 
     transient do
       agents { [] }
       primary_organization { nil }
+      oneroster_version { "1.2.1" }
     end
 
     sourced_id { SecureRandom.uuid }
@@ -20,7 +28,14 @@ FactoryBot.define do
     primary_org_sourced_id { primary_organization&.sourced_id }
 
     trait :jp do
-      initialize_with { Meibo::JapanProfile::User.new(**attributes) }
+      initialize_with do
+        case oneroster_version
+        when "1.2.1"
+          Meibo::JapanProfile::User.new(**attributes)
+        when "1.2", "1.2.0"
+          Meibo::JapanProfile::UserM0.new(**attributes)
+        end
+      end
 
       transient do
         homeroom { nil }

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.22.0"
+  VERSION = "0.24.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meibo
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Seiei Miyagi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-22 00:00:00.000000000 Z
+date: 2023-03-01 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.22.0/CHANGELOG.md
+  changelog_uri: https://github.com/hanachin/meibo/blob/meibo/v0.24.0/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []