ruby-net-text 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 866ba253d1dbbc5b2e9a8eba1f6bf4813c6f3b163ce3278d36c4932be80c3714
-  data.tar.gz: 16e0059f252a8d88c8c04667e1b779e65eadae7c1c6da17aba4487fdac459070
+  metadata.gz: 2610c775fb8178c5c035a7ffbb9176ba679a15fcd061fed7e192b3d83b609727
+  data.tar.gz: 386863cda1e5682d05bc75a52da55ae4d972393db7efa38fed7d259b44f9e717
 SHA512:
-  metadata.gz: 4643771216d1ee0c494a5e368037fbfcfcf303a290dfa2260af3cb9125cbdbeaad6d4fc7ee3836abb914e5c5f731d4f351fb1e4e19193751b07bfd31a0385abe
-  data.tar.gz: 1625097ffa76cc274460e64987fca75cb43db9963d4401e434a796b4aa7effdbbbda9e787001597183ce4d8e91db15f0c0c8f5f8945b725485aef218b314ab4d
+  metadata.gz: 8c7663972f81f9f93e02bf76bccfaa1b158b4034259617e94856d27fb63aa5368def164135cea3318c355e3e137ae0c6b852b96194c52db9180aecd318a8d3e1
+  data.tar.gz: 61bff20043c1866c3075312a87f9a68dc7d7aa7fd869d8962672dc2ce6eeed9ad065d6ca0bc8330bc94a41fa041933a7bf0da20c0871826d805a0febf2d8dcb2

data/lib/net/gemini/client/ssl.rb

@@ -23,6 +23,7 @@ module Net
 
         cert_file = File.expand_path("#{@certs_path}/#{@host}.pem")
         return ssl_check_existing(cert, cert_file) if File.exist?(cert_file)
+
         FileUtils.mkdir_p(File.expand_path(@certs_path))
         File.open(cert_file, 'wb') { |f| f.print cert.to_pem }
         true
@@ -30,10 +31,12 @@ module Net
 
       def ssl_context
         ssl_context = OpenSSL::SSL::SSLContext.new
-        ssl_context.set_params(verify_mode: OpenSSL::SSL::VERIFY_PEER)
-        ssl_context.min_version = OpenSSL::SSL::TLS1_2_VERSION
-        ssl_context.verify_hostname = true
-        ssl_context.ca_file = '/etc/ssl/certs/ca-certificates.crt'
+        ssl_context.set_params(
+          verify_mode: OpenSSL::SSL::VERIFY_PEER,
+          min_version: OpenSSL::SSL::TLS1_2_VERSION,
+          ca_file: '/etc/ssl/certs/ca-certificates.crt',
+          verify_hostname: true
+        )
         ssl_context.verify_callback = lambda do |preverify_ok, store_context|
           return true if preverify_ok
 

data/lib/net/gemini/client.rb

@@ -3,9 +3,11 @@
 require_relative 'error'
 require_relative 'request'
 require_relative 'response'
+require_relative '../text/generic'
 
 module Net
-  module Gemini
+  module Gemini # rubocop:disable Style/Documentation
+    # An example client to fetch resources hosted on Gemini network.
     class Client
       attr_writer :certs_path
 
@@ -15,13 +17,18 @@ module Net
         @certs_path = '~/.cache/gemini/certs'
       end
 
-      def request(uri)
+      # This method can raise an OpenSSL::SSL::SSLError
+      def request!(uri)
         init_sockets
         req = Request.new uri
         req.write @ssl_socket
         res = Response.read_new(@ssl_socket)
         res.uri = uri
         res.reading_body(@ssl_socket)
+      end
+
+      def request(uri)
+        request! uri
       rescue OpenSSL::SSL::SSLError => e
         msg = format(
           'SSLError: %<cause>s',
@@ -36,8 +43,10 @@ module Net
 
       def fetch(uri, limit = 5)
         raise Error, 'Too many Gemini redirects' if limit.zero?
+
         r = request(uri)
         return r unless r.status[0] == '3'
+
         begin
           uri = handle_redirect(r)
         rescue ArgumentError, URI::InvalidURIError
@@ -55,6 +64,7 @@ module Net
         new_uri = URI(response.meta)
         uri.merge!(new_uri)
         raise Error, "Redirect loop on #{uri}" if uri.to_s == old_url
+
         @host = uri.host
         @port = uri.port
         uri
@@ -78,7 +88,8 @@ module Net
       start(uri.host, uri.port) { |gem| gem.fetch(uri) }
     end
 
-    def self.get(uri)
+    def self.get(string_or_uri)
+      uri = Net::Text::Generic.build_uri string_or_uri, URI::Gemini
       get_response(uri).body
     end
   end

data/lib/net/gemini/request.rb

@@ -13,7 +13,7 @@ module Net
     # The syntax of Gemini Requests are defined in the Gemini
     # specification, section 2.
     #
-    # @see https://gemini.circumlunar.space/docs/specification.html
+    # @see https://geminiprotocol.net/docs/protocol-specification.html
     #
     class Request
       attr_reader :uri
@@ -21,11 +21,11 @@ module Net
       def initialize(uri_or_str)
         # In any case, make some sanity check over this uri-like think
         url = uri_or_str.to_s
-        if url.length > 1024
-          raise BadRequest, "Request too long: #{url.dump}"
-        end
+        raise BadRequest, "Request too long: #{url.dump}" if url.length > 1024
+
         @uri = URI(url)
         return if uri.is_a? URI::Gemini
+
         raise BadRequest, "Not a Gemini URI: #{url.dump}"
       end
 
@@ -45,6 +45,7 @@ module Net
           str = sock.gets($INPUT_RECORD_SEPARATOR, 1026)
           m = /\A(.*)\r\n\z/.match(str)
           raise BadRequest, "Malformed request: #{str&.dump}" if m.nil?
+
           new(m[1])
         end
       end

data/lib/net/gemini/response/parser.rb

@@ -7,19 +7,27 @@ module Net
     class Response
       private
 
+      def received_mime(raw_meta)
+        meta_data = raw_meta.map { |m| m.split('=') }
+        mime = { lang: nil, charset: 'utf-8', format: nil }
+        new_mime = meta_data.filter_map do |opt|
+          key = opt[0].downcase.to_sym
+          next unless mime.has_key? key
+
+          [key, opt[1].downcase]
+        end
+        mime.merge new_mime.to_h
+      end
+
       def parse_meta
         header = { status: @status, meta: @meta, mimetype: nil }
         return header unless body_permitted?
-        mime = { lang: nil, charset: 'utf-8', format: nil }
+
         raw_meta = meta.split(';').map(&:strip)
         header[:mimetype] = raw_meta.shift
         return header unless raw_meta.any?
-        raw_meta.map { |m| m.split('=') }.each do |opt|
-          key = opt[0].downcase.to_sym
-          next unless mime.has_key? key
-          mime[key] = opt[1].downcase
-        end
-        header.merge(mime)
+
+        header.merge received_mime(raw_meta)
       end
 
       def parse_preformatted_block(line, buf)
@@ -36,6 +44,7 @@ module Net
       def parse_link(line)
         m = line.strip.match(/\A=>\s*([^\s]+)(?:\s*(.+))?\z/)
         return if m.nil?
+
         begin
           uri = URI(m[1])
         rescue URI::InvalidURIError

data/lib/net/gemini/response.rb

@@ -12,7 +12,7 @@ module Net
     # The syntax of Gemini Responses are defined in the Gemini
     # specification, section 3.
     #
-    # @see https://gemini.circumlunar.space/docs/specification.html
+    # @see https://geminiprotocol.net/docs/protocol-specification.html
     #
     # See {Net::Gemini} documentation to see how to interract with a
     # Response.
@@ -55,12 +55,12 @@ module Net
 
       def reading_body(sock)
         return self unless body_permitted?
+
         raw_body = []
-        while (line = sock.gets)
-          raw_body << line
-        end
+        sock.each_line { raw_body << _1 }
         @body = encode_body(raw_body.join)
         return self unless @header[:mimetype] == 'text/gemini'
+
         parse_body
         self
       end
@@ -72,7 +72,14 @@ module Net
       # @return [String] the body content
       def body(reflow_at: -1)
         return '' if @body.nil? # Maybe not ready?
-        return @body if reflow_at < 0 || @header[:format] == 'fixed'
+
+        unless reflow_at.is_a? Integer
+          raise(
+            ArgumentError, "reflow_at must be Integer, #{reflow_at.class} given"
+          )
+        end
+
+        return @body if reflow_at <= 0 || @header[:format] == 'fixed'
 
         Net::Text::Reflow.format_body(@body, reflow_at)
       end
@@ -86,6 +93,7 @@ module Net
           str = sock.gets($INPUT_RECORD_SEPARATOR, 1029)
           m = /\A([1-6]\d) (.*)\r\n\z/.match(str)
           raise BadResponse, "wrong status line: #{str.dump}" if m.nil?
+
           new(*m.captures)
         end
       end
@@ -94,6 +102,7 @@ module Net
 
       def encode_body(body)
         return body unless @header[:mimetype].start_with?('text/')
+
         if @header[:charset] && @header[:charset] != 'utf-8'
           # If body use another charset than utf-8, we need first to
           # declare the raw byte string as using this chasret

data/lib/net/gemini.rb

@@ -11,7 +11,7 @@ module Net
   #
   # Net::Gemini provides a library which can be used to build Gemini
   # user-agents.
-  # @see https://gemini.circumlunar.space/docs/specification.html
+  # @see gemini://geminiprotocol.net/docs/specification.gmi
   #
   # Net::Gemini is designed to work closely with URI.
   #
@@ -29,8 +29,7 @@ module Net
   #
   # === GET by URI
   #
-  #   uri = URI('gemini://gemini.circumlunar.space/')
-  #   Net::Gemini.get(uri) # => String
+  #   Net::Gemini.get('gemini://gemini.circumlunar.space/') # => String
   #
   # === GET with Dynamic Parameters
   #

data/lib/net/text/generic.rb

@@ -19,6 +19,7 @@ module Net
       def self.build_uri(string_or_uri, uri_class)
         string_or_uri = URI(string_or_uri) if string_or_uri.is_a?(String)
         return string_or_uri if string_or_uri.is_a?(uri_class)
+
         raise ArgumentError, "uri is not a String, nor an #{uri_class.name}"
       end
     end

data/lib/net/text/reflow.rb

@@ -12,6 +12,7 @@ module Net
         return '' unless m
         # Each quote line should begin with the quote mark
         return m[1] if m[1].start_with?('>')
+
         ' ' * m[1].length
       end
 
@@ -20,6 +21,7 @@ module Net
         if mono_block_open || line.start_with?('=>') || line.length < length
           return [line]
         end
+
         output = []
         prefix = reflow_line_prefix(line)
         limit_chars = ['-', '­', ' '].freeze
@@ -35,15 +37,9 @@ module Net
       end
 
       def self.format_body(body, length)
-        unless length.is_a? Integer
-          raise ArgumentError, "Length must be Integer, #{length.class} given"
-        end
-        return body if length.zero?
-
         new_body = []
         mono_block_open = false
-        buf = StringIO.new(body)
-        while (line = buf.gets)
+        body.each_line do |line|
           if line.start_with?('```')
             mono_block_open = !mono_block_open
             # Don't include code block toggle lines

data/lib/uri/finger.rb

@@ -14,13 +14,15 @@ module URI # :nodoc:
     DEFAULT_PORT = 79
 
     # An Array of the available components for URI::Finger.
-    COMPONENT = [:scheme, :userinfo, :host, :port, :path].freeze
+    COMPONENT = %i[scheme userinfo host port path].freeze
 
     def name
       # Utilitary method to extract a name to query, either from the userinfo
       # part or from the path.
       return @user if @user
+
       return '' unless @path
+
       # Remove leading /
       @path[1..] || ''
     end

data/lib/uri/gemini.rb

@@ -7,15 +7,14 @@ module URI # :nodoc:
   # The syntax of Gemini URIs is defined in the Gemini specification,
   # section 1.2.
   #
-  # @see https://gemini.circumlunar.space/docs/specification.html
+  # @see https://geminiprotocol.net/docs/protocol-specification.html
   #
   class Gemini < HTTP
     # A Default port of 1965 for URI::Gemini.
     DEFAULT_PORT = 1965
 
     # An Array of the available components for URI::Gemini.
-    COMPONENT = [:scheme, :host, :port,
-                 :path, :query, :fragment].freeze
+    COMPONENT = %i[scheme host port path query fragment].freeze
   end
 
   if respond_to? :register_scheme

data/lib/uri/gopher.rb

@@ -14,22 +14,24 @@ module URI # :nodoc:
     DEFAULT_PORT = 70
 
     # An Array of the available components for URI::Gopher.
-    COMPONENT = [:scheme, :host, :port, :path].freeze
+    COMPONENT = %i[scheme host port path].freeze
 
     def selector
       return @selector if defined? @selector
+
       @selector = extract_gopher_path_elements[1]
     end
 
     def item_type
       return @item_type if defined? @item_type
+
       @item_type = extract_gopher_path_elements[0]
     end
 
     private
 
     def extract_gopher_path_elements
-      m = /\A\/([0-9+dfghisA-LT])(\/.*)?\Z/.match(@path)
+      m = %r{\A/([0-9+dfghisA-LT])(/.*)?\Z}.match(@path)
       m.captures
     end
   end

data/lib/uri/nex.rb

@@ -7,14 +7,14 @@ module URI # :nodoc:
   # The syntax of Nex URIs is defined in the Nex specification,
   # section 1.2.
   #
-  # @see https://gemini.circumlunar.space/docs/specification.html
+  # @see nex://nightfall.city/nex/info/specification.txt
   #
   class Nex < HTTP
     # A Default port of 1900 for URI::Nex.
     DEFAULT_PORT = 1900
 
     # An Array of the available components for URI::Nex.
-    COMPONENT = [:scheme, :host, :port, :path].freeze
+    COMPONENT = %i[scheme host port path].freeze
   end
 
   if respond_to? :register_scheme

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-net-text
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Étienne Deparis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-20 00:00:00.000000000 Z
+date: 2024-07-13 00:00:00.000000000 Z
 dependencies: []
 description:
 email: etienne@depar.is
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.15
 signing_key:
 specification_version: 4
 summary: Finger, Gemini, Gopher and Nex support for Net::* and URI::*