source2md 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6729b84590ef4ebe43528414aa73d6acd79d9171c813c4a8de9acd7148c9115
-  data.tar.gz: 0b5d54093161840a33b2ce104752883e50e582dda9e7dc925767c83ef6f8ab05
+  metadata.gz: f98cf52536b132ac7b8a7ed2b99653c0b1c668c0d3b7bd3681e898854fa00b8a
+  data.tar.gz: e78fa6dbddfefd98ee5757ca3f41911568df9825c332e1e1453e0df3ff0d7b7f
 SHA512:
-  metadata.gz: 81e2f855af240b3ea35c887f6bb6275eb699702934f62a8f13b86e5c0abfe4dcf0b77e7ffd17d2f17784565da8f92795ee1a35416226813c91269b247b2fe8f5
-  data.tar.gz: 51272d19c77da2481488acecc3a30eb97b8073ce8e2b1c9264252e0d738974223327f8a30eadc7146feefe20b4e6a76dd63a523b1345f3f149125cb950026678
+  metadata.gz: a9844d91a277c17f86037ab84efbf5b1f0bcd627fbb00ef16188f19b0e90716b0d7402644b7b60f5975919d7b194851d762463b93a7a50461e09b1eb5459d95f
+  data.tar.gz: 8d18aeff6e37f72c9c18c8187d64a62e9078cd534e280ef4c165a99c973f6bf079a610b57d86d8fe9d2b7abc8143ce7a9acbedbce2f710dcb537467358acddf4

data/.gitignore

@@ -2,3 +2,4 @@
 /*.gem
 /pkg
 /spec/.all_test_result.txt
+/*.el

data/examples/type_partial_code.rb

@@ -5,15 +5,17 @@ Source2MD.data_block_exclude = true
 
 puts Source2MD::Element.new(<<~EOS).to_md
   #+partial_code_name: foo
+  #+data_block_exclude: true
   a
     b
   c
   __END__
   foo
 EOS
-# >> head: {"partial_code_name"=>"foo"}
+# >> head: {"partial_code_name"=>"foo", "data_block_exclude"=>"true"}
 # >> body: "a\n  b\nc\n__END__\nfoo\n"
 # >> Source2MD::Formatter::TypeHidden => false
+# >> Source2MD::Formatter::TypeEval => 
 # >> Source2MD::Formatter::TypeCodeInclude => 
 # >> Source2MD::Formatter::TypeRawInclude => 
 # >> Source2MD::Formatter::TypeParseInclude => 
@@ -26,7 +28,7 @@ EOS
 # >> Source2MD::Formatter::TypeText => false
 # >> Source2MD::Formatter::TypePartialCode => true
 # >> > -------------------------------------------------------------------------------- Source2MD::Formatter::TypePartialCode
-# >> > {"partial_code_name"=>"foo"}
+# >> > {"partial_code_name"=>"foo", "data_block_exclude"=>"true"}
 # >> > ------------------------------------------------------------ in
 # >> > a
 # >> >   b

data/examples/type_source_block.rb

@@ -2,18 +2,41 @@
 require "./setup"
 
 puts Source2MD::Element.new(<<~EOS).to_md
-#+BEGIN_SRC diff xxx:yyy hidden!
+#+BEGIN_SRC diff xxx:yyy data_block_exclude!
 (foo)
+__END__
+xxx
 #+END_SRC
 EOS
+# >> head: {}
+# >> body: "#+BEGIN_SRC diff xxx:yyy data_block_exclude!\n(foo)\n__END__\nxxx\n#+END_SRC\n"
+# >> Source2MD::Formatter::TypeHidden => false
+# >> Source2MD::Formatter::TypeEval => 
+# >> Source2MD::Formatter::TypeCodeInclude => 
+# >> Source2MD::Formatter::TypeRawInclude => 
+# >> Source2MD::Formatter::TypeParseInclude => 
+# >> Source2MD::Formatter::TypeTitle => false
+# >> Source2MD::Formatter::TypeWarn => 
+# >> Source2MD::Formatter::TypeAlert => 
+# >> Source2MD::Formatter::TypeMethod => 
+# >> Source2MD::Formatter::TypeTable => false
+# >> Source2MD::Formatter::TypeSourceBlock => true
 # >> > -------------------------------------------------------------------------------- Source2MD::Formatter::TypeSourceBlock
 # >> > {}
 # >> > ------------------------------------------------------------ in
-# >> > #+BEGIN_SRC diff xxx:yyy hidden!
+# >> > #+BEGIN_SRC diff xxx:yyy data_block_exclude!
 # >> > (foo)
+# >> > __END__
+# >> > xxx
 # >> > #+END_SRC
 # >> > 
+# >> > 
 # >> > ------------------------------------------------------------ out
+# >> > ```diff xxx:yyy
+# >> > (foo)
+# >> > ```
 # >> > 
 # >> > ------------------------------------------------------------
-# >> 
+# >> ```diff xxx:yyy
+# >> (foo)
+# >> ```

data/lib/source2md/formatter/type_partial_code.rb

@@ -12,8 +12,8 @@ module Source2MD
       private
 
       def body
-        if Source2MD.data_block_exclude
-          element.body.sub(/^__END__\R.*/m, "")
+        if element.head["data_block_exclude"] || Source2MD.data_block_exclude
+          TextHelper.data_block_exclude(element.body)
         else
           element.body
         end

data/lib/source2md/formatter/type_source_block.rb

@@ -1,31 +1,53 @@
 module Source2MD
   module Formatter
     class TypeSourceBlock < Base
