shinycolors 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad13ae04aecffbe52eb37d7eba831555923072c2e27214932e2892b7ae83e268
-  data.tar.gz: 4eac4a3c368d7926283286c30629c02c8737900f2f8e82795a69ba5e24cedd01
+  metadata.gz: b4ca290bfd88521be3afbf4e5a663352c5eb1a248cf282f73eaa986bd1e96ed7
+  data.tar.gz: 90b3d3312787e27a31dcb31701a8052f2022d549f7aaf7fc1b889dec3a753b32
 SHA512:
-  metadata.gz: 821deb56372525324414d304b90caf26f747fdb4f7a01dde5b2f55d65aa456588f8faf62d30859c28a889c3a8c99687b82621d057dc13ebb37adeeb8e0b91c66
-  data.tar.gz: 3063a6d27c500fe3aa45fa4b425ab8223f28df1595f5d40f4c8c3dbbe725e163be0669f03ccc2ab932635b701800ffb48c4fe04e7728c080c5d736314fa63b13
+  metadata.gz: bcc2f621e5fc48f4bf814cdfb9cb788a7fe2e5a8a6dea5b9f7b9dfa5257496bc3a527f382dab56c8ccf40f2752ab2b43d04f6d37f307cfeec64255372c4516bf
+  data.tar.gz: 040263b42c68ee81ced35435287235b97d88d5cbe5e89abbdf5beb5592ba6a4625ffa7049d00b77332d2609933569ebd0b491e2b7c058d18983aa0aa63839bcf

data/lib/shinycolors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shinycolors/version'
 require 'shinycolors/idol'
 require 'shinycolors/unit'

data/lib/shinycolors/idol.rb

@@ -1,56 +1,86 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'active_support/core_ext/hash'
+require './lib/shinycolors/unit'
 
 module ShinyColors
   class Idol
     class NotFoundError < StandardError; end
 
-    def initialize(name:, cv:, age:, birthplace:, birthday:, nickname:)
+    def initialize(name:, cv:, age:, blood_type:, birthday:, zodiac_sign:, dominant_hand:,
+                   birthplace:, hobby:, special_skills:, nickname_key:, nickname_kana:, key_name:)
       @name = name
       @cv = cv
       @age = age
-      @birthplace = birthplace
+      @blood_type = blood_type
       @birthday = birthday
-      @nickname = nickname
+      @zodiac_sign = zodiac_sign
+      @dominant_hand = dominant_hand
+      @birthplace = birthplace
+      @hobby = hobby
+      @special_skills = special_skills
+      @nickname_key = nickname_key
+      @nickname_kana = nickname_kana
+      @key_name = key_name
     end
 
-    attr_reader :name, :cv, :age, :birthplace, :birthday, :nickname
+    attr_reader :name, :cv, :age, :blood_type, :birthday, :zodiac_sign, :dominant_hand,
+                :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|
-          values[:nickname]&.each { |nickname| result.merge!({ nickname => fullname }) }
+        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 display(name)
-        idol = find(name)
-        puts <<~PRETTY
-          名前:   #{idol.name}
-          cv:     #{idol.cv}
-          年齢:   #{idol.age}
-          出身地: #{idol.birthplace}
-          誕生日: #{idol.birthday}
-        PRETTY
+      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
+      nickname_kana
+    end
+
+    def unit_name
+      Unit.all.select do |unit|
+        unit.idols.include?(self)
+      end.first.name
+    end
   end
 end

data/lib/shinycolors/unit.rb

@@ -1,34 +1,53 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 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,3 +1,5 @@
+# frozen_string_literal: true
+
 module ShinyColors
-  VERSION = "0.2.0"
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shinycolors
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - iavivai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies: []
 description: 'shinycolorsは「アイドルマスター シャイニーカラーズ」の情報をRubyで扱えるようにするためのgemです。
 
@@ -37,7 +37,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="