meibo 0.25.2 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbb41ba6150c14e53fa63daa4cca32543e1ab394345fc69224543e566c3af129
-  data.tar.gz: 0f433d844789058490011265b14c13cff98c78f97d50c9575e9ce0eb057b5089
+  metadata.gz: eba37b50b98d947b9bdc5912ae9f25ea71f57e81797f8b08756f031935cc62bd
+  data.tar.gz: d97317ead377eba9e18eb7df2876e7f132cdf09f1bae4a931047dd980b9ce6f0
 SHA512:
-  metadata.gz: 9e211816ce477c9de76c3101545d0815c2271d0112f3f7ef378188d84d3136525973da8cbe6da8b9abcf0a65af381305fa54a87a74f1f1af33c75b458b714e6f
-  data.tar.gz: bf4f803d4670ea84751fb47cafda087679955863af971abcb2335df3b319488be153ea0c8641e6042af27e416a53a8a9b4d22ec9de70709d641fbebabb4c626d
+  metadata.gz: 721e920151cf6ad03d369f77320abd9ba98822cc1e614259432422a323fd3af59104f0e9b20f9162f9cbe525a1f95d1d3efe75383294013ed7fcdad16a34ed33
+  data.tar.gz: 46e733cf816e857a8fe8804801d7253f84c9bc9a8d4d59d876ec9fb216989712ff430a0d2995d8eacf1b83206fc8a4fab4d6d043f4c8fbb1aaac44ba6ee18399

data/.rubocop_todo.yml

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

data/Gemfile.lock

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

data/lib/meibo/classroom_set.rb

@@ -6,7 +6,9 @@ module Meibo
       super
 
       each do |classroom|
-        roster.organizations.find(classroom.school_sourced_id)
+        school = roster.organizations.find(classroom.school_sourced_id)
+        raise InvalidDataTypeError unless school.school?
+
         roster.courses.find(classroom.course_sourced_id)
 
         raise DataNotFoundError, "termSourcedIdは1つ以上指定してください" if classroom.term_sourced_ids.empty?

data/lib/meibo/converter.rb

@@ -13,6 +13,8 @@ module Meibo
       date
       datetime
       enum
+      format
+      fullwidth
       mext_grade_code
       integer
       status
@@ -43,9 +45,9 @@ module Meibo
           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)
-            if converter_type == :enum
-              enum_definition = fields_to_be_converted.transform_keys { |field| fields.index(field) }
-              send(method_name, enum_definition)
+            if %i[enum format].include?(converter_type)
+              definition = fields_to_be_converted.transform_keys { |field| fields.index(field) }
+              send(method_name, definition)
             else
               indexes = fields_to_be_converted.map { |field| fields.index(field) }
               send(method_name, indexes)
@@ -146,7 +148,28 @@ module Meibo
           return field unless field
 
           enum = enum_definition[field_info.index]
-          raise InvalidDataTypeError if enum&.none? { |e| e.match?(field) }
+          raise InvalidDataTypeError if enum&.none? { |pat| pat.is_a?(String) ? field == pat : field.match?(pat) }
+
+          field
+        end
+      end
+
+      def build_format_field_parser_converter(format_definition)
+        format_definition = format_definition.dup.freeze
+        lambda do |field, field_info|
+          return field unless field
+
+          format = format_definition[field_info.index]
+          raise InvalidDataTypeError if format && !field.match?(format)
+
+          field
+        end
+      end
+
+      def build_fullwidth_field_parser_converter(fullwidth_field_indexes)
+        fullwidth_field_indexes = fullwidth_field_indexes.dup.freeze
+        lambda do |field, field_info|
+          raise InvalidDataTypeError if field && fullwidth_field_indexes.include?(field_info.index) && field.match?(/[\p{In_Halfwidth_and_Fullwidth_Forms}&&\p{Katakana}]/)
 
           field
         end

data/lib/meibo/course_set.rb

@@ -6,7 +6,11 @@ module Meibo
       super
 
       each do |course|
-        roster.academic_sessions.find(course.school_year_sourced_id) if course.school_year_sourced_id
+        if course.school_year_sourced_id
+          school_year = roster.academic_sessions.find(course.school_year_sourced_id)
+
+          raise InvalidDataTypeError unless school_year.school_year?
+        end
 
         roster.organizations.find(course.org_sourced_id)
       end

data/lib/meibo/enrollment.rb

