amakanize 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 74e0311ca23b89b645e0629caa871060fd4f2796
-  data.tar.gz: fe9047de846deaccabf42d2b6cc9eba7d809d7c4
+SHA256:
+  metadata.gz: 2aa8603dd551be8c7b2e179e223e78928f882827ca8e20ef2758bd28162bb98d
+  data.tar.gz: cf47597d14fc7b1cccb449f7a139017da92801dde80944f257774db715a9d3ce
 SHA512:
-  metadata.gz: 898701f616daac7e977173f3794a51ed11d63ad7558303626255badaa6d72fe04bbfcb5f9a34f8199936e242ca715a93f1b46c7aebf628149a069beea80fa7bf
-  data.tar.gz: d776540d85acc6bce04afa16c4bacde2480c346dcf6f0267333bbaaf9a8ce3f2f6d6cad001c48c20cd60193e5cb139463b10086ec14d864af588a69cd1354db4
+  metadata.gz: 53c64c95dbde2e99c5490906e9c34b7d238b061e0a093c8c8058cd1702d769451e4477638df55c9454f3972dbf96728a56addca781f4e775f9d7ba79d2b8a6ea
+  data.tar.gz: 5f2a69a8089ea0814e1881f640d05603788ee06d21257910a863ff8ca912cf7b881a3f5ba5423cfe37ac6277da926087e7d4e9b4ee655ffbc3feb0887a8eadcb

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## v0.7.0
+
+- Require Ruby 2.5+
+
+## v0.6.5
+
+- Fix typo in DashBetweenAl'p'habetsNormalizationFilter
+
+## v0.6.4
+
+- Fix bug on 放課"後"
+
+## v0.6.3
+
+- Support `(その1)` format
+
+## v0.6.2
+
+- Remove trailing symbols from series name
+
 ## v0.6.1
 
 - Add `Amakanize::BookPosition`

data/amakanize.gemspec

@@ -13,9 +13,8 @@ Gem::Specification.new do |spec|
 
   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.required_ruby_version = ">= 2.5"
 
-  spec.add_dependency "activesupport"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "3.5.0"

data/lib/amakanize.rb

@@ -19,7 +19,7 @@ module Amakanize
     |下
     |中
     |前
-    |後
+    |(?<!放課)後
   /x
 
   PATTERN_OF_PREFIX_OF_BOOK_POSITION = /
@@ -28,6 +28,7 @@ module Amakanize
     |lv\.?\s*
     |level\.?\s*
     |vol(?:ume)?\.?\s*
+    |その\s*
     |巻(?:の|ノ|之)?\s*
     |第\s*
   /ix
@@ -46,7 +47,8 @@ module Amakanize
     |vol(?:ume)?\.?\s*
     |Vol(?:ume)?\.?\s*
     |VOL(?:UME)?\.?\s*
-    |第
+    |その\s*
+    |第\s*
   /x
 end
 
@@ -78,6 +80,7 @@ require "amakanize/filters/trailing_dash_deletion_filter"
 require "amakanize/filters/trailing_double_parentheses_singlization_filter"
 require "amakanize/filters/trailing_parentheses_deletion_filter"
 require "amakanize/filters/trailing_series_name_payload_deletion_filter"
+require "amakanize/filters/trailing_symbol_deletion_filter"
 require "amakanize/filters/trailing_volume_number_deletion_filter"
 require "amakanize/filters/video_position_detection_filter"
 require "amakanize/filters/video_position_number_conversion_filter"

data/lib/amakanize/book_position.rb

@@ -12,7 +12,7 @@ module Amakanize
           ::Amakanize::Filters::NormalizationFilter,
           ::Amakanize::Filters::ContinuousSpacesNormalizationFilter,
           ::Amakanize::Filters::HyphenMinusNormalizationFilter,
-          ::Amakanize::Filters::DashBetweenAlhabetsNormalizationFilter,
+          ::Amakanize::Filters::DashBetweenAlphabetsNormalizationFilter,
           ::Amakanize::Filters::BracketsNormalizationFilter,
           ::Amakanize::Filters::SpacesBetweenExclamationsDeletionFilter,
           ::Amakanize::Filters::SpaceBetweenExclamationAndBracketDeletionFilter,

data/lib/amakanize/filterable.rb

@@ -1,8 +1,8 @@
-require "active_support/concern"
-
 module Amakanize
   module Filterable
-    extend ::ActiveSupport::Concern
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
 
     # @param raw [String]
     def initialize(raw)

data/lib/amakanize/filters/brackets_normalization_filter.rb

@@ -33,7 +33,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/dash_between_alphabets_normalization_filter.rb

@@ -2,7 +2,7 @@ require "amakanize/filters/base_filter"
 
 module Amakanize
   module Filters
-    class DashBetweenAlhabetsNormalizationFilter < ::Amakanize::Filters::BaseFilter
+    class DashBetweenAlphabetsNormalizationFilter < ::Amakanize::Filters::BaseFilter
       # @note Override
       # @param output [String] e.g. `"D.Grayーman"`
       # @return [Hash] e.g. `"D.Gray-man"`

data/lib/amakanize/filters/normalization_filter.rb

@@ -1,4 +1,3 @@
-require "active_support"
 require "amakanize/filters/base_filter"
 
 module Amakanize
@@ -10,7 +9,7 @@ module Amakanize
       def call(context:, output:)
         {
           context: context,
-          output: ::ActiveSupport::Multibyte::Unicode.normalize(output),
+          output: output.unicode_normalize(:nfkc),
         }
       end
     end

data/lib/amakanize/filters/trailing_symbol_deletion_filter.rb

@@ -0,0 +1,18 @@
+require "amakanize/filters/base_filter"
+
+module Amakanize
+  module Filters
+    class TrailingSymbolDeletionFilter < ::Amakanize::Filters::BaseFilter
+      PATTERN = /\s*[-:]\z/
+
+      # @note Override
+      def call(context:, output:)
+        output = output.gsub(PATTERN, "")
+        {
+          context: context,
+          output: output,
+        }
+      end
+    end
+  end
+end

data/lib/amakanize/series_name.rb

@@ -12,7 +12,7 @@ module Amakanize
           ::Amakanize::Filters::NormalizationFilter,
           ::Amakanize::Filters::ContinuousSpacesNormalizationFilter,
           ::Amakanize::Filters::HyphenMinusNormalizationFilter,
-          ::Amakanize::Filters::DashBetweenAlhabetsNormalizationFilter,
+          ::Amakanize::Filters::DashBetweenAlphabetsNormalizationFilter,
           ::Amakanize::Filters::BracketsNormalizationFilter,
           ::Amakanize::Filters::SpacesBetweenExclamationsDeletionFilter,
           ::Amakanize::Filters::SpaceBetweenExclamationAndBracketDeletionFilter,
@@ -23,6 +23,7 @@ module Amakanize
           ::Amakanize::Filters::TrailingSeriesNamePayloadDeletionFilter,
           ::Amakanize::Filters::TrailingVolumeNumberDeletionFilter,
           ::Amakanize::Filters::TrailingSeriesNamePayloadDeletionFilter,
+          ::Amakanize::Filters::TrailingSymbolDeletionFilter,
         ]
       end
     end

data/lib/amakanize/version.rb

@@ -1,3 +1,3 @@
 module Amakanize
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/lib/amakanize/video_position.rb

@@ -12,7 +12,7 @@ module Amakanize
           ::Amakanize::Filters::NormalizationFilter,
           ::Amakanize::Filters::ContinuousSpacesNormalizationFilter,
           ::Amakanize::Filters::HyphenMinusNormalizationFilter,
-          ::Amakanize::Filters::DashBetweenAlhabetsNormalizationFilter,
+          ::Amakanize::Filters::DashBetweenAlphabetsNormalizationFilter,
           ::Amakanize::Filters::BracketsNormalizationFilter,
           ::Amakanize::Filters::VideoPositionDetectionFilter,
           ::Amakanize::Filters::VideoPositionNumberConversionFilter,

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: amakanize
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +111,7 @@ files:
 - lib/amakanize/filters/trailing_double_parentheses_singlization_filter.rb
 - lib/amakanize/filters/trailing_parentheses_deletion_filter.rb
 - lib/amakanize/filters/trailing_series_name_payload_deletion_filter.rb
+- lib/amakanize/filters/trailing_symbol_deletion_filter.rb
 - lib/amakanize/filters/trailing_volume_number_deletion_filter.rb
 - lib/amakanize/filters/video_position_detection_filter.rb
 - lib/amakanize/filters/video_position_number_conversion_filter.rb
@@ -143,15 +130,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Utilities to canonicalize series names and author names.