shinycolors 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a0af2443c3102bb87cdfb1f13407a59b6d6e4564e29d672007ff7c4e2280ffc
-  data.tar.gz: 806f09ed074fb196578d24190239d08378a59a5063809fd207af5cd14c99daae
+  metadata.gz: ea8dec6dac54d7501b5beb803d268b6aa3411fe17b39fadef42f6b378b9ec598
+  data.tar.gz: 1086db2a3b05b5b1f52ca5433c47b5dbdbda6511e2b32727755dd033a17da8e6
 SHA512:
-  metadata.gz: b067db144210f2adb53224c134a621ff24585f8e682067c7084810438dcb4649b626507ef6ff106bc8168c11d7e41d29d5ec37bb2be8f8b68ad4563376f83fb3
-  data.tar.gz: fd4e042595d72c776291ad91101b80ed2285ccc21d62108ae7ed83ea3b6d076856d598936c59f3f19a1b7837d24f84a4e49dbe476daf23259baa4ef5bc8af9b2
+  metadata.gz: e76456904a856740ae929bcc41f69ddfe690f79a6e0a2f12d2dc4cbea24d21cf764edd8665869e1c0889d673e3c3c13c2a0508fa09eb46cc7c8aedcc98281674
+  data.tar.gz: a373fc1f7bfc37c4af20adc7239be6a74537a73e8fd027f0dddf55e7180d1df7c323b21463b2d888dd7e70c177b3c94afa747fed69db3e66d79b699088d006af

data/lib/shinycolors/idol.rb

@@ -9,7 +9,7 @@ module ShinyColors
     class NotFoundError < StandardError; end
 
     def initialize(name:, cv:, age:, blood_type:, birthday:, zodiac_sign:, dominant_hand:,
-                   birthplace:, hobby:, special_skills:, nickname_key:, nickname_kana:)
+                   birthplace:, hobby:, special_skills:, nickname_key:, nickname_kana:, key_name:)
       @name = name
       @cv = cv
       @age = age
@@ -22,36 +22,55 @@ module ShinyColors
       @special_skills = special_skills
       @nickname_key = nickname_key
       @nickname_kana = nickname_kana
+      @key_name = key_name
     end
 
     attr_reader :name, :cv, :age, :blood_type, :birthday, :zodiac_sign, :dominant_hand,
-                :birthplace, :hobby, :special_skills, :nickname_key, :nickname_kana
+                :birthplace, :hobby, :special_skills, :nickname_key, :nickname_kana, :key_name
 
     class << self
       def all
-        return @all unless @all.nil?
-
-        @all = YAML.load_file('./data/idol.yml').each_with_object({}) do |(_, values), result|
-          result.merge!(values['idols'])
-        end.deep_symbolize_keys!
+        data.map do |key, values|
+          values[:key_name] = key
+          new(**values)
+        end
       end
 
       def names
-        all.keys
+        data.keys
       end
 
       def nicknames
-        all.each_with_object({}) do |(fullname, values), result|
+        data.each_with_object({}) do |(fullname, values), result|
           values[:nickname_key]&.each { |nickname| result.merge!({ nickname => fullname }) }
         end
       end
 
       def find(name)
-        h = all[name]
+        h = data[name]
         raise(NotFoundError) if h.nil?
 
+        h[:key_name] = name
         new(**h)
       end
+
+      def sample
+        all.sample
+      end
+
+      private
+
+      def data
+        return @data unless @data.nil?
+
+        @data = YAML.load_file('./data/idol.yml').each_with_object({}) do |(_, values), result|
+          result.merge!(values['idols'])
+        end.deep_symbolize_keys!
+      end
+    end
+
+    def ==(other)
+      key_name == other.key_name
     end
 
     def nickname
@@ -59,19 +78,9 @@ module ShinyColors
     end
 
     def unit_name
-      Unit.all.find do |_, values|
-        values[:idols].key?(key_name)
-      end.last[:name]
-    end
-
-    alias unit unit_name
-
-    private
-
-    def key_name
-      Idol.all.find do |_, values|
-        name == values[:name]
-      end.first
+      Unit.all.select do |unit|
+        unit.idols.include?(self)
+      end.first.name
     end
   end
 end

data/lib/shinycolors/unit.rb

@@ -6,32 +6,48 @@ module ShinyColors
   class Unit
     class NotFoundError < StandardError; end
 
-    def initialize(name:, name_jp:, color:, idols:)
+    def initialize(name:, name_jp:, color:, key_name:)
       @name = name
       @name_jp = name_jp
       @color = color
-      @idols = idols
+      @key_name = key_name
     end
 
-    attr_reader :name, :name_jp, :color, :idols
+    attr_reader :name, :name_jp, :color, :key_name
 
     class << self
       def all
-        return @all unless @all.nil?
-
-        @all = YAML.load_file('./data/idol.yml').deep_symbolize_keys!
+        data.map do |key, values|
+          values.delete(:idols)
+          values[:key_name] = key
+          new(**values)
+        end
       end
 
       def names
-        all.keys
+        data.keys
       end
 
       def find(name)
-        h = all[name]
-        raise(IdolNotFoundError) if h.nil?
+        h = data[name]
+        raise(NotFoundError) if h.nil?
 
+        h.delete(:idols)
+        h[:key_name] = name
         new(**h)
       end
+
+      def sample
+        all.sample
+      end
+
+      def data
+        YAML.load_file('./data/idol.yml').deep_symbolize_keys!
+      end
+    end
+
+    def idols
+      Unit.data[key_name][:idols].keys.map { |key_name| Idol.find(key_name) }
     end
   end
 end

data/lib/shinycolors/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ShinyColors
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shinycolors
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - iavivai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-24 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies: []
 description: 'shinycolorsは「アイドルマスター シャイニーカラーズ」の情報をRubyで扱えるようにするためのgemです。