@@ -38,6 +38,7 @@ module Meibo
       @sourced_id = sourced_id
       @status = status
       @date_last_modified = date_last_modified
+      @primary = primary
       @class_sourced_id = class_sourced_id
       @school_sourced_id = school_sourced_id
       @user_sourced_id = user_sourced_id

data/lib/meibo/enrollment_set.rb

@@ -7,8 +7,11 @@ module Meibo
 
       each do |enrollment|
         roster.classes.find(enrollment.class_sourced_id)
-        roster.organizations.find(enrollment.school_sourced_id)
+        school = roster.organizations.find(enrollment.school_sourced_id)
+        raise InvalidDataTypeError unless school.school?
+
         roster.users.find(enrollment.user_sourced_id)
+        raise InvalidDataTypeError if enrollment.primary && !enrollment.teacher?
       end
     end
 

data/lib/meibo/eportal_v3/classroom.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Meibo
+  module EportalV3
+    class Classroom < ::Meibo::JapanProfile::Classroom
+      DataModel.define(
+        self,
+        attribute_name_to_header_field_map: superclass.attribute_name_to_header_field_map,
+        converters: superclass.converters.merge(
+          fullwidth: %i[title location].freeze
+        ).freeze
+      )
+    end
+  end
+end

data/lib/meibo/eportal_v3/course.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Meibo
+  module EportalV3
+    class Course < ::Meibo::JapanProfile::Course
+      DataModel.define(
+        self,
+        attribute_name_to_header_field_map: superclass.attribute_name_to_header_field_map,
+        converters: superclass.converters.merge(
+          fullwidth: %i[title].freeze
+        ).freeze
+      )
+    end
+  end
+end

data/lib/meibo/eportal_v3/enrollment.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Meibo
+  module EportalV3
+    class Enrollment < ::Meibo::JapanProfile::Enrollment
+      DataModel.define(
+        self,
+        attribute_name_to_header_field_map: superclass.attribute_name_to_header_field_map,
+        converters: superclass.converters.merge(
+          required: [*superclass.converters[:required], :primary].freeze
+        ).freeze
+      )
+    end
+  end
+end

data/lib/meibo/eportal_v3/organization.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Meibo
+  module EportalV3
+    class Organization < ::Meibo::JapanProfile::Organization
+      DataModel.define(
+        self,
+        attribute_name_to_header_field_map: superclass.attribute_name_to_header_field_map,
+        converters: superclass.converters.merge(
+          fullwidth: %i[name].freeze
+        ).freeze
+      )
+    end
+  end
+end

data/lib/meibo/eportal_v3/user.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Meibo
+  module EportalV3
+    class User < ::Meibo::JapanProfile::UserM0
+      DataModel.define(
+        self,
+        attribute_name_to_header_field_map: superclass.attribute_name_to_header_field_map,
+        converters: superclass.converters.merge(
+          fullwidth: %i[given_name family_name middle_name preferred_given_name preferred_middle_name preferred_family_name kana_given_name kana_family_name kana_middle_name].freeze,
+          required: [*superclass.converters[:required], :user_master_identifier, :preferred_given_name, :preferred_family_name, :kana_given_name, :kana_family_name].freeze
+        ).freeze
+      )
+    end
+  end
+end

data/lib/meibo/eportal_v3/user_profile.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Meibo
+  module EportalV3
+    class UserProfile < ::Meibo::UserProfile
+      DataModel.define(
+        self,
+        attribute_name_to_header_field_map: superclass.attribute_name_to_header_field_map,
+        converters: superclass.converters.merge(
+          fullwidth: %i[description].freeze
+        ).freeze
+      )
+    end
+  end
+end

data/lib/meibo/factory_bot/organization.rb

@@ -65,6 +65,7 @@ FactoryBot.define do
 
     trait :jp do
       initialize_with { Meibo::JapanProfile::Organization.new(**attributes) }
+      sequence(:name) { |n| "第#{n}教委" }
     end
   end
 end

data/lib/meibo/japan_profile/academic_session.rb

@@ -9,6 +9,7 @@ module Meibo
         self,
         attribute_name_to_header_field_map: superclass.attribute_name_to_header_field_map,
         converters: superclass.converters.merge(
+          format: { title: /\A\d+年度\z/ },
           enum: { type: TYPES.values.freeze }.freeze
         )
       )

