html-pipeline-nico_link 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9326910aebea057e21d0f74ee6617c7f01c68926
-  data.tar.gz: da223434d219d76b6775fff001cb831dbb8313ce
+  metadata.gz: 366a0e350574d225a5afaa5dd1842866abf4eee4
+  data.tar.gz: 5b1b0c477d9629e5cf7d1a1522e307577e72b990
 SHA512:
-  metadata.gz: f187d6daf42de61d0ea51c12cc261dac5fa0aa70a463b2bc66141eea28d186cce17737b1b42dc6dbcfd3e97ff2902fc5821587df32b4e186454dc1e7e1af443f
-  data.tar.gz: 775cc0b910afc46db7b3770f3777767f83ed589bcfaaa6a5c98379af4d8870a4357377e3b30fab8be525a54a64ea191c0d28b26a90fc932f7d961e23366d0e39
+  metadata.gz: 3191efafc28421a8cacc3521a46bc07d7080102be4ea5091d7330d65c762e588bd8d8e85c37e646702bf15026058e0eb14474e51037b02132769c591172f97b3
+  data.tar.gz: e567142ee2b3caec8a59d75ee2c83c33ff7e82ec160b2394f8fca821dce1fd4a0c662d194577e9e1943b28d98cd2efc49eb49a6eff6bd7714e64a014012e8dc9

data/.rubocop.yml

@@ -0,0 +1,29 @@
+AllCops:
+  Exclude:
+    - bin/**/*
+    - tmp/**/*
+    - vendor/**/*
+
+SpecialGlobalVars:
+  Enabled: false
+
+AsciiComments:
+  Enabled: false
+
+ClassLength:
+  Max: 200
+
+Documentation:
+  Enabled: false
+
+LineLength:
+  Max: 120
+  Exclude:
+    - spec/**/*
+
+MethodLength:
+  Max: 30
+
+TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma
+

data/.travis.yml

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

data/README.md

@@ -1,5 +1,7 @@
 # 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

@@ -2,5 +2,4 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new('spec')
-task :default => :spec
-
+task default: :spec

data/html-pipeline-nico_link.gemspec

@@ -6,11 +6,10 @@ require 'html/pipeline/nico_link/version'
 Gem::Specification.new do |spec|
   spec.name          = 'html-pipeline-nico_link'
   spec.version       = HTML::Pipeline::NicoLink::VERSION
-  spec.authors       = ['Ru/MuckRu']
+  spec.authors       = ['ru_shalm']
   spec.email         = ['ru_shalm@hazimu.com']
-  spec.summary       = %q{niconico link for html-pipeline}
-  spec.description   = %q{niconico link for html-pipeline}
-  spec.homepage      = ''
+  spec.summary       = 'niconico link for html-pipeline'
+  spec.homepage      = 'https://github.com/rutan/html-pipeline-nico_link/'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -18,9 +17,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'html-pipeline', '~> 2.0'
+  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', '~> 0.40.0'
 end

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

@@ -10,26 +10,24 @@ module HTML
       end
 
       def call
-        doc.search('.//text()').each do |node|
+        doc.xpath('.//text()').each do |node|
           next if has_ancestor?(node, IGNORE_PARENTS)
           content = node.to_html
-          has_prev_node = !!(node.previous_element)
-          html = apply_filter(content, has_prev_node)
+          html = apply_filter(content)
           next if html == content
           node.replace(html)
         end
         doc
       end
 
-      def apply_filter(content, has_prev_node = false)
+      def apply_filter(content)
         content = content.dup
-        self.patterns.each do |pattern_set|
-          content.gsub!(pattern_set[:pattern]) do
-            space = $1
-            text = $2
-            url = pattern_set[:link].gsub('%s', text)
-            "#{space.size > 0 ? space : (has_prev_node ? ' ' : '')}<a href=\"#{ERB::Util.html_escape(url)}\">#{ERB::Util.html_escape(text)}</a>"
-          end
+        content.gsub!(merged_pattern) do |text|
+          index = $~.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)
+          "<a href=\"#{ERB::Util.html_escape(url)}\">#{ERB::Util.html_escape(text)}</a>"
         end
         content
       end
@@ -37,97 +35,98 @@ module HTML
       def patterns
         @patterns ||= (@context[:nico_link] || DEFAULT_PATTERNS).map do |pattern_set|
           {
-            pattern: create_pattern(pattern_set[:pattern]),
+            pattern: pattern_set[:pattern],
             link: pattern_set[:link],
+            convert: pattern_set[:convert],
           }
         end
       end
 
