qwik2md 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cb7c43164290355d2e67e91922d0d712ce1b3c1
-  data.tar.gz: ff38f0a168a6926ca0291a024dfb6597846d19c2
+  metadata.gz: f8187e0a84c36ecefdbca49118a54f1fcc2cf82e
+  data.tar.gz: a1bc7326eccd49a5b15ee1e74536f9e6a9a81a96
 SHA512:
-  metadata.gz: 224639a3f997e4c66f41fef3571fc7cd2125cf54717c1666b53c138d3d40e5a5547d3cbdf3d351643289f8d6143d13ce12c849b5b437218b968a2f3bb1dcd412
-  data.tar.gz: abd6d006ab76558908ab9f8cb8789734dba501c11b218b94cfb9d1f37944d171011dae0d186fa4a8c4edafab04c353ab7a85befceea1c9b2693e0ac391a55d62
+  metadata.gz: 6df6a5b1399fd05759dcee826befe749d0af54dbe05042305aa9bc69dcc96332918d2de638cd629391da4840bd6e6b71a9700a242c5fc9246b3a21f95dc3ab8c
+  data.tar.gz: 7d53f7418c4f10f0c2964a2fcb9a2b942699b998e9ecd5ca1f9cff8850b381ab45d5476a7d80bfafb016aeed98740806fad328a93437b66e757e3f18cd53a63c

data/exe/qwik2md

@@ -9,9 +9,17 @@ end
 
 require "qwik2md"
 require "optparse"
+require "pathname"
 
+options = {}
 OptionParser.new {|opts|
   opts.banner = "Usage: qwik2md [options] <file>"
+
+  opts.on("-bBASE", "--base=BASE", "Base path for files (ex. `-b path/to/base` will convert `{{file(a.jpg)}}` to `path/to/base.files/a.jpg`)") do |b|
+    options[:base] = b
+  end
 }.parse!
 
-puts Qwik2md.convert(ARGF.read)
+file = Pathname.new(ARGV[0])
+base = options.fetch(:base, file.dirname.join(file.basename('.*')))
+puts Qwik2md.convert(ARGF.read, base: base)

data/lib/qwik2md/version.rb

@@ -1,3 +1,3 @@
 module Qwik2md
-  VERSION = "1.0.2"
+  VERSION = "2.0.0"
 end

data/lib/qwik2md.rb

@@ -1,9 +1,9 @@
 require "qwik2md/version"
+
 require "qwik/parser-emode"
 require "qwik/tokenizer"
 require "qwik/parser"
 require 'qwik/wabisabi-format-xml'
-require 'reverse_markdown'
 require 'qwik/action'
 require 'qwik/loadlib'
 require 'qwik/config'
@@ -15,12 +15,16 @@ require 'qwik/test-module-path'
 require 'webrick'
 require 'logger'
 
+require 'reverse_markdown'
+require 'charlock_holmes'
+
 Qwik::LoadLibrary.load_libs_here('qwik/act-*')
 
 module Qwik2md
   class Action
-    def initialize(dir)
+    def initialize(dir, base)
       @dir = dir
+      @base = base
     end
 
     def resolve_all_plugin(tree)
@@ -58,7 +62,9 @@ module Qwik2md
     end
 
     def req
-      @req ||= Qwik::Request.new(config)
+      @req ||= Qwik::Request.new(config).tap do |req|
+        req.base = @base
+      end
     end
 
     def res
@@ -95,14 +101,16 @@ module Qwik2md
   end
 
   class << self
-    def convert(qwik_str)
-      Converter.new(qwik_str).convert
+    def convert(qwik_str, base:)
+      Converter.new(qwik_str, base: base).convert
     end
   end
 
   class Converter
-    def initialize(qwik_str)
-      @qwik_str = qwik_str
+    def initialize(qwik_str, base:)
+      detection = CharlockHolmes::EncodingDetector.detect(qwik_str)
+      @qwik_str = CharlockHolmes::Converter.convert(qwik_str, detection[:encoding], 'UTF-8')
+      @base = base
     end
 
     def convert
@@ -123,7 +131,7 @@ module Qwik2md
 
       tokens = Qwik::TextTokenizer.tokenize(str)
       tree = Qwik::TextParser.make_tree(tokens)
-      action = Action.new(dir)
+      action = Action.new(dir, @base)
       tree = action.resolve_all_plugin(tree)
       tree.format_xml
     end

data/qwik2md.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "algorithm-diff", "~> 0.1"
   spec.add_dependency "iconv", "~> 1.0"
   spec.add_dependency "reverse_markdown", "~> 1.0"
+  spec.add_dependency "charlock_holmes", "~> 0.7"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qwik2md
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Fumiaki MATSUSHIMA
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: charlock_holmes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement