rubiderella 0.1.1 → 0.1.5

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/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/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}月#{@day}日"
+      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/person.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+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/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/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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubiderella
-  VERSION = '0.1.1'
+  VERSION = '0.1.5'
 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/rubiderella.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'lib/rubiderella/version'
 
 Gem::Specification.new do |spec|
@@ -10,7 +12,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.5.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
@@ -24,13 +26,16 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.add_dependency 'activesupport'
-
-  spec.add_development_dependency 'codecov'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rspec-parameterized'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'simplecov'
+  spec.add_dependency 'activesupport', '>= 6.0.0'
+  spec.add_dependency 'rake', '~> 13.0'
+  spec.add_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'codecov', '>= 0.5.1'
+  spec.add_development_dependency 'pry', '>= 0.10'
+  spec.add_development_dependency 'pry-byebug', '>= 3.9'
+  spec.add_development_dependency 'pry-doc', '>= 0.6'
+  spec.add_development_dependency 'rspec', '>= 3.10'
+  spec.add_development_dependency 'rspec-parameterized', '>= 0.4.2'
+  spec.add_development_dependency 'rubocop', '>= 1.11'
+  spec.add_development_dependency 'simplecov', '>= 0.21'
+  spec.add_development_dependency 'webrick', '>= 1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubiderella
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - hikko624
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-08 00:00:00.000000000 Z
+date: 2021-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,112 +16,168 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-parameterized
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 description: Idol m@ster cinderella girls starlight stage
 email:
 - hikko624@gmail.com
@@ -129,6 +185,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/pull_request_template.md"
 - ".github/workflows/coverage.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
@@ -143,6 +200,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 +391,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
@@ -348,7 +422,7 @@ metadata:
   homepage_uri: https://github.com/hikko624/rubiderella
   source_code_uri: https://github.com/hikko624/rubiderella
   changelog_uri: https://github.com/hikko624/rubiderella/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -356,15 +430,15 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Idol m@ster cinderella girls starlight stage
 test_files: []