rubiderella 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5559978595d42282b81485fce6beda1d157c71f85d64cbba0742aee3ecd2616b
-  data.tar.gz: 9bed6d31a732b91d6cb379799f0d2218693a34d32f6581d8bf6fa866752d021d
+  metadata.gz: a645ccea51cb5c049e586307fc207e426d86e56ed4e245ac0798240a2b51ce60
+  data.tar.gz: 8972fbd5d694118572914176e61578e48d5182c118afb61a7e6c14dc54af39de
 SHA512:
-  metadata.gz: 8482e81d4ba8f578a63b8f6beffc19599bbc3fc220a510bd3e5d1805c4ca10aac8bf9494c209f189f5e901203468033fb2e675dd1b20a81866add0e36914faae
-  data.tar.gz: 9d764d5ee453968e47011063c500a4f9d119ee3ae62967e01085280f78855a6911598d309f178e157fed70f608c6490c99010c6bba15626a2a51a8af683f7ad5
+  metadata.gz: be24c8fef6dc9077f1a8e2d28e10cbd76410877db86afd89c98dadab0fcbdfda7de7333221b01f0740cf3eccb4497e27ee4516ac7b8eb715329b00573a228a20
+  data.tar.gz: 45a94797a1644c54ded88aee486c55adc70f4989eae70b043d062a36f938aa237aa2d002af2194c294dcdb6a0159a69d140b204820116bed5b452564673ff9c9

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+# v0.1.2
+
+[Full Changelog](https://github.com/hikko624/rubiderella/compare/v0.1.1...v0.1.2)
+
+- bug fix
+- add assistant(chihiro-san) and trainer sisters
+  - https://github.com/hikko624/rubiderella/pull/39
+  - https://github.com/hikko624/rubiderella/pull/40
+
+# v0.1.1
+
+[Full Changelog](https://github.com/hikko624/rubiderella/compare/v0.1.0...v0.1.1)
+
+- bug fix
+  - https://github.com/hikko624/rubiderella/pull/35
+
+# v0.1.0
+- first release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubiderella (0.1.1)
+    rubiderella (0.1.2)
       activesupport
 
 GEM

data/config/assistant/senkawa_chihiro.yml

@@ -0,0 +1,25 @@
+---
+senkawa_chihiro:
+  name:
+    last: 千川
+    last_kana: せんかわ
+    first: ちひろ
+    first_kana: ちひろ
+  type: ~
+  age: ??
+  birthday:
+    month: 11
+    day: 28
+  sign: 射手座
+  blood: A
+  height: 154.0
+  weight: ひ・み・つ
+  bust: 82.0
+  waist: 58.0
+  hip: 84.0
+  handed: right
+  from: 東京都
+  favorite:
+    - コスプレ
+    - パーティ
+  cv: 佐藤利奈

data/config/trainer/master_trainer.yml

@@ -0,0 +1,24 @@
+---
+master_trainer:
+  name:
+    last: 青木
+    last_kana: あおき
+    first: 麗
+    first_kana: れい
+  type: passion
+  age: 28
+  birthday:
+    month: 12
+    day: 10
+  sign: 射手座
+  blood: AB
+  height: 166.0
+  weight: 45.0
+  bust: 82.0
+  waist: 56.0
+  hip: 83.0
+  handed: right
+  from: 栃木県
+  favorite:
+    - スポーツドリンクの自作
+  cv: 藤村歩

data/config/trainer/rookie_trainer.yml

@@ -0,0 +1,24 @@
+---
+rookie_trainer:
+  name:
+    last: 青木
+    last_kana: あおき
+    first: 慶
+    first_kana: けい
+  type: passion
+  age: 19
+  birthday:
+    month: 3
+    day: 10
+  sign: 魚座
+  blood: B
+  height: 157.0
+  weight: 45.0
+  bust: 77.0
+  waist: 56.0
+  hip: 82.0
+  handed: right
+  from: 栃木県
+  favorite:
+    - ジム通い
+  cv: 藤村歩

data/config/trainer/trainer.yml

@@ -0,0 +1,24 @@
+---
+trainer:
+  name:
+    last: 青木
+    last_kana: あおき
+    first: 明
+    first_kana: めい
+  type: passion
+  age: 23
+  birthday:
+    month: 6
+    day: 10
+  sign: 双子座
+  blood: B
+  height: 160.0
+  weight: 45.0
+  bust: 84.0
+  waist: 56.0
+  hip: 85.0
+  handed: right
+  from: 栃木県
+  favorite:
+    - 早朝ランニング
+  cv: 藤村歩

data/config/trainer/veteran_trainer.yml

@@ -0,0 +1,24 @@
+---
+veteran_trainer:
+  name:
+    last: 青木
+    last_kana: あおき
+    first: 聖
+    first_kana: せい
+  type: passion
+  age: 26
+  birthday:
+    month: 9
+    day: 10
+  sign: 乙女座
+  blood: A
+  height: 163.0
+  weight: 45.0
+  bust: 83.0
+  waist: 56.0
+  hip: 84.0
+  handed: right
+  from: 栃木県
+  favorite:
+    - デイトレード
+  cv: 藤村歩

data/lib/cinderella_girls.rb

@@ -4,4 +4,12 @@ module CinderellaGirls
   def self.idol
     Idol
   end
+
+  def self.assistant
+    Assistant
+  end
+
+  def self.trainer
+    Trainer
+  end
 end

data/lib/cinderella_girls/assistant.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module CinderellaGirls
+  class Assistant
+    Rubiderella::Assistant.names.each do |name|
+      define_singleton_method name do
+        Rubiderella::Assistant.find_by_key(name)
+      end
+    end
+
+    def self.all
+      Rubiderella::Assistant.all
+    end
+  end
+end

data/lib/cinderella_girls/trainer.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module CinderellaGirls
+  class Trainer
+    Rubiderella::Trainer.names.each do |name|
+      define_singleton_method name do
+        Rubiderella::Trainer.find_by_key(name)
+      end
+    end
+
+    def self.all
+      Rubiderella::Trainer.all
+    end
+  end
+end

data/lib/rubiderella.rb

@@ -2,9 +2,21 @@
 
 require 'active_support/all'
 require 'yaml'
+require 'rubiderella/person'
+require 'rubiderella/person/name'
+require 'rubiderella/person/birthday'
+require 'rubiderella/assistant'
+require 'rubiderella/assistant/name'
+require 'rubiderella/assistant/birthday'
+require 'rubiderella/errors'
 require 'rubiderella/idol'
 require 'rubiderella/idol/name'
 require 'rubiderella/idol/birthday'
+require 'rubiderella/trainer'
+require 'rubiderella/trainer/name'
+require 'rubiderella/trainer/birthday'
 require 'rubiderella/version'
 require 'cinderella_girls'
+require 'cinderella_girls/assistant'
 require 'cinderella_girls/idol'
+require 'cinderella_girls/trainer'

data/lib/rubiderella/assistant.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Rubiderella
+  class Assistant < Person
+    class << self
+      def config
+        @config = Dir.glob("#{File.dirname(__FILE__)}/../../config/assistant/*.yml").each_with_object({}) do |file, idols|
+          idols.merge!(YAML.load_file(file))
+        end.deep_symbolize_keys
+      end
+
+      def find_by_key(key)
+        raise UnknownAssistantError unless valid?(key)
+
+        new(@config[key])
+      end
+    end
+  end
+end

data/lib/rubiderella/assistant/birthday.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Rubiderella
+  class Assistant
+    class Birthday < Person::Birthday
+    end
+  end
+end

data/lib/rubiderella/assistant/name.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Rubiderella
+  class Assistant
+    class Name < Person::Name
+    end
+  end
+end

data/lib/rubiderella/errors.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Rubiderella
+  class UnknownIdolError < StandardError; end
+  class UnknownTrainerError < StandardError; end
+  class UnknownAssistantError < StandardError; end
+end

data/lib/rubiderella/idol.rb

@@ -1,32 +1,7 @@
 # frozen_string_literal: true
 
 module Rubiderella
-  class Idol
-    attr_reader :name, :type, :age, :birthday, :sign, :blood, :height, :weight, :bust, :waist, :hip, :handed, :from,
-                :favorite, :cv
-    @config = nil
-    @all = nil
-
-    def initialize(args)
-      @name = Name.new(args[:name])
-      @type = args[:type]
-      @age = args[:age]
-      @birthday = Birthday.new(args[:birthday])
-      @sign = args[:sign]
-      @blood = args[:blood]
-      @height = args[:height]
-      @weight = args[:weight]
-      @bust = args[:bust]
-      @waist = args[:waist]
-      @hip = args[:hip]
-      @handed = args[:handed]
-      @from = args[:from]
-      @favorite = args[:favorite]
-      @cv = args[:cv]
-    end
-
-    class UnknownIdolError < StandardError; end
-
+  class Idol < Person
     class << self
       def config
         @config = Dir.glob("#{File.dirname(__FILE__)}/../../config/idols/*.yml").each_with_object({}) do |file, idols|
@@ -34,25 +9,10 @@ module Rubiderella
         end.deep_symbolize_keys
       end
 
-      def names
-        config.keys
-      end
-
-      def valid?(idol_name)
-        names.include?(idol_name)
-      end
-
-      def all
-        @all = config.map do |key, value|
-          value[:key] = key
-          new(**value)
-        end
-      end
-
-      def find_by_key(name)
-        raise UnknownIdolError unless valid?(name)
+      def find_by_key(key)
+        raise UnknownIdolError unless valid?(key)
 
-        new(@config[name])
+        new(@config[key])
       end
     end
   end

data/lib/rubiderella/idol/birthday.rb

@@ -2,17 +2,7 @@
 
 module Rubiderella
   class Idol
-    class Birthday
-      attr_reader :month, :day
-
-      def initialize(args)
-        @month = args[:month]
-        @day = args[:day]
-      end
-
-      def date
-        @month.to_s + '月' + @day.to_s + '日'
-      end
+    class Birthday < Person::Birthday
     end
   end
 end

data/lib/rubiderella/idol/name.rb

@@ -2,23 +2,7 @@
 
 module Rubiderella
   class Idol
-    class Name
-      attr_reader :last, :last_kana, :first, :first_kana
-
-      def initialize(args)
-        @last = args[:last]
-        @last_kana = args[:last_kana]
-        @first = args[:first]
-        @first_kana = args[:first_kana]
-      end
-
-      def full
-        @last + @first
-      end
-
-      def full_kana
-        @last_kana + @first_kana
-      end
+    class Name < Person::Name
     end
   end
 end

data/lib/rubiderella/person.rb

@@ -0,0 +1,51 @@
+module Rubiderella
+  class Person
+    attr_reader :name, :type, :age, :birthday, :sign, :blood, :height, :weight, :bust, :waist, :hip, :handed, :from,
+                :favorite, :cv
+    @config = nil
+    @all = nil
+
+    def initialize(args)
+      @name = Name.new(args[:name])
+      @type = args[:type]
+      @age = args[:age]
+      @birthday = Birthday.new(args[:birthday])
+      @sign = args[:sign]
+      @blood = args[:blood]
+      @height = args[:height]
+      @weight = args[:weight]
+      @bust = args[:bust]
+      @waist = args[:waist]
+      @hip = args[:hip]
+      @handed = args[:handed]
+      @from = args[:from]
+      @favorite = args[:favorite]
+      @cv = args[:cv]
+    end
+
+    class << self
+      def config
+        raise NotImplementedError
+      end
+
+      def names
+        config.keys
+      end
+
+      def valid?(person_name)
+        names.include?(person_name)
+      end
+
+      def all
+        @all = config.map do |key, value|
+          value[:key] = key
+          new(**value)
+        end
+      end
+
+      def find_by_key(key)
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/lib/rubiderella/person/birthday.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Rubiderella
+  class Person
+    class Birthday
+      attr_reader :month, :day
+
+      def initialize(args)
+        @month = args[:month]
+        @day = args[:day]
+      end
+
+      def date
+        @month.to_s + '月' + @day.to_s + '日'
+      end
+    end
+  end
+end

data/lib/rubiderella/person/name.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Rubiderella
+  class Person
+    class Name
+      attr_reader :last, :last_kana, :first, :first_kana
+
+      def initialize(args)
+        @last = args[:last]
+        @last_kana = args[:last_kana]
+        @first = args[:first]
+        @first_kana = args[:first_kana]
+      end
+
+      def full
+        @last + @first
+      end
+
+      def full_kana
+        @last_kana + @first_kana
+      end
+    end
+  end
+end

data/lib/rubiderella/trainer.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Rubiderella
+  class Trainer < Person
+    class << self
+      def config
+        @config = Dir.glob("#{File.dirname(__FILE__)}/../../config/trainer/*.yml").each_with_object({}) do |file, idols|
+          idols.merge!(YAML.load_file(file))
+        end.deep_symbolize_keys
+      end
+
+      def find_by_key(key)
+        raise UnknownTrainerError unless valid?(key)
+
+        new(@config[key])
+      end
+    end
+  end
+end

data/lib/rubiderella/trainer/birthday.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Rubiderella
+  class Trainer
+    class Birthday < Person::Birthday
+    end
+  end
+end

data/lib/rubiderella/trainer/name.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Rubiderella
+  class Trainer
+    class Name < Person::Name
+    end
+  end
+end

data/lib/rubiderella/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubiderella
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/rubiderella.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Idol m@ster cinderella girls starlight stage'
   spec.homepage      = 'https://github.com/hikko624/rubiderella'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubiderella
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - hikko624
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-08 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -143,6 +143,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config/assistant/senkawa_chihiro.yml
 - config/idols/abe_nana.yml
 - config/idols/aiba_yumi.yml
 - config/idols/aihara_yukino.yml
@@ -333,12 +334,28 @@ files:
 - config/idols/yusa_kozue.yml
 - config/idols/yuuki_haru.yml
 - config/idols/zaizen_tokiko.yml
+- config/trainer/master_trainer.yml
+- config/trainer/rookie_trainer.yml
+- config/trainer/trainer.yml
+- config/trainer/veteran_trainer.yml
 - lib/cinderella_girls.rb
+- lib/cinderella_girls/assistant.rb
 - lib/cinderella_girls/idol.rb
+- lib/cinderella_girls/trainer.rb
 - lib/rubiderella.rb
+- lib/rubiderella/assistant.rb
+- lib/rubiderella/assistant/birthday.rb
+- lib/rubiderella/assistant/name.rb
+- lib/rubiderella/errors.rb
 - lib/rubiderella/idol.rb
 - lib/rubiderella/idol/birthday.rb
 - lib/rubiderella/idol/name.rb
+- lib/rubiderella/person.rb
+- lib/rubiderella/person/birthday.rb
+- lib/rubiderella/person/name.rb
+- lib/rubiderella/trainer.rb
+- lib/rubiderella/trainer/birthday.rb
+- lib/rubiderella/trainer/name.rb
 - lib/rubiderella/version.rb
 - rubiderella.gemspec
 homepage: https://github.com/hikko624/rubiderella
@@ -356,7 +373,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="