pennyworth 20.1.0 → 21.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66daba2c300a31e69ca7ecad8db607fbd7c9f7a7a2c865b09f9936c3c3176f17
-  data.tar.gz: 33788212f778bb340a55939b2f603901e6779835666c3691a85086a0b1e7d929
+  metadata.gz: fd5a9bee54b2e0b04b957ab8bad00881d798fcad5accd6156806e32172d633fc
+  data.tar.gz: 3814834f7b85212965de3536cbfc406f7fb4765bc27e793eda909067bb0979da
 SHA512:
-  metadata.gz: 39ef03465bfb270b6394f99d16a93caea12f20099f9a2607be954e2af13bde9c87a0663fbce93662cd32925f1eb41a399ec0d872b9d34cb89f709a432893f594
-  data.tar.gz: 0cdae061432f46e08f86088eaa305cd1378ed157bad971872b4c035913e22bb111f40906e2b58a6425fb49e3483eef502182682a2ae4d9ec7a9fc706d493a289
+  metadata.gz: 7af812e43ccaa359727026b6d5bcb14f5534d029c71dc049d4883422cdc28fa2ebebe3d13ad2fce599f965fe87a7c6a13bec6020ae2e256f59be5d1abeffa89f
+  data.tar.gz: 6304b028aadeaf56723d489d1c3bfe9271be534a90711dc593d2f2fe4dba521ccc7c0484d896c3373c74d4d6a0529d08feb321f4d27f8371959df562c7022c2c

data/README.adoc

@@ -82,7 +82,7 @@ with others.
 
 From the command line, type `pennyworth` to view usage:
 
-image:https://alchemists.io/images/projects/pennyworth/screenshots/usage.png[Usage,width=638,height=505,role=focal_point]
+image:https://alchemists.io/images/projects/pennyworth/screenshots/usage.wepb[Usage,width=719,height=516,role=focal_point]
 
 While the command line options are nice, the real power comes from using Pennyworth in conjunction
 with link:https://www.alfredapp.com/help/workflows/inputs/script-filter/json[Alfred Script Filters].
@@ -182,10 +182,13 @@ http:
   statuses:
     uri: "https://developer.mozilla.org/docs/Web/HTTP/Status"
 htmx:
-  examples_uri: "%<htmx_site_uri>s/examples"
   extensions_uri: "%<htmx_site_uri>s/extensions"
+  patterns_uri: "%<htmx_site_uri>s/patterns"
   references_uri: "%<htmx_site_uri>s/reference"
-  site_uri: "https://htmx.org"
+  site_uri: "https://four.htmx.org"
+rfc:
+  index_uri: "%<rfc_site_uri>s/rfc-index"
+  site_uri: "https://www.rfc-editor.org"
 rodauth:
   site_uri: "https://rodauth.jeremyevans.net"
   documentation_uri: "%<rodauth_site_uri>s/documentation.html"
@@ -272,6 +275,16 @@ Provides quick access to the {htmx_link} JavaScript library.
    double click to install.
 2. Click on _Configure Workflow_ to view documentation.
 
+===== RFC
+
+image:https://alchemists.io/images/projects/pennyworth/screenshots/rfc.png[RFC workflow screenshot.,width=706,height=631,role=focal_point]
+
+Provides quick access to link:https://www.rfc-editor.org[RFCs] which are foundational to the internet.
+
+1. link:https://alchemists.io/public/alfred/workflows/rfc.alfredworkflow[Download] and double
+   click to install.
+2. Click on _Configure Workflow_ to view documentation.
+
 ===== Rodauth
 
 image:https://alchemists.io/images/projects/pennyworth/screenshots/rodauth.webp[Rodauth workflow screenshot.,width=706,height=631,role=focal_point]

data/lib/pennyworth/cli/actions/htmx/pattern.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "sod"
+
+module Pennyworth
+  module CLI
+    module Actions
+      module HTMX
+        # Handles pattern documentation action.
+        class Pattern < Sod::Action
+          include Dependencies[:settings, :io, processor: "processors.htmx"]
+
+          description "Render Alfred patterns script filter."
+
+          on "--patterns"
+
+          def call(*) = io.puts processor.call(settings.htmx_patterns_uri).to_json
+        end
+      end
+    end
+  end
+end

data/lib/pennyworth/cli/actions/rfc.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "sod"
+
+module Pennyworth
+  module CLI
+    module Actions
+      # Handles RFC feature action.
+      class RFC < Sod::Action
+        include Dependencies[:settings, :io, processor: "processors.rfc"]
+
+        description "Render Alfred RFC script filter."
+
+        on "--rfc"
+
+        def call(*) = io.puts processor.call(settings.rfc_index_uri).to_json
+      end
+    end
+  end
+end

data/lib/pennyworth/cli/shell.rb

@@ -32,14 +32,15 @@ module Pennyworth
           end
 
           on "htmx", "Render htmx script filters" do
-            on Actions::HTMX::Example
             on Actions::HTMX::Extension
+            on Actions::HTMX::Pattern
             on Actions::HTMX::Reference
           end
 
           on Actions::Encoding
           on Actions::HTTPStatus
           on Actions::Gem
+          on Actions::RFC
           on Actions::Rodauth
           on Actions::StandardGem
           on Actions::StandardError

data/lib/pennyworth/configuration/contract.rb

@@ -13,10 +13,12 @@ module Pennyworth
       optional(:git_hub_organization).filled :string
       optional(:git_hub_user).filled :string
       required(:http_statuses_uri).filled :string
-      required(:htmx_examples_uri).filled :string
       required(:htmx_extensions_uri).filled :string
+      required(:htmx_patterns_uri).filled :string
       required(:htmx_references_uri).filled :string
       required(:htmx_site_uri).filled :string
+      required(:rfc_index_uri).filled :string
+      required(:rfc_site_uri).filled :string
       required(:rodauth_site_uri).filled :string
       required(:rodauth_documentation_uri).filled :string
       required(:ruby_gems_api_uri).filled :string

data/lib/pennyworth/configuration/defaults.yml

@@ -76,10 +76,13 @@ http:
   statuses:
     uri: "https://developer.mozilla.org/docs/Web/HTTP/Status"
 htmx:
-  examples_uri: "%<htmx_site_uri>s/examples"
   extensions_uri: "%<htmx_site_uri>s/extensions"
+  patterns_uri: "%<htmx_site_uri>s/patterns"
   references_uri: "%<htmx_site_uri>s/reference"
-  site_uri: "https://htmx.org"
+  site_uri: "https://four.htmx.org"
+rfc:
+  index_uri: "%<rfc_site_uri>s/rfc-index"
+  site_uri: "https://www.rfc-editor.org"
 rodauth:
   site_uri: "https://rodauth.jeremyevans.net"
   documentation_uri: "%<rodauth_site_uri>s/documentation.html"

data/lib/pennyworth/configuration/model.rb

@@ -9,10 +9,12 @@ module Pennyworth
                        :git_hub_organization,
                        :git_hub_user,
                        :http_statuses_uri,
-                       :htmx_examples_uri,
                        :htmx_extensions_uri,
+                       :htmx_patterns_uri,
                        :htmx_references_uri,
                        :htmx_site_uri,
+                       :rfc_index_uri,
+                       :rfc_site_uri,
                        :rodauth_site_uri,
                        :rodauth_documentation_uri,
                        :ruby_gems_api_uri,

data/lib/pennyworth/container.rb

@@ -4,7 +4,6 @@ require "cogger"
 require "containable"
 require "etcher"
 require "http"
-require "ox"
 require "runcom"
 require "spek"
 
@@ -17,9 +16,10 @@ module Pennyworth
       Etcher::Registry.new(contract: Configuration::Contract, model: Configuration::Model)
                       .add_loader(:yaml, self[:defaults_path])
                       .add_loader(:yaml, self[:xdg_config].active)
-                      .add_transformer(:format, :htmx_examples_uri)
                       .add_transformer(:format, :htmx_extensions_uri)
+                      .add_transformer(:format, :htmx_patterns_uri)
                       .add_transformer(:format, :htmx_references_uri)
+                      .add_transformer(:format, :rfc_index_uri)
                       .add_transformer(:format, :rodauth_documentation_uri)
     end
 
@@ -54,6 +54,12 @@ module Pennyworth
                       serializer: Serializers::Project
       end
 
+      register :rfc do
+        Processor.new loader: Loaders::RFC.new,
+                      presenter: Presenters::RFC,
+                      serializer: Serializers::RFC
+      end
+
       register :rodauth do
         Processor.new loader: Loaders::Rodauth.new,
                       presenter: Presenters::Rodauth,
@@ -91,10 +97,6 @@ module Pennyworth
       end
     end
 
-    register :ox do
-      Ox.tap { |ox| ox.default_options = {mode: :generic, effort: :tolerant, smart: true} }
-    end
-
     register(:settings) { Etcher.call(self[:registry]).dup }
     register(:specification) { Spek::Loader.call "#{__dir__}/../../pennyworth.gemspec" }
     register(:defaults_path) { Pathname(__dir__).join("configuration/defaults.yml") }

data/lib/pennyworth/loaders/htmx.rb

@@ -1,61 +1,46 @@
 # frozen_string_literal: true
 
 require "core"
-require "refinements/string"
+require "nokogiri"
 
 module Pennyworth
   module Loaders
-    # Loads htmx documentation by scraping web page.
+    # Loads htmx records by scraping web page.
     class HTMX
-      include Dependencies[:http, :settings, parser: :ox]
+      include Dependencies[:http, :settings]
 
-      using Refinements::String
-
-      def self.text_for element
-        parts = element.each.with_object [] do |item, content|
-          text = if item.is_a? Ox::Element
-                   "`#{item.text}`"
-                 else
-                   item.encode ::Encoding::UTF_8, replace: Core::EMPTY_STRING
-                 end
-
-          content.append text
-        end
-
-        parts.join.up.delete_suffix "."
-      end
-
-      def initialize(model: Models::HTMX, **)
+      def initialize(parser: Nokogiri::HTML5, model: Models::HTMX, **)
+        @parser = parser
         @model = model
         super(**)
       end
 
       def call uri
-        read(uri).each.with_object [] do |row, entries|
-          next unless row.locate("td") in Ox::Element => item, Ox::Element => description
-
-          entries.append record_for(item, description, uri)
+        fetch(uri).then { parse_rows it }
+                  .each
+                  .with_object [] do |row, entries|
+          row.children in Nokogiri::XML::Element => item, Nokogiri::XML::Element => description
+          entries.append build_record(item, description) unless item.text.include? "Soon"
         end
       end
 
       private
 
-      attr_reader :model
+      attr_reader :parser, :model
 
-      def read uri
+      def fetch uri
         http.follow.get(uri).then do |response|
-          [200, 301].include?(response.status) ? parse_rows(response.body.to_s) : Core::EMPTY_ARRAY
+          [200, 301].include?(response.status) ? response.body.to_s : Core::EMPTY_STRING
         end
       end
 
-      def parse_rows(document) = parser.parse(document).locate "*/tr"
+      def parse_rows(page) = parser.parse(page).xpath "//tbody/tr"
+
+      def build_record item, description
+        link = item.at_css "a"
+        uri = %(#{settings.htmx_site_uri}#{link["href"]})
 
-      def record_for item, description, uri
-        model[
-          label: (item.locate("*/code").first || item.locate("a").first).text,
-          description: "#{self.class.text_for description}.",
-          uri: (item.locate("*/@href").first || uri).sub(%r(\A(?=/)), settings.htmx_site_uri)
-        ]
+        model[label: link.text, description: "#{description.text}.", uri:]
       end
     end
   end

data/lib/pennyworth/loaders/http_status.rb

@@ -14,9 +14,7 @@ module Pennyworth
         @model = model
       end
 
-      def call(*)
-        codes.map { |(code, label)| model[code:, label:, url: "#{url}/#{code}"] }
-      end
+      def call(*) = codes.map { |(code, label)| model[code:, label:, url: "#{url}/#{code}"] }
 
       private
 

data/lib/pennyworth/loaders/rfc.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "core"
+require "nokogiri"
+
+module Pennyworth
+  module Loaders
+    # Loads RFC records by scraping web page.
+    class RFC
+      include Dependencies[:http, :settings]
+
+      def initialize(parser: Nokogiri::HTML5, model: Models::RFC, **)
+        @parser = parser
+        @model = model
+        super(**)
+      end
+
+      def call uri
+        fetch(uri).then { parse_rows it }
+                  .each
+                  .with_object [] do |row, entries|
+          row.children in Nokogiri::XML::Element => label,
+                         Nokogiri::XML::Element => description,
+                         Nokogiri::XML::Element => published
+          entries.append build_record(label, description, published)
+        end
+      end
+
+      private
+
+      attr_reader :parser, :model
+
+      def fetch uri
+        http.follow.get(uri).then do |response|
+          [200, 301].include?(response.status) ? response.body.to_s : Core::EMPTY_STRING
+        end
+      end
+
+      def parse_rows(page) = parser.parse(page).xpath "//tbody/tr"
+
+      def build_record label, description, published
+        prefix, number = label.xpath(".//span/span").map(&:text)
+        uri = label.at_css("a")["href"]
+
+        model[
+          number: number,
+          label: "#{prefix} #{number}",
+          description: description.text,
+          published: published.text,
+          uri: "#{settings.rfc_site_uri}#{uri}"
+        ]
+      end
+    end
+  end
+end

data/lib/pennyworth/loaders/rodauth.rb

@@ -1,51 +1,52 @@
 # frozen_string_literal: true
 
 require "core"
+require "nokogiri"
 require "refinements/pathname"
-require "refinements/string"
 
 module Pennyworth
   module Loaders
     # Loads Rodauth documentation by scraping the web page.
     class Rodauth
-      include Dependencies[:http, :settings, parser: :ox]
+      include Dependencies[:http, :settings]
 
-      using Refinements::String
       using Refinements::Pathname
 
-      def initialize(model: Models::Rodauth, **)
+      def initialize(parser: Nokogiri::HTML5, model: Models::Rodauth, **)
+        @parser = parser
         @model = model
         super(**)
       end
 
       def call uri
-        read(uri).each.with_object([]) { |item, entries| entries.append record_for(item) }
+        fetch(uri).then { parse_items it }
+                  .each
+                  .with_object([]) { |item, entries| entries.append build_record(item) }
       end
 
       private
 
-      attr_reader :model
+      attr_reader :parser, :model
 
-      def read uri
+      def fetch uri
         http.get(uri).then do |response|
-          [200, 301].include?(response.status) ? parse_items(response.body.to_s) : Core::EMPTY_ARRAY
+          [200, 301].include?(response.status) ? response.body.to_s : Core::EMPTY_STRING
         end
       end
 
-      def parse_items document
-        parser.parse(document).root.body.div.ul.nodes
-      rescue NoMethodError
-        Core::EMPTY_ARRAY
+      def parse_items page
+        parser.parse(page).xpath('//*[@id="content"]//ul/li')
       end
 
-      def record_for item
-        link = item.a
-        uri = "#{settings.rodauth_site_uri}/#{link.href}"
+      def build_record item
+        link = item.at_css "a"
+        label = link.text
+        uri = %(#{settings.rodauth_site_uri}/#{link["href"]})
 
         model[
           name: Pathname(uri).name.to_s.delete_suffix("_rdoc"),
-          label: link.text,
-          description: item.text.delete_prefix(": "),
+          label:,
+          description: item.text.delete_prefix("#{label}: "),
           uri:
         ]
       end

data/lib/pennyworth/models/rfc.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Pennyworth
+  module Models
+    # Represents a RFC link.
+    RFC = Data.define :number, :label, :description, :published, :uri
+  end
+end

data/lib/pennyworth/presenters/htmx.rb

@@ -8,7 +8,7 @@ module Pennyworth
     class HTMX
       extend Forwardable
 
-      delegate %i[label description uri] => :record
+      delegate Models::HTMX.members => :record
 
       def initialize record
         @record = record

data/lib/pennyworth/presenters/http_status.rb

@@ -11,7 +11,7 @@ module Pennyworth
 
       using Refinements::String
 
-      delegate %i[code label url] => :record
+      delegate Models::HTTPStatus.members => :record
 
       def initialize record, inflector: Inflector.new
         @record = record

data/lib/pennyworth/presenters/rfc.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "forwardable"
+
+module Pennyworth
+  module Presenters
+    # Shapes a RFC record for serialization.
+    class RFC
+      extend Forwardable
+
+      delegate Models::RFC.members => :record
+
+      def initialize record
+        @record = record
+      end
+
+      alias id number
+
+      def subtitle = "#{description}. Published: #{published}."
+
+      private
+
+      attr_reader :record
+    end
+  end
+end

data/lib/pennyworth/presenters/rodauth.rb

@@ -8,7 +8,7 @@ module Pennyworth
     class Rodauth
       extend Forwardable
 
-      delegate %i[name label description uri] => :record
+      delegate Models::Rodauth.members => :record
 
       def initialize record
         @record = record

data/lib/pennyworth/presenters/system/error.rb

@@ -9,13 +9,13 @@ module Pennyworth
       class Error
         extend Forwardable
 
-        delegate %i[id description] => :record
+        delegate Models::System::Error.members => :record
 
         def initialize record
           @record = record
         end
 
-        def label = record.name
+        alias label name
 
         def subtitle = "#{label}: #{description}."
 

data/lib/pennyworth/presenters/text.rb

@@ -8,7 +8,7 @@ module Pennyworth
     class Text
       extend Forwardable
 
-      delegate %i[id content] => :record
+      delegate Models::Text.members => :record
 
       def initialize record, inflector: Inflector.new
         @record = record

data/lib/pennyworth/serializers/rfc.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Pennyworth
+  module Serializers
+    # Serializes a RFC presenter for parsing by Alfred script filters.
+    class RFC
+      def initialize presenter
+        @presenter = presenter
+      end
+
+      def to_h
+        {
+          uid: presenter.id,
+          title: presenter.label,
+          subtitle: presenter.subtitle,
+          arg: site_uri,
+          quicklookurl: site_uri,
+          mods: modifications,
+          text:
+        }
+      end
+
+      private
+
+      attr_reader :presenter
+
+      def modifications
+        {
+          alt: modification(presenter.label, "Copy label."),
+          cmd: modification(presenter.description, "Copy description."),
+          control: modification(presenter.number, "Copy number.")
+        }
+      end
+
+      def modification argument, subtitle
+        {
+          subtitle:,
+          arg: argument
+        }
+      end
+
+      def text
+        {
+          copy: site_uri,
+          largetype: site_uri
+        }
+      end
+
+      def site_uri = presenter.uri
+    end
+  end
+end

data/lib/pennyworth.rb

@@ -6,7 +6,8 @@ Zeitwerk::Loader.new.then do |loader|
   loader.inflector.inflect "cli" => "CLI",
                            "http_status" => "HTTPStatus",
                            "http_statuses" => "HTTPStatuses",
-                           "htmx" => "HTMX"
+                           "htmx" => "HTMX",
+                           "rfc" => "RFC"
   loader.tag = File.basename __FILE__, ".rb"
   loader.push_dir __dir__
   loader.setup

data/pennyworth.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "pennyworth"
-  spec.version = "20.1.0"
+  spec.version = "21.0.0"
   spec.authors = ["Brooke Kuhlmann"]
   spec.email = ["brooke@alchemists.io"]
   spec.homepage = "https://alchemists.io/projects/pennyworth"
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ghub", "~> 2.0"
   spec.add_dependency "http", "~> 6.0"
   spec.add_dependency "infusible", "~> 5.0"
-  spec.add_dependency "ox", "~> 2.14"
+  spec.add_dependency "nokogiri", "~> 1.19.4"
   spec.add_dependency "rack", "~> 3.1"
   spec.add_dependency "refinements", "~> 14.0"
   spec.add_dependency "runcom", "~> 13.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennyworth
 version: !ruby/object:Gem::Version
-  version: 20.1.0
+  version: 21.0.0
 platform: ruby
 authors:
 - Brooke Kuhlmann
@@ -134,19 +134,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: ox
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 1.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 1.19.4
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -248,10 +248,11 @@ files:
 - lib/pennyworth/cli/actions/gem.rb
 - lib/pennyworth/cli/actions/git_hub/organization.rb
 - lib/pennyworth/cli/actions/git_hub/user.rb
-- lib/pennyworth/cli/actions/htmx/example.rb
 - lib/pennyworth/cli/actions/htmx/extension.rb
+- lib/pennyworth/cli/actions/htmx/pattern.rb
 - lib/pennyworth/cli/actions/htmx/reference.rb
 - lib/pennyworth/cli/actions/http_status.rb
+- lib/pennyworth/cli/actions/rfc.rb
 - lib/pennyworth/cli/actions/rodauth.rb
 - lib/pennyworth/cli/actions/standard_error.rb
 - lib/pennyworth/cli/actions/standard_gem.rb
@@ -270,6 +271,7 @@ files:
 - lib/pennyworth/loaders/git_hub.rb
 - lib/pennyworth/loaders/htmx.rb
 - lib/pennyworth/loaders/http_status.rb
+- lib/pennyworth/loaders/rfc.rb
 - lib/pennyworth/loaders/rodauth.rb
 - lib/pennyworth/loaders/standard_error.rb
 - lib/pennyworth/loaders/standard_gem.rb
@@ -279,6 +281,7 @@ files:
 - lib/pennyworth/models/encoding.rb
 - lib/pennyworth/models/htmx.rb
 - lib/pennyworth/models/http_status.rb
+- lib/pennyworth/models/rfc.rb
 - lib/pennyworth/models/rodauth.rb
 - lib/pennyworth/models/standard_error.rb
 - lib/pennyworth/models/system/error.rb
@@ -289,6 +292,7 @@ files:
 - lib/pennyworth/presenters/htmx.rb
 - lib/pennyworth/presenters/http_status.rb
 - lib/pennyworth/presenters/repository.rb
+- lib/pennyworth/presenters/rfc.rb
 - lib/pennyworth/presenters/rodauth.rb
 - lib/pennyworth/presenters/standard_error.rb
 - lib/pennyworth/presenters/standard_gem.rb
@@ -300,6 +304,7 @@ files:
 - lib/pennyworth/serializers/htmx.rb
 - lib/pennyworth/serializers/http_status.rb
 - lib/pennyworth/serializers/project.rb
+- lib/pennyworth/serializers/rfc.rb
 - lib/pennyworth/serializers/rodauth.rb
 - lib/pennyworth/serializers/standard_error.rb
 - lib/pennyworth/serializers/system/error.rb
@@ -331,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.18
 specification_version: 4
 summary: A command line interface for augmented Alfred workflows.
 test_files: []

data/lib/pennyworth/cli/actions/htmx/example.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require "sod"
-
-module Pennyworth
-  module CLI
-    module Actions
-      module HTMX
-        # Handles examples documentation action.
-        class Example < Sod::Action
-          include Dependencies[:settings, :io, processor: "processors.htmx"]
-
-          description "Render Alfred examples script filter."
-
-          on "--examples"
-
-          def call(*) = io.puts processor.call(settings.htmx_examples_uri).to_json
-        end
-      end
-    end
-  end
-end