source2md 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f98d5b2f1f4a15eb936a3fa1fabbc4e38316b01f65bf317253cbdf6b3e8d79f5
-  data.tar.gz: 9383810a16af7443690a4de9e2528f30d916319129f3bde75da1905325924048
+  metadata.gz: a21ad256d10d0e8ac822542cfd3b1487ac15ce8e24e9ca7d49b79b8ebef0a29c
+  data.tar.gz: d437547f1970f22495788b9a39df4c4c953a90a567765181c8ba3fad37dbc095
 SHA512:
-  metadata.gz: db0be63ef5b74fc60841e4f3db52c928ece933c170580f28d5e8892c41f1bad662e68519d80ddf20fe325d840a7f93ffc59bb2a522532485afb581b6d1af637b
-  data.tar.gz: 4c3f17eff3f140510e33061340fbecec8e909c9ac869324446f5c737d1d457f42c59477b278446e482d99f9e320e441ffa00318b3b543afac184f32557845bae
+  metadata.gz: '0920cf0732141436270a375f378a2981b28fcbcefb58e74c4eca9d29fb83e3473ccbc161c956cef54c24ab998d62c618c38fcca6c66cb63422ea6458363448dd'
+  data.tar.gz: e25345a90c1e3d46899a762a87582b3c9c6e2ec398d38a2a1c815af4fe03094ec823ef840b97a24e7089c3636280f940c5192751213e2e7eecfdfcec8ac74e97

data/README.md

@@ -72,20 +72,12 @@ EOS
 puts Source2MD::Section.new(<<~EOS).to_md
   #+hidden: true
   p "This paragraph is not displayed"
-
-  p "This paragraph is displayed"
 EOS
 ```
 
-> ```ruby
-> p "This paragraph is displayed"
-> ```
-
 ### Code include ###
 
-```ruby
 Insert inside the code block.
-```
 
 ```ruby
 File.write("/tmp/hello.html", "<p>Hello</p>")
@@ -291,6 +283,35 @@ EOS
 > Lorem ipsum dolor sit amet, consectetur adipisicing elit,sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 > ```
 
+### Squish Text ###
+
+Single spaces for line breaks and consecutive spaces.
+
+```ruby
+puts Source2MD::Section.new(<<~EOS).to_md
+  #+squish: true
+  #  Lorem  ipsum  dolor  sit  amet,  consectetur  adipisicing  elit,
+  #  sed  do  eiusmod  tempor  incididunt  ut  labore  et  dolore  magna  aliqua.
+EOS
+```
+
+> ```
+> Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+> ```
+
+### Hankaku Kana ###
+
+JISX0208 Katakana to JISX0201 Katakana.
+
+```ruby
+puts Source2MD::Section.new(<<~EOS).to_md
+  #+hankaku_kana: true
+  # ｱア
+EOS
+```
+
+> ｱｱ
+
 ### Parse include ###
 
 Paste the results of processing other files with the same rules.

data/doc/0130_hidden.rb

@@ -7,11 +7,13 @@ require "./setup"
 puts Source2MD::Section.new(<<~EOS).to_md
   #+hidden: true
   p "This paragraph is not displayed"
-
-  p "This paragraph is displayed"
 EOS
 #+END_SRC
 
-# > ```ruby
-# > p "This paragraph is displayed"
-# > ```
+#+BEGIN_SRC
+puts Source2MD::Section.new(<<~EOS).to_md
+  #+BEGIN_SRC hidden!
+  p "This paragraph is not displayed"
+  #+END_SRC
+EOS
+#+END_SRC

data/doc/0140_code_include.rb

@@ -3,7 +3,7 @@ require "./setup"
 
 ### Code include ###
 
-Insert inside the code block.
+# Insert inside the code block.
 
 #+BEGIN_SRC
 File.write("/tmp/hello.html", "<p>Hello</p>")

data/doc/0230_text_squish.rb

@@ -0,0 +1,18 @@
+#+hidden: true
+require "./setup"
+
+### Squish Text ###
+
+# Single spaces for line breaks and consecutive spaces.
+
+#+BEGIN_SRC
+puts Source2MD::Section.new(<<~EOS).to_md
+  #+squish: true
+  #  Lorem  ipsum  dolor  sit  amet,  consectetur  adipisicing  elit,
+  #  sed  do  eiusmod  tempor  incididunt  ut  labore  et  dolore  magna  aliqua.
+EOS
+#+END_SRC
+
+# > ```
+# > Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+# > ```

data/doc/0240_text_hankaku_kana.rb

@@ -0,0 +1,15 @@
+#+hidden: true
+require "./setup"
+
+### Hankaku Kana ###
+
+# JISX0208 Katakana to JISX0201 Katakana.
+
+#+BEGIN_SRC
+puts Source2MD::Section.new(<<~EOS).to_md
+  #+hankaku_kana: true
+  # ｱア
+EOS
+#+END_SRC
+
+# > ｱｱ

data/examples/type_code_include.rb

@@ -7,15 +7,20 @@ puts Source2MD::Element.new(<<~EOS).to_md
 #+name:
 
 EOS
-# ~> /Users/ikeda/src/source2md/lib/source2md/part/type_include.rb:27:in `read': No such file or directory @ rb_sysopen - /Users/ikeda/src/source2md/examples/input.yml diff xxx:yyy (Errno::ENOENT)
-# ~> 	from /Users/ikeda/src/source2md/lib/source2md/part/type_include.rb:27:in `read'
-# ~> 	from /Users/ikeda/src/source2md/lib/source2md/part/type_include.rb:27:in `body'
-# ~> 	from /Users/ikeda/src/source2md/lib/source2md/part/type_include.rb:17:in `to_md'
-# ~> 	from /Users/ikeda/src/source2md/lib/source2md/part/base.rb:25:in `block in initialize'
-# ~> 	from /opt/rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/activesupport-7.0.6/lib/active_support/logger_thread_safe_level.rb:58:in `add'
-# ~> 	from /opt/rbenv/versions/3.2.2/lib/ruby/3.2.0/logger.rb:689:in `debug'
-# ~> 	from /Users/ikeda/src/source2md/lib/source2md/part/base.rb:13:in `initialize'
-# ~> 	from /Users/ikeda/src/source2md/lib/source2md/part/type_include.rb:9:in `initialize'
-# ~> 	from /Users/ikeda/src/source2md/lib/source2md/element.rb:27:in `new'
-# ~> 	from /Users/ikeda/src/source2md/lib/source2md/element.rb:27:in `to_md'
-# ~> 	from -:3:in `<main>'
+# >> > -------------------------------------------------------------------------------- Source2MD::Formatter::TypeCodeInclude
+# >> > {"code_include"=>"input.yml", "name"=>""}
+# >> > ------------------------------------------------------------ in
+# >> > 
+# >> > 
+# >> > ------------------------------------------------------------ out
+# >> > ```yml:
+# >> > ---
+# >> > one:
+# >> >   foo: 1
+# >> > ```
+# >> > ------------------------------------------------------------
+# >> ```yml:
+# >> ---
+# >> one:
+# >>   foo: 1
+# >> ```

data/examples/type_source_block.rb

@@ -2,28 +2,18 @@
 require "./setup"
 
 puts Source2MD::Element.new(<<~EOS).to_md
-#+BEGIN_SRC diff xxx:yyy
+#+BEGIN_SRC diff xxx:yyy hidden!
 (foo)
 #+END_SRC
 EOS
-# >> --------------------------------------------------------------------------------
-# >> Source2MD::Part::TypeSourceBlock
+# >> > -------------------------------------------------------------------------------- Source2MD::Formatter::TypeSourceBlock
+# >> > {}
+# >> > ------------------------------------------------------------ in
+# >> > #+BEGIN_SRC diff xxx:yyy hidden!
+# >> > (foo)
+# >> > #+END_SRC
+# >> > 
+# >> > ------------------------------------------------------------ out
+# >> > 
+# >> > ------------------------------------------------------------
 # >> 
-# >> head:
-# >> {}
-# >> 
-# >> in:
-# >> #+BEGIN_SRC diff xxx:yyy
-# >> (foo)
-# >> #+END_SRC
-# >> 
-# >> out:
-# >> ```diff xxx:yyy
-# >> diff xxx:yyy
-# >> (foo)
-# >> ```
-# >> --------------------------------------------------------------------------------
-# >> ```diff xxx:yyy
-# >> diff xxx:yyy
-# >> (foo)
-# >> ```

data/examples/type_text.rb

@@ -9,6 +9,21 @@ puts Source2MD::Element.new(<<~EOS).to_md
 # c
 # d
 EOS
+
+puts Source2MD::Element.new(<<~EOS).to_md
+#+squish: true
+# a
+# b
+#
+# c
+# d
+EOS
+
+puts Source2MD::Element.new(<<~EOS).to_md
+#+hankaku_kana: true
+# ｱア
+EOS
+
 # >> > -------------------------------------------------------------------------------- Source2MD::Formatter::TypeText
 # >> > {"oneline"=>"true"}
 # >> > ------------------------------------------------------------ in
@@ -22,3 +37,25 @@ EOS
 # >> > abcd
 # >> > ------------------------------------------------------------
 # >> abcd
+# >> > -------------------------------------------------------------------------------- Source2MD::Formatter::TypeText
+# >> > {"squish"=>"true"}
+# >> > ------------------------------------------------------------ in
+# >> > # a
+# >> > # b
+# >> > #
+# >> > # c
+# >> > # d
+# >> > 
+# >> > ------------------------------------------------------------ out
+# >> > a b c d
+# >> > ------------------------------------------------------------
+# >> a b c d
+# >> > -------------------------------------------------------------------------------- Source2MD::Formatter::TypeText
+# >> > {"hankaku_kana"=>"true"}
+# >> > ------------------------------------------------------------ in
+# >> > # ｱア
+# >> > 
+# >> > ------------------------------------------------------------ out
+# >> > ｱｱ
+# >> > ------------------------------------------------------------
+# >> ｱｱ

data/lib/source2md/formatter/type_source_block.rb

@@ -6,6 +6,9 @@ module Source2MD
       end
 
       def to_md
+        if code_block_desc_keywords.include?("hidden!")
+          return ""
+        end
         CodeBlock.new(body, desc: code_block_desc).to_md
       end
 
@@ -20,6 +23,10 @@ module Source2MD
           md.captures.first.strip
         end
       end
+
+      def code_block_desc_keywords
+        code_block_desc.to_s.split(/\s+/).to_set
+      end
     end
   end
 end

data/lib/source2md/formatter/type_text.rb

@@ -17,13 +17,15 @@ module Source2MD
 
       def body
         s = element.body.remove(REGEXP)
-        s = oneline(s)
-      end
-
-      def oneline(s)
+        if element.head["squish"] == "true"
+          s = TextHelper.squish(s)
+        end
         if element.head["oneline"] == "true"
           s = TextHelper.oneline(s)
         end
+        if element.head["hankaku_kana"] == "true"
+          s = TextHelper.hankaku_kana(s)
+        end
         s
       end
     end

data/lib/source2md/scanner.rb

@@ -1,19 +1,16 @@
 module Source2MD
   class Scanner
-    SEPARATOR           = "\\R{2,}"
+    SEPARATOR = "\\R{2,}"
 
-    # MD_CODE_BLOCK_REGEXP = /^# ```.*?^# ```/m
+    SRC_BEGIN_KEY = "BEGIN_SRC"
+    SRC_END_KEY   = "END_SRC"
+    SRC_BLOCK_RE  = /^#\+#{SRC_BEGIN_KEY}.*?^#\+#{SRC_END_KEY}/m
 
