source2md 0.0.4 → 0.0.5

data/examples/{element_warn.rb → type_warn.rb}

@@ -1,10 +1,11 @@
+#+hidden: true
 require "./setup"
 
 puts Source2MD::Element.new(<<~EOS).to_md
 #+info: (foo)
 EOS
 # >> --------------------------------------------------------------------------------
-# >> Source2MD::Type::ElementInfo
+# >> Source2MD::Part::ElementInfo
 # >> 
 # >> head:
 # >> {:info=>"(foo)"}

data/lib/source2md/code_block.rb

@@ -8,7 +8,8 @@ module Source2MD
     def initialize(code, options = {})
       @code = code
       @options = {
-        lang: "ruby",
+        :lang => "ruby",
+        # :single_sharp_replace_to_blank_line => false,
       }.merge(options)
     end
 
@@ -43,13 +44,18 @@ module Source2MD
     end
 
     def normalize(line)
-      line = single_sharp_replace_to_blank_line(line)
-      line = comment_mark_justfiy(line)
+      # if @options[:single_sharp_replace_to_blank_line]
+      #   line = single_sharp_replace_to_blank_line(line)
+      # end
+      if @options[:lang] == "ruby"
+        line = comment_mark_justfiy(line)
+      end
+      line
     end
 
-    def single_sharp_replace_to_blank_line(line)
-      line.gsub(/\A#\z/, "")
-    end
+    # def single_sharp_replace_to_blank_line(line)
+    #   line.gsub(/\A#\z/, "")
+    # end
 
     def comment_mark_justfiy(line)
       line.gsub(/(.*?)\s*#{MARK}(.*)/) {

data/lib/source2md/element.rb

@@ -1,21 +1,22 @@
 module Source2MD
   class Element
-    KEY_VALUE = /^#\+(\S+):\s*(.*)\R?/
+    KEY_VALUE_REGEXP = /^#\+(\S+):\s*(.*)\R?/ # #+key: value
 
     PLUGINS = [
-      Type::ElementReject,      # require "setup"
-      Type::ElementMdHeader,    # ---
-      Type::ElementMdTitle,     # ## foo ##
-      Type::ElementInclude,     # #+include: foo.txt
-      Type::ElementTitle,       # #+title2: foo
-      Type::ElementWarn,        # #+warn: foo
-      Type::ElementAlert,       # #+alert: foo
-      Type::ElementMethod,      # #+name: foo
-      Type::ElementTable,       # |-
-      Type::ElementSourceBlock, # #+BEGIN_SRC
-      Type::ElementUncomment,   # foo
-      Type::ElementPartialCode, # 1 + 2 # => 3
-      Type::ElementElse,
+      Formatter::TypeHidden,       # #+hidden: true
+      Formatter::TypeMdTitle,      # ## foo ##
+      Formatter::TypeCodeInclude,  # #+code_include: path/to/foo.html xml:SAMPLE.xml
+      Formatter::TypeRawInclude,   # #+raw_include: path/to/file.txt
+      Formatter::TypeParseInclude, # #+parse_include: path/to/file.txt
+      Formatter::TypeTitle,        # #+title2: foo
+      Formatter::TypeWarn,         # #+warn: foo
+      Formatter::TypeAlert,        # #+alert: foo
+      Formatter::TypeMethod,       # #+name: foo
+      Formatter::TypeTable,        # # |-
+      Formatter::TypeSourceBlock,  # #+BEGIN_SRC
+      Formatter::TypeText,         # # foo
+      Formatter::TypePartialCode,  # 1 + 2 # => 3
+      Formatter::TypeElse,
     ]
 
     def initialize(content)
@@ -29,11 +30,11 @@ module Source2MD
     end
 
     def head
-      @head ||= @content.scan(KEY_VALUE).to_h.symbolize_keys.freeze
+      @head ||= @content.scan(KEY_VALUE_REGEXP).to_h.freeze
     end
 
     def body
-      @body ||= @content.remove(KEY_VALUE).strip.freeze
+      @body ||= @content.remove(KEY_VALUE_REGEXP).strip.freeze
     end
 
     private

data/lib/source2md/{type → formatter}/base.rb

@@ -1,5 +1,5 @@
 module Source2MD
-  module Type
+  module Formatter
     class Base
       def self.accept?(element)
         false
@@ -11,10 +11,9 @@ module Source2MD
         @element = element
       end
 
-      # def to_md
-      # 
-      #   to_md
-      # end
+      def to_md
+        raise NotImplementedError, "#{__method__} is not implemented"
+      end
     end
   end
 end

data/lib/source2md/{type/element_alert.rb → formatter/type_alert.rb}

@@ -1,14 +1,14 @@
 module Source2MD
-  module Type
-    class ElementAlert < Base
+  module Formatter
+    class TypeAlert < Base
       def self.accept?(element)
-        element.head[:alert]
+        element.head["alert"]
       end
 
       def to_md
         [
           ":::message alert",
-          element.head[:alert],
+          element.head["alert"],
           ":::",
         ] * "\n"
       end

data/lib/source2md/{type/element_include.rb → formatter/type_code_include.rb}

@@ -1,14 +1,14 @@
 module Source2MD
-  module Type
-    class ElementInclude < Base
+  module Formatter
+    class TypeCodeInclude < Base
       def self.accept?(element)
-        element.head[:include]
+        element.head["code_include"]
       end
 
       def initialize(...)
         super
 
-        @user_define_path, @desc = element.head[:include].split(/\s+/, 2)
+        @user_define_path, @desc = element.head["code_include"].split(/\s+/, 2)
       end
 
       def to_md
@@ -26,7 +26,7 @@ module Source2MD
       end
 
       def code_block_options
-        options = element.head.dup
+        options = element.head.dup.to_options
         options[:desc] ||= @desc
         options[:lang] ||= auto_lang
         options[:name] ||= path.basename

data/lib/source2md/{type/element_else.rb → formatter/type_else.rb}

@@ -1,6 +1,6 @@
 module Source2MD
-  module Type
-    class ElementElse < Base
+  module Formatter
+    class TypeElse < Base
       def self.accept?(element)
         true
       end

data/lib/source2md/{type/element_reject.rb → formatter/type_hidden.rb}

@@ -1,11 +1,12 @@
 module Source2MD
-  module Type
-    class ElementReject < Base
+  module Formatter
+    class TypeHidden < Base
       def self.accept?(element)
-        element.body.match?(/^require.*setup/)
+        element.head["hidden"] == "true"
       end
 
       def to_md
+        ""
       end
     end
   end

data/lib/source2md/{type/element_md_title.rb → formatter/type_md_title.rb}

@@ -1,6 +1,6 @@
 module Source2MD
-  module Type
-    class ElementMdTitle < Base
+  module Formatter
+    class TypeMdTitle < Base
       def self.accept?(element)
         element.head.blank? && element.body.match?(/\A(#+)\s+.*\s+\1\z/)
       end

data/lib/source2md/formatter/type_method.rb

@@ -0,0 +1,24 @@
+module Source2MD
+  module Formatter
+    class TypeMethod < Base
+      def self.accept?(element)
+        element.head["name"]
+      end
+
+      def to_md
+        [
+          "### #{element.head["name"]} ###",
+          element.head["desc"],
+          CodeBlock.new(body).to_md,
+          element.head["comment"],
+        ].compact * "\n\n"
+      end
+
+      private
+
+      def body
+        element.body.gsub(/^\#$/, "")
+      end
+    end
+  end
+end

data/lib/source2md/formatter/type_parse_include.rb

@@ -0,0 +1,13 @@
+module Source2MD
+  module Formatter
+    class TypeParseInclude < Base
+      def self.accept?(element)
+        element.head["parse_include"]
+      end
+
+      def to_md
+        Generator.new(files: element.head["parse_include"]).to_md.strip
+      end
+    end
+  end
+end

data/lib/source2md/{type/element_partial_code.rb → formatter/type_partial_code.rb}

@@ -1,6 +1,6 @@
 module Source2MD
-  module Type
-    class ElementPartialCode < Base
+  module Formatter
+    class TypePartialCode < Base
       def self.accept?(element)
         !element.body.empty?
       end

data/lib/source2md/formatter/type_raw_include.rb

@@ -0,0 +1,13 @@
+module Source2MD
+  module Formatter
+    class TypeRawInclude < Base
+      def self.accept?(element)
+        element.head["raw_include"]
+      end
+
+      def to_md
+        Pathname(element.head["raw_include"]).expand_path.read.strip
+      end
+    end
+  end
+end

data/lib/source2md/{type/element_source_block.rb → formatter/type_source_block.rb}

@@ -1,6 +1,6 @@
 module Source2MD
-  module Type
-    class ElementSourceBlock < Base
+  module Formatter
+    class TypeSourceBlock < Base
       def self.accept?(element)
         element.body.start_with?("#+BEGIN_SRC")
       end

data/lib/source2md/{type/element_table.rb → formatter/type_table.rb}

@@ -1,6 +1,6 @@
 module Source2MD
-  module Type
-    class ElementTable < Base
+  module Formatter
+    class TypeTable < Base
       def self.accept?(element)
         !element.body.empty? && element.body.lines.all? { |e| e.match?(/^# \|.*\|$/) }
       end

data/lib/source2md/formatter/type_text.rb

@@ -0,0 +1,31 @@
+module Source2MD
+  module Formatter
+    class TypeText < Base
+      # "# xxx"
+      # "#"
+      REGEXP = /^#( |$)/
+
+      def self.accept?(element)
+        element.body.lines.all? { |e| e.match?(REGEXP) }
+      end
+
+      def to_md
+        body
+      end
+
+      private
+
+      def body
+        s = element.body.remove(REGEXP)
+        s = oneline(s)
+      end
+
+      def oneline(s)
+        if element.head["oneline"] == "true"
+          s = TextHelper.oneline(s)
+        end
+        s
+      end
+    end
+  end
+end

data/lib/source2md/{type/element_title.rb → formatter/type_title.rb}

@@ -1,6 +1,6 @@
 module Source2MD
-  module Type
-    class ElementTitle < Base
+  module Formatter
+    class TypeTitle < Base
       REGEXP = /\Atitle(\d+)\z/
 
       def self.accept?(element)

data/lib/source2md/{type/element_warn.rb → formatter/type_warn.rb}

@@ -1,16 +1,16 @@
 module Source2MD
-  module Type
-    class ElementWarn < Base
+  module Formatter
+    class TypeWarn < Base
       def self.accept?(element)
         if element.body.empty?
-          element.head[:warn]
+          element.head["warn"]
         end
       end
 
       def to_md
         [
           ":::message",
-          element.head[:warn],
+          element.head["warn"],
           ":::",
         ] * "\n"
       end

data/lib/source2md/generator.rb

@@ -11,20 +11,20 @@ module Source2MD
       puts "write: #{output_file}"
     end
 
-    private
-
     def to_md
       s = sections.collect(&:to_md) * "\n\n"
       s = TextHelper.blank_lines_squish(s)
       s = TextHelper.add_newline_at_end_of_text(s)
     end
 
+    private
+
     def sections
       @sections ||= files.collect { |e| Section.new(e.read) }
     end
 
     def files
-      @files ||= params[:files].collect { |e| Pathname(e) }
+      @files ||= Array(params[:files]).collect { |e| Pathname(e).expand_path }
     end
 
     def output_file

data/lib/source2md/scanner.rb

@@ -2,7 +2,7 @@ module Source2MD
   class Scanner
     SEPARATOR           = "\\R{2,}"
 
-    MD_CODE_BLOCK_REGEXP = /^# ```.*?^# ```/m
+    # MD_CODE_BLOCK_REGEXP = /^# ```.*?^# ```/m
 
     BEGIN_KEY           = "BEGIN_SRC"
     END_KEY             = "END_SRC"
@@ -11,7 +11,7 @@ module Source2MD
     NORMAL_BLOCK_REGEXP = /.*?#{SEPARATOR}/m
 
     PARAGRAPH_REGEXP = Regexp.union [
-      MD_CODE_BLOCK_REGEXP,
+      # MD_CODE_BLOCK_REGEXP,
       SOURCE_BLOCK_REGEXP,
       NORMAL_BLOCK_REGEXP,
     ]

data/lib/source2md/text_helper.rb

@@ -3,11 +3,15 @@ module Source2MD
     extend self
 
     def blank_lines_squish(text)
-      text.gsub(/\n{2,}/, "\n\n")
+      text.gsub(/\n{3,}/, "\n\n")
     end
 
     def add_newline_at_end_of_text(text)
       text.strip + "\n"
     end
+
+    def oneline(text)
+      text.remove(/\R/)
+    end
   end
 end

data/lib/source2md/version.rb

@@ -1,3 +1,3 @@
 module Source2MD
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/code_block_spec.rb

@@ -12,7 +12,7 @@ module Source2MD
       s.should == <<~EOS.strip
         ```ruby
         a   # => 1
-
+        #
         bb  # => 2
         cccc
         ```

data/spec/formatter/sample.yml

@@ -0,0 +1 @@
+(yaml)

data/spec/{type/element_include_spec.rb → formatter/type_code_include_spec.rb}

@@ -4,35 +4,35 @@ module Source2MD
   describe do
     it "works" do
       actual = Element.new(<<~EOS).to_md
-#+include: #{__dir__}/sample.yml
+#+code_include: #{__dir__}/sample.yml
 EOS
       actual.should == <<~EOS.strip
 ```yml:sample.yml
-yaml content
+(yaml)
 ```
       EOS
     end
 
     it "works" do
       actual = Element.new(<<~EOS).to_md
-#+include: #{__dir__}/sample.yml
+#+code_include: #{__dir__}/sample.yml
 #+lang: (lang)
 #+name: (name)
 EOS
       actual.should == <<~EOS.strip
 ```(lang):(name)
-yaml content
+(yaml)
 ```
       EOS
     end
 
     it "works" do
       actual = Element.new(<<~EOS).to_md
-#+include: #{__dir__}/sample.yml yaml:filename
+#+code_include: #{__dir__}/sample.yml yaml:filename
 EOS
       actual.should == <<~EOS.strip
 ```yaml:filename
-yaml content
+(yaml)
 ```
       EOS
     end

data/spec/{type/element_reject_spec.rb → formatter/type_hidden_spec.rb}

@@ -4,9 +4,10 @@ module Source2MD
   describe do
     it "works" do
       actual = Element.new(<<~EOS).to_md
-require "./setup"
+      #+hidden: true
+      (hidden)
 EOS
-      assert { actual.nil? }
+      assert { actual == "" }
     end
   end
 end

data/spec/formatter/type_parse_include_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+module Source2MD
+  describe do
+    it "works" do
+      actual = Element.new(<<~EOS).to_md
+#+parse_include: #{__dir__}/sample.yml
+EOS
+      actual.should == <<~EOS.strip
+```ruby
+(yaml)
+```
+      EOS
+    end
+  end
+end

data/spec/{type/element_md_header_spec.rb → formatter/type_raw_include_spec.rb}

@@ -4,14 +4,10 @@ module Source2MD
   describe do
     it "works" do
       actual = Element.new(<<~EOS).to_md
----
-foo: 1
----
+#+raw_include: #{__dir__}/sample.yml
 EOS
       actual.should == <<~EOS.strip
----
-foo: 1
----
+(yaml)
       EOS
     end
   end

data/spec/{type/element_text_spec.rb → formatter/type_text_spec.rb}

@@ -6,12 +6,24 @@ module Source2MD
       actual = Element.new(<<~EOS).to_md
 # - foo
 #   http://example.com/
-# - bar: http://example.com/
 EOS
       actual.should == <<~EOS.strip
 - foo
   http://example.com/
-- bar: http://example.com/
+EOS
+    end
+
+    it "works" do
+      actual = Element.new(<<~EOS).to_md
+#+oneline: true
+# a
+# b
+#
+# c
+# d
+EOS
+      actual.should == <<~EOS.strip
+abcd
 EOS
     end
   end