html-pipeline-nico_link 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ae571a46d4a1978dda095d9278c7e7063b2aaecfae7e0d4bb9bcfd592df94c9
-  data.tar.gz: ea58a1fcb4bedee2d259a0923a5d605babc2a73c88bd003ead98de6331ca68b3
+  metadata.gz: e97d52ee866a3d14710eb88972d922aeb704bc07cf8176ae437fca9ed762e05c
+  data.tar.gz: 79313c428ece52f5febf205dd32d45edf89095ce5fa44463d922279b14c6e4be
 SHA512:
-  metadata.gz: d348ab7ba43e58138d0796d8f3259e340ae3e2f09f25507329d187f3f76ee95dbecbb7eae35733c9023452059a4a503ae5b30a3da2299ac75d782b2b14f3c6c0
-  data.tar.gz: ceda942499fc34d4a8a2bf8a0ef6a51d31234387997dae3057c7d9de28b98b5872358a14b64c7778096ab218459e4a91464d26f2f6bc730fdee323d6cf7d0217
+  metadata.gz: b76a18ab70ccd9ba093ba9deb3006db36615f7b2adefc2ee2246aa034cfeead09ecc802b7042a3e3831f7ddec400c4cd2d68c0fdfe72c5ffa66c72eb9fc6e7f8
+  data.tar.gz: c4a8ab35c272df73a7bd47afd5e69f9d88efdf628642793f206077a64a52fdc097ed08dc21982350bf445b1204980ae7199fdb4589991c34383ad6312a137a01

data/.github/workflows/ruby.yml

@@ -0,0 +1,23 @@
+name: Ruby
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.4', '2.5', '2.6', '2.7' ]
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: eregon/use-ruby-action@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Build and test with Rake
+        run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+          bundle exec rubocop
+          bundle exec rake

data/.rubocop.yml

@@ -1,32 +1,89 @@
 AllCops:
   Exclude:
-    - bin/**/*
     - tmp/**/*
     - vendor/**/*
+  TargetRubyVersion: 2.4
+  DisplayCopNames: true
 
-BlockLength:
+# use japanese :)
+Style/AsciiComments:
   Enabled: false
 
-SpecialGlobalVars:
+# use method chain ( avoid use `end.compact` )
+#
+#   hoge.map { |item|
+#     item.piyo
+#   }.compact
+Style/BlockDelimiters:
   Enabled: false
 
-AsciiComments:
+# no document
+Style/Documentation:
   Enabled: false
 
-ClassLength:
-  Max: 200
+# use `!!hoge`
+Style/DoubleNegation:
+  Enabled: false
 
-Documentation:
+# empty case is useful
+#
+#  case
+#  when user.admin?
+#    ...
+#  when user.active?
+#    ...
+#  else
+#    ...
+#  end
+Style/EmptyCaseCondition:
   Enabled: false
 
-LineLength:
+# my preference :)
+Style/EmptyMethod:
+  EnforcedStyle: expanded
+
+# use `-> {}` syntax
+Style/Lambda:
+  Enabled: false
+
+# see Style/BlockDelimiters
+Style/MultilineBlockChain:
+  Enabled: false
+
+# I feel `.zero?` difficult to understand...
+Style/NumericPredicate:
+  Enabled: false
+
+# %w[a b c] or %i[a b c] ?
+Style/SymbolArray:
+  Enabled: false
+
+# incompatible DSL
+Layout/EmptyLinesAroundArguments:
+  Enabled: false
+
+# my preference :)
+Layout/LineLength:
   Max: 120
   Exclude:
     - spec/**/*
 
-MethodLength:
+# :(
+Metrics/AbcSize:
   Max: 30
 
-TrailingCommaInLiteral:
-  EnforcedStyleForMultiline: comma
+# incompatible DSL
+Metrics/BlockLength:
+  Enabled: false
+
+# incompatible DSL
+Metrics/ClassLength:
+  Enabled: false
+
+# my preference :(
+Metrics/MethodLength:
+  Max: 25
+
+Metrics/ParameterLists:
+  CountKeywordArgs: false
 

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in html-pipeline-nico_link_filter.gemspec