-    BEGIN_KEY           = "BEGIN_SRC"
-    END_KEY             = "END_SRC"
-    SOURCE_BLOCK_REGEXP = /^#\+#{BEGIN_KEY}.*?^#\+#{END_KEY}/m
+    NORMAL_BLOCK_RE = /.*?#{SEPARATOR}/m
 
-    NORMAL_BLOCK_REGEXP = /.*?#{SEPARATOR}/m
-
-    PARAGRAPH_REGEXP = Regexp.union [
-      # MD_CODE_BLOCK_REGEXP,
-      SOURCE_BLOCK_REGEXP,
-      NORMAL_BLOCK_REGEXP,
+    PARAGRAPH_RE = Regexp.union [
+      SRC_BLOCK_RE,
+      NORMAL_BLOCK_RE,
     ]
 
     def initialize(content)
@@ -26,7 +23,7 @@ module Source2MD
         v = v.remove(/^# >>.*$/)
       end
       v = v + "\n\n"
-      v = v.scan(PARAGRAPH_REGEXP)
+      v = v.scan(PARAGRAPH_RE)
       v = v.collect(&:strip)
       v = v.find_all(&:present?)
     end

data/lib/source2md/text_helper.rb

@@ -11,7 +11,15 @@ module Source2MD
     end
 
     def oneline(text)
-      text.remove(/\R/)
+      text.remove(/\R+/)
+    end
+
+    def squish(text)
+      text.gsub(/[[:space:]]+/, " ").strip
+    end
+
+    def hankaku_kana(text)
+      NKF.nkf("-wxZ4", text)
     end
   end
 end

data/lib/source2md/version.rb

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

data/spec/formatter/type_source_block_spec.rb

@@ -27,5 +27,14 @@ module Source2MD
 ```
       EOS
     end
+
+    it "works" do
+      actual = Element.new(<<~EOS).to_md
+      #+BEGIN_SRC diff xxx:yyy hidden!
+      (foo)
+      #+END_SRC
+      EOS
+      actual.should == ""
+    end
   end
 end

data/spec/formatter/type_text_spec.rb

@@ -13,7 +13,7 @@ EOS
 EOS
     end
 
-    it "works" do
+    it "oneline" do
       actual = Element.new(<<~EOS).to_md
 #+oneline: true
 # a
@@ -26,5 +26,27 @@ EOS
 abcd
 EOS
     end
+
+    it "squish" do
+      actual = Element.new(<<~EOS).to_md
+#+squish: true
+# a
+# b
+#
+# c
+# d
+EOS
+      actual.should == <<~EOS.strip
+a b c d
+EOS
+    end
+
+    it "hankaku_kana" do
+      actual = Element.new(<<~EOS).to_md
+#+hankaku_kana: true
+# ｱア
+EOS
+      actual.should == "ｱｱ"
+    end
   end
 end

data/spec/text_helper_spec.rb

@@ -11,5 +11,9 @@ module Source2MD
       assert { TextHelper.add_newline_at_end_of_text("A\n") == "A\n"   }
       assert { TextHelper.add_newline_at_end_of_text("A\n\n") == "A\n" }
     end
+
+    it "hankaku_kana" do
+      assert { TextHelper.hankaku_kana("ｱア") == "ｱｱ" }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: source2md
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Akira Ikeda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-22 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -161,7 +161,9 @@ files:
 - doc/0200_alert.rb
 - doc/0210_text.rb
 - doc/0220_text_oneline.rb
-- doc/0230_parse_include.rb
+- doc/0230_text_squish.rb
+- doc/0240_text_hankaku_kana.rb
+- doc/0250_parse_include.rb
 - doc/setup.rb
 - examples/cli.rb
 - examples/element_text.rb
@@ -246,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.16
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: Markdown generator from source code