rubicure 2.1.3 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f982b720c002c29f3b9d207bf633e001b45e358785cc25b29475ee2c0d0e38ce
-  data.tar.gz: 37a75b1663e79c9526ea1289caa3fed3ef9963fd676240a9936f1c258e6ee124
+  metadata.gz: 2c3737d8910f3c70c7585874c07348835b64305a12684524dd03f4f5c6391206
+  data.tar.gz: ede1db907ee2349ea1266ffd09c6fa34b91939b3b822716f337dd902da752aaa
 SHA512:
-  metadata.gz: ff61bd10c70f6a6101a5d9aa4036ada09d7e0fcc5a4c449c9926bfa6bfde33f95225e77bb95dcb8f3d112d3ab5c87304c6bfe5b47eb4ba70aa6ea9a530717fa8
-  data.tar.gz: e226e849aa9f122ef74243e349d49c27f74406f56ae8aeb95f7b6aabbc414991dba7ce1e79eff086cbfa8a6f88efbd142d1897c4d790a1ebf0942ca190940e6c
+  metadata.gz: 45e62b6affb30bb1099ed6d1d2e618e0ae30262b6b814f842e9b9cdab450b6a9a611e99a9f374211f4fc7eea72d343602683d446e37241f69d9158977328403a
+  data.tar.gz: 5a1d7b8623792c4db4fd8ede8f2458445abc8cbdb6999208cd3fb89d926fb737b004b7574d4d88344804685b5faedfbf0b0c504a4d6ca241a1278f5283919c9b

data/.github/workflows/test.yml

@@ -27,11 +27,10 @@ jobs:
 
       matrix:
         ruby:
-          - ruby:2.4
-          - ruby:2.5
           - ruby:2.6
           - ruby:2.7
           - ruby:3.0
+          - ruby:3.1
           - rubylang/ruby:master-nightly-bionic
         include:
           - ruby: rubylang/ruby:master-nightly-bionic

data/.rubocop.yml

