meibo 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72db5b95c8207a9f74cc5930da8103632a2f6c51e3d59243fc452ac4ffefa010
-  data.tar.gz: bd156f3a9ffb5a367d490b1d755f44ce5af13ec5ca69ed4341fbf6ecfc44fdeb
+  metadata.gz: 30d0a69e4f0c29d2454a59deeac497b6315ad82e927c1eb30dfcd9d764807d1b
+  data.tar.gz: fb1883792099051fa89c6f7a66689bc661ddbd3fdb21b157d91d559368383b2f
 SHA512:
-  metadata.gz: 7263fac70bb046b9a85088530e8a822e59d15f47ef7d1c809ff4fd8fa26c9927bbf5313db7979fd7613292bf7aa05cce0103659ea4686e39eb8eb21f0f7a2ffe
-  data.tar.gz: 1befb3a9401a3d92000282e576b75914c4bffd67788b5ba8853385b85eb691676e9e42cad7e5acf3b65a79cc8a20604be9f2ae574eebb5301dcc715fb60fc365
+  metadata.gz: 201f65ec64a3066ea7b594aad1638c3edc6b9868c351d1f1b8cc479070820dedac5435cec4a30fa450daa71d1e5a5caa3a2d0c1318c5522aa4a9902ec2eb2e70
+  data.tar.gz: d423b6be73f4d365dd9de6fe97ea9bc4ce3c2373086db58dc2958aa0fae967db20fa153f39371c3b63ab4735ccc355cc6ef2e78f7bcb25187d38a3df1055d164

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    meibo (0.1.0)
+    meibo (0.3.0)
       rubyzip
       zeitwerk
 
@@ -67,7 +67,7 @@ GEM
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
-    zeitwerk (2.6.1)
+    zeitwerk (2.6.4)
 
 PLATFORMS
   x86_64-linux

data/lib/meibo/academic_session_set.rb

@@ -8,7 +8,7 @@ module Meibo
       each do |academic_session|
         next unless academic_session.parent_sourced_id
 
-        find_by_sourced_id(academic_session.parent_sourced_id)
+        find(academic_session.parent_sourced_id)
       end
     end
   end

data/lib/meibo/builder.rb

@@ -6,12 +6,12 @@ module Meibo
   class Builder
     extend Forwardable
 
-    attr_reader :package, :profile
+    attr_reader :roster, :profile
 
-    def_delegators :@package, :academic_sessions, :classes, :courses, :demographics, :enrollments, :organizations, :roles, :users, :user_profiles
+    def_delegators :@roster, :academic_sessions, :classes, :courses, :demographics, :enrollments, :organizations, :roles, :users, :user_profiles
 
-    def initialize(package:, profile: BaseProfile)
-      @package = package
+    def initialize(roster:, profile: Profile.new)
+      @roster = roster
       @profile = profile
     end
 

data/lib/meibo/classroom_set.rb

@@ -2,26 +2,19 @@
 
 module Meibo
   class ClassroomSet < DataSet
-    def initialize(data, academic_session_set:, course_set:, organization_set:)
-      super(data)
-      @academic_session_set = academic_session_set
-      @course_set = course_set
-      @organization_set = organization_set
-    end
-
     def check_semantically_consistent
       super
 
       each do |classroom|
-        @organization_set.find_by_sourced_id(classroom.school_sourced_id)
-        @course_set.find_by_sourced_id(classroom.course_sourced_id)
+        roster.organizations.find(classroom.school_sourced_id)
+        roster.courses.find(classroom.course_sourced_id)
 
         if classroom.term_sourced_ids.empty?
           raise DataNotFoundError, "termSourcedIdは1つ以上指定してください"
         end
 
         classroom.term_sourced_ids.each do |term_sourced_id|
-          @academic_session_set.find_by_sourced_id(term_sourced_id)
+          roster.academic_sessions.find(term_sourced_id)
         end
       end
     end

data/lib/meibo/course_set.rb

@@ -2,21 +2,15 @@
 
 module Meibo
   class CourseSet < DataSet
-    def initialize(data, academic_session_set:, organization_set:)
-      super(data)
-      @academic_session_set = academic_session_set
-      @organization_set = organization_set
-    end
-
     def check_semantically_consistent
       super
 
       each do |course|
         if course.school_year_sourced_id
-          @academic_session_set.find_by_sourced_id(course.school_year_sourced_id)
+          roster.academic_sessions.find(course.school_year_sourced_id)
         end
 
-        @organization_set.find_by_sourced_id(course.org_sourced_id)
+        roster.organizations.find(course.org_sourced_id)
       end
     end
   end

