rubicure 2.1.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e876905265c2be67f43569f92acb97365296ca732f0a640ae7ad37d814e0bc3
-  data.tar.gz: 3e3929915de0493ef96c6bd1a431d955d9471dac03d3a02e108f1e6d8e9d5c00
+  metadata.gz: 4f469d7af84146fdffb852be483d6b6ddd54dc5a72d10451edccf18651b1c378
+  data.tar.gz: 2aecfe3678a1ff025565e3f4df232bfd748a3547a08f34e471d1b7ceac567f65
 SHA512:
-  metadata.gz: 63a8e1040322a2863fc06ae7b700bf48b6d682ecd0ab55a2a3138da5c4f499afa0ad2ab47212660b174dadd7c1a30143c56224da3373807da1c31606022fe566
-  data.tar.gz: dbb82a33e27c357943c7056ddf9efdcfce621c5ab111bc328636c6749cd7034b87cd307896198324dc6cd9e8a8b63463a1f88f1a4b5ac425b839350bb1806927
+  metadata.gz: bf4361cdb9203eedf8367513422b224456538573a2fc1eb4c5b8203205829cc8b11e3bbcc671780ec0ca5965c2da454226a6e60422cd74b1708fe7c5728e8761
+  data.tar.gz: 5afb770053cc077e8c725b9ecfc420b147990c1b170c0cd63f0e7ab1d80cd4e8ba7b2c940a2507a31c55ead02afff7f2415f13f4233ae4c927683cb4f8784c81

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,30 @@
 ## master
-[full changelog](http://github.com/sue445/rubicure/compare/v2.1.2...master)
+[full changelog](http://github.com/sue445/rubicure/compare/v3.0.0...master)
+
+## 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)
+
+* Tweak Laura's name
+  * https://github.com/sue445/rubicure/pull/255
 
 ## v2.1.2
 [full changelog](http://github.com/sue445/rubicure/compare/v2.1.1...v2.1.2)

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)".
 
@@ -720,9 +719,9 @@ Cure.cosmo.name
 => true
 
 >> Precure.all_girls.select(&:have_birthday?).map(&:human_name)
-=> ["美墨なぎさ", "雪城ほのか", "九条ひかり", "日向咲", "美翔舞", "相田マナ", "菱川六花", "四葉ありす", "剣崎真琴", "春野はるか", "海藤みなみ", "天ノ川きらら", "紅城トワ", "朝日奈みらい", "十六夜リコ", "宇佐美いちか", "有栖川ひまり", "立神あおい", "琴爪ゆかり", "剣城あきら", "キラ星シエル", "野乃はな", "薬師寺さあや", "輝木ほまれ", "愛崎えみる", "ルールー・アムール", "星奈ひかる", "羽衣ララ", "天宮えれな", "香久矢まどか", "ユニ", "花寺のどか", "沢泉ちゆ", "平光ひなた", "風鈴アスミ", "夏海まなつ", "涼村さんご", "一ノ瀬みのり", "滝沢あすか", "ローラ"]
+=> ["美墨なぎさ", "雪城ほのか", "九条ひかり", "日向咲", "美翔舞", "相田マナ", "菱川六花", "四葉ありす", "剣崎真琴", "春野はるか", "海藤みなみ", "天ノ川きらら", "紅城トワ", "朝日奈みらい", "十六夜リコ", "宇佐美いちか", "有栖川ひまり", "立神あおい", "琴爪ゆかり", "剣城あきら", "キラ星シエル", "野乃はな", "薬師寺さあや", "輝木ほまれ", "愛崎えみる", "ルールー・アムール", "星奈ひかる", "羽衣ララ", "天宮えれな", "香久矢まどか", "ユニ", "花寺のどか", "沢泉ちゆ", "平光ひなた", "風鈴アスミ", "夏海まなつ", "涼村さんご", "一ノ瀬みのり", "滝沢あすか", "ローラ・ラメール"]
 >> Precure.all_girls.select(&:have_birthday?).sort_by { |girl| Date.parse(girl.birthday) }.map{ |girl| [girl.birthday, girl.human_name]  }
-=> [["1/7", "宇佐美いちか"], ["1/20", "野乃はな"], ["3/9", "花寺のどか"], ["4/4", "雪城ほのか"], ["4/8", "輝木ほまれ"], ["4/10", "春野はるか"], ["4/12", "星奈ひかる"], ["4/16", "有栖川ひまり"], ["5/9", "涼村さんご"], ["5/28", "四葉ありす"], ["6/10", "薬師寺さあや"], ["6/11", "琴爪ゆかり"], ["6/12", "朝日奈みらい"], ["6/30", "ローラ"], ["7/7", "羽衣ララ"], ["7/15", "愛崎えみる"], ["7/20", "海藤みなみ"], ["7/30", "キラ星シエル"], ["8/1", "夏海まなつ"], ["8/4", "相田マナ"], ["8/7", "日向咲"], ["8/16", "風鈴アスミ"], ["8/21", "沢泉ちゆ"], ["8/27", "立神あおい"], ["9/8", "天宮えれな"], ["9/9", "九条ひかり"], ["9/12", "天ノ川きらら"], ["9/17", "菱川六花"], ["9/23", "ルールー・アムール"], ["9/24", "剣城あきら"], ["10/4", "平光ひなた"], ["10/10", "美墨なぎさ"], ["10/11", "ユニ"], ["10/15", "滝沢あすか"], ["11/4", "剣崎真琴"], ["11/12", "十六夜リコ"], ["11/20", "美翔舞"], ["11/21", "一ノ瀬みのり"], ["11/23", "香久矢まどか"], ["12/15", "紅城トワ"]]
+=> [["1/7", "宇佐美いちか"], ["1/20", "野乃はな"], ["3/9", "花寺のどか"], ["4/4", "雪城ほのか"], ["4/8", "輝木ほまれ"], ["4/10", "春野はるか"], ["4/12", "星奈ひかる"], ["4/16", "有栖川ひまり"], ["5/9", "涼村さんご"], ["5/28", "四葉ありす"], ["6/10", "薬師寺さあや"], ["6/11", "琴爪ゆかり"], ["6/12", "朝日奈みらい"], ["6/30", "ローラ・ラメール"], ["7/7", "羽衣ララ"], ["7/15", "愛崎えみる"], ["7/20", "海藤みなみ"], ["7/30", "キラ星シエル"], ["8/1", "夏海まなつ"], ["8/4", "相田マナ"], ["8/7", "日向咲"], ["8/16", "風鈴アスミ"], ["8/21", "沢泉ちゆ"], ["8/27", "立神あおい"], ["9/8", "天宮えれな"], ["9/9", "九条ひかり"], ["9/12", "天ノ川きらら"], ["9/17", "菱川六花"], ["9/23", "ルールー・アムール"], ["9/24", "剣城あきら"], ["10/4", "平光ひなた"], ["10/10", "美墨なぎさ"], ["10/11", "ユニ"], ["10/15", "滝沢あすか"], ["11/4", "剣崎真琴"], ["11/12", "十六夜リコ"], ["11/20", "美翔舞"], ["11/21", "一ノ瀬みのり"], ["11/23", "香久矢まどか"], ["12/15", "紅城トワ"]]
 
 >> Precure.all_girls.select(&:have_birthday?).map(&:human_name).count
 => 40

data/config/girls/018_tropical_rouge.yml

@@ -120,7 +120,7 @@ flamingo:
 
 cure_lamer: &cure_lamer
   girl_name:       cure_lamer
-  human_name:      ローラ
+  human_name:      ローラ・ラメール
   human_full_name: ローラ・アポロドーロス・ヒュギーヌス・ラメール
   precure_name:    キュアラメール
   cast_name:       日高里菜

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

@@ -215,7 +215,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 +293,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.2".freeze
+  VERSION = "3.0.0".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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubicure
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0
 platform: ruby
 authors:
 - sue445
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-20 00:00:00.000000000 Z
+date: 2021-12-31 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.3.3
 signing_key:
 specification_version: 4
 summary: All about Japanese battle heroine "Pretty Cure (Precure)".