@@ -9,7 +9,7 @@ inherit_gem:
     - "config/performance.yml"
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
   NewCops: enable
 
 Layout/HashAlignment:

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 ## master
-[full changelog](http://github.com/sue445/rubicure/compare/v2.1.3...master)
+[full changelog](http://github.com/sue445/rubicure/compare/v3.0.1...master)
+
+## v3.0.1
+[full changelog](http://github.com/sue445/rubicure/compare/v3.0.0...v3.0.1)
+
+* Add `ended_date` of Tropical-Rouge! Precure
+  * https://github.com/sue445/rubicure/pull/260
+* Fixed. Couldn't call `#precure_operation!` and `#precure_tropical_change!`
+  * https://github.com/sue445/rubicure/pull/264
+* Randomized Tropical-Rouge! Precure's `#transform!` (a.k.a. `#precure_tropical_change!`) transformation message
+  * https://github.com/sue445/rubicure/pull/263
+
+## v3.0.0
+[full changelog](http://github.com/sue445/rubicure/compare/v2.1.5...v3.0.0)
+
+### Breaking changes :bomb:
+* Supports ruby 3.1+ and drop ruby < 2.6
+  * https://github.com/sue445/rubicure/pull/259
+
+## v2.1.5
+[full changelog](http://github.com/sue445/rubicure/compare/v2.1.4...v2.1.5)
+
+* Fixed. `NameError: uninitialized constant ActiveSupport::XmlMini::IsolatedExecutionState` with activesupport v7.0.0
+  * https://github.com/sue445/rubicure/pull/258
+
+## v2.1.4
+[full changelog](http://github.com/sue445/rubicure/compare/v2.1.3...v2.1.4)
+
+* Enable MFA requirement for gem releasing
+  * https://github.com/sue445/rubicure/pull/256
 
 ## v2.1.3
 [full changelog](http://github.com/sue445/rubicure/compare/v2.1.2...v2.1.3)

data/Gemfile

@@ -2,8 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in rubicure.gemspec
 gemspec
-
-if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.5.0")
-  # activesupport v6.0.0+ requires Ruby 2.5.0+
-  gem "activesupport", "< 6.0.0"
-end

data/README.md

@@ -4,7 +4,6 @@
 [![Build Status](https://github.com/sue445/rubicure/workflows/test/badge.svg?branch=master)](https://github.com/sue445/rubicure/actions?query=workflow%3Atest)
 [![Code Climate](https://codeclimate.com/github/sue445/rubicure.png)](https://codeclimate.com/github/sue445/rubicure)
 [![Coverage Status](https://coveralls.io/repos/sue445/rubicure/badge.png)](https://coveralls.io/r/sue445/rubicure)
-[![Inline docs](http://inch-ci.org/github/sue445/rubicure.svg?branch=master)](http://inch-ci.org/github/sue445/rubicure)
 
 All about Japanese battle heroine "Pretty Cure (Precure)".
 
@@ -119,7 +118,7 @@ and [more aliases!](config/series.yml)
 
 ```ruby
 >> Precure.now
-=> {:series_name=>"tropical_rouge", :title=>"トロピカル～ジュ！プリキュア", :started_date=>#<Date: 2021-02-28 ((2459274j,0s,0n),+0s,2299161j)>, :girls=>["cure_summer", "cure_coral", "cure_papaya", "cure_flamingo", "cure_lamer"]}
+=> {:series_name=>"tropical_rouge", :title=>"トロピカル～ジュ！プリキュア", :started_date=>#<Date: 2021-02-28 ((2459274j,0s,0n),+0s,2299161j)>, :ended_date=>#<Date: 2022-01-30 ((2459610j,0s,0n),+0s,2299161j)>, :girls=>["cure_summer", "cure_coral", "cure_papaya", "cure_flamingo", "cure_lamer"]}
 
 # -2013/1/27  : smile precure
 #  2013/2/5 - : dokidoki precure
@@ -419,6 +418,15 @@ Go!プリンセスプリキュア！
 プリキュア！ルビーパッショナーレ！
 ```
 
+### When [Tropical-Rouge! Precure](https://en.wikipedia.org/wiki/Tropical-Rouge!_Pretty_Cure)
+In Tropical Rouge Precure's `#transform!` (a.k.a. `#precure_tropical_change!`), the transformation message will be randomized as in the original work.
+
+Example
+
+![tropical_rouge](examples/tropical_rouge.gif)
+
+[examples/tropical_rouge.rb](examples/tropical_rouge.rb)
+
 ### full_name
 When `Rubicure::Girl` has `human_full_name` (i.e. another `human_name`), she returns as `#full_name`
 

data/config/girls/017_healingood.yml

@@ -25,7 +25,7 @@ cure_grace: &cure_grace
       プリキュア！ヒーリングフラワー！
       お大事に
   transform_calls:
-    - precure_operation
+    - operation
 grace:
   <<: *cure_grace
 
@@ -56,7 +56,7 @@ cure_fontaine: &cure_fontaine
       プリキュア！ヒーリングストリーム！
       お大事に
   transform_calls:
-    - precure_operation
+    - operation
 fontaine:
   <<: *cure_fontaine
 
@@ -87,7 +87,7 @@ cure_sparkle: &cure_sparkle
       プリキュア！ヒーリングフラッシュ！
       お大事に
   transform_calls:
-    - precure_operation
+    - operation
 sparkle:
   <<: *cure_sparkle
 
@@ -118,6 +118,6 @@ cure_earth: &cure_earth
       プリキュア・ヒーリングハリケーン！
       お大事に
   transform_calls:
-    - precure_operation
+    - operation
 earth:
   <<: *cure_earth

data/config/girls/018_tropical_rouge.yml

@@ -16,7 +16,40 @@ cure_summer: &cure_summer
     ドレス！
     ときめく常夏！キュアサマー！
     はぁー！
-    4人揃って！トロピカル～ジュ！プリキュア！
+    ${random_transform_word}
+    トロピカル～ジュ！プリキュア！
+  random_transform_words: &random_transform_words
+    - 4人揃って！
+    - 今日も元気だ！
+    - よく食べよく寝る！
+    - エキストラだよ！
+    - 笑顔は100点！
+    - 雨にも負けない！
+    - 噂も吹き飛ぶ！
+    - 悩みも吹き飛ぶ！
+    - よいこの友達！
+    - 今日も元気だ！
+    - 5人揃って！
+    - 年中無休だ！
+    - 一人迷子だ！
+    - お祭り大好き！
+    - 転んで泣かない！
+    - いいとこ見せたい！
+    - 光る5つ星！
+    - 今日も元気だ！
+    - メイクは気合だ！
+    - 6人揃って！
+    - 雪の国でも！
+    - 子どももなれるよ！
+    - 今日も元気だ！
+    - 仮装じゃないよ！
+    - 今日も元気だ！
+    - 今日も本気だ！
+    - 燃えるど根性！
+    - 今日も元気だ！
+    - 全速前進！
+    - 絶対負けない！
+    - あっという間に！
   # extra_names:
   attack_messages:
     - |-
@@ -24,7 +57,7 @@ cure_summer: &cure_summer
       プリキュア！おてんとサマーストライク！
       ビクトリー！
   transform_calls:
-    - precure_tropical_change
+    - tropical_change
 summer:
   <<: *cure_summer
 
@@ -46,7 +79,9 @@ cure_coral: &cure_coral
     ドレス！
     きらめく宝石！キュアコーラル！
     はぁー！
-    4人揃って！トロピカル～ジュ！プリキュア！
+    ${random_transform_word}
+    トロピカル～ジュ！プリキュア！
+  random_transform_words: *random_transform_words
   # extra_names:
   attack_messages:
     - |-
@@ -54,7 +89,7 @@ cure_coral: &cure_coral
       プリキュア！もこもこコーラルディフュージョン！
       ビクトリー！
   transform_calls:
-    - precure_tropical_change
+    - tropical_change
 coral:
   <<: *cure_coral
 
@@ -76,7 +111,9 @@ cure_papaya: &cure_papaya
     ドレス！
     ひらめく果実！キュアパパイア！
     はぁー！
-    4人揃って！トロピカル～ジュ！プリキュア！
+    ${random_transform_word}
+    トロピカル～ジュ！プリキュア！
+  random_transform_words: *random_transform_words
   # extra_names:
   attack_messages:
     - |-
@@ -84,7 +121,7 @@ cure_papaya: &cure_papaya
       プリキュア！ぱんぱかパパイアショット！
       ビクトリー！
   transform_calls:
-    - precure_tropical_change
+    - tropical_change
 papaya:
   <<: *cure_papaya
 
@@ -106,7 +143,9 @@ cure_flamingo: &cure_flamingo
     ドレス！
     はためく翼！キュアフラミンゴ！
     はぁー！
-    4人揃って！トロピカル～ジュ！プリキュア！
+    ${random_transform_word}
+    トロピカル～ジュ！プリキュア！
+  random_transform_words: *random_transform_words
   # extra_names:
   attack_messages:
     - |-
@@ -114,7 +153,7 @@ cure_flamingo: &cure_flamingo
       プリキュア！ぶっとびフラミンゴスマッシュ！
       ビクトリー！
   transform_calls:
-    - precure_tropical_change
+    - tropical_change
 flamingo:
   <<: *cure_flamingo
 
@@ -134,12 +173,16 @@ cure_lamer: &cure_lamer
     ネイル！
     ドレス！
     ゆらめく大海原！キュアラメール！
+    はぁー！
+    ${random_transform_word}
+    トロピカル～ジュ！プリキュア！
+  random_transform_words: *random_transform_words
   # extra_names:
   attack_messages:
     - |-
       プリキュア！くるくるラメールストリーム！
       ビクトリー！
   transform_calls:
-    - precure_tropical_change
+    - tropical_change
 lamer:
   <<: *cure_lamer

data/config/series.yml

@@ -235,7 +235,7 @@ tropical_rouge: &tropical_rouge
   series_name: tropical_rouge
   title: トロピカル～ジュ！プリキュア
   started_date: 2021-02-28
-  # ended_date:   2021-01-
+  ended_date:   2022-01-30
   girls:
     - cure_summer
     - cure_coral

data/lib/rubicure/concerns/util.rb

@@ -22,6 +22,14 @@ module Rubicure
           nil
         end
       end
+
+      module_function
+
+      # @param yaml_file [String]
+      # @return [Hash]
+      def load_yaml_file(yaml_file)
+        YAML.safe_load(File.read(yaml_file), permitted_classes: [Date], aliases: true)
+      end
     end
   end
 end

data/lib/rubicure/girl.rb

@@ -22,6 +22,7 @@ module Rubicure
       :extra_names,
       :attack_messages,
       :transform_calls,
+      :random_transform_words,
     ].freeze
 
     attr_accessor :io
@@ -80,7 +81,15 @@ module Rubicure
       end
 
       state = inc_current_state
-      print_by_line transform_message if state == 1
+
+      message =
+        if random_transform_words && !random_transform_words.empty?
+          random_transform_word = random_transform_words.sample
+          transform_message.gsub("${random_transform_word}", random_transform_word)
+        else
+          transform_message
+        end
+      print_by_line message if state == 1
 
       self
     end
@@ -215,7 +224,7 @@ module Rubicure
       # @return [Hash] content of config/girls/*.yml
       def config
         unless @config
-          @config = SengiriYaml.load_dir("#{File.dirname(__FILE__)}/../../config/girls").deep_symbolize_keys
+          @config = SengiriYaml.load_dir("#{File.dirname(__FILE__)}/../../config/girls", permitted_classes: [Date], aliases: true).deep_symbolize_keys
         end
         @config
       end
@@ -293,8 +302,7 @@ module Rubicure
         return false unless has_key?(:transform_calls)
 
         shortened_name = method_name.to_s.
-                           sub(/\Aprecure_|_precure\z/, "").
-                           sub(/!\z/, "")
+                           sub(/\Aprecure_|_precure\z/, "").delete_suffix("!")
 
         transform_calls.include?(shortened_name)
       end

data/lib/rubicure/movie.rb

@@ -6,6 +6,8 @@ module Rubicure
     include Hashie::Extensions::MethodAccess
 
     class << self
+      include Rubicure::Concerns::Util
+
       # @return [Array<Symbol>]
       def names
         config.keys
@@ -24,7 +26,7 @@ module Rubicure
       def config
         unless @config
           config_file = "#{File.dirname(__FILE__)}/../../config/movies.yml"
-          @config = YAML.load_file(config_file).deep_symbolize_keys
+          @config = load_yaml_file(config_file).deep_symbolize_keys
         end
         @config
       end

data/lib/rubicure/series.rb

@@ -87,6 +87,8 @@ module Rubicure
     end
 
     class << self
+      include Rubicure::Concerns::Util
+
       # @return [Array<Symbol>]
       def names
         config.keys
@@ -105,7 +107,7 @@ module Rubicure
       def config
         unless @config
           config_file = "#{File.dirname(__FILE__)}/../../config/series.yml"
-          @config = YAML.load_file(config_file).deep_symbolize_keys
+          @config = load_yaml_file(config_file).deep_symbolize_keys
         end
         @config
       end

data/lib/rubicure/version.rb

@@ -1,3 +1,3 @@
 module Rubicure
-  VERSION = "2.1.3".freeze
+  VERSION = "3.0.1".freeze
 end

data/lib/rubicure.rb

@@ -1,6 +1,14 @@
 require "active_support/core_ext/array/wrap"
 require "active_support/core_ext/hash/keys"
+
+begin
+  # workaround for activesupport 7.0.0
+  # c.f. https://github.com/rails/rails/issues/43851
+  require "active_support/isolated_execution_state"
+rescue LoadError # rubocop:disable Lint/SuppressedException
+end
 require "active_support/core_ext/time/calculations"
+
 require "yaml"
 require "hashie"
 require "date"

data/rubicure.gemspec

@@ -12,15 +12,16 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/sue445/rubicure"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 2.4"
+  spec.required_ruby_version = ">= 2.6"
 
   if spec.respond_to?(:metadata)
     spec.metadata["homepage_uri"] = spec.homepage
     spec.metadata["source_code_uri"] = spec.homepage
     spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/master/CHANGELOG.md"
+    spec.metadata["rubygems_mfa_required"] = "true"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+          "public gem pushes."
   end
 
   spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
@@ -35,7 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport", ">= 5.0.0"
   spec.add_dependency "hashie", ">= 2.0.5"
-  spec.add_dependency "sengiri_yaml", ">= 0.0.2"
+  spec.add_dependency "sengiri_yaml", ">= 1.0.0"
 
   spec.add_development_dependency "bundler", ">= 1.3.5"
   spec.add_development_dependency "coveralls"
@@ -46,7 +47,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-collection_matchers"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rspec-parameterized", ">= 0.3.2"
-  spec.add_development_dependency "rubocop", "1.7.0"
+  spec.add_development_dependency "rubocop", "1.24.0"
   spec.add_development_dependency "rubocop_auto_corrector"
   spec.add_development_dependency "rubocop-performance", "1.9.2"
   spec.add_development_dependency "rubocop-rake", "0.5.1"

data/spec/config/girls_checker_spec.rb

@@ -3,7 +3,7 @@ describe "girls_checker" do # rubocop:disable RSpec/DescribeClass
 
   config_files.each do |config_file|
     describe "config/girls/#{config_file.basename}" do
-      girls = YAML.load_file(config_file)
+      girls = Rubicure::Concerns::Util.load_yaml_file(config_file)
 
       girls.each do |girl_name, girl|
         describe girl_name do
@@ -36,6 +36,20 @@ describe "girls_checker" do # rubocop:disable RSpec/DescribeClass
               end
             end
           end
+
+          transform_calls = Array(girl["transform_calls"])
+
+          describe "#transform_calls", unless: transform_calls.empty? do
+            subject { transform_calls }
+
+            transform_calls.count.times do |n|
+              # rubocop:disable RSpec/RepeatedDescription `expect().not_to all( matcher )` is not supported.
+              its([n]) { should_not be_start_with "precure_" }
+              its([n]) { should_not be_end_with "_precure" }
+              its([n]) { should_not be_end_with "!" }
+              # rubocop:enable RSpec/RepeatedDescription
+            end
+          end
         end
       end
     end

data/spec/config/series_checker_spec.rb

@@ -1,5 +1,5 @@
 describe "config/series.yml" do # rubocop:disable RSpec/DescribeClass
-  series = YAML.load_file("#{spec_dir}/../config/series.yml")
+  series = Rubicure::Concerns::Util.load_yaml_file("#{spec_dir}/../config/series.yml")
 
   series.values.uniq {|attributes| attributes["series_name"] }.each do |attributes|
     context attributes["title"] do

data/spec/rubicure/girl_spec.rb

@@ -1,16 +1,17 @@
 describe Rubicure::Girl do
   let(:girl) do
     girl = Rubicure::Girl[
-        girl_name:         girl_name,
-        human_name:        human_name,
-        precure_name:      precure_name,
-        cast_name:         cast_name,
-        created_date:      created_date,
-        extra_names:       extra_names,
-        transform_message: transform_message,
-        attack_messages:   attack_messages,
-        transform_calls:   transform_calls,
-        color:             color,
+        girl_name:              girl_name,
+        human_name:             human_name,
+        precure_name:           precure_name,
+        cast_name:              cast_name,
+        created_date:           created_date,
+        extra_names:            extra_names,
+        transform_message:      transform_message,
+        attack_messages:        attack_messages,
+        transform_calls:        transform_calls,
+        color:                  color,
+        random_transform_words: random_transform_words,
     ]
     girl.io = mock_io
     girl
@@ -38,6 +39,7 @@ describe Rubicure::Girl do
     ]
   end
   let(:transform_calls) { %w[smile_charge] }
+  let(:random_transform_words) { nil }
 
   describe "#name" do
     context "when before transform" do
@@ -143,6 +145,45 @@ describe Rubicure::Girl do
         it { expect(girl.state_names).to eq ["朝日奈みらい", "キュアミラクル（ダイヤスタイル）"] }
       end
     end
+
+    context "when Cure summer" do
+      let(:girl_name)       { "cure_summer" }
+      let(:human_name)      { "夏海まなつ" }
+      let(:precure_name)    { "キュアサマー" }
+      let(:cast_name)       { "ファイルーズあい" }
+      let(:created_date)    { date("2021-02-28") }
+      let(:transform_calls) { %w[precure_tropical_change] }
+      let(:color)           { "white" }
+
+      let(:transform_message) do
+        <<~MSG
+          プリキュア！トロピカルチェンジ！
+          レッツメイク！キャッチ！
+          チーク！
+          アイズ！
+          ヘアー！
+          リップ！
+          ドレス！
+          ときめく常夏！キュアサマー！
+          はぁー！
+          ${random_transform_word}
+          トロピカル～ジュ！プリキュア！
+        MSG
+      end
+
+      let(:random_transform_words) do
+        %w[
+          4人揃って！
+          今日も元気だ！
+        ]
+      end
+
+      it "stdout includes one of random_transform_words" do
+        girl.transform!
+
+        expect(mock_io.string).to include("4人揃って！").or include("今日も元気だ！")
+      end
+    end
   end
 
   describe "#==" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubicure
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 3.0.1
 platform: ruby
 authors:
 - sue445
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-27 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: rubocop_auto_corrector
   requirement: !ruby/object:Gem::Requirement
@@ -382,6 +382,7 @@ metadata:
   homepage_uri: https://github.com/sue445/rubicure
   source_code_uri: https://github.com/sue445/rubicure
   changelog_uri: https://github.com/sue445/rubicure/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -390,14 +391,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: All about Japanese battle heroine "Pretty Cure (Precure)".