meibo 0.13.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fed6d292ab3d38301370ef4d6238d4ddc470d8ae380e1e8bdf8f6d88822aaf0
-  data.tar.gz: d364e20a7336ad702b4d3434efefe800bed8a971f0cc02177c817398fa79982d
+  metadata.gz: 0f093d7946a8add1449f8ae9c89c94a47431f36386c598dfeb21ca225ca9c167
+  data.tar.gz: facfe3ab95a9e3c4f61885afedea7df1c8f657725f4e61b6918da4e58f0375ec
 SHA512:
-  metadata.gz: bb712c2090b7cc03708a4c8b302e187357db4f2bf260e62486f79072ba646371368c6968baaa022c472774b6a09c0aba3a7f1716b1b074e6fcb2ab6ab6e19935
-  data.tar.gz: dd2f31087c8b28e02b9e257dcb405cb1eec588d5a576c120cdcadcb0402743cb7a02f6e62262ca1c932f93c8f119839d95eb505ce44534a04a478883e0d966af
+  metadata.gz: c472f7f3874f886ae4c27b9fb93b8a8024f820b1a6172b04b54efcfcaca5672faca6d1235845d9bad8daf63fa9a277714140ee9114ca537ced93e584a6c45d55
+  data.tar.gz: 0220f2730b1ee389f13e7c114a87964a82a7777e3c1662963c04977f74a9bfa85b0c5afbacd2701a483aef3c9ba6f30c1f4be8d6722081334288b4d5bb590864

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    meibo (0.13.0)
+    meibo (0.15.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,7 +66,11 @@ module Meibo
     end
 
     def parent
-      Meibo.current_roster.academic_sessions.find(parent_sourced_id)
+      parent_sourced_id && collection.find(parent_sourced_id)
+    end
+
+    def children
+      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
@@ -83,5 +87,9 @@ module Meibo
     def terms
       term_sourced_ids.map {|term_sourced_id| Meibo.current_roster.academic_sessions.find(term_sourced_id) }
     end
+
+    def enrollments
+      Meibo.current_roster.enrollments.where(class_sourced_id: sourced_id)
+    end
   end
 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
@@ -49,5 +53,9 @@ module Meibo
     def school_year
       Meibo.current_roster.academic_sessions.find(school_year_sourced_id)
     end
+
+    def classes
+      Meibo.current_roster.classes.where(course_sourced_id: sourced_id)
+    end
   end
 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,19 +42,22 @@ module Meibo
       raise DataNotFoundError, "sourcedId: #{sourced_id} が見つかりません"
     end
 
-    def by_organization(org_sourced_id)
-      data_by_org_sourced_id[org_sourced_id]
+    def lineno(datum)
+      # NOTE: add one for one-based, and add one for header line
+      find_index(datum)&.+(2)
     end
 
-    def by_user(user_sourced_id)
-      data_by_user_sourced_id[user_sourced_id]
+    def where(**conditions)
+      group_cache[conditions.keys.sort][conditions.values]
     end
 
     private
 
-    def data_by_org_sourced_id
-      @cache[:data_by_org_sourced_id] ||= @data.group_by(&:data_by_org_sourced_id).to_h do |org_sourced_id, data|
-        [org_sourced_id, new(data)]
+    def group_cache
+      @cache[:group_cache] ||= Hash.new do |hash, keys|
+        hash[keys] = @data.group_by {|datum| keys.map {|attribute| datum.public_send(attribute) } }.to_h do |values, data|
+          [values, new(data)]
+        end
       end
     end
 
@@ -62,12 +65,6 @@ module Meibo
       @cache[:data_by_sourced_id] ||= @data.to_h {|datum| [datum.sourced_id, datum] }
     end
 
-    def data_by_user_sourced_id
-      @cache[:data_by_user_sourced_id] ||= @data.group_by(&:user_sourced_id).to_h do |user_sourced_id, data|
-        [user_sourced_id, new(data)]
-      end
-    end
-
     def new(data)
       self.class.new(data, roster: roster)
     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,27 @@ 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
+      Meibo.current_roster.enrollments.where(school_sourced_id: sourced_id)
+    end
+
+    def classes
+      Meibo.current_roster.classes.where(school_sourced_id: sourced_id)
+    end
+
+    def courses
+      Meibo.current_roster.courses.where(org_sourced_id: sourced_id)
+    end
+
+    def roles
+      Meibo.current_roster.roles.where(org_sourced_id: sourced_id)
     end
   end
 end

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/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
@@ -79,7 +83,7 @@ module Meibo
     end
 
     def enrollments
-      Meibo.current_roster.enrollments.by_user(sourced_id)
+      Meibo.current_roster.enrollments.where(user_sourced_id: sourced_id)
     end
 
     def primary_organization
@@ -87,17 +91,17 @@ module Meibo
     end
 
     def primary_role_in(org)
-      Meibo.current_roster.roles.by_user(sourced_id).detect do |role|
+      Meibo.current_roster.roles.where(user_sourced_id: sourced_id).detect do |role|
         role.primary? && role.org_sourced_id == org.sourced_id
       end
     end
 
     def roles
-      Meibo.current_roster.roles.by_user(sourced_id)
+      Meibo.current_roster.roles.where(user_sourced_id: sourced_id)
     end
 
     def user_profiles
-      Meibo.current_roster.user_profiles.by_user(sourced_id)
+      Meibo.current_roster.user_profiles.where(user_sourced_id: sourced_id)
     end
   end
 end

data/lib/meibo/user_profile.rb

@@ -39,8 +39,16 @@ 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
+
+    def role
+      Meibo.current_roster.roles.where(user_profile_sourced_id: sourced_id).first
+    end
   end
 end

data/lib/meibo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meibo
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Seiei Miyagi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2022-11-21 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.13.0/CHANGELOG.md
+  changelog_uri: https://github.com/hanachin/meibo/blob/meibo/v0.15.0/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: