ruby-net-text 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f3d4fbd93c189d283b253e0f0a520bdaee167f09281d3c6a25c95126c07ecf9
-  data.tar.gz: 209152612f6f0dad44282fe17dc02d34fc6457ccc0f01bb993374ceef9491f33
+  metadata.gz: c547f919d21a6cb162b2e56553a4c7d7a935d8823036bbb97ae249417be0e1ae
+  data.tar.gz: 754907558f7a4db368b7f7cd7001bd5550dde2bb798804ee133dfee433945594
 SHA512:
-  metadata.gz: e6826cd8ee993dabd7210a329b4349fb059c5007ff1560914d09049dfa7276ff1590d9f5405c31a99c70202511502d30c1d68d9b66643ddbf881774e161cdac3
-  data.tar.gz: 7f756ac8389178ae82a8c11b0a8e3e7491d096cab8dfbd42d55345e277680656ccb64da1fb69e119417fb2de68b75a2740b7fbd60f492ef2c44df31668adcd69
+  metadata.gz: '079107d052b63ac01d47b648966b875b7150d20db1787411f671ad5cf0fd911ded1924e9300885a0a17dea342d884482b2b4132c1b7ffdc9adb1417ecfead74a'
+  data.tar.gz: f2894b7e387968c2d0c3f1f7a00bceb18b78351f0aa392dc53b350badccb6e5a5c17ebfb150679537cb4be344b19ca98f1c9c9ce3ecaf6b4fea2146d761eb307

data/lib/net/gemini/gmi_parser.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Gemini
+  # Contains specific method to parse text/gemini documents.
+  module GmiParser
+    private
+
+    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)
+    end
+
+    def parse_preformatted_block(line, buf)
+      cur_block = { meta: line[3..].chomp, content: '' }
+      while (line = buf.gets)
+        if line.start_with?('```')
+          @preformatted_blocks << cur_block
+          break
+        end
+        cur_block[:content] += line
+      end
+    end
+
+    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
+        return
+      end
+      uri = @uri.merge(uri) if @uri && uri.is_a?(URI::Generic)
+      @links << { uri: uri, label: m[2]&.chomp }
+    end
+
+    def parse_body
+      buf = StringIO.new(@body)
+      while (line = buf.gets)
+        if line.start_with?('```')
+          parse_preformatted_block(line, buf)
+        elsif line.start_with?('=>')
+          parse_link(line)
+        end
+      end
+    end
+  end
+end

