sakura_gakuin 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4bcdd1043ab40be722ecac6ba4b882824e1cd8c
-  data.tar.gz: 5bea1113e91d39f0e2eca293311206b881ff97b7
+  metadata.gz: adbe16026646a8a50c9d5f5eabf51cf7b91b7a73
+  data.tar.gz: 4b71056b3b1c1f21bfb559ae50a4f8be4bc5bf0e
 SHA512:
-  metadata.gz: e3c59a836da8e511818edd05e0d31db268df8950ef6a68ed5667381b4059913ef851ecc374262883ca490c77591bc8a547ced5b3155c1716b7a6392e9f9e996d
-  data.tar.gz: 3a6c579fbced84993bc1aa90aa8d25303da52b2e124854b293922b6427c8235af3bc3bf6d0d20edef906e23da4bee7880dced2187c06b661964210ebdeacc714
+  metadata.gz: eac881d36608559868bf9ec65f338860057d47bb14b8b1ae424dbad955a85e4e2970b4ccea9b71d88af39ee7064a9c2562245a0dea7a7c3074b17ed194753953
+  data.tar.gz: 17d8066936998dd88965ff4ad476deca182077d7c816e8e9a06eaf76eaabbb4587c8413a8a4ea569878d7133a8028a0cf01bca869289ac868d05e048abe4c2d7

data/example/yui_profile.rb

@@ -15,7 +15,8 @@ puts "Name(en): #{yui.name_en}"
 puts "Nicknames: #{yui.nicknames.join(" ")}"
 puts "Birthday: #{yui.birthday}"
 puts "Age: #{yui.age}"
-puts "Grade: #{yui.grade}"
+puts "Grade(ja): #{yui.grade_ja}"
+puts "Grade(en): #{yui.grade_en}"
 puts "Birthplace: #{yui.birthplace}"
 puts "DiaryURL: #{yui.diary_url}"
 puts

data/lib/sakura_gakuin/angel.rb

@@ -8,6 +8,7 @@ module SakuraGakuin
 
     primary_key :id
 
+
     # angel data
 
     attr_reader :name_ja

data/lib/sakura_gakuin/member.rb

@@ -97,7 +97,7 @@ module SakuraGakuin
     attr_reader :introductions
     attr_reader :attendances
 
-    def grade(date=Date.today)
+    def grade_en(date=Date.today)
       if active?
         birth_adjust = birthday < Date.new(birthday.year, 4, 2) ? 1 : 0
         birth_year = birthday.year - birth_adjust
@@ -107,14 +107,24 @@ module SakuraGakuin
 
         grade_age = date_year - birth_year
         case grade_age
-        when 7..12
-          "小等部#{grade_age-6}年"
-        when 13..15
-          "中等部#{grade_age-12}年"
+        when 7..15
+          grade_age - 6
         end 
       end 
     end
 
+    def grade_ja(date=Date.today)
+      grade = grade_en
+      case grade
+      when 1..6
+        "小等部#{grade}年"
+      when 7..9
+        "中等部#{grade-6}年"
+      end
+    end
+
+    alias :grade :grade_ja
+
 
     # relations
 

data/lib/sakura_gakuin/version.rb

@@ -1,3 +1,3 @@
 module SakuraGakuin
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sakura_gakuin
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Yoshida Tetsuya