-      def create_pattern(key)
-        /
-          (^|\W)
-          (#{key})
-          (?=
-            \.+[ \t\W]|
-            \.+$|
-            [^0-9a-zA-Z_.]|
-            $
-          )
-        /ix
+      def merged_pattern
+        @merged_pattern ||= /\b(?:(#{patterns.map { |n| n[:pattern] }.join(')|(')}))\b/
       end
 
-      IGNORE_PARENTS = %w[pre code a style script].to_set
+      IGNORE_PARENTS = %w(pre code a style script).to_set
 
       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: /(?:watch|user|myvideo|mylist)\d{1,14}/,
-          link: 'http://www.nicovideo.jp/%s'
+          pattern: %r{(?:watch|user|myvideo|mylist)/\d{1,10}},
+          link: 'http://www.nicovideo.jp/%s',
         },
         {
-          pattern: /(?:co)\d{1,14}/,
-          link: 'http://com.nicovideo.jp/%s'
+          pattern: /co\d{1,14}/,
+          link: 'http://com.nicovideo.jp/%s',
         },
         {
-          pattern: /(?:ch)\d{1,14}/,
-          link: 'http://ch.nicovideo.jp/%s'
+          pattern: /ch\d{1,14}/,
+          link: 'http://ch.nicovideo.jp/%s',
         },
         {
-          pattern: /(?:ar)\d{1,14}/,
-          link: 'http://ch.nicovideo.jp/article/%s'
+          pattern: /ar\d{1,14}/,
+          link: 'http://ch.nicovideo.jp/article/%s',
         },
         {
-          pattern: /(?:td)\d+/,
+          pattern: /td\d+/,
           link: 'http://3d.nicovideo.jp/works/%s',
         },
         {
-          pattern: /(?:nc)\d{1,14}/,
+          pattern: /nc\d{1,14}/,
           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-]+)/,
+          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',
         },
         {
-          pattern: /(?:lv)\d{1,14}/,
+          pattern: /lv\d{1,14}/,
           link: 'http://live.nicovideo.jp/watch/%s',
         },
         {
-          pattern: /(?:[sm]g)\d{1,14}/,
+          pattern: /[sm]g\d{1,14}/,
           link: 'http://seiga.nicovideo.jp/watch/%s',
         },
         {
-          pattern: /(?:bk)\d{1,14}/,
+          pattern: /bk\d{1,14}/,
           link: 'http://seiga.nicovideo.jp/watch/%s',
         },
         {
-          pattern: /(?:im)\d{1,14}/,
+          pattern: /im\d{1,14}/,
           link: 'http://seiga.nicovideo.jp/seiga/%s',
         },
         {
-          pattern: /commons\.nicovideo\.jp\/user\/\d+/,
+          pattern: %r{commons\.nicovideo\.jp/user/\d+},
           link: 'http://%s',
         },
         {
-          pattern: /niconicommons\.jp\/user\/\d+/,
+          pattern: %r{niconicommons\.jp/user/\d+},
           link: 'http://www.%s',
         },
         {
-          pattern: /user\/illust\/\d+/,
+          pattern: %r{user/illust/\d+},
           link: 'http://seiga.nicovideo.jp/%s',
         },
         {
-          pattern: /clip\/\d+/,
+          pattern: %r{clip/\d+},
           link: 'http://seiga.nicovideo.jp/%s',
         },
         {
-          pattern: /ch\.nicovideo\.jp\/[a-zA-Z0-9][-_a-zA-Z0-9]+(?=[^\-_A-Za-z0-9\/]|$)/,
+          pattern: %r{ch\.nicovideo\.jp/[a-zA-Z0-9][-_a-zA-Z0-9]+(?=[^\-_A-Za-z0-9/]|$)},
           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: 'http://niconare.nicovideo.jp/watch/%s',
+        },
+      ].freeze
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module HTML
   class Pipeline
     module NicoLink
-      VERSION = '0.0.5'
+      VERSION = '0.1.0'.freeze
     end
   end
 end

data/spec/nico_link_filter_spec.rb

@@ -17,6 +17,21 @@ describe 'NicoLinkFilter' do
     it { expect(subject).to eq '<a href="http://commons.nicovideo.jp/user/123">commons.nicovideo.jp/user/123</a>' }
   end
 
+  context 'ch.nicovideo.jp/kmmk' do
+    let(:text) { 'ch.nicovideo.jp/kmmk' }
+    it { expect(subject).to eq '<a href="http://ch.nicovideo.jp/kmmk">ch.nicovideo.jp/kmmk</a>' }
+  end
+
+  context 'ch.nicovideo.jp/kmmk' do
+    let(:text) { 'ch.nicovideo.jp/kmmk' }
+    it { expect(subject).to eq '<a href="http://ch.nicovideo.jp/kmmk">ch.nicovideo.jp/kmmk</a>' }
+  end
+
+  context 'jps156' do
+    let(:text) { 'jps156' }
+    it { expect(subject).to eq '<a href="http://jpstore.dwango.jp/products/detail.php?product_id=156">jps156</a>' }
+  end
+
   context 'sm12345 ar23456　td34567' do
     let(:text) { 'sm12345 ar23456　td34567' }
     it { expect(subject).to eq '<a href="http://www.nicovideo.jp/watch/sm12345">sm12345</a> <a href="http://ch.nicovideo.jp/article/ar23456">ar23456</a>　<a href="http://3d.nicovideo.jp/works/td34567">td34567</a>' }
@@ -41,4 +56,16 @@ describe 'NicoLinkFilter' do
     let(:text) { '<a href="http://www.nicovideo.jp/watch/sm9">http://www.nicovideo.jp/watch/sm9</a>' }
     it { expect(subject).to eq '<a href="http://www.nicovideo.jp/watch/sm9">http://www.nicovideo.jp/watch/sm9</a>' }
   end
+
+  context 'all stars' do
+    let :text do
+      %w(
+        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
+      ).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="http://niconare.nicovideo.jp/watch/kn1567">kn1567</a>' }
+  end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,3 @@ require 'rspec'
 require 'html/pipeline/nico_link'
 
 Dir.glob('./support/**/*.rb').each { |f| require f }
-
-RSpec.configure do |config|
-end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline-nico_link
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
-- Ru/MuckRu
+- ru_shalm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
-description: niconico link for html-pipeline
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.40.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.40.0
+description: 
 email:
 - ru_shalm@hazimu.com
 executables: []
@@ -74,6 +88,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -84,7 +100,7 @@ files:
 - lib/html/pipeline/nico_link/version.rb
 - spec/nico_link_filter_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/rutan/html-pipeline-nico_link/
 licenses:
 - MIT
 metadata: {}
@@ -104,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: niconico link for html-pipeline