data/lib/net/gemini/reflow_text.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Gemini
+  # Contains specific method to correctly display Gemini texts
+  module ReflowText
+    private
+
+    def reflow_line_cut_index(line)
+      possible_cut = [
+        line.rindex(' ') || 0,
+        line.rindex('­') || 0,
+        line.rindex('-') || 0
+      ].sort
+      possible_cut.reverse!
+      possible_cut[0]
+    end
+
+    def reflow_line_prefix(line)
+      m = line.match(/\A([*#>]+ )/)
+      return '' unless m
+      # Each quote line should begin with the quote mark
+      return m[1] if m[1].start_with?('>')
+      ' ' * m[1].length
+    end
+
+    def reflow_text_line(line, mono_block_open, length)
+      line.strip!
+      if mono_block_open || line.start_with?('=>') || line.length < length
+        return [line]
+      end
+      output = []
+      prefix = reflow_line_prefix(line)
+      while line.length > length
+        cut_line = line[0...length]
+        cut_index = reflow_line_cut_index(cut_line)
+        break if cut_index.zero? # Better do nothing for now
+        output << line[0...cut_index]
+        line = prefix + line[cut_index + 1..]
+      end
+      output << line
+    end
+
+    def reformat_body(length)
+      unless length.is_a? Integer
+        raise ArgumentError, "Length must be Integer, #{length} given"
+      end
+      return @body if length.zero?
+      new_body = []
+      mono_block_open = false
+      buf = StringIO.new(@body)
+      while (line = buf.gets)
+        if line.start_with?('```')
+          mono_block_open = !mono_block_open
+          # Don't include code block toggle lines
+          next
+        end
+        new_body += reflow_text_line(line, mono_block_open, length)
+      end
+      new_body.join("\n")
+    end
+  end
+end

data/lib/net/gemini/request.rb

@@ -23,9 +23,8 @@ module Net
         raise GeminiBadRequest, "Request too long: #{url.dump}"
       end
       @uri = URI(url)
-      unless uri.is_a? URI::Gemini
-        raise GeminiBadRequest, "Not a Gemini URI: #{url.dump}"
-      end
+      return if uri.is_a? URI::Gemini
+      raise GeminiBadRequest, "Not a Gemini URI: #{url.dump}"
     end
 
     def path
@@ -43,7 +42,7 @@ module Net
         # - 2 bytes for <CR><LF>
         str = sock.gets($INPUT_RECORD_SEPARATOR, 1026)
         m = /\A(.*)\r\n\z/.match(str)
-        raise GeminiBadRequest, "Malformed request: #{str.dump}" if m.nil?
+        raise GeminiBadRequest, "Malformed request: #{str&.dump}" if m.nil?
         new(m[1])
       end
     end

data/lib/net/gemini/ssl.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Gemini
+  # Contains specific method to handle SSL connection
+  module SSL
+    private
+
+    def ssl_check_existing(new_cert, cert_file)
+      raw = File.read cert_file
+      saved_one = OpenSSL::X509::Certificate.new raw
+      return true if saved_one == new_cert
+      # TODO: offer some kind of recuperation
+      warn "#{cert_file} does not match the current host cert!"
+      false
+    end
+
+    def ssl_verify_cb(cert)
+      return false unless OpenSSL::SSL.verify_certificate_identity(cert, @host)
+      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
+    end
+
+    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.verify_callback = lambda do |preverify_ok, store_context|
+        return true if preverify_ok
+        ssl_verify_cb store_context.current_cert
+      end
+      ssl_context
+    end
+
+    def init_sockets
+      socket = TCPSocket.new(@host, @port)
+      @ssl_socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)
+      # Close underlying TCP socket with SSL socket
+      @ssl_socket.sync_close = true
+      @ssl_socket.hostname = @host # SNI
+      @ssl_socket.connect
+    end
+
+    # Closes the SSL and TCP connections.
+    def finish
+      @ssl_socket.close
+    end
+  end
+end

data/lib/net/gemini.rb

@@ -16,8 +16,8 @@ module Net
 
   # == A Gemini client API for Ruby.
   #
-  # Net::Gemini provides a rich library which can be used to build
-  # Gemini user-agents.
+  # Net::Gemini provides a library which can be used to build Gemini
+  # user-agents.
   # @see https://gemini.circumlunar.space/docs/specification.html
   #
   # Net::Gemini is designed to work closely with URI.
@@ -36,21 +36,20 @@ module Net
   #
   # === GET by URI
   #
-  #   uri = URI('gemini://example.com/index.html?count=10')
+  #   uri = URI('gemini://gemini.circumlunar.space/')
   #   Net::Gemini.get(uri) # => String
   #
   # === GET with Dynamic Parameters
   #
-  #   uri = URI('gemini://example.com/index.html')
-  #   params = { :limit => 10, :page => 3 }
-  #   uri.query = URI.encode_www_form(params)
+  #   uri = URI('gemini://gus.guru/search')
+  #   uri.query = URI.encode_www_form('test')
   #
   #   res = Net::Gemini.get_response(uri)
   #   puts res.body if res.body_permitted?
   #
   # === Response Data
   #
-  #   res = Net::Gemini.get_response(URI('gemini://exemple.com/home'))
+  #   res = Net::Gemini.get_response(URI('gemini://gemini.circumlunar.space/'))
   #
   #   # Status
   #   puts res.status # => '20'
@@ -105,6 +104,12 @@ module Net
       res = GeminiResponse.read_new(@ssl_socket)
       res.uri = uri
       res.reading_body(@ssl_socket)
+    rescue OpenSSL::SSL::SSLError => e
+      msg = format(
+        'SSLError: %<cause>s',
+        cause: e.message.sub(/.*state=error: (.+)\Z/, '\1')
+      )
+      GeminiResponse.new('59', msg)
     ensure
       # Stop remaining connection, even if they should be already cut
       # by the server

data/lib/uri/finger.rb

@@ -14,8 +14,22 @@ module URI # :nodoc:
     DEFAULT_PORT = 79
 
     # An Array of the available components for URI::Finger.
-    COMPONENT = [:scheme, :userinfo, :host, :port].freeze
+    COMPONENT = [: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
   end
 
-  @@schemes['FINGER'] = Finger
+  if respond_to? :register_scheme
+    # Introduced somewhere in ruby 3.0.x
+    register_scheme 'FINGER', Finger
+  else
+    @@schemes['FINGER'] = Finger
+  end
 end

data/lib/uri/gemini.rb

@@ -18,5 +18,10 @@ module URI # :nodoc:
                  :path, :query, :fragment].freeze
   end
 
-  @@schemes['GEMINI'] = Gemini
+  if respond_to? :register_scheme
+    # Introduced somewhere in ruby 3.0.x
+    register_scheme 'GEMINI', Gemini
+  else
+    @@schemes['GEMINI'] = Gemini
+  end
 end

data/lib/uri/gopher.rb

@@ -15,7 +15,29 @@ module URI # :nodoc:
 
     # An Array of the available components for URI::Gopher.
     COMPONENT = [: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.captures
+    end
   end
 
-  @@schemes['GOPHER'] = Gopher
+  if respond_to? :register_scheme
+    # Introduced somewhere in ruby 3.0.x
+    register_scheme 'GOPHER', Gopher
+  else
+    @@schemes['GOPHER'] = Gopher
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-net-text
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - Étienne Deparis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2022-02-20 00:00:00.000000000 Z
 dependencies: []
 description:
 email: etienne@depar.is
@@ -18,15 +18,21 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - lib/net/gemini.rb
+- lib/net/gemini/gmi_parser.rb
+- lib/net/gemini/reflow_text.rb
 - lib/net/gemini/request.rb
 - lib/net/gemini/response.rb
+- lib/net/gemini/ssl.rb
 - lib/uri/finger.rb
 - lib/uri/gemini.rb
 - lib/uri/gopher.rb
 homepage: https://git.umaneti.net/ruby-net-text/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
+  source_code_uri: https://git.umaneti.net/ruby-net-text
+  funding_uri: https://liberapay.com/milouse
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -42,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Gemini, Gopher, and Finger support for Net::* and URI::*