data/lib/meibo/data_set.rb

@@ -1,8 +1,11 @@
 module Meibo
   class DataSet
-    def initialize(data)
+    attr_reader :roster
+
+    def initialize(data, roster:)
       @data = data
       @data_hash = data.to_h {|datum| [datum.sourced_id, datum] }
+      @roster = roster
     end
 
     def <<(new_data)
@@ -31,7 +34,7 @@ module Meibo
       @data.empty?
     end
 
-    def find_by_sourced_id(sourced_id)
+    def find(sourced_id)
       @data_hash.fetch(sourced_id)
     rescue KeyError
       raise DataNotFoundError, "sourcedId: #{sourced_id} が見つかりません"

data/lib/meibo/demographic_set.rb

@@ -2,16 +2,11 @@
 
 module Meibo
   class DemographicSet < DataSet
-    def initialize(data, user_set:)
-      super(data)
-      @user_set = user_set
-    end
-
     def check_semantically_consistent
       super
 
       each do |demographic|
-        @user_set.find_by_sourced_id(demographic.sourced_id)
+        roster.users.find(demographic.sourced_id)
       end
     end
   end

data/lib/meibo/enrollment_set.rb

@@ -2,20 +2,13 @@
 
 module Meibo
   class EnrollmentSet < DataSet
-    def initialize(data, classroom_set:, organization_set:, user_set:)
-      super(data)
-      @classroom_set = classroom_set
-      @organization_set = organization_set
-      @user_set = user_set
-    end
-
     def check_semantically_consistent
       super
 
       each do |enrollment|
-        @classroom_set.find_by_sourced_id(enrollment.class_sourced_id)
-        @organization_set.find_by_sourced_id(enrollment.school_sourced_id)
-        @user_set.find_by_sourced_id(enrollment.user_sourced_id)
+        roster.classes.find(enrollment.class_sourced_id)
+        roster.organizations.find(enrollment.school_sourced_id)
+        roster.users.find(enrollment.user_sourced_id)
       end
     end
   end

data/lib/meibo/factory_bot/all.rb

@@ -6,8 +6,8 @@ require 'meibo/factory_bot/course'
 require 'meibo/factory_bot/demographic'
 require 'meibo/factory_bot/enrollment'
 require 'meibo/factory_bot/manifest'
-require 'meibo/factory_bot/memory_package'
 require 'meibo/factory_bot/organization'
 require 'meibo/factory_bot/role'
+require 'meibo/factory_bot/roster'
 require 'meibo/factory_bot/user_profile'
 require 'meibo/factory_bot/user'

data/lib/meibo/factory_bot/{memory_package.rb → roster.rb}

@@ -3,9 +3,7 @@
 require 'factory_bot'
 
 FactoryBot.define do
-  factory :meibo_memory_package, class: 'Meibo::MemoryPackage' do
+  factory :meibo_roster, class: 'Meibo::Roster' do
     initialize_with { new(**attributes) }
-
-    manifest { build(:meibo_manifest) }
   end
 end

data/lib/meibo/factory_bot/user.rb

@@ -19,4 +19,12 @@ FactoryBot.define do
     agent_sourced_ids { agents&.map(&:sourced_id) }
     primary_org_sourced_id { primary_organization&.sourced_id }
   end
+
+  factory :meibo_jp_user, class: 'Meibo::JapanProfile::User', parent: :meibo_user do
+    transient do
+      homeroom { nil }
+    end
+
+    home_class { homeroom&.sourced_id }
+  end
 end

data/lib/meibo/japan_profile/academic_session.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Meibo
-  module JapanProfile
+  class JapanProfile < ::Meibo::Profile
     class AcademicSession < ::Meibo::AcademicSession
       TYPES = { school_year: 'schoolYear' }.freeze
 