data/lib/meibo/japan_profile/organization_set.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Meibo
+  module JapanProfile
+    class OrganizationSet < ::Meibo::OrganizationSet
+      def check_semantically_consistent
+        super
+
+        each do |organization|
+          next unless organization.parent_sourced_id
+
+          raise InvalidDataTypeError if organization.district?
+        end
+      end
+    end
+  end
+end

data/lib/meibo/japan_profile/user.rb

@@ -13,7 +13,9 @@ module Meibo
               kana_middle_name: "metadata.jp.kanaMiddleName",
               home_class: "metadata.jp.homeClass"
             ).freeze,
-            converters: klass.superclass.converters
+            converters: klass.superclass.converters.merge(
+              mext_grade_code: [:grades].freeze
+            )
           )
         end
       end

data/lib/meibo/profiles.rb

@@ -68,6 +68,7 @@ module Meibo
         file_users: JapanProfile::User
       ),
       data_set: profile121.data_set.merge(
+        orgs: JapanProfile::OrganizationSet,
         users: JapanProfile::UserSet
       )
     )
@@ -92,10 +93,31 @@ module Meibo
       data_set: japan_profile120_v11.data_set
     )
 
+    eportal_v3 = Profile.new(
+      builders: japan_profile120_v11.builders.merge(
+        class: Builder::ClassroomBuilder.create(EportalV3::Classroom),
+        course: Builder::CourseBuilder.create(EportalV3::Course),
+        enrollment: Builder::EnrollmentBuilder.create(EportalV3::Enrollment),
+        organization: Builder::OrganizationBuilder.create(EportalV3::Organization),
+        user_profile: Builder::UserProfileBuilder.create(EportalV3::UserProfile),
+        user: Builder::UserBuilder.create(EportalV3::User)
+      ),
+      data_models: japan_profile120_v11.data_models.merge(
+        file_classes: EportalV3::Classroom,
+        file_courses: EportalV3::Course,
+        file_enrollments: EportalV3::Enrollment,
+        file_orgs: EportalV3::Organization,
+        file_user_profiles: EportalV3::UserProfile,
+        file_users: EportalV3::User
+      ),
+      data_set: japan_profile120_v11.data_set
+    )
+
     PROFILES = {
       "v1.2" => profile121,
       "v1.2.1" => profile121,
       "v1.2.0" => profile120,
+      "v1.2.0 ep v3.00" => eportal_v3,
       "v1.2.0 jp v1.0" => japan_profile120_v10,
       "v1.2.0 jp v1.1" => japan_profile120_v11,
       "v1.2.1 jp v1.1" => japan_profile121_v11

data/lib/meibo/user_set.rb

@@ -5,6 +5,8 @@ module Meibo
     def check_semantically_consistent
       super
 
+      raise Error, "userMasterIdentifier\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059" if @data.filter_map(&:user_master_identifier).tally.values.any? { |v| v > 1 }
+
       each do |user|
         roster.organizations.find(user.primary_org_sourced_id) if user.primary_org_sourced_id
 

data/lib/meibo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meibo
 version: !ruby/object:Gem::Version
-  version: 0.25.2
+  version: 0.26.0
 platform: ruby
 authors:
 - Seiei Miyagi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -94,6 +94,12 @@ files:
 - lib/meibo/demographic_set.rb
 - lib/meibo/enrollment.rb
 - lib/meibo/enrollment_set.rb
+- lib/meibo/eportal_v3/classroom.rb
+- lib/meibo/eportal_v3/course.rb
+- lib/meibo/eportal_v3/enrollment.rb
+- lib/meibo/eportal_v3/organization.rb
+- lib/meibo/eportal_v3/user.rb
+- lib/meibo/eportal_v3/user_profile.rb
 - lib/meibo/errors.rb
 - lib/meibo/factory_bot/academic_session.rb
 - lib/meibo/factory_bot/all.rb
@@ -113,6 +119,7 @@ files:
 - lib/meibo/japan_profile/demographic.rb
 - lib/meibo/japan_profile/enrollment.rb
 - lib/meibo/japan_profile/organization.rb
+- lib/meibo/japan_profile/organization_set.rb
 - lib/meibo/japan_profile/role_jp_m0.rb
 - lib/meibo/japan_profile/user.rb
 - lib/meibo/japan_profile/user_m0.rb
@@ -142,7 +149,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.25.2/CHANGELOG.md
+  changelog_uri: https://github.com/hanachin/meibo/blob/meibo/v0.26.0/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []