meibo 0.14.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ad0dc346f3bc9d8166c4ddc9a55ddfedc79bcf78aea61f83289e339a40dfea4
-  data.tar.gz: d2bf911450a3c05d334e3b6c5ea7ea9a2dd8e9cb141ce125f0d6a95a99e4daca
+  metadata.gz: e25f22026f4551e67b4016aad6a5e526e8ccfefe07e860b0f1ec092b6e21dd37
+  data.tar.gz: 608bd3b794791f86d01a3931ddb17433d26ce7631ac125881b3bb01f14e7958d
 SHA512:
-  metadata.gz: fb78b3143e372d6629f174fe3e0d34eea05ecbaf11bb1b8c0478c09a6a78c9792349f850da3f7530f5e20e5503b5151907dd6e7ee85a46dc286f5bc1f24cbc71
-  data.tar.gz: d28830dba3e605a95bca895ddc2655d6921707884c0fefa5257e79766e400f13bcc7e9c47a940c8687f4a874a2e8d4178ef61aef721cd7bcd16e784d4aeac2ab
+  metadata.gz: 0cc22ea80b35a152b99de89bd6452cad6699d950653a8461976f73e0d93f64e4a3974641cf1f12802372e0a8d9f8f31e2b7c7d1c49deddbd03d66eb2006970f4
+  data.tar.gz: 3f60761df5b94e9dd8f60661b730598b34788c6ff980eb83924bc8c472a9facf890e12d0b08a6d777fdd4184954d023f37fb613b494eee889544664807ada22d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    meibo (0.14.0)
+    meibo (0.16.0)
       rubyzip
       zeitwerk
 

data/lib/meibo/academic_session.rb

@@ -45,6 +45,10 @@ module Meibo
       @extension_fields = extension_fields
     end
 
+    def collection
+      Meibo.current_roster.academic_sessions
+    end
+
     def grading_period?
       type == TYPES[:grading_period]
     end
@@ -62,11 +66,11 @@ module Meibo
     end
 
     def parent
-      parent_sourced_id && Meibo.current_roster.academic_sessions.find(parent_sourced_id)
+      parent_sourced_id && collection.find(parent_sourced_id)
     end
 
     def children
-      Meibo.current_roster.academic_sessions.where(parent_sourced_id: sourced_id)
+      collection.where(parent_sourced_id: sourced_id)
     end
   end
 end

data/lib/meibo/classroom.rb

@@ -64,6 +64,10 @@ module Meibo
       @extension_fields = extension_fields
     end
 
+    def collection
+      Meibo.current_roster.classes
+    end
+
     def homeroom?
       class_type == TYPES[:homeroom]
     end

data/lib/meibo/course.rb

@@ -42,6 +42,10 @@ module Meibo
       @extension_fields = extension_fields
     end
 
+    def collection
+      Meibo.current_roster.courses
+    end
+
     def organization
       Meibo.current_roster.organizations.find(org_sourced_id)
     end

data/lib/meibo/data_model.rb

@@ -61,6 +61,10 @@ module Meibo
       klass.define_singleton_method(:write_converters) { write_converter }
     end
 
+    def lineno
+      collection.lineno(self)
+    end
+
     def to_csv(...)
       to_a.to_csv(...)
     end

data/lib/meibo/data_set.rb

@@ -42,6 +42,11 @@ module Meibo
       raise DataNotFoundError, "sourcedId: #{sourced_id} が見つかりません"
     end
 
+    def lineno(datum)
+      # NOTE: add one for one-based, and add one for header line
+      find_index(datum)&.+(2)
+    end
+
     def where(**conditions)
       group_cache[conditions.keys.sort][conditions.values]
     end

data/lib/meibo/demographic.rb

@@ -67,6 +67,10 @@ module Meibo
       @extension_fields = extension_fields
     end
 
+    def collection
+      Meibo.current_roster.demographics
+    end
+
     def male?
       sex == SEX[:male]
     end

data/lib/meibo/enrollment.rb

@@ -46,6 +46,10 @@ module Meibo
       @extension_fields = extension_fields
     end
 
+    def collection
+      Meibo.current_roster.enrollments
+    end
+
     def administrator?
       role == ROLES[:administrator]
     end

data/lib/meibo/organization.rb

@@ -41,6 +41,10 @@ module Meibo
       @extension_fields = extension_fields
     end
 
+    def collection
+      Meibo.current_roster.organizations
+    end
+
     def department?
       type == TYPES[:department]
     end
@@ -66,7 +70,11 @@ module Meibo
     end
 
     def parent
-      parent_sourced_id && Meibo.current_roster.organizations.find(parent_sourced_id)
+      parent_sourced_id && collection.find(parent_sourced_id)
+    end
+
+    def children
+      collection.where(parent_sourced_id: sourced_id)
     end
 
     def enrollments

data/lib/meibo/role.rb

@@ -62,6 +62,10 @@ module Meibo
       @extension_fields = extension_fields
     end
 
+    def collection
+      Meibo.current_roster.roles
+    end
+
     def primary?
       @role_type == TYPES[:primary]
     end

data/lib/meibo/roster.rb

@@ -69,15 +69,15 @@ module Meibo
     def initialize(profile: Meibo.default_profile, 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, 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)
+      @academic_sessions = profile.data_set_for(:academic_sessions).new(academic_sessions, roster: self)
+      @classes = profile.data_set_for(:classes).new(classes, roster: self)
+      @courses = profile.data_set_for(:courses).new(courses, roster: self)
+      @demographics = profile.data_set_for(:demographics).new(demographics, roster: self)
+      @enrollments = profile.data_set_for(:enrollments).new(enrollments, roster: self)
+      @organizations = profile.data_set_for(:orgs).new(organizations, roster: self)
+      @roles = profile.data_set_for(:roles).new(roles, roster: self)
+      @user_profiles = profile.data_set_for(:user_profiles).new(user_profiles, roster: self)
+      @users = profile.data_set_for(:users).new(users, roster: self)
     end
 
     def builder

data/lib/meibo/user.rb

@@ -68,6 +68,10 @@ module Meibo
       @extension_fields = extension_fields
     end
 
+    def collection
+      Meibo.current_roster.users
+    end
+
     def agents
       agent_sourced_ids.map {|agent_sourced_id| Meibo.current_roster.users.find(agent_sourced_id) }
     end

data/lib/meibo/user_profile.rb

@@ -39,6 +39,10 @@ module Meibo
       @extension_fields = extension_fields
     end
 
+    def collection
+      Meibo.current_roster.user_profiles
+    end
+
     def user
       Meibo.current_roster.users.find(user_sourced_id)
     end

data/lib/meibo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meibo
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Seiei Miyagi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-16 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -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.14.0/CHANGELOG.md
+  changelog_uri: https://github.com/hanachin/meibo/blob/meibo/v0.16.0/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: