pseudohikiparser 0.0.0.13.develop → 0.0.0.14.develop

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 687d3c71781413308c05437bee7de9ca5ade7370
+  data.tar.gz: 3a8e171f56796ba47882fefccb04ec78e8ba1499
+SHA512:
+  metadata.gz: 3d3935e24ba70e03f0e12cd60360e4b01e210e101ac8bcecc6e044003322b77c25eef6bdba9ed083e45c0a816e09faf73541f358521b1b2c96345ca543b1d057
+  data.tar.gz: 1d2fd247886b2c24594db8f5df51620242b661d97966bdb1ea5012cc04482f2168f2c6b8ce5503927c24a2fea3b31520cbf54b7ba3986391f0187b8e04a5df68

data/lib/pseudohiki/blockparser.rb

@@ -326,29 +326,31 @@ module PseudoHiki
 
     def self.assign_head_re
       irregular_leafs = [BlockNodeEnd, VerbatimLeaf, HrLeaf]
-      head_pats, leaf_types = [], [:entire_matched_part]
+      irregular_head_pats, regular_leaf_types, head_to_leaf = [], [], {}
       [['\r?\n?$', BlockNodeEnd],
-       ['//@', DecoratorLeaf],
-       [':', DescLeaf],
        ['\s', VerbatimLeaf],
+       ['*', ListLeaf],
+       ['#', EnumLeaf],
+       [':', DescLeaf],
+       ['!', HeadingLeaf],
        ['""', QuoteLeaf],
        ['||', TableLeaf],
+       ['//@', DecoratorLeaf],
        ['//', CommentOutLeaf],
-       ['!', HeadingLeaf],
-       ['*', ListLeaf],
-       ['#', EnumLeaf],
        ['----\s*$', HrLeaf]
       ].each do |head, leaf|
         escaped_head = irregular_leafs.include?(leaf) ? head : Regexp.escape(head)
         head_pat = leaf.with_depth? ? "#{escaped_head}+" : "#{escaped_head}"
         leaf.head_re = Regexp.new('\\A'+head_pat)
-        head_pats.push "(#{escaped_head})"
-        leaf_types.push leaf
+        head_to_leaf[head] = leaf
+        irregular_head_pats.push "(#{escaped_head})" if irregular_leafs.include?(leaf)
+        regular_leaf_types.push head unless irregular_leafs.include?(leaf)
       end
-      return Regexp.new('\\A(?:'+head_pats.join('|')+')'), leaf_types, leaf_types.length - 1
+      irregular_leaf_types = [:entire_matched_part].concat(irregular_leafs)
+      return Regexp.new('\\A(?:'+irregular_head_pats.join('|')+')'), regular_leaf_types, head_to_leaf, irregular_leaf_types, irregular_leafs.length
     end
 
-    LEAF_HEAD_PAT, NOT_PARAGRAPH_LEAF_TYPES, NUMBER_OF_NOT_PARAGRAPH_LEAF_TYPES = assign_head_re
+    IRREGULAR_HEAD_PAT, REGULAR_LEAF_TYPES, HEAD_TO_LEAF, IRREGULAR_LEAF_TYPES, NUMBER_OF_IRREGULAR_LEAF_TYPES = assign_head_re
 
     def initialize
       root_node = BlockNode.new
@@ -363,9 +365,10 @@ module PseudoHiki
     end
 
     def select_leaf_type(line)
-      matched = LEAF_HEAD_PAT.match(line)
-      return ParagraphLeaf unless matched
-      1.upto(NUMBER_OF_NOT_PARAGRAPH_LEAF_TYPES) {|i| return NOT_PARAGRAPH_LEAF_TYPES[i] if matched[i] }
+      matched = IRREGULAR_HEAD_PAT.match(line)
+      1.upto(NUMBER_OF_IRREGULAR_LEAF_TYPES) {|i| return IRREGULAR_LEAF_TYPES[i] if matched[i] } if matched
+      REGULAR_LEAF_TYPES.each {|head| return HEAD_TO_LEAF[head] if line.start_with?(head) }
+      ParagraphLeaf
     end
 
     def read_lines(lines)

data/lib/pseudohiki/version.rb

@@ -1,3 +1,3 @@
 module PseudoHiki
-  VERSION = "0.0.0.13.develop"
+  VERSION = "0.0.0.14.develop"
 end

metadata

@@ -1,148 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pseudohikiparser
-version: !ruby/object:Gem::Version 
-  hash: -1684086064
-  prerelease: true
-  segments: 
-  - 0
-  - 0
-  - 0
-  - 13
-  - develop
-  version: 0.0.0.13.develop
+version: !ruby/object:Gem::Version
+  version: 0.0.0.14.develop
 platform: ruby
-authors: 
+authors:
 - HASHIMOTO, Naoki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-12-25 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-12-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.3.1
   type: :development
-  version_requirements: *id003
-description: PseudoHikiParser is a parser of texts written in a Hiki like notation, and coverts them into HTML or other formats.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+description: PseudoHikiParser is a parser of texts written in a Hiki like notation,
+  and coverts them into HTML or other formats.
+email:
 - hashimoto.naoki@gmail.com
-executables: 
+executables:
 - pseudohiki2html.rb
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- README.md
+files:
 - LICENSE
-- lib/pseudohikiparser.rb
-- lib/pseudohiki/treestack.rb
-- lib/pseudohiki/inlineparser.rb
+- README.md
+- bin/pseudohiki2html.rb
+- lib/htmlelement.rb
+- lib/htmlelement/htmltemplate.rb
 - lib/pseudohiki/blockparser.rb
+- lib/pseudohiki/converter.rb
 - lib/pseudohiki/htmlformat.rb
-- lib/pseudohiki/plaintextformat.rb
+- lib/pseudohiki/htmlplugin.rb
+- lib/pseudohiki/inlineparser.rb
 - lib/pseudohiki/markdownformat.rb
+- lib/pseudohiki/plaintextformat.rb
 - lib/pseudohiki/sinatra_helpers.rb
+- lib/pseudohiki/treestack.rb
 - lib/pseudohiki/version.rb
-- lib/pseudohiki/converter.rb
-- lib/pseudohiki/htmlplugin.rb
-- lib/htmlelement.rb
-- lib/htmlelement/htmltemplate.rb
-- test/test_htmltemplate.rb
-- test/test_pseudohikiparser.rb
+- lib/pseudohikiparser.rb
 - test/test_blockparser.rb
-- test/test_pseudohiki2html.rb
-- test/test_plaintextformat.rb
 - test/test_htmlelement.rb
-- test/test_treestack.rb
-- test/test_inlineparser.rb
-- test/test_markdownformat.rb
 - test/test_htmlformat.rb
 - test/test_htmlplugin.rb
-- test/test_utils.rb
+- test/test_htmltemplate.rb
+- test/test_inlineparser.rb
 - test/test_latexformat.rb
-- bin/pseudohiki2html.rb
-has_rdoc: true
+- test/test_markdownformat.rb
+- test/test_plaintextformat.rb
+- test/test_pseudohiki2html.rb
+- test/test_pseudohikiparser.rb
+- test/test_treestack.rb
+- test/test_utils.rb
 homepage: https://github.com/nico-hn/PseudoHikiParser/wiki
-licenses: 
+licenses:
 - BSD 2-Clause license
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: "PseudoHikiParser: a parser of texts in a Hiki like notation."
-test_files: 
+specification_version: 4
+summary: 'PseudoHikiParser: a parser of texts in a Hiki like notation.'
+test_files:
 - test/test_htmltemplate.rb
 - test/test_pseudohikiparser.rb
 - test/test_blockparser.rb