amakanize 0.6.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b733fa6b1b58408b9f775a8771148e0dd6fad83c
-  data.tar.gz: e63462625cf13bff717399039967015d14704168
+SHA256:
+  metadata.gz: 16678421179e2e75b6b7d4f9789f4e33a9f458f3b4b9d96dc2fed4f642d5e907
+  data.tar.gz: 52989b7b4056e9943f6f0e45e5bbe1b44b949cc23b714799d2dc59fedd698fd5
 SHA512:
-  metadata.gz: 6297c44d37ced45e17163679010d169b5e73b20087fd73d4837a5097b20459732e9b5f9e80db98eb6c180a2e518f10611b5eb2178a72b155a7068bffd9d1fe0d
-  data.tar.gz: cc21ebabb03d6d01cabe852fcc32989f304562490db8de1da197bfff7bc3c0e2a8148b928f272202adc7e5a7da7669071b6ea442c38ab98b38d8a19b75709605
+  metadata.gz: 3cd4c607e385326e3967d1397daf0b504d0832e41beb67048deee97d4cf6b8b392effdc083a87a86dee247ee6c71aa9e8c12308e62b9307142c3a78bdc4d2a01
+  data.tar.gz: 10a56038359bd17b023099449822dacea75a78f3a059c4a816c5babd0a3973246976ab5c179d286f455327495733f9c4e3db33afe9663c69d934e446bcbd915a

data/.github/release.yml

@@ -0,0 +1,23 @@
+changelog:
+  categories:
+    - title: Added
+      labels:
+        - add
+    - title: Changed
+      labels:
+        - change
+    - title: Deprecated
+      labels:
+        - deprecate
+    - title: Fixed
+      labels:
+        - fix
+    - title: Removed
+      labels:
+        - remove
+    - title: Security
+      labels:
+        - security
+    - title: Others
+      labels:
+        - "*"

data/.github/workflows/bump-request.yml

@@ -0,0 +1,26 @@
+name: bump-request
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: Version to change to.
+        required: true
+        type: string
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1.2
+          bundler-cache: true
+      - uses: r7kamura/bump-request@v0
+        with:
+          command: |
+            sed -i -r 's/([0-9]+\.[0-9]+\.[0-9]+)/${{ inputs.version }}/' lib/*/version.rb
+            bundle install
+          version: ${{ inputs.version }}

data/.github/workflows/github-label-sync.yml

@@ -0,0 +1,18 @@
+name: github-label-sync
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - .github/workflows/github-label-sync.yml
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: r7kamura/github-label-sync-action@v0
+        with:
+          source_path: labels-keepachangelog.yml
+          source_repository: r7kamura/github-label-presets

data/.github/workflows/release.yml

@@ -0,0 +1,12 @@
+name: release
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release:
+    uses: r7kamura/workflows/.github/workflows/gem-release.yml@main
+    secrets:
+      rubygems-org-api-key: ${{ secrets.RUBYGEMS_ORG_API_KEY }}

data/.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    strategy:
+      matrix:
+        ruby:
+          - '2.7'
+          - '3.1'
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run the default task
+      run: bundle exec rake

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rubocop.yml

@@ -1,84 +1,14 @@
 AllCops:
-  Exclude:
-    - db/**/*
-    - node_modules/**/*
-    - vendor/**/*
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.7
 
-AsciiComments:
+Layout/LineLength:
   Enabled: false
 
-Lint/HandleExceptions:
-  Enabled: false
-
-Lint/UnusedBlockArgument:
-  Enabled: false
-
-Lint/UnusedMethodArgument:
-  Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/ParameterLists:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
-  Max: 10
-
-Style/AccessModifierIndentation:
+Metrics:
   Enabled: false
 
 Style/Documentation:
   Enabled: false
 
-Style/DoubleNegation:
-  Enabled: false
-
-Style/GuardClause:
-  Enabled: false
-
-Style/IfUnlessModifier:
-  Enabled: false
-
 Style/MultilineBlockChain:
   Enabled: false
-
-Style/MultilineMethodCallIndentation:
-  Enabled: false
-
-Style/MutableConstant:
-  Enabled: false
-
-Style/Next:
-  Enabled: false
-
-Style/PercentLiteralDelimiters:
-  Enabled: false
-
-Style/PredicateName:
-  Enabled: false
-
-Style/SpaceAroundOperators:
-  Enabled: false
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Style/TrailingCommaInArguments:
-  Enabled: false
-
-Style/TrailingCommaInLiteral:
-  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.7.0
+
+- Require Ruby 2.5+
+
 ## v0.6.5
 
 - Fix typo in DashBetweenAl'p'habetsNormalizationFilter

data/Gemfile

@@ -1,4 +1,10 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 # Specify your gem"s dependencies in amakanize.gemspec
 gemspec
+
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'

data/Gemfile.lock

@@ -0,0 +1,58 @@
+PATH
+  remote: .
+  specs:
+    amakanize (0.8.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    diff-lcs (1.5.0)
+    json (2.6.2)
+    parallel (1.22.1)
+    parser (3.1.3.0)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.6.1)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.39.0)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.2.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.23.0)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.3.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  amakanize!
+  bundler
+  rake
+  rspec
+  rubocop
+
+BUNDLED WITH
+   2.3.26

data/README.md

@@ -1,10 +1,8 @@
 # Amakanize
 
-[![CircleCI](https://img.shields.io/circleci/project/github/amakan/amakanize.svg)](https://circleci.com/gh/amakan/amakanize)
-[![Gem Version](https://badge.fury.io/rb/amakanize.svg)](https://rubygems.org/gems/amakanize)
-[![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/github/amakan/amakanize)
+[![test](https://github.com/amakan/amakanize/actions/workflows/test.yml/badge.svg)](https://github.com/amakan/amakanize/actions/workflows/test.yml)
 
-Utilities to canonicalize names for [amakan.net](https://amakan.net/).
+Utilities to canonicalize Japanese comic series names and author names.
 
 ## Installation
 

data/Rakefile

@@ -1,5 +1,12 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
-task default: :spec
+
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new
+
+task default: %i[spec rubocop]

data/amakanize.gemspec

@@ -1,23 +1,21 @@
-lib = File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "amakanize/version"
+require 'amakanize/version'
 
 Gem::Specification.new do |spec|
-  spec.name = "amakanize"
+  spec.name = 'amakanize'
   spec.version = Amakanize::VERSION
-  spec.authors = ["Ryo Nakamura"]
-  spec.email = ["r7kamura@gmail.com"]
-  spec.summary = "Utilities to canonicalize series names and author names."
-  spec.homepage = "https://github.com/amakan/amakanize"
-  spec.license = "MIT"
+  spec.authors = ['Ryo Nakamura']
+  spec.email = ['r7kamura@gmail.com']
+  spec.summary = 'Utilities to canonicalize Japanese comic series names and author names.'
+  spec.homepage = 'https://github.com/amakan/amakanize'
+  spec.license = 'MIT'
 
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.2.2"
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_dependency "activesupport"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "3.5.0"
-  spec.add_development_dependency "rubocop", "0.44.1"
+  spec.add_development_dependency 'bundler'
 end

data/lib/amakanize/author_name.rb

@@ -1,4 +1,6 @@
-require "amakanize/filterable"
+# frozen_string_literal: true
+
+require 'amakanize/filterable'
 
 module Amakanize
   class AuthorName
@@ -14,7 +16,7 @@ module Amakanize
           ::Amakanize::Filters::ParenthesesDeletionFilter,
           ::Amakanize::Filters::RoleNameDeletionFilter,
           ::Amakanize::Filters::TrailingAuthorNamePayloadDeletionFilter,
-          ::Amakanize::Filters::SpaceDeletionFilter,
+          ::Amakanize::Filters::SpaceDeletionFilter
         ]
       end
     end

data/lib/amakanize/author_names.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Amakanize
   class AuthorNames
     include ::Enumerable
 
-    AUTHOR_NAME_SEPARATORS = %w(
+    AUTHOR_NAME_SEPARATORS = %w[
       ,
       ，
       、
-    )
+    ].freeze
 
     AUTHOR_NAME_SEPARATORS_REGEXP = ::Regexp.union(AUTHOR_NAME_SEPARATORS)
 
@@ -34,9 +36,7 @@ module Amakanize
 
     # @private
     # @return [String]
-    def raw
-      @raw
-    end
+    attr_reader :raw
 
     # @private
     # @return [Array<String>]

data/lib/amakanize/book_position.rb

@@ -1,4 +1,6 @@
-require "amakanize/filterable"
+# frozen_string_literal: true
+
+require 'amakanize/filterable'
 
 module Amakanize
   class BookPosition
@@ -25,7 +27,7 @@ module Amakanize
           ::Amakanize::Filters::BookPositionAtEndDetectionFilter,
           ::Amakanize::Filters::BookPositionClearingFilter,
           ::Amakanize::Filters::VideoPositionNumberConversionFilter,
-          ::Amakanize::Filters::BookPositionNumberCanonicalizationFilter,
+          ::Amakanize::Filters::BookPositionNumberCanonicalizationFilter
         ]
       end
     end

data/lib/amakanize/filterable.rb

@@ -1,8 +1,10 @@
-require "active_support/concern"
+# frozen_string_literal: true
 
 module Amakanize
   module Filterable
-    extend ::ActiveSupport::Concern
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
 
     # @param raw [String]
     def initialize(raw)
@@ -12,7 +14,7 @@ module Amakanize
     # @note Override
     def to_s
       filters.inject(context: {}, output: raw) do |result, filter|
-        filter.call(result)
+        filter.call(**result)
       end[:output]
     end
 

data/lib/amakanize/filters/base_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Amakanize
   module Filters
     class BaseFilter

data/lib/amakanize/filters/book_position_at_end_detection_filter.rb

@@ -1,4 +1,6 @@
-require "amakanize/filters/base_filter"
+# frozen_string_literal: true
+
+require 'amakanize/filters/base_filter'
 
 module Amakanize
   module Filters
@@ -9,19 +11,17 @@ module Amakanize
         (?:#{::Amakanize::PATTERN_OF_SUFFIX_OF_BOOK_POSITION})?
         \s*
         \z
-      /x
+      /x.freeze
 
       # @note Override
       def call(context:, output:)
-        unless context[:position_detected]
-          if position = output[PATTERN, 1]
-            context[:position_detected] = true
-            output = position
-          end
+        if !context[:position_detected] && (position = output[PATTERN, 1])
+          context[:position_detected] = true
+          output = position
         end
         {
           context: context,
-          output: output,
+          output: output
         }
       end
     end

data/lib/amakanize/filters/book_position_clearing_filter.rb

@@ -1,16 +1,16 @@
-require "amakanize/filters/base_filter"
+# frozen_string_literal: true
+
+require 'amakanize/filters/base_filter'
 
 module Amakanize
   module Filters
     class BookPositionClearingFilter < ::Amakanize::Filters::BaseFilter
       # @note Override
       def call(context:, output:)
-        unless context[:position_detected]
-          output = ""
-        end
+        output = '' unless context[:position_detected]
         {
           context: context,
-          output: output,
+          output: output
         }
       end
     end

data/lib/amakanize/filters/book_position_in_bracket_detection_filter.rb

@@ -1,4 +1,6 @@
-require "amakanize/filters/base_filter"
+# frozen_string_literal: true
+
+require 'amakanize/filters/base_filter'
 
 module Amakanize
   module Filters
@@ -9,19 +11,17 @@ module Amakanize
         (#{::Amakanize::PATTERN_OF_NUMERIC_CHARACTERS})
         (?:#{::Amakanize::PATTERN_OF_SUFFIX_OF_BOOK_POSITION})?
         \)
-      /x
+      /x.freeze
 
       # @note Override
       def call(context:, output:)
-        unless context[:position_detected]
-          if position = output[PATTERN, 1]
-            context[:position_detected] = true
-            output = position
-          end
+        if !context[:position_detected] && (position = output[PATTERN, 1])
+          context[:position_detected] = true
+          output = position
         end
         {
           context: context,
-          output: output,
+          output: output
         }
       end
     end

data/lib/amakanize/filters/book_position_in_words_detection_filter.rb

@@ -1,4 +1,6 @@
-require "amakanize/filters/base_filter"
+# frozen_string_literal: true
+
+require 'amakanize/filters/base_filter'
 
 module Amakanize
   module Filters
@@ -6,19 +8,17 @@ module Amakanize
       PATTERN = /
         (?:#{::Amakanize::PATTERN_OF_PREFIX_OF_BOOK_POSITION})(#{::Amakanize::PATTERN_OF_NUMERIC_CHARACTERS})
         |(#{::Amakanize::PATTERN_OF_NUMERIC_CHARACTERS})(?:#{::Amakanize::PATTERN_OF_SUFFIX_OF_BOOK_POSITION})
-      /x
+      /x.freeze
 
       # @note Override
       def call(context:, output:)
-        unless context[:position_detected]
-          if position = output[PATTERN, 1]
-            context[:position_detected] = true
-            output = position
-          end
+        if !context[:position_detected] && (position = output[PATTERN, 1])
+          context[:position_detected] = true
+          output = position
         end
         {
           context: context,
-          output: output,
+          output: output
         }
       end
     end

data/lib/amakanize/filters/book_position_number_canonicalization_filter.rb

@@ -1,16 +1,16 @@
-require "amakanize/filters/base_filter"
+# frozen_string_literal: true
+
+require 'amakanize/filters/base_filter'
 
 module Amakanize
   module Filters
     class BookPositionNumberCanonicalizationFilter < ::Amakanize::Filters::BaseFilter
       # @note Override
       def call(context:, output:)
-        if context[:position_detected]
-          output = output.gsub(/\A0+([1-9]+)/, '\1')
-        end
+        output = output.gsub(/\A0+([1-9]+)/, '\1') if context[:position_detected]
         {
           context: context,
-          output: output,
+          output: output
         }
       end
     end

data/lib/amakanize/filters/brackets_normalization_filter.rb

@@ -1,4 +1,6 @@
-require "amakanize/filters/base_filter"
+# frozen_string_literal: true
+
+require 'amakanize/filters/base_filter'
 
 module Amakanize
   module Filters
@@ -33,7 +35,7 @@ module Amakanize
         {
           context: context,
           output: PAIRS.each_with_object(output) do |(open, close), result|
-            result.gsub!(/#{open}([^\( ]+?)#{close}/, '(\1)')
+            result.gsub!(/#{open}([^( ]+?)#{close}/, '(\1)')
           end.gsub(/\s*\((.+?)\)(?:\z|(\s*))/) do
             " \(#{::Regexp.last_match(1)})#{' ' if Regexp.last_match(2)}"
           end

data/lib/amakanize/filters/continuous_spaces_normalization_filter.rb

@@ -1,4 +1,6 @@
-require "amakanize/filters/base_filter"
+# frozen_string_literal: true
+
+require 'amakanize/filters/base_filter'
 
 module Amakanize
   module Filters
@@ -9,7 +11,7 @@ module Amakanize
       def call(context:, output:)
         {
           context: context,
-          output: output.gsub(/\s+/, " "),
+          output: output.gsub(/\s+/, ' ')
         }
       end
     end

data/lib/amakanize/filters/dash_between_alphabets_normalization_filter.rb

@@ -1,4 +1,6 @@
-require "amakanize/filters/base_filter"
+# frozen_string_literal: true
+
+require 'amakanize/filters/base_filter'
 
 module Amakanize
   module Filters
@@ -9,7 +11,7 @@ module Amakanize
       def call(context:, output:)
         {
           context: context,
-          output: output.gsub(/(\w)ー(\w)/, '\1-\2'),
+          output: output.gsub(/(\w)ー(\w)/, '\1-\2')
         }
       end
     end