data/lib/meibo/japan_profile/classroom.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 module Meibo
-  module JapanProfile
+  class JapanProfile < ::Meibo::Profile
     class Classroom < ::Meibo::Classroom
       DataModel.define(
         self,
-        attribute_name_to_header_field_map: superclass.attribute_name_to_header_field_map.merge(special_needs: 'metadata.jp.specialNeeds').freeze,
+        attribute_name_to_header_field_map: superclass.attribute_name_to_header_field_map.merge(
+          special_needs: 'metadata.jp.specialNeeds'
+        ).freeze,
         converters: superclass.converters.merge(
           boolean: [:special_needs].freeze,
           enum: { class_type: TYPES.values.freeze }.freeze

data/lib/meibo/japan_profile/course.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Meibo
-  module JapanProfile
+  class JapanProfile < ::Meibo::Profile
     class Course < ::Meibo::Course
       DataModel.define(
         self,

data/lib/meibo/japan_profile/demographic.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Meibo
-  module JapanProfile
+  class JapanProfile < ::Meibo::Profile
     class Demographic < ::Meibo::Demographic
       DataModel.define(
         self,

data/lib/meibo/japan_profile/enrollment.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Meibo
-  module JapanProfile
+  class JapanProfile < ::Meibo::Profile
     class Enrollment < ::Meibo::Enrollment
       ROLES = {
         student: 'student',

data/lib/meibo/japan_profile/organization.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Meibo
-  module JapanProfile
+  class JapanProfile < ::Meibo::Profile
     class Organization < ::Meibo::Organization
       TYPES = {
         district: 'district',

data/lib/meibo/japan_profile/role.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Meibo
-  module JapanProfile
+  class JapanProfile < ::Meibo::Profile
     class Role < ::Meibo::Role
       # NOTE: roleは固定
       #   - 児童生徒の場合student

data/lib/meibo/japan_profile/user.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Meibo
-  module JapanProfile
+  class JapanProfile < ::Meibo::Profile
     class User < ::Meibo::User
       DataModel.define(
         self,

data/lib/meibo/japan_profile/user_set.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Meibo
+  class JapanProfile < ::Meibo::Profile
+    class UserSet < ::Meibo::UserSet
+      def check_semantically_consistent
+        super
+        each do |user|
+          if user.home_class
+            roster.classes.find(user.home_class)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/meibo/japan_profile.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 module Meibo
-  module JapanProfile
-    include BaseProfile
-
+  class JapanProfile < ::Meibo::Profile
     BUILDERS = {
       academic_session: Builder::AcademicSessionBuilder.create(AcademicSession),
       class: Builder::ClassroomBuilder.create(Classroom),
@@ -17,23 +15,23 @@ module Meibo
     }
 
     DATA_MODELS = {
-      file_academic_sessions: Meibo::JapanProfile::AcademicSession,
-      file_classes: Meibo::JapanProfile::Classroom,
-      file_courses: Meibo::JapanProfile::Course,
-      file_demographics: Meibo::JapanProfile::Demographic,
-      file_enrollments: Meibo::JapanProfile::Enrollment,
-      file_orgs: Meibo::JapanProfile::Organization,
-      file_roles: Meibo::JapanProfile::Role,
-      file_user_profiles: Meibo::JapanProfile::UserProfile,
-      file_users: Meibo::JapanProfile::User
+      file_academic_sessions: AcademicSession,
+      file_classes: Classroom,
+      file_courses: Course,
+      file_demographics: Demographic,
+      file_enrollments: Enrollment,
+      file_orgs: Organization,
+      file_roles: Role,
+      file_user_profiles: UserProfile,
+      file_users: User
     }
 
-    def self.builder_for(key)
-      BUILDERS[key]
-    end
+    DATA_SET = ::Meibo::Profile::DATA_SET.merge(
+      users: UserSet
+    )
 
-    def self.data_model_for(file_attribute)
-      DATA_MODELS[file_attribute]
+    def initialize(builders: BUILDERS, data_models: DATA_MODELS, data_set: DATA_SET)
+      super
     end
   end
 end

data/lib/meibo/organization_set.rb

@@ -8,7 +8,7 @@ module Meibo
       each do |organization|
         next unless organization.parent_sourced_id
 
-        find_by_sourced_id(organization.parent_sourced_id)
+        find(organization.parent_sourced_id)
       end
     end
   end

data/lib/meibo/{base_profile.rb → profile.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Meibo
-  module BaseProfile
+  class Profile
     BUILDERS = {
       academic_session: Builder::AcademicSessionBuilder.create(AcademicSession),
       class: Builder::ClassroomBuilder.create(Classroom),
@@ -26,12 +26,36 @@ module Meibo
       file_users: Meibo::User
     }
 
-    def self.builder_for(key)
-      BUILDERS[key]
+    DATA_SET = {
+      academic_sessions: Meibo::AcademicSessionSet,
+      classes: Meibo::ClassroomSet,
+      courses: Meibo::CourseSet,
+      demographics: Meibo::DemographicSet,
+      enrollments: Meibo::EnrollmentSet,
+      orgs: Meibo::OrganizationSet,
+      roles: Meibo::RoleSet,
+      user_profiles: Meibo::UserProfileSet,
+      users: Meibo::UserSet
+    }
+
+    attr_reader :builders, :data_models, :data_set
+
+    def initialize(builders: BUILDERS, data_models: DATA_MODELS, data_set: DATA_SET)
+      @builders = builders
+      @data_models = data_models
+      @data_set = data_set
+    end
+
+    def builder_for(key)
+      builders[key]
+    end
+
+    def data_model_for(file_attribute)
+      data_models[file_attribute]
     end
 
-    def self.data_model_for(file_attribute)
-      DATA_MODELS[file_attribute]
+    def data_set_for(name)
+      data_set[name]
     end
   end
 end

data/lib/meibo/reader.rb

@@ -5,7 +5,7 @@ require 'zip'
 
 module Meibo
   class Reader
-    def self.open(file_path, profile: BaseProfile)
+    def self.open(file_path, profile: Profile.new)
       Zip::File.open(file_path) do |zipfile|
         yield new(zipfile: zipfile, profile: profile)
       end

data/lib/meibo/role.rb

@@ -61,5 +61,13 @@ module Meibo
       @user_profile_sourced_id = user_profile_sourced_id
       @extension_fields = extension_fields
     end
+
+    def primary?
+      @role_type == TYPES['primary']
+    end
+
+    def secondary?
+      @role_type == TYPES['secondary']
+    end
   end
 end

data/lib/meibo/role_set.rb

@@ -2,22 +2,15 @@
 
 module Meibo
   class RoleSet < DataSet
-    def initialize(data, organization_set:, user_set:, user_profile_set:)
-      super(data)
-      @organization_set = organization_set
-      @user_set = user_set
-      @user_profile_set = user_profile_set
-    end
-
     def check_semantically_consistent
       super
 
       each do |role|
-        @organization_set.find_by_sourced_id(role.org_sourced_id)
-        @user_set.find_by_sourced_id(role.user_sourced_id)
+        roster.organizations.find(role.org_sourced_id)
+        roster.users.find(role.user_sourced_id)
 
         if role.user_profile_sourced_id
-          @user_profile_set.find_by_sourced_id(role.user_profile_sourced_id)
+          roster.user_profiles.find(role.user_profile_sourced_id)
         end
       end
     end

data/lib/meibo/roster.rb

@@ -6,7 +6,7 @@ require 'csv'
 module Meibo
   class Roster
     class << self
-      def from_file(file_path, profile: BaseProfile)
+      def from_file(file_path, profile: Profile.new)
         Reader.open(file_path, profile: profile) do |reader|
           begin
             manifest = reader.manifest
@@ -66,18 +66,22 @@ module Meibo
 
     attr_reader :profile, :manifest_properties, :academic_sessions, :classes, :courses, :demographics, :enrollments, :organizations, :roles, :user_profiles, :users
 
-    def initialize(profile: BaseProfile, manifest_properties: {}, academic_sessions: [], classes: [], courses: [], demographics: [], enrollments: [], organizations: [], roles: [], user_profiles: [], users: [])
+    def initialize(profile: Profile.new, manifest_properties: {}, academic_sessions: [], classes: [], courses: [], demographics: [], enrollments: [], organizations: [], roles: [], user_profiles: [], users: [])
       @profile = profile
       @manifest_properties = manifest_properties
-      @academic_sessions = AcademicSessionSet.new(academic_sessions)
-      @organizations = OrganizationSet.new(organizations)
-      @courses = CourseSet.new(courses, academic_session_set: @academic_sessions, organization_set: @organizations)
-      @classes = ClassroomSet.new(classes, academic_session_set: @academic_sessions, course_set: @courses, organization_set: @organizations)
-      @users = UserSet.new(users, organization_set: @organizations)
-      @demographics = DemographicSet.new(demographics, user_set: @users)
-      @user_profiles = UserProfileSet.new(user_profiles, user_set: @users)
-      @roles = RoleSet.new(roles, organization_set: @organizations, user_set: @users, user_profile_set: @user_profiles)
-      @enrollments = EnrollmentSet.new(enrollments, classroom_set: @classes, organization_set: @organizations, user_set: @users)
+      @academic_sessions = AcademicSessionSet.new(academic_sessions, roster: self)
+      @organizations = OrganizationSet.new(organizations, roster: self)
+      @courses = CourseSet.new(courses, roster: self)
+      @classes = ClassroomSet.new(classes, roster: self)
+      @users = UserSet.new(users, roster: self)
+      @demographics = DemographicSet.new(demographics, roster: self)
+      @user_profiles = UserProfileSet.new(user_profiles, roster: self)
+      @roles = RoleSet.new(roles, roster: self)
+      @enrollments = EnrollmentSet.new(enrollments, roster: self)
+    end
+
+    def builder
+      Builder.new(roster: self, profile: profile)
     end
 
     def check_semantically_consistent

data/lib/meibo/user.rb

@@ -41,7 +41,7 @@ module Meibo
       }.freeze
     )
 
-    def initialize(sourced_id:, status: nil, date_last_modified: nil, enabled_user: nil, username:, user_ids: nil, given_name:, family_name:, middle_name: nil, identifier: nil, email: nil, sms: nil, phone: nil, agent_sourced_ids: [], grades: nil, password: nil, user_master_identifier: nil, resource_sourced_ids: nil, preferred_given_name: nil, preferred_middle_name: nil, preferred_family_name: nil, primary_org_sourced_id: nil, pronouns: nil, kana_given_name: nil, kana_family_name: nil, kana_middle_name: nil, home_class: nil, **extension_fields)
+    def initialize(sourced_id:, status: nil, date_last_modified: nil, enabled_user: nil, username:, user_ids: nil, given_name:, family_name:, middle_name: nil, identifier: nil, email: nil, sms: nil, phone: nil, agent_sourced_ids: [], grades: nil, password: nil, user_master_identifier: nil, resource_sourced_ids: nil, preferred_given_name: nil, preferred_middle_name: nil, preferred_family_name: nil, primary_org_sourced_id: nil, pronouns: nil, **extension_fields)
       @sourced_id = sourced_id
       @status = status
       @date_last_modified = date_last_modified

data/lib/meibo/user_profile_set.rb

@@ -2,16 +2,11 @@
 
 module Meibo
   class UserProfileSet < DataSet
-    def initialize(data, user_set:)
-      super(data)
-      @user_set = user_set
-    end
-
     def check_semantically_consistent
       super
 
       each do |user_profile|
-        @user_set.find_by_sourced_id(user_profile.user_sourced_id)
+        roster.users.find(user_profile.user_sourced_id)
       end
     end
   end

data/lib/meibo/user_set.rb

@@ -2,21 +2,16 @@
 
 module Meibo
   class UserSet < DataSet
-    def initialize(data, organization_set:)
-      super(data)
-      @organization_set = organization_set
-    end
-
     def check_semantically_consistent
       super
 
       each do |user|
         if user.primary_org_sourced_id
-          @organization_set.find_by_sourced_id(user.primary_org_sourced_id)
+          roster.organizations.find(user.primary_org_sourced_id)
         end
 
         user.agent_sourced_ids.each do |agent_sourced_id|
-          find_by_sourced_id(agent_sourced_id)
+          find(agent_sourced_id)
         end
       end
     end

data/lib/meibo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meibo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Seiei Miyagi
@@ -57,7 +57,6 @@ files:
 - lib/meibo.rb
 - lib/meibo/academic_session.rb
 - lib/meibo/academic_session_set.rb
-- lib/meibo/base_profile.rb
 - lib/meibo/builder.rb
 - lib/meibo/builder/academic_session_builder.rb
 - lib/meibo/builder/base_builder.rb
@@ -88,9 +87,9 @@ files:
 - lib/meibo/factory_bot/demographic.rb
 - lib/meibo/factory_bot/enrollment.rb
 - lib/meibo/factory_bot/manifest.rb
-- lib/meibo/factory_bot/memory_package.rb
 - lib/meibo/factory_bot/organization.rb
 - lib/meibo/factory_bot/role.rb
+- lib/meibo/factory_bot/roster.rb
 - lib/meibo/factory_bot/user.rb
 - lib/meibo/factory_bot/user_profile.rb
 - lib/meibo/japan_profile.rb
@@ -102,11 +101,12 @@ files:
 - lib/meibo/japan_profile/organization.rb
 - lib/meibo/japan_profile/role.rb
 - lib/meibo/japan_profile/user.rb
-- lib/meibo/japan_profile/user_profile.rb
+- lib/meibo/japan_profile/user_set.rb
 - lib/meibo/manifest.rb
 - lib/meibo/manifest/processing_mode.rb
 - lib/meibo/organization.rb
 - lib/meibo/organization_set.rb
+- lib/meibo/profile.rb
 - lib/meibo/reader.rb
 - lib/meibo/role.rb
 - lib/meibo/role_set.rb
@@ -125,7 +125,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.1.0/CHANGELOG.md
+  changelog_uri: https://github.com/hanachin/meibo/blob/meibo/v0.3.0/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/meibo/japan_profile/user_profile.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Meibo
-  module JapanProfile
-    UserProfile = ::Meibo::UserProfile
-  end
-end