mok-parser 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 979f9c3bab2b80999ba5c86cc58cd43b7f5007e3
-  data.tar.gz: 0f4e4a31757eb142a6907d4bc803ccbaf0d6f177
+  metadata.gz: e8d9c6ea441f7a52b43f6409470471656918817b
+  data.tar.gz: 5ccf2028ee649ae65ed8b24a3d9abeba5d0227a6
 SHA512:
-  metadata.gz: ce4ba3be3ad44a4ebf2e9d03ab1c618d32c8c6f1058c959b4fde44b9ef27d3473a2d6b885a4353cc1cc913f73e317206d7fbf67f528f51a7d7ee1b172c4556fb
-  data.tar.gz: 511c408a35309c8938fd30e8272a15529e3a0c3417ea81a8b5bf116381584bafe8f050ecf8157ece11a6c5e422b1fe122c551952acd57c79adc24a182f7c3f23
+  metadata.gz: f1aa94bb504512f5e2d6ecd73fe811b03e8be38ede030a347457dae34bc22b09905b4c9f428c76e30deca025f178e68201e03b04e64340ce9c3bddf32d580cb0
+  data.tar.gz: 01db7cdb5d42e0179d6f19d2b22f1e67aa8336dfeaaa0844778166eed55f8409693d515e393548c000136e3fca1fead56ea24d25e7a8bf0a88f2946f4ec18281

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mok-parser (0.3.0)
+    mok-parser (0.3.2)
       mimemagic
 
 GEM

data/History.rdoc

@@ -1,3 +1,7 @@
+== 0.3.2 2013-12-20
+* new: 部分テンプレート(partial)機能を試験的に追加
+* change: _base_directory オプションを *_directory に変更
+
 == 0.3.1 2013-12-14
 * new: Referenceエレメントにreference_base_directoryオプションを追加
 * change: Mediaエレメントの media_directory オプションを media_base_directory

data/RELEASE

@@ -1 +1 @@
-2013-12-14
+2013-12-21

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/bin/mok-parser

@@ -10,7 +10,10 @@ opt = OptionParser.new do |opt|
   opt.version = Mok::VERSION
   opt.release = Mok::RELEASE
   opt.banner = <<EOL
-"mok" is simple document format.
+#{opt.ver}
+
+== Description
+"mok-parser" is mok document parser by racc.
 Read more: https://github.com/garin/mok-parser
 EOL
 end

data/lib/mokblockparser.ry

@@ -147,6 +147,7 @@ end
 
 
 def initialize(options = {})
+  @options = options
   @inline_parser = InlineParser.new(options)
   @metadata = {}
   @inline_index = @inline_parser.index
@@ -160,6 +161,9 @@ def parse(src)
   # srcをerbで処理
   src = ERB.new(src.join,4).result(binding.taint).split("\n").map {|s| "#{s}\n"}
 
+  # 部分テンプレート(partial)
+  src = insert_partial(src)
+
   @src = Array(src)
   @line = Line.new("")
   @line_pre = @line.dup
@@ -364,6 +368,26 @@ def if_current_indent_equal(ident)
   end
 end
 
+def insert_partial(src)
+  src.map do |line|
+    if line =~ /^\(\(\!(.*?)\!\)\)/
+      file = File.join(File.dirname($1), "_#{File.basename($1)}.mok")
+      file_path = file
+      file_path = File.join(File.dirname(@options[:src_file]),file) if @options[:src_file]
+      unless @options[:partial_directory].nil?
+        file_path = File.join(@options[:partial_directory],file) unless @options[:partial_directory].empty?
+      end
+      if File.exist?(file_path)
+        File.open(file_path).readlines
+      else
+        ["((*Warning*)): [partial] #{file} is not found\n"]
+      end
+    else
+      line
+    end
+  end.flatten
+end
+
 ---- header
 require "parserutility"
 require "mokinlineparser.tab"

data/lib/mokblockparser.tab.rb

@@ -38,6 +38,7 @@ end
 
 
 def initialize(options = {})
+  @options = options
   @inline_parser = InlineParser.new(options)
   @metadata = {}
   @inline_index = @inline_parser.index
@@ -51,6 +52,9 @@ def parse(src)
   # srcをerbで処理
   src = ERB.new(src.join,4).result(binding.taint).split("\n").map {|s| "#{s}\n"}
 
+  # 部分テンプレート(partial)
+  src = insert_partial(src)
+
   @src = Array(src)
   @line = Line.new("")
   @line_pre = @line.dup
@@ -255,6 +259,26 @@ def if_current_indent_equal(ident)
   end
 end
 
+def insert_partial(src)
+  src.map do |line|
+    if line =~ /^\(\(\!(.*?)\!\)\)/
+      file = File.join(File.dirname($1), "_#{File.basename($1)}.mok")
+      file_path = file
+      file_path = File.join(File.dirname(@options[:src_file]),file) if @options[:src_file]
+      unless @options[:partial_directory].nil?
+        file_path = File.join(@options[:partial_directory],file) unless @options[:partial_directory].empty?
+      end
+      if File.exist?(file_path)
+        File.open(file_path).readlines
+      else
+        ["((*Warning*)): [partial] #{file} is not found\n"]
+      end
+    else
+      line
+    end
+  end.flatten
+end
+
 ...end mokblockparser.ry/module_eval...
 ##### State transition tables begin ###
 

data/lib/mokinlineparser.ry

@@ -72,7 +72,7 @@ class InlineParser
 
   media_strings :  media_strings media_string { val.join }
                 |  media_string {
-		     mok_link_path(val[0], @options[:media_base_directory])
+		     mok_link_path(val[0], @options[:media_directory])
 		}
   media    : MEDIA_OPEN media_strings MEDIA_CLOSE {
 	     mime = MimeMagic.by_extension(val[1].split(".").last)
@@ -219,7 +219,7 @@ class InlineParser
 		    uri.slice!(-2,2)
 		    uri = "#{uri}#{@options[:reference_extension]}"
 		  end
-                  uri = mok_link_path(uri, @options[:reference_base_directory])
+                  uri = mok_link_path(uri, @options[:reference_directory])
                   Reference.new([title, uri])
                 }
   # --- reference : end
@@ -366,6 +366,8 @@ def parse(src)
 end
 def initialize(options = {})
   @options = options
+  @variables = options[:variables]
+  @variables ||= {}
   @index = {}
 end
 attr_reader :index

data/lib/mokinlineparser.tab.rb

@@ -116,6 +116,8 @@ def parse(src)
 end
 def initialize(options = {})
   @options = options
+  @variables = options[:variables]
+  @variables ||= {}
   @index = {}
 end
 attr_reader :index
@@ -898,7 +900,7 @@ module_eval(<<'.,.,', 'mokinlineparser.ry', 72)
 
 module_eval(<<'.,.,', 'mokinlineparser.ry', 74)
   def _reduce_55(val, _values)
-    		     mok_link_path(val[0], @options[:media_base_directory])
+    		     mok_link_path(val[0], @options[:media_directory])
 		
   end
 .,.,
@@ -1164,7 +1166,7 @@ module_eval(<<'.,.,', 'mokinlineparser.ry', 215)
 		    uri.slice!(-2,2)
 		    uri = "#{uri}#{@options[:reference_extension]}"
 		  end
-                  uri = mok_link_path(uri, @options[:reference_base_directory])
+                  uri = mok_link_path(uri, @options[:reference_directory])
                   Reference.new([title, uri])
                 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mok-parser
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - garin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2013-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler