readme_yard 0.1.2 → 0.3.0

data/README_YARD.md

@@ -1,89 +1,196 @@
 # Readme Yard 🌿
 [![Gem Version](https://badge.fury.io/rb/readme_yard.svg)](https://badge.fury.io/rb/readme_yard)
-[![Maintainability](https://api.codeclimate.com/v1/badges/9fe0012930c3886dbe00/maintainability)](https://codeclimate.com/github/mattruzicka/readme_yard/maintainability)
 
 {@readme ReadmeYard}
 
 ---
 
-{@readme ReadmeYard#command_line_usage}
+⚠️ **Generated file warning** – Edit README_YARD.md, not README.md. Changes to README.md will be lost when running `readme build`.
+
+### Future Work
+- Implement safeguards to prevent accidental edits to README.md
+- Support bidirectional editing through git integration
+
+[PRs are welcome](#contributing) for these improvements.
+
+---
+
+## Table of Contents
+- [Installation](#installation)
+- [Getting Started](#getting-started)
+- [Command Line Usage](#command-line-usage)
+- [Tag Usage](#tag-usage)
+- [Readme Tag](#readme-tag)
+- [Standalone Tag Usage](#standalone-tag-usage)
+- [Example Tag](#example-tag)
+- [Contributing](#contributing)
 
 ---
 
+## Installation
+
+Add [gem "readme_yard"](https://rubygems.org/gems/readme_yard) to your Gemfile and run `bundle install` or install it yourself with: `gem install readme_yard`
+
+**Note:** As of version 0.3.0, Readme Yard requires Ruby 3.0 or higher.
+
 ## Getting Started
 
-Add [gem "readme_yard"](https://rubygems.org/gems/readme_yard) to your application's Gemfile and run `bundle install` or install it yourself with `gem install readme_yard`.
+Run `readme build` at the command line. This creates a README_YARD.md file if there isn't one by copying your existing README.md file.
 
-Next run `readme build` at the command line. This creates a README_YARD.md file if there isn’t one by copying the README file if it exists. It then parses README_YARD.md and writes the result to README.md.
+README_YARD.md is the template from which `readme build` generates the README. Readme Yard adds the ability to embed and reference your source code in your README via README_YARD.md.
+
+See [Tag Usage](#tag-usage).
+
+---
 
-In addition to being able to use tags as documented in the next section, you can edit the README_YARD file just as you would edit any README. Then to see changes made to README_YARD reflected in the README, run `readme build`.
+{@readme ReadmeYard#command_line_usage}
 
 ---
 
-## Usage
+## Tag Usage
+
+Readme Yard uses YARD tags and custom markdown tags. YARD tags live inside Ruby source code. The markdown tags live inside README_YARD.md.
 
-The following tags can be used in README_YARD.md to generate YARD documentation inside your README.
+When the Readme Yard build process encounters a tag in README_YARD.md, it searches the Ruby source code for its YARD tag counterpart, formats the output, and embeds it in the README file.
 
-### @readme
+### Tag Reference Table
 
-Usage: `{@readme ObjectPath}`
+| Tag Type | YARD Syntax (in source code) | Markdown Syntax (in README_YARD.md) | Standalone Tag* | Purpose |
+|----------|------------------------------|-------------------------------------|----------------|---------|
+| Readme | `@readme` | `{@readme ObjectPath}` | N/A | General purpose tag to embed content from source code |
+| Readme (comment) | `@readme comment` | `{@readme ObjectPath}` | `{@comment ObjectPath}` | Embeds only the comment from source code |
+| Readme (code) | `@readme code` | `{@readme ObjectPath}` | `{@code ObjectPath}` | Embeds only code implementation |
+| Readme (source) | `@readme source` | `{@readme ObjectPath}` | `{@source ObjectPath}` | Embeds both comments and code |
+| Readme (value) | `@readme value` | `{@readme ObjectPath}` | `{@value ObjectPath}` | Embeds a Ruby value as a Ruby code block |
+| Readme (string) | `@readme string` | `{@readme ObjectPath}` | `{@string ObjectPath}` | Embeds a Ruby string as normal text |
+| Example | `@example` | `{@example ObjectPath}` | N/A | Embeds example code from YARD @example tags |
 
-`{@readme ReadmeYard}` is used at the top of this project's README_YARD.md file to generate this README's title and description. `ReadmeYard` references the class located in [lib/readme_yard.rb](https://github.com/mattruzicka/readme_yard/blob/main/lib/readme_yard.rb).
+> *Standalone tags allow embedding content without requiring corresponding YARD tags in source code. See [Standalone Tag Usage](#standalone-tag-usage) for details.
 
-`{@readme ReadmeYard#command_line_usage}` is used to generate the "Command Line Usage" section above from the comments located above. `ReadmeYard#command_line_usage` references the instance method `command_line_usage` located in [lib/readme_yard.rb](https://github.com/mattruzicka/readme_yard/blob/main/lib/readme_yard.rb).
+### Examples
 
-`{@readme ReadmeYard.hello_world}` - {@readme ReadmeYard.hello_world}
+The next line is a code snippet if you're looking at [README.md](https://github.com/mattruzicka/README/blob/main/README_YARD.md) and `{@readme ReadmeYard::ExampleTag.hello_world}` if you're looking at [README_YARD.md](https://github.com/mattruzicka/readme_yard/blob/main/README_YARD.md).
 
-### @example
+{@readme ReadmeYard::ExampleTag.hello_world}
 
-Usage: `{@example ObjectPath}`
+The markdown tag tells Readme Yard to parse the `@readme` tag located above the `hello_world` class method located in [lib/readme_yard/example_tag.rb](https://github.com/mattruzicka/readme_yard/blob/main/lib/readme_yard/example_tag.rb).
 
-The below example code is generated from placing `{@example ReadmeYard.hello_world}` in README_YARD.md.
+To use another "meta" example, `{@readme ReadmeYard}` is used at the top of this project's README_YARD.md file to generate the first few sentences of this README. `ReadmeYard` references the class located in [lib/readme_yard.rb](https://github.com/mattruzicka/readme_yard/blob/main/lib/readme_yard.rb).
 
-{@example ReadmeYard.hello_world}
+Last one, `{@readme ReadmeYard#command_line_usage}` is used to generate the "Command Line Usage" section above from the comments of the `command_line_usage` instance method located in [lib/readme_yard.rb](https://github.com/mattruzicka/readme_yard/blob/main/lib/readme_yard.rb). This method is extra meta: it returns the result of formatting its own comments as markdown. In this way, the usage instructions in the comments, the README, and as printed at the command line will always be in sync.
 
 ---
 
-## Inspiration
+## Readme Tag
+
+**Markdown** syntax: `{@readme ObjectPath}`
+
+**YARD** syntax: `@example <name>`
+
+{@readme ReadmeYard::ReadmeTag}
+
+### {@readme ReadmeYard::CommentTag}
+
+**Usage:**
+
+{@example ReadmeYard::CommentTag}
+
+This example [@readme comment](https://github.com/mattruzicka/readme_yard/blob/main/lib/readme_yard/comment_tag.rb) tag embeds the below code snippet via the `{@readme ReadmeYard::CommentTag.format_tag}` markdown tag.
+
+{@readme ReadmeYard::CommentTag.format_tag}
+
+### {@readme ReadmeYard::CodeTag}
+
+**Usage:**
 
-The desire to have the code, README, and documentation for [Evolvable](https://github.com/mattruzicka/evolvable) be useful, synced, and correct as I work on documenting the [1.1.0 Release](https://github.com/mattruzicka/evolvable/pull/8).
+{@example ReadmeYard::CodeTag}
 
-I want a README that summarizes and contextualizes the code and documentation, without duplicating them, so as to make keeping it up-to-date easier. Laziness!
+This example [@readme code](https://github.com/mattruzicka/readme_yard/blob/main/lib/readme_yard/code_tag.rb) tag embeds the below code snippet via the `{@readme ReadmeYard::CodeTag.format_tag}` markdown tag.
+
+{@readme ReadmeYard::CodeTag.format_tag}
+
+### {@readme ReadmeYard::SourceTag}
+
+**Usage:**
+
+{@example ReadmeYard::SourceTag}
+
+This example [@readme source](https://github.com/mattruzicka/readme_yard/blob/main/lib/readme_yard/source_tag.rb) tag embeds the below code snippet via the `{@readme ReadmeYard::SourceTag.format_tag}` markdown tag.
+
+{@readme ReadmeYard::SourceTag.format_tag}
+
+### {@readme ReadmeYard::ValueTag}
+
+**Usage:**
+
+{@example ReadmeYard::ValueTag}
+
+This example [@readme value](https://github.com/mattruzicka/readme_yard/blob/main/lib/readme_yard/value_tag.rb) tag embeds the below code snippet via the `{@value ReadmeYard::ValueTag::EXAMPLE}` markdown tag.
+
+{@value ReadmeYard::ValueTag::EXAMPLE}
+
+### {@readme ReadmeYard::StringTag}
+
+**Usage:**
+
+Because a [@readme string](https://github.com/mattruzicka/readme_yard/blob/main/lib/readme_yard/string_tag.rb) tag:
+
+{@example ReadmeYard::StringTag::XZAMPLE}
+
+Is located above this constant:
+
+{@code ReadmeYard::StringTag::XZAMPLE}
+
+We see can see its string value as simple text below:
+
+{@string ReadmeYard::StringTag::XZAMPLE}
 
 ---
 
-## Ideas
+## Standalone Tag Usage
 
-- Embed whole doc string if @readme tag is found, but there’s no text.
+While using the `@readme` tag in your source code is recommended because it makes the README's dependency on source code explicit, sometimes it's useful to embed source code snippets directly without it. This is especially valuable when a source object can only contain one `@readme` tag, but you want to highlight multiple aspects of the object.
 
-- Embed whole method if @example tag is found, but no text.
+You can use any of these tags directly in README_YARD.md without requiring a corresponding `@readme` tag in the source code:
 
-- `readme tags` - Prints usage and a list of all tags
+- `{@comment ObjectPath}` - Embeds comments only
+- `{@code ObjectPath}` - Embeds code only
+- `{@source ObjectPath}` - Embeds both comments and code
+- `{@value ObjectPath}` - Embeds a Ruby value as a Ruby code block
+- `{@string ObjectPath}` - Embeds a Ruby string as plain text
 
-- `readme tags -v` - Prints docstrings of all tags
+For example, in the StringTag section above, we used both:
+- `{@code ReadmeYard::StringTag::XZAMPLE}` to show the constant definition
+- `{@string ReadmeYard::StringTag::XZAMPLE}` to display the string value as text
 
-- `readme tags <tag>` - Prints list of matching tags
+The standalone tag usage provides more flexibility when documenting your code and doesn't require modifications to the source files.
 
-- `readme tags <tag>` - Prints list of matching tag docstrings
+---
 
-- Improve linking. At the moment, there's lots of room for error when adding links in the YARD documentation.
+## Example Tag
 
-- Support @todo tags or any other native YARD tags that might be useful.
+**Markdown** syntax: `{@example ObjectPath}`
 
-- Add ability to target a particular tag in a doc string from README_YARD.md. Maybe via a tag directive?
+**YARD** syntax: `@example`
 
-- Follow @see links to find tags
+{@readme ReadmeYard::ExampleTag}
 
-- Integrate something like https://github.com/lsegal/yard-examples/blob/master/doctest/doctest.rb to add red/green test status to code example. Maybe via some sort of tag directive?
+**Usage:**
 
-- Be able to customize the name of the source and target files.
+{@source ReadmeYard::ExampleTag.hello_world}
 
-- Integrate with the YARD server so that changes to documentation or README_YARD.md automatically regenerate the README
+The below example code is generated from `{@example ReadmeYard::ExampleTag.hello_world}` because, as you can see above, the "hello_world" class method has an `@example` tag.
 
-- Be able to register regexes for matching tags and running given blocks. Use to create functionality for tagging GitHub source.
+{@example ReadmeYard::ExampleTag.hello_world}
 
 ---
 
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/mattruzicka/yard-readme.
+
+If you're interested in contributing, but don't know where to get started, feel free to message me on twitter at [@mattruzicka](https://twitter.com/mattruzicka). I have a lot of ideas!
+
+Thanks for taking the time to think about me, the README.
+
+🌿 🥏 🌱 ⚽

data/bin/readme

@@ -3,7 +3,7 @@
 
 require "bundler/setup"
 require "readme_yard"
-require "tty-markdown"
 
-arg, options = ARGV
+arg, *arg_options = ARGV.dup
+options = arg_options.join(" ") unless arg_options.empty?
 ReadmeYard.call(arg, options)

data/lib/readme_yard/code_tag.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class ReadmeYard
+  #
+  # @readme
+  #   Embed Ruby code
+  #
+  # @example
+  #   # @readme code
+  #
+  class CodeTag
+    class << self
+      #
+      # The code for this method is in the README because
+      # `@readme code` is below (in the source code).
+      #
+      # @readme code
+      #
+      def format_tag(yard_object, _tag)
+        ExampleTag.format_ruby(yard_object.source)
+      end
+
+      def format_yard_object(yard_object)
+        format_tag(yard_object, nil)
+      end
+    end
+  end
+end

data/lib/readme_yard/comment_tag.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+class ReadmeYard
+  #
+  # @readme
+  #   Embed comments
+  #
+  # @example
+  #   # @readme comment
+  #
+  class CommentTag
+    class << self
+      #
+      # This comment is in the README because `@readme comment`
+      # is below (in the source code).
+      #
+      # @readme comment
+      #
+      def format_tag(yard_object, _tag)
+        comment = format_docstring_as_comment(yard_object)
+        ExampleTag.format_ruby(comment)
+      end
+
+      def format_yard_object(yard_object)
+        format_tag(yard_object, nil)
+      end
+
+      #
+      # @see https://rubydoc.info/gems/yard/YARD%2FDocstring:to_raw
+      #
+      def format_docstring_as_comment(yard_object)
+        comment = +""
+        docstring = yard_object.docstring.all
+        docstring.gsub!(named_readme_tag_regex, "")
+        docstring.lines.each do |line|
+          comment << "#"
+          comment << " " unless line[0] == "\n"
+          comment << line
+        end
+        last_line = yard_object.docstring.all.lines.last
+        comment << "#" if last_line&.match?(/\n$/)
+        comment
+      end
+
+      def named_readme_tag_regex
+        @named_readme_tag_regex ||= /(\n|^)@readme\s(#{ReadmeYard::TagRegistry.tag_names.join("|")})\n/
+      end
+    end
+  end
+end

data/lib/readme_yard/error.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class ReadmeYard
+  class Error < StandardError
+    class << self
+      #
+      # @todo
+      #   Look for instance method with same name if
+      #   class method and vise versa to give a more helpful error.
+      #   Look for the object path in other scopes.
+      #
+      def object_not_found(object_path, tag_name)
+        new("*Readme Yard* could not find `#{object_path}`. Perhaps" \
+            " the `@#{tag_name}` tag was moved, mispelled," \
+            " or the `.yardopts` YARD file is missing the file path.")
+      end
+    end
+  end
+end

data/lib/readme_yard/example_tag.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class ReadmeYard
+  #
+  # @readme
+  #   The Example Tag leverages YARD's standard `@example` tag syntax, allowing you to
+  #   include example code in your README directly from source files. This saves time and
+  #   ensures your README stays in sync with your YARD documentation
+  #
+  class ExampleTag
+    class << self
+      #
+      # @readme source
+      #
+      # @example
+      #   ReadmeYard::ExampleTag.hello_world #=> "Hello 🌎 🌍 🌏"
+      #
+      def hello_world
+        "Hello 🌎 🌍 🌏"
+      end
+
+      def format_tags(yard_object, yard_tags)
+        yard_tags.map { |tag| format_tag(yard_object, tag) }.join("\n")
+      end
+
+      def format_tag(yard_object, tag)
+        text = tag.text.empty? ? yard_object.source : tag.text
+        format_ruby(text)
+      end
+
+      def format_ruby(text)
+        "```ruby\n#{text}\n```\n"
+      end
+    end
+  end
+end

data/lib/readme_yard/logger.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class ReadmeYard
+  class Logger
+    class << self
+      def warn(msg)
+        msg = "Warning: #{msg}"
+        puts_md(msg)
+      end
+
+      def puts_md(msg)
+        puts TTY::Markdown.parse(msg)
+      end
+    end
+  end
+end

data/lib/readme_yard/readme_tag.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+class ReadmeYard
+  #
+  # @readme
+  #   By default, only the text nested under a @readme tag
+  #   will be embedded in the final output. The default
+  #   embed behavior can be changed through the use of tag names.
+  #
+  # @see ReadmeYard::CommentTag
+  # @see ReadmeYard::CodeTag
+  # @see ReadmeYard::SourceTag
+  # @see ReadmeYard::ValueTag
+  # @see ReadmeYard::StringTag
+  #
+  class ReadmeTag
+    class << self
+      def format_tags(yard_object, yard_tags)
+        md = +""
+        yard_tags.each do |tag|
+          res = format_yard_tag(yard_object, tag)
+          md << res if res
+        end
+        md
+      end
+
+      def format_tag(_yard_object, tag)
+        "#{tag.text}\n"
+      end
+
+      private
+
+      def format_yard_tag(yard_object, tag)
+        if tag.name && !tag.name.empty?
+          tag_class = TagRegistry.find_class(tag.name)
+          tag_class&.format_tag(yard_object, tag)
+        elsif tag.text && !tag.text.empty?
+          format_tag(yard_object, tag)
+        else
+          Logger.warn("Empty `@readme` tag found in `#{yard_object}`.")
+        end
+      end
+    end
+  end
+end

data/lib/readme_yard/source_tag.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class ReadmeYard
+  #
+  # @readme
+  #   Embed Ruby comments and code
+  #
+  # @example
+  #   # @readme source
+  #
+  class SourceTag
+    class << self
+      #
+      # The comment and code for ReadmeYard::SourceTag#format_tag
+      # is in the README because `@readme source` is below (in the source code).
+      #
+      # @readme source
+      #
+      def format_tag(yard_object, _tag)
+        text = CommentTag.format_docstring_as_comment(yard_object)
+        text << "\n#{yard_object.source}"
+        ExampleTag.format_ruby(text)
+      end
+
+      def format_yard_object(yard_object)
+        format_tag(yard_object, nil)
+      end
+    end
+  end
+end

data/lib/readme_yard/string_tag.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+class ReadmeYard
+  #
+  # @readme
+  #   Embed a Ruby string as normal text
+  #
+  class StringTag
+    #
+    # @example
+    #   # @readme string
+    #
+    # @readme string
+    #
+    XZAMPLE = <<~STRING
+      I heard you like self-documenting Ruby, so I wrote
+      self-documenting Ruby for your self-documenting Ruby.
+    STRING
+
+    class << self
+      def format_tag(yard_object, _tag)
+        if yard_object.respond_to?(:value)
+          normalize_yard_value(yard_object.value)
+        else
+          Logger.warn("Cannot parse `@readme string`: #{yard_object.class.name} lacks `value` method.")
+        end
+      end
+
+      def format_yard_object(yard_object)
+        format_tag(yard_object, nil)
+      end
+
+      def normalize_yard_value(string_value)
+        return "" if string_value.nil? || string_value.empty?
+
+        string_value = string_value.dup
+
+        # Handle heredoc format
+        return normalize_value_for_heredoc(string_value) if string_value.strip.start_with?("<<~")
+
+        # Handle regular string format
+        string_value.delete_prefix!('"')
+        string_value.delete_suffix!('"')
+
+        # Replace different line continuation patterns
+        # This handles patterns like: " \\\n" and \\\n"
+        string_value.gsub!(/" \\\n"/, "")
+        string_value.gsub!(/\\\n\s*"/, "")
+        string_value.gsub!(/"\\\n"/, "")
+        string_value.gsub!(/"\\\n/, "")
+
+        # Unescape common escape sequences
+        string_value.gsub!(/\\n/, "\n")
+        string_value.gsub!(/\\t/, "\t")
+        string_value.gsub!(/\\r/, "\r")
+        string_value.gsub!(/\\"/, '"')
+        string_value.gsub!(/\\'/, "'")
+        string_value.gsub!(/\\\\/, "\\")
+        string_value
+      end
+
+      private
+
+      def normalize_value_for_heredoc(string_value)
+        # Extract the content between the heredoc delimiters
+        lines = string_value.lines
+        delimiter = lines.first.strip.gsub(/<<~/, "").strip
+        content_lines = []
+
+        in_content = false
+        lines.each do |line|
+          if in_content && line.strip == delimiter
+            break
+          elsif in_content
+            content_lines << line
+          elsif line.strip.start_with?("<<~")
+            in_content = true
+          end
+        end
+
+        # Return the joined content with proper indentation removed
+        content_lines.join.gsub(/^\s+/, "").strip
+      end
+    end
+  end
+end

data/lib/readme_yard/tag_registry.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class ReadmeYard
+  class TagRegistry
+    TAGS = { "readme" => ReadmeTag,
+             "example" => ExampleTag,
+             "code" => CodeTag,
+             "source" => SourceTag,
+             "comment" => CommentTag,
+             "value" => ValueTag,
+             "string" => StringTag }.freeze
+
+    def self.find_class(tag_name)
+      TAGS[tag_name.downcase]
+    end
+
+    def self.tag_names
+      TAGS.keys
+    end
+  end
+end

data/lib/readme_yard/value_tag.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class ReadmeYard
+  #
+  # @readme
+  #   Embed a Ruby value as a Ruby code block
+  #
+  # @example
+  #   # @readme value
+  #
+  class ValueTag
+    #
+    # @readme value
+    #
+    EXAMPLE = { key: "value" }.freeze
+
+    class << self
+      def format_tag(yard_object, _tag)
+        if yard_object.respond_to?(:value)
+          "```ruby\n#{yard_object.value}\n```"
+        else
+          Logger.warn("Cannot parse `@readme value`: #{yard_object.class.name} lacks `value` method.")
+        end
+      end
+
+      def format_yard_object(yard_object)
+        format_tag(yard_object, nil)
+      end
+    end
+  end
+end

data/lib/readme_yard/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ReadmeYard
-  VERSION = "0.1.2"
+  VERSION = "0.3.0"
 end

data/lib/readme_yard/yard_opts_manager.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class ReadmeYard
+  class YardOptsManager
+    class << self
+      YARDOPTS_FILE = ".yardopts"
+
+      def upsert_yardopts
+        File.exist?(YARDOPTS_FILE) ? update_yardopts_file : create_yardopts_file
+      end
+
+      def update_yardopts_file
+        text = File.read(YARDOPTS_FILE)
+        text_addition = build_yardopts_text_addition(text)
+        File.open(YARDOPTS_FILE, "a") { |f| f.write(text_addition) } if text_addition
+      end
+
+      def build_yardopts_text_addition(yardopts_text)
+        return if yardopts_text.match?(/\s*--plugin\s+readme\W/)
+
+        readme_plugin_opts = default_readme_plugin_opts(yardopts_text)
+        case yardopts_text
+        when /\s*--markup\s+markdown/, /\s*-m\s+markdown/
+          readme_plugin_opts
+        when /\s*--markup\s/, /\s*-m\s/
+          warn_about_supported_markdown
+          readme_plugin_opts
+        else
+          readme_plugin_opts << "--markup markdown\n"
+        end
+      end
+
+      def default_readme_plugin_opts(yardopts_text)
+        readme_opts = +""
+        readme_opts << "\n" unless yardopts_text.lines.last.include?("\n")
+        readme_opts << "--plugin readme\n"
+      end
+
+      def create_yardopts_file
+        File.write(YARDOPTS_FILE, "--plugin readme\n--markup markdown\n")
+      end
+
+      def warn_about_supported_markdown
+        Logger.warn "*Readme Yard* works best with markdown. " \
+                    "Consider adding `--markup markdown` to your `.yardopts` file."
+      end
+    end
+  end
+end