hiki2md 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 75c588c94f143ff7531246991a1f1cd286e4d22d
-  data.tar.gz: 9acce914fec1459b92dac42914badf6b4861bff6
+SHA256:
+  metadata.gz: dd9f235518be1faf5230ff7f4739a1fb311727ded398fe7c44f24b459c3ec3a0
+  data.tar.gz: 47ae584b929f160ae9a680994dfebdacfc1fe12e7c9cb52470ae900fc0d8482a
 SHA512:
-  metadata.gz: 81094c8d50da145dfd50b7ac42a1965404e87302185beeaa156f7f9e5d0f2162fe6a5a1ed3ac593c0c8e16bc7713b2470327c3cad59633c38dc5a48595634575
-  data.tar.gz: 0b862ccd85bcd0f374a89b06a2b4abf5bbde43ed965e6723b6e1df1d1f099a3c27f0de8fddfed40f7ef370cc974c69de742ee2b69c89be180297014d3a54b70b
+  metadata.gz: b0e0d03d869dfd64587ae2b782e56d6bf5fa88e4bb8bd0eba6736b00ff06c5f0b929e41577fdbeb4cdb3a01e272400b94e95ddf3633c2ad7a3be6f7d3e37d8be
+  data.tar.gz: 98c7f8cda9a0d088cf26c4a4d23e340f5fbcb7b23e3cfe6e47794170166c6511c6c8324f798d9a07e8ea2a2f227c03670670b9f91fce4a6d8c07c58a65994727

data/.gitignore

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

data/Gemfile.lock

@@ -0,0 +1,36 @@
+PATH
+  remote: .
+  specs:
+    hiki2md (0.1.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.6.2)
+    rake (13.3.0)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.5)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.6)
+
+PLATFORMS
+  arm64-darwin-23
+  ruby
+
+DEPENDENCIES
+  bundler
+  hiki2md!
+  rake
+  rspec
+
+BUNDLED WITH
+   2.6.8

data/exe/hiki2md

@@ -1,12 +1,31 @@
 #!/usr/bin/env ruby
 require 'hiki2md'
+require 'optparse'
+require 'yaml'
+
+interwiki_map = {}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: hiki2md [options] <file>"
+
+  opts.on("--interwiki-map PATH", "Path to a YAML file for InterWiki definitions") do |path|
+    if File.exist?(path)
+      interwiki_map.merge!(YAML.load_file(path))
+    else
+      raise IOError.new("InterWiki map file not found: #{path}")
+    end
+  end
+end.parse!
 
 if ARGV.size != 1
   raise ArgumentError.new("no file specified")
 end
 
-if !File.exist?(ARGV[0])
-  raise IOError.new("no exist #{ARGV[0]}")
+input_file = ARGV[0]
+
+if !File.exist?(input_file)
+  raise IOError.new("no exist #{input_file}")
 end
 
-puts Hiki2md.new.convert(File.read(ARGV[0]))
+hiki2md = Hiki2md.new(interwiki_map: interwiki_map)
+puts hiki2md.convert(File.read(input_file))

data/hiki2md.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

data/lib/hiki2md/version.rb

@@ -1,3 +1,3 @@
 class Hiki2md
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/hiki2md.rb

@@ -1,7 +1,12 @@
 # -*- coding: utf-8 -*-
 require 'hiki2md/version'
+require 'cgi'
 
 class Hiki2md
+  def initialize(interwiki_map: {})
+    @interwiki_map = interwiki_map
+  end
+
   def convert(lines)
     @outputs = []
 
@@ -63,12 +68,59 @@ class Hiki2md
       # コメント削除
       next if line =~ %r|\A//.*\z|
 
+      # 水平線
+      if line =~ /\A----\z/
+        @outputs << "\n---\n"
+        next
+      end
+
+      # 箇条書き
+      line.gsub! /\A[*]{3} ?/, '    - '
+      line.gsub! /\A[*]{2} ?/, '  - '
+      line.gsub! /\A[*] ?/   , '- '
+
+      line.gsub! /\A[#]{3} ?/  , '    1. '
+      line.gsub! /\A[#]{2} ?/  , '  1. '
+      line.gsub! /\A[#] ?/     , '1. '
+
+      # 見出し
+      line.gsub! /\A!{5} ?/ , '###### '
+      line.gsub! /\A!{4} ?/ , '##### '
+      line.gsub! /\A!{3} ?/ , '#### '
+      line.gsub! /\A!{2} ?/ , '### '
+      line.gsub! /\A! ?/    , '## '
+
       # 引用
       line.gsub! /\A""/, '>'
 
       # リンク
       line.gsub! /\[{2}([^\[\]\|]+?)\|([^\[\]\|]+?)\]{2}/, "[\\1](\\2)"
 
+      # 画像 or Wiki内リンク
+      line.gsub!(/\[{2}(.+?)\]{2}/) do |match|
+        content = $1
+        if content =~ /\Ahttps?:\/\// || content =~ /\.(png|jpg|jpeg|gif|bmp|svg)\z/i
+          "![](#{content})"
+        elsif content =~ /\A([^:]+):(.+)\z/
+          interwiki_name = $1
+          page_name = $2
+          if @interwiki_map[interwiki_name]
+            url = @interwiki_map[interwiki_name] + CGI.escape(page_name).gsub('+', '%20')
+            "[#{content}](#{url})"
+          else
+            "[#{content}](#{content}.md)"
+          end
+        else
+          "[#{content}](#{content}.md)"
+        end
+      end
+
+      # URL自動リンク
+      line.gsub!(/(?<![\(\[])(https?:\/\/[^\s<>]+)/, '<\1>')
+
+      # WikiName自動リンク
+      line.gsub!(/(?<![\(\[\/])([A-Z][a-z0-9]+[A-Z][a-z0-9]+[A-Za-z0-9]*)/, '[\1](\1.md)')
+
       # 強調
       line.gsub! /'''(.+)'''/, "**\\1**"
       line.gsub! /''(.+)''/, "*\\1*"
@@ -76,14 +128,6 @@ class Hiki2md
       # 取り消し
       line.gsub! /\=\=(.+)\=\=/, "~~\\1~~"
 
-      # 箇条書き
-      line.gsub! /\A[*]{3} ?/, '    - '
-      line.gsub! /\A[*]{2} ?/, '  - '
-      line.gsub! /\A[*] ?/   , '- '
-
-      line.gsub! /\A[#]{3} ?/  , '    1. '
-      line.gsub! /\A[#]{2} ?/  , '  1. '
-      line.gsub! /\A[#] ?/     , '1. '
 
       # 定義リスト
       if line =~ /\A\:(.+)\:(.+)/
@@ -102,16 +146,6 @@ class Hiki2md
         end
       end
 
-      # 見出し
-      line.gsub! /\A!{5} ?/ , '##### '
-      line.gsub! /\A!{4} ?/ , '#### '
-      line.gsub! /\A!{3} ?/ , '### '
-      line.gsub! /\A!{2} ?/ , '## '
-      line.gsub! /\A! ?/    , '# '
-
-      # 画像
-      line.gsub! /\[{2}([^\[\]\|]+?)\]{2}/, "![](\\1)"
-
       # テーブル
       if line =~ /\A\|\|/
         @in_table_block = true

metadata

@@ -1,43 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: hiki2md
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Masanori Kado
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        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
@@ -52,7 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
 email:
 - kdmsnr@gmail.com
 executables:
@@ -64,6 +62,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -75,7 +74,6 @@ homepage: http://github.com/kdmsnr/hiki2md
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -90,10 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Converter of Hiki to Markdown
 test_files: []
-has_rdoc: