qwik2md 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3106526347f3ea2c05225be6df24e05292b86169
-  data.tar.gz: 4575f2c43c033351f79d3ac1f07e7cc0df7e3e6c
+  metadata.gz: a8c3145aa48df052282672c7665b53aa1c0dc04b
+  data.tar.gz: 433f158cd8e49e082d862e1d2e2c70d37d24db3a
 SHA512:
-  metadata.gz: 96e6b6f0987accd4dbf92be60fc2375b101ad92e850958a7636d5e99e7fe40b317da34db066f4bccbee7b1288ae5b9974c7c78e6a751d2e4effb0ce16566c442
-  data.tar.gz: ea52c9a2cad57459dcd208f6969ae1d7cfb88d608303db7fd964c2a22d1e9b1954cb22e453a425b0cf9067cdaf38da0145abf798fa8bba4a795377f94d2f72f2
+  metadata.gz: d2a8cb6833c80f071305be0153c5b55ca2cb77103b9aee4f7498944221d0e39af193711868625cb7a4cc5dc18788b51b014abc3593f5b1314193ff25c19eb65e
+  data.tar.gz: c6f380e45db77dcf88436c345d795c8aa05405fa200540a865e79dd4d19c1fb85e63b59253d3f04d55d9e72074da78ba9265bb52610799d8d4e63ffb87ec4171

data/lib/qwik2md/version.rb

@@ -1,3 +1,3 @@
 module Qwik2md
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/qwik2md.rb

@@ -6,12 +6,94 @@ require 'qwik/wabisabi-format-xml'
 require 'reverse_markdown'
 require 'qwik/action'
 require 'qwik/loadlib'
+require 'qwik/config'
+require 'qwik/request'
+require 'qwik/response'
+require 'qwik/farm'
+require 'qwik/test-module-path'
 
-require 'ostruct'
+require 'webrick'
+require 'logger'
 
 Qwik::LoadLibrary.load_libs_here('qwik/act-*')
 
 module Qwik2md
+  class Action
+    def initialize(dir)
+      @dir = dir
+    end
+
+    def resolve_all_plugin(tree)
+      action.resolve_all_plugin(tree)
+    end
+
+    private
+
+    def action
+      @action ||= Qwik::Action.new.tap do |action|
+        action.init(config, memory, req, res)
+        _site = site
+        action.instance_eval {
+          @site = _site;
+        }
+      end
+    end
+
+    def memory
+      @memory ||= Qwik::ServerMemory.new(config).tap do |memory|
+        logfile = File.join(@dir, '.test/testlog.txt')
+        loglevel = WEBrick::Log::INFO
+        logger = WEBrick::Log::new(logfile, loglevel)
+        memory[:logger] = logger
+
+        burylogfile = File.join(@dir, '.test/testburylog.txt')
+        log = ::Logger.new(burylogfile)
+        log.level = ::Logger::INFO
+        memory[:bury_log] = log
+      end
+    end
+
+    def site
+      @site ||= memory.farm.get_site('test')
+    end
+
+    def req
+      @req ||= Qwik::Request.new(config)
+    end
+
+    def res
+      @res ||= Qwik::Response.new(config)
+    end
+
+    def config
+      @config ||= Qwik::Config.new.tap do |config|
+        config.update(Qwik::Config::DebugConfig)
+        config.update(Qwik::Config::TestConfig)
+
+        %i(
+          sites_dir
+          grave_dir
+          cache_dir
+          etc_dir
+          log_dir
+        ).each do |key|
+          config[key] = File.join(@dir, config[key])
+        end
+
+        config.sites_dir.path.check_directory
+        config.grave_dir.path.check_directory
+        config.cache_dir.path.check_directory
+        config.etc_dir.path.check_directory
+        config.log_dir.path.check_directory
+
+        wwwdir = config.sites_dir.path + 'www'
+        wwwdir.setup
+        dir = config.sites_dir.path + 'test'
+        dir.setup
+      end
+    end
+  end
+
   class << self
     def convert(qwik_str)
       Converter.new(qwik_str).convert
@@ -24,12 +106,14 @@ module Qwik2md
     end
 
     def convert
-      ReverseMarkdown.convert(to_html)
+      Dir.mktmpdir do |dir|
+        ReverseMarkdown.convert(to_html(dir))
+      end
     end
 
     private
 
-    def to_html
+    def to_html(dir)
       str =
         if Qwik::EmodePreProcessor.emode?(@qwik_str)
            Qwik::EmodePreProcessor.preprocess(@qwik_str)
@@ -39,14 +123,7 @@ module Qwik2md
 
       tokens = Qwik::TextTokenizer.tokenize(str)
       tree = Qwik::TextParser.make_tree(tokens)
-      action = Qwik::Action.new
-      action.init(OpenStruct.new(test: true), nil, nil, nil)
-      action.instance_eval do
-        @site = Object.new
-        def @site.resolve_all_ref(tree)
-          tree
-        end
-      end
+      action = Action.new(dir)
       tree = action.resolve_all_plugin(tree)
       tree.format_xml
     end

data/vendor/qwik/lib/qwik/page-wikidb.rb

@@ -94,7 +94,7 @@ module Qwik
 
     def self.parse(str)
       array = []
-      str.each {|line|
+      str.each_line {|line|
 	firstchar = line[0, 1]
 	next unless SIGNATURE.include?(firstchar)
 	ar = line.chomp.split(firstchar)

data/vendor/qwik/lib/qwik/test-module-session.rb

@@ -5,7 +5,7 @@
 require 'webrick/log'
 
 $LOAD_PATH.unshift '..' unless $LOAD_PATH.include? '..'
-require 'qwik/testunit'
+
 require 'qwik/test-module-path'
 require 'qwik/test-module-public'
 require 'qwik/request'
@@ -241,13 +241,13 @@ module TestSession
     return assert_equal(e, nil) if elem.nil?
     return assert_equal(e, elem.inside.get_single)
   end
-  
+
   def ok_title(e, res=@res)
     elem = res.body.get_path('//title')
     return assert_equal(e, nil) if elem.nil?
     return assert_equal(e, elem.inside.get_single[0])
   end
-  
+
   def assert_text(e, tag, res=@res)
     elem = res.body.get_tag(tag)
     return assert_equal(e, nil) if elem.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwik2md
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Fumiaki MATSUSHIMA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htree