data/README.md

@@ -1,7 +1,5 @@
 # Html::Pipeline::NicoLink
 
-[![Build Status](https://travis-ci.org/rutan/html-pipeline-nico_link.svg?branch=master)](https://travis-ci.org/rutan/html-pipeline-nico_link)
-
 An HTML::Pipeline filter for niconico(http://www.nicovideo.jp) description links.
 
 niconicoの動画説明文中のオートリンクです。mylist2.jsの定義を参考にしています。

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/html-pipeline-nico_link.gemspec

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'html/pipeline/nico_link/version'
 
@@ -19,8 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'html-pipeline', '~> 2.4'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.1.0'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop', '0.79.0'
 end

data/lib/html/pipeline/nico_link.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'html/pipeline/nico_link/version'
 require 'html/pipeline/nico_link/filter'

data/lib/html/pipeline/nico_link/filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'html/pipeline'
 require 'erb'
 
@@ -12,9 +14,11 @@ module HTML
       def call
         doc.xpath('.//text()').each do |node|
           next if has_ancestor?(node, IGNORE_PARENTS)
+
           content = node.to_html
           html = apply_filter(content)
           next if html == content
+
           node.replace(html)
         end
         doc
@@ -23,7 +27,7 @@ module HTML
       def apply_filter(content)
         content = content.dup
         content.gsub!(merged_pattern) do |text|
-          index = $~.captures.index { |n| n }
+          index = Regexp.last_match.captures.index { |n| n }
           pattern_set = patterns[index]
           value = pattern_set[:convert] ? pattern_set[:convert].call(text) : text
           url = pattern_set[:link].gsub('%s', value)
@@ -37,7 +41,7 @@ module HTML
           {
             pattern: pattern_set[:pattern],
             link: pattern_set[:link],
-            convert: pattern_set[:convert],
+            convert: pattern_set[:convert]
           }
         end
       end
@@ -51,93 +55,85 @@ module HTML
       DEFAULT_PATTERNS = [
         {
           pattern: /(?:sm|nm|so|ca|ax|yo|nl|ig|na|cw|z[a-e]|om|sk|yk)\d{1,14}/,
-          link: 'http://www.nicovideo.jp/watch/%s',
+          link: 'http://www.nicovideo.jp/watch/%s'
         },
         {
-          pattern: %r{(?:watch|user|myvideo|mylist)/\d{1,10}},
-          link: 'http://www.nicovideo.jp/%s',
+          pattern: %r{(?:watch|user|myvideo|mylist|series)/\d{1,10}},
+          link: 'http://www.nicovideo.jp/%s'
         },
         {
           pattern: /co\d{1,14}/,
-          link: 'http://com.nicovideo.jp/%s',
+          link: 'http://com.nicovideo.jp/%s'
         },
         {
           pattern: /ch\d{1,14}/,
-          link: 'http://ch.nicovideo.jp/%s',
+          link: 'http://ch.nicovideo.jp/%s'
         },
         {
           pattern: /ar\d{1,14}/,
-          link: 'http://ch.nicovideo.jp/article/%s',
+          link: 'http://ch.nicovideo.jp/article/%s'
         },
         {
           pattern: /td\d+/,
-          link: 'http://3d.nicovideo.jp/works/%s',
+          link: 'http://3d.nicovideo.jp/works/%s'
         },
         {
           pattern: /nc\d{1,14}/,
-          link: 'http://commons.nicovideo.jp/material/%s',
+          link: 'http://commons.nicovideo.jp/material/%s'
         },
         {
           pattern: /(?:dw\d+|az[A-Z0-9]{10}|ys[a-zA-Z0-9-]+_[a-zA-Z0-9-]+|ga\d+|ip[\d_]+|gg[a-zA-Z0-9]+-[a-zA-Z0-9-]+)/,
-          link: 'http://ichiba.nicovideo.jp/item/%s',
+          link: 'http://ichiba.nicovideo.jp/item/%s'
         },
         {
           pattern: /lv\d{1,14}/,
-          link: 'http://live.nicovideo.jp/watch/%s',
+          link: 'http://live.nicovideo.jp/watch/%s'
         },
         {
           pattern: /[sm]g\d{1,14}/,
-          link: 'http://seiga.nicovideo.jp/watch/%s',
+          link: 'http://seiga.nicovideo.jp/watch/%s'
         },
         {
           pattern: /bk\d{1,14}/,
-          link: 'http://seiga.nicovideo.jp/watch/%s',
+          link: 'http://seiga.nicovideo.jp/watch/%s'
         },
         {
           pattern: /im\d{1,14}/,
-          link: 'http://seiga.nicovideo.jp/seiga/%s',
+          link: 'http://seiga.nicovideo.jp/seiga/%s'
         },
         {
           pattern: %r{commons\.nicovideo\.jp/user/\d+},
-          link: 'http://%s',
+          link: 'http://%s'
         },
         {
           pattern: %r{niconicommons\.jp/user/\d+},
-          link: 'http://www.%s',
+          link: 'http://www.%s'
         },
         {
           pattern: %r{user/illust/\d+},
-          link: 'http://seiga.nicovideo.jp/%s',
+          link: 'http://seiga.nicovideo.jp/%s'
         },
         {
           pattern: %r{clip/\d+},
-          link: 'http://seiga.nicovideo.jp/%s',
+          link: 'http://seiga.nicovideo.jp/%s'
         },
         {
           pattern: %r{ch\.nicovideo\.jp/[a-zA-Z0-9][-_a-zA-Z0-9]+(?=[^\-_A-Za-z0-9/]|$)},
-          link: 'http://%s',
+          link: 'http://%s'
         },
         {
           pattern: /jps\d{1,14}/,
           link: 'http://jpstore.dwango.jp/products/detail.php?product_id=%s',
-          convert: ->(str) { str.sub('jps', '') },
-        },
-        {
-          pattern: /kn\d+/,
-          link: 'https://niconare.nicovideo.jp/watch/%s',
+          convert: ->(str) { str.sub('jps', '') }
         },
         {
           pattern: /gm\d+/,
-          link: 'https://game.nicovideo.jp/atsumaru/games/%s',
-        },
-        {
-          pattern: /mt\d+/,
-          link: 'https://mtm.nicovideo.jp/watch/%s',
+          link: 'https://game.nicovideo.jp/atsumaru/games/%s'
         },
         {
           pattern: /nq\d+/,
-          link: 'https://q.nicovideo.jp/watch/%s',
-        },
+          link: 'https://q.nicovideo.jp/watch/%s'
+        }
       ].freeze
     end
   end

data/lib/html/pipeline/nico_link/version.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module HTML
   class Pipeline
     module NicoLink
-      VERSION = '0.4.0'.freeze
+      VERSION = '0.5.0'
     end
   end
 end

data/spec/nico_link_filter_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'spec_helper'
 
@@ -63,9 +64,9 @@ describe 'NicoLinkFilter' do
         sm123 watch/5321 co9999 ch1414 ar56789 td3232 nc9284 dw111 lv8864 sg9123 bk1313 im58
         commons.nicovideo.jp/user/1 niconicommons.jp/user/2
         user/illust/3 clip/555 ch.nicovideo.jp/h-p
-        jps1111 kn1567 gm54321 nq2525
+        jps1111 gm54321 nq2525
       ].join(' ')
     end
-    it { expect(subject).to eq '<a href="http://www.nicovideo.jp/watch/sm123">sm123</a> <a href="http://www.nicovideo.jp/watch/5321">watch/5321</a> <a href="http://com.nicovideo.jp/co9999">co9999</a> <a href="http://ch.nicovideo.jp/ch1414">ch1414</a> <a href="http://ch.nicovideo.jp/article/ar56789">ar56789</a> <a href="http://3d.nicovideo.jp/works/td3232">td3232</a> <a href="http://commons.nicovideo.jp/material/nc9284">nc9284</a> <a href="http://ichiba.nicovideo.jp/item/dw111">dw111</a> <a href="http://live.nicovideo.jp/watch/lv8864">lv8864</a> <a href="http://seiga.nicovideo.jp/watch/sg9123">sg9123</a> <a href="http://seiga.nicovideo.jp/watch/bk1313">bk1313</a> <a href="http://seiga.nicovideo.jp/seiga/im58">im58</a> <a href="http://commons.nicovideo.jp/user/1">commons.nicovideo.jp/user/1</a> <a href="http://www.niconicommons.jp/user/2">niconicommons.jp/user/2</a> <a href="http://seiga.nicovideo.jp/user/illust/3">user/illust/3</a> <a href="http://seiga.nicovideo.jp/clip/555">clip/555</a> <a href="http://ch.nicovideo.jp/h-p">ch.nicovideo.jp/h-p</a> <a href="http://jpstore.dwango.jp/products/detail.php?product_id=1111">jps1111</a> <a href="https://niconare.nicovideo.jp/watch/kn1567">kn1567</a> <a href="https://game.nicovideo.jp/atsumaru/games/gm54321">gm54321</a> <a href="https://q.nicovideo.jp/watch/nq2525">nq2525</a>' }
+    it { expect(subject).to eq '<a href="http://www.nicovideo.jp/watch/sm123">sm123</a> <a href="http://www.nicovideo.jp/watch/5321">watch/5321</a> <a href="http://com.nicovideo.jp/co9999">co9999</a> <a href="http://ch.nicovideo.jp/ch1414">ch1414</a> <a href="http://ch.nicovideo.jp/article/ar56789">ar56789</a> <a href="http://3d.nicovideo.jp/works/td3232">td3232</a> <a href="http://commons.nicovideo.jp/material/nc9284">nc9284</a> <a href="http://ichiba.nicovideo.jp/item/dw111">dw111</a> <a href="http://live.nicovideo.jp/watch/lv8864">lv8864</a> <a href="http://seiga.nicovideo.jp/watch/sg9123">sg9123</a> <a href="http://seiga.nicovideo.jp/watch/bk1313">bk1313</a> <a href="http://seiga.nicovideo.jp/seiga/im58">im58</a> <a href="http://commons.nicovideo.jp/user/1">commons.nicovideo.jp/user/1</a> <a href="http://www.niconicommons.jp/user/2">niconicommons.jp/user/2</a> <a href="http://seiga.nicovideo.jp/user/illust/3">user/illust/3</a> <a href="http://seiga.nicovideo.jp/clip/555">clip/555</a> <a href="http://ch.nicovideo.jp/h-p">ch.nicovideo.jp/h-p</a> <a href="http://jpstore.dwango.jp/products/detail.php?product_id=1111">jps1111</a> <a href="https://game.nicovideo.jp/atsumaru/games/gm54321">gm54321</a> <a href="https://q.nicovideo.jp/watch/nq2525">nq2525</a>' }
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 require 'rspec'
 require 'html/pipeline/nico_link'
 
-Dir.glob('./support/**/*.rb').each { |f| require f }
+Dir.glob('./support/**/*.rb').sort.each { |f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline-nico_link
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - ru_shalm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-18 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline
@@ -28,58 +28,58 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.79.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.79.0
 description: 
 email:
 - ru_shalm@hazimu.com
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -119,8 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: niconico link for html-pipeline

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.2.2
-  - 2.3.0
-  - 2.4.0
-  - ruby-head
-before_install:
-  - gem install bundler
-script:
-  - bundle exec rubocop
-  - bundle exec rake
-