source2md 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45ea284efbf369a44f443d19ad9efef483c50d71b7d0a6a3061e22fd0a844ab4
-  data.tar.gz: f5e5ae8ac1275e92d6a09161f6561e3ca3ed39e13b821d69a3b5ceae53d23467
+  metadata.gz: f07581e2e1a43897fbabf84171220745ae7ca72f96a19fd0f56e9aac6e73bd5d
+  data.tar.gz: 62e064eaf58861b1abf0b04739e54715a2efbcc74ced61fb0c949e232bf6e3a0
 SHA512:
-  metadata.gz: 9b801b23ca8be860c0f76bbc6e3184b79ee9872b424108b83598dc23362667e00c21eb857c2995698addee97f85bd2995dc421b4f2d6dadd871e7f3db80eb6d0
-  data.tar.gz: 4972b72106e655da9078ce8962eb4bd32fbecccd520c1d7d0bd24b7e1029b6d9fa1aa2775ce9b9a4a980fd7af9d373d35be8c1666d67868eb1a04d5589f036cf
+  metadata.gz: b426db58ee1eda88c7c9174867cdb6dd9e67d951605a74dc0c2fbcaf8d3464819a84042822fc7d99d78513762be1c3de491af6a2f61dd2d755f8a268fcd58bde
+  data.tar.gz: 2d97f41bc6ab44b7a2019c2008a4845f879c7b91e82a68ed5fc98e158eebb9a660fe7a34ebfc9a7ef2551c389fc0a84360bc67bd57de56e465900f717a6544c1

data/README.md

@@ -77,9 +77,7 @@ EOS
 
 ### Code include ###
 
-```ruby
 Insert inside the code block.
-```
 
 ```ruby
 File.write("/tmp/hello.html", "<p>Hello</p>")
@@ -275,7 +273,7 @@ Using this option allows you to split a line regardless of the markdown library.
 
 ```ruby
 puts Source2MD::Section.new(<<~EOS).to_md
-  #+oneline: true
+  #+squish: true
   # Lorem ipsum dolor sit amet, consectetur adipisicing elit,
   # sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 EOS
@@ -285,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/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/0220_text_oneline.rb

@@ -7,7 +7,7 @@ require "./setup"
 
 #+BEGIN_SRC
 puts Source2MD::Section.new(<<~EOS).to_md
-  #+oneline: true
+  #+squish: true
   # Lorem ipsum dolor sit amet, consectetur adipisicing elit,
   # sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 EOS

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_text.rb

@@ -2,13 +2,28 @@
 require "./setup"
 
 puts Source2MD::Element.new(<<~EOS).to_md
-#+oneline: true
+#+squish: true
 # a
 # b
 #
 # 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/cli.rb

@@ -2,6 +2,7 @@ module Source2MD
   class Cli < Thor
     class_option :debug,           type: :boolean, aliases: "-d", default: false
     class_option :xmp_out_exclude, type: :boolean, aliases: "-x", default: false
+    class_option :readonly, type: :boolean, default: true
 
     def initialize(...)
       super
@@ -12,6 +13,7 @@ module Source2MD
       end
 
       Source2MD.xmp_out_exclude = options[:xmp_out_exclude]
+      Source2MD.readonly = options[:readonly]
 
       tp Source2MD.config
     end

data/lib/source2md/code_block.rb

@@ -1,7 +1,7 @@
 module Source2MD
   class CodeBlock
     PADDING_KEEP = 2
-    MARK         = "# =>"
+    MARK         = /(?:#|\/\/) =>/
 
     attr_accessor :code
 
@@ -58,10 +58,10 @@ module Source2MD
     # end
 
     def comment_mark_justfiy(line)
-      line.gsub(/(.*?)\s*#{MARK}(.*)/) {
-        a, b = Regexp.last_match.captures
+      line.gsub(/(.*?)\s*(#{MARK})(.*)/) {
+        a, b, c = Regexp.last_match.captures
         space = " " * (PADDING_KEEP + (max - a.size))
-        [a, space, MARK, b].join
+        [a, space, b, c].join
       }
     end
 
@@ -72,7 +72,7 @@ module Source2MD
     def max
       @max ||= yield_self do
         av = lines
-        av = av.find_all { |e| e.include?(MARK) }
+        av = av.find_all { |e| e.match?(MARK) }
         av = av.collect { |e| e.gsub(/\s*#{MARK}.*/, "").size }
         av.max
       end

data/lib/source2md/element.rb

@@ -1,6 +1,6 @@
 module Source2MD
   class Element
-    KEY_VALUE_REGEXP = /^#\+(\S+):\s*(.*)\R?/ # #+key: value
+    KEY_VALUE_REGEXP = /^(?:#|\/\/)\+(\S+):\s*(.*)\R?/ # #+key: value
 
     PLUGINS = [
       Formatter::TypeHidden,       # #+hidden: true

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/generator.rb

@@ -7,7 +7,13 @@ module Source2MD
     end
 
     def call
+      if output_file.exist?
+        FileUtils.chmod("a+w", output_file)
+      end
       output_file.write(to_md)
+      if Source2MD.readonly
+        FileUtils.chmod("a-w", output_file)
+      end
       puts "write: #{output_file}"
     end
 

data/lib/source2md/scanner.rb

@@ -2,8 +2,6 @@ module Source2MD
   class Scanner
     SEPARATOR = "\\R{2,}"
 
-    # MD_CODE_BLOCK_RE = /^# ```.*?^# ```/m
-
     SRC_BEGIN_KEY = "BEGIN_SRC"
     SRC_END_KEY   = "END_SRC"
     SRC_BLOCK_RE  = /^#\+#{SRC_BEGIN_KEY}.*?^#\+#{SRC_END_KEY}/m
@@ -11,7 +9,6 @@ module Source2MD
     NORMAL_BLOCK_RE = /.*?#{SEPARATOR}/m
 
     PARAGRAPH_RE = Regexp.union [
-      # MD_CODE_BLOCK_RE,
       SRC_BLOCK_RE,
       NORMAL_BLOCK_RE,
     ]

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.6"
+  VERSION = "0.0.8"
 end

data/lib/source2md.rb

@@ -14,6 +14,7 @@ module Source2MD
   include ActiveSupport::Configurable
   config_accessor(:debug) { false }
   config_accessor(:xmp_out_exclude) { false }
+  config_accessor(:readonly) { true }
 end
 
 require "zeitwerk"

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.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Akira Ikeda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-22 00:00:00.000000000 Z
+date: 2023-08-09 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.18
 signing_key:
 specification_version: 4
 summary: Markdown generator from source code