+      OPTION_KEYS = [
+        "hidden!",
+        "data_block_exclude!",
+      ]
+
       def self.accept?(element)
         element.body.match?(%r{#{RE.meta_re}\+BEGIN_SRC})
       end
 
       def to_md
-        if code_block_desc_keywords.include?("hidden!")
+        if option_list.include?("hidden!")
           return ""
         end
-        CodeBlock.new(body, desc: code_block_desc).to_md
+        CodeBlock.new(body, desc: clean_descs.join(" ").presence).to_md
       end
 
       private
 
       def body
-        element.body.match(%r{#{RE.meta_re}\+BEGIN_SRC.*?\R(.*)#{RE.meta_re}\+END_SRC}m).captures.first
+        content = element.body.match(%r{#{RE.meta_re}\+BEGIN_SRC.*?\R(.*)#{RE.meta_re}\+END_SRC}m).captures.first
+        data_block_exclude(content)
       end
 
-      def code_block_desc
+      def desc_line
         if md = element.body.match(%r{#{RE.meta_re}\+BEGIN_SRC (.+)\R})
           md.captures.first
         end
       end
 
-      def code_block_desc_keywords
-        code_block_desc.to_s.split(/\s+/).to_set
+      def option_list
+        @option_list ||= desc_line.to_s.split(/\s+/).to_set
+      end
+
+      def data_block_exclude(content)
+        if data_block_exclude?
+          TextHelper.data_block_exclude(content)
+        else
+          content
+        end
+      end
+
+      def data_block_exclude?
+        option_list.include?("data_block_exclude!") || Source2MD.data_block_exclude
+      end
+
+      def clean_descs
+        option_list - OPTION_KEYS
       end
     end
   end

data/lib/source2md/formatter/type_text.rb

@@ -1,13 +1,16 @@
 module Source2MD
   module Formatter
     class TypeText < Base
+
       # "# xxx"
       # "#"
-      REGEXP = %r{#{RE.meta_re}( |$)}
+      def self.regexp
+        %r{#{RE.meta_re}( |$)}
+      end
 
       def self.accept?(element)
         if element.body.present?
-          element.body.lines.all? { |e| e.match?(REGEXP) }
+          element.body.lines.all? { |e| e.match?(regexp) }
         end
       end
 
@@ -18,7 +21,7 @@ module Source2MD
       private
 
       def body
-        s = element.body.remove(REGEXP)
+        s = element.body.remove(self.class.regexp)
         if element.head["squish"] == "true"
           s = TextHelper.squish(s)
         end

data/lib/source2md/regexp_builder.rb

@@ -28,6 +28,7 @@ module Source2MD
     def reset
       @meta_re = nil
       @stdout_re = nil
+      @text_prefix_re = nil
     end
   end
 end

data/lib/source2md/text_helper.rb

@@ -30,5 +30,9 @@ module Source2MD
       min = text.lines.reject(&:blank?).collect { |e| e.slice(/^\s*/).size }.min
       text.remove(/^ {#{min}}/)
     end
+
+    def data_block_exclude(text)
+      text.sub(/^__END__\R.*/m, "")
+    end
   end
 end

data/lib/source2md/version.rb

@@ -1,3 +1,3 @@
 module Source2MD
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/spec/formatter/type_partial_code_spec.rb

@@ -6,6 +6,7 @@ module Source2MD
       actual = Element.new(<<~EOS).to_md
 #+partial_code_name: xxx
 #+partial_code_lang: yyy
+#+data_block_exclude: true
 (foo)
 __END__
 1

data/spec/formatter/type_source_block_spec.rb

@@ -36,5 +36,42 @@ module Source2MD
       EOS
       actual.should == ""
     end
+
+    it "works" do
+      actual = Element.new(<<~EOS).to_md
+      #+BEGIN_SRC xxx:yyy data_block_exclude!
+      (foo)
+      __END__
+      xxx
+      #+END_SRC
+      EOS
+      actual.should == <<~EOS
+```xxx:yyy
+(foo)
+```
+      EOS
+    end
   end
 end
+# >> ...F
+# >> 
+# >> Failures:
+# >> 
+# >>   1) works
+# >>      Failure/Error: Unable to find - to read failed line
+# >> 
+# >>        expected: ""
+# >>             got: "```xxx:yyy data_block_exclude\n```\n" (using ==)
+# >>        Diff:
+# >>        @@ -1,2 +1,4 @@
+# >>        +```xxx:yyy data_block_exclude
+# >>        +```
+# >>      # -:47:in `block (2 levels) in <module:Source2MD>'
+# >> 
+# >> Finished in 0.01747 seconds (files took 0.33507 seconds to load)
+# >> 4 examples, 1 failure
+# >> 
+# >> Failed examples:
+# >> 
+# >> rspec -:40 # works
+# >> 

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ Zeitwerk::Loader.eager_load_all
 
 Source2MD.logger.level = :error
 Source2MD.xmp_out_exclude = true
-Source2MD.data_block_exclude = true
+# Source2MD.data_block_exclude = true
 
 RSpec.configure do |config|
   config.expect_with :rspec do |c|

data/spec/text_helper_spec.rb

@@ -19,5 +19,9 @@ module Source2MD
       assert { TextHelper.space_prefix_remove(" a\n  b\n") == "a\n b\n" }
       assert { TextHelper.space_prefix_remove(" a\n\n  b\n") == "a\n\n b\n" }
     end
+
+    it "data_block_exclude" do
+      assert { TextHelper.data_block_exclude("(before)\n__END__\n(after)") == "(before)\n" }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: source2md
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Akira Ikeda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-10 00:00:00.000000000 Z
+date: 2023-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport