opentofu 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eeac402d86ae7cc5b5f2e9be3327a60f8f3132453854ea9ee5f477462e58fc7
-  data.tar.gz: 54f68d912adb5e14a39ddde842ad4acf5ff3664923815138e5a30fcc8ba87881
+  metadata.gz: a69c67e3a0d558a57695eafff1a69d111d8ff7ccc6c74de393efe6cb5f0bf276
+  data.tar.gz: 780851bb7b0166ec9ea945f71735eba1c795cd399a7633606bdd4639762c6b59
 SHA512:
-  metadata.gz: c74b24eada5091a0d37eb1a97b871838744e2169b36974fed374900c0a64e73acafe019751341da153f6f5e59a0b6e48e2c4aa9b1674fa65aa3573a74be44528
-  data.tar.gz: 8c00e948a371088cd8e87698d3884fe55d7aa8b84ac65c5a5d64d6b0a53cbf505fed91010cd4d83e53f820a1b2a6dac46a9ad5947733546404e1d992d0301bf5
+  metadata.gz: c506b5667e6e99e717f0455c94a6e362664a5c299d880f465b031aa684969120c5484175c28606fc5aaabc39bd1fa577c89f6d05374e1df8ea37642dd4bf91e3
+  data.tar.gz: 5d6f6f2ea96f1ea01a5b442dba6f1f8ef8f83f40f852866b28995fcd879a96a6914030f20303a71d6c9b21e2a56346aba28ad74b9a03a832a71b34e57325a1c2

data/.rubocop.yml

@@ -1,16 +1,13 @@
 AllCops:
   TargetRubyVersion: 2.6
 
-Metrics/MethodLength:
+Metrics/AbcSize:
   Enabled: true
-  Max: 18
-  Exclude:
-    - "lib/net/tofu/response.rb"
+  Max: 25
 
-Style/ClassVars:
+Metrics/MethodLength:
   Enabled: true
-  Exclude:
-    - "lib/net/tofu/request.rb"
+  Max: 18
 
 Style/Semicolon:
   Enabled: true
@@ -18,9 +15,7 @@ Style/Semicolon:
     - "lib/net/tofu/response.rb"
 
 Style/SingleLineMethods:
-  Enabled: true
-  Exclude:
-    - "lib/net/tofu/response.rb"
+  Enabled: false
 
 Style/StringLiterals:
   Enabled: true

data/CHANGELOG.md

@@ -5,7 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.1.0] - 2023-07027
+## [0.1.1] - 2023-07-28
+
+### Added
+
+- Tests.
+- The `simplecov` gem to view testing coverage.
+- A new error, for if the server doesn't send any data.
+- The Linux platform to the bundle platform.
+
+### Fixed
+
+- Complexity issues in the Response class from the linter.
+
+### Removed
+
+- The `@@current_host` class variable from Request. Clients should handle keeping track of the current host, Tofu should just fetch data.
+- The complicated logic used to parse host names from the Request class, as per the above point.
+
+## [0.1.0] - 2023-07-27
 
 First release. Still lots of improvements to be made.
 

data/lib/net/tofu/error.rb

@@ -3,6 +3,9 @@
 module Net
   module Tofu
     class Response
+      # Raised when a server doesn't send any data.
+      class NoServerResponseError < StandardError; end
+
       # Raised when a server sends an invalid header.
       class InvalidHeaderError < StandardError; end
 

data/lib/net/tofu/request.rb

@@ -4,8 +4,6 @@ module Net
   module Tofu
     # Stores a client request to a Gemini server.
     class Request
-      SCHEME = "gemini"
-
       MAX_URI_BYTESIZE = 1024
 
       # @return [URI] The full URI object of the request.
@@ -36,17 +34,12 @@ module Net
       # @param host [String] A host string, optionally with the gemini:// scheme.
       # @param port [Integer] Optional parameter to specify the server port to connect to.
       def initialize(host, port: nil)
-        # Keeps track of the current host for links with only paths.
-        @@current_host ||= ""
+        @uri = URI(host)
+        @uri.port = port unless port.nil?
 
-        @host = host
-        @port = port unless port.nil?
-        determine_host
         parse_head
         parse_tail
 
-        puts format
-
         # Make sure the URI isn't too large
         if format.bytesize > MAX_URI_BYTESIZE
           raise InvalidURIError,
@@ -73,63 +66,28 @@ module Net
 
       private
 
-      # Parses the host and the path, and sets the current_host.
-      def determine_host
-        puts "current: #{@@current_host}"
-        @uri = URI(@host)
-
-        unless @uri.host.nil? || @uri.host.empty?
-          @host = @uri.host
-          @@current_host = @host
-          return
-        end
-
-        return if @uri.path.nil? || @uri.path.empty?
-        return unless @uri.host.nil? || @uri.host.empty?
-
-        if @uri.path.start_with?("/")
-          raise InvalidURIError, "No host specified" if @@current_host.nil? || @@current_host.empty?
-
-          unless @@current_host.nil? || @@current_host.empty?
-            @uri.host = @@current_host
-            @host = @uri.host
-            @@current_host = @host
-          end
-
-          return
-        end
-
-        paths = @uri.path.split("/")
-        puts paths
-
-        @uri.host = paths[0]
-        @host = @uri.host
-        @@current_host = @host
-        @uri.path = nil if paths.length == 1
-        return unless paths.length > 1
-
-        @uri.path = paths[1..].join("/")
-        @uri.path = "/#{uri.path}"
-      end
-
       # Parses the scheme, the host, and the port for the request.
       def parse_head
         # Check if a scheme was specified, if not, default to gemini://
         # Also set the port if this happens
         if @uri.scheme.nil? || @uri.scheme.empty?
-          @uri.scheme = SCHEME
-          @uri.port = URI::Gemini::DEFAULT_PORT
+          @uri.scheme = URI::Gemini::DEFAULT_SCHEME
+          @uri.port = URI::Gemini::DEFAULT_PORT if @uri.port.nil?
         end
 
+        # Check if a host was specified.
+        raise InvalidURIError, "Request does not contain a host" if @uri.host.nil? || @uri.host.empty?
+
         # Set member parts
         @scheme = @uri.scheme
+        @host = @uri.host
         @port = @uri.port
 
         # Check if a scheme is present that isn't gemini://
-        return if @uri.scheme == SCHEME
+        return if @uri.scheme == URI::Gemini::DEFAULT_SCHEME
 
         raise InvalidSchemeError,
-              "Request uses an invalid scheme (has: #{@uri.scheme}, wants: #{SCHEME}"
+              "Request uses an invalid scheme (has: #{@uri.scheme}, wants: #{URI::Gemini::DEFAULT_SCHEME}"
       end
 
       # Parses the path, the query, and the fragment for the request.

data/lib/net/tofu/response.rb

@@ -83,6 +83,8 @@ module Net
 
       # Splits up the responseinto a header and a body.
       def parse
+        raise NoServerResponseError if @data.nil? || @data.empty?
+
         # Extract the header and parse it
         a = @data.split("\n")
         @header = a[0].strip
@@ -108,6 +110,7 @@ module Net
         # Parse the meta
         @meta = ""
         @meta = a[1..].join(" ") if a.length >= 2
+        @meta.strip!
         parse_meta
       end
 
@@ -144,14 +147,21 @@ module Net
       def parse_meta
         # Make sure the meta isn't too large
         if @meta.bytesize > MAX_META_BYTESIZE
-          raise InvalidMetaError,
-                "The server sent a meta that was too large, should be #{MAX_META_BYTESIZE} bytes, instead is #{@meta.bytesize} bytes"
+          raise InvalidMetaError, <<-TXT
+                The server sent a meta that was too large, should be #{MAX_META_BYTESIZE} bytes,
+                instead is #{@meta.bytesize} bytes
+          TXT
         end
 
         if @status_maj == TEMPORARY_FAILURE || @status_maj == PERMANENT_FAILURE || @status_maj == REQUEST_CERTIFICATE
           return
         end
 
+        # Handle extra checks based on the @status type
+        handle_type
+      end
+
+      def handle_type
         # Make sure meta exists (i.e. has length)
         # This satisfies the INPUT and SUCCESS
         unless @meta.length.positive?
@@ -169,10 +179,10 @@ module Net
         raise InvalidRedirectError, "The redirect link does not have a scheme" if uri.scheme.nil? || uri.scheme.empty?
 
         # Make sure the URI scheme is 'gemini'
-        return if uri.scheme == "gemini"
+        return if uri.scheme == URI::Gemini::DEFAULT_SCHEME
 
         raise InvalidRedirectError,
-              "The redirect link has an invalid scheme (has: #{uri.scheme}, wants: gemini)"
+              "The redirect link has an invalid scheme (has: #{uri.scheme}, wants: #{URI::Gemini::DEFAULT_SCHEME})"
       end
     end
   end

data/lib/net/tofu/version.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
-module Tofu
-  VERSION = "0.1.0"
+module Net
+  module Tofu
+    VERSION = "0.1.1"
+  end
 end

data/lib/uri/gemini.rb

@@ -35,6 +35,9 @@ module URI # :nodoc:
     # A Default port of 1965 for URI::Gemini.
     DEFAULT_PORT = 1965
 
+    # A Default scheme of gemini for URI::Gemini.
+    DEFAULT_SCHEME = "gemini"
+
     # An Array of the available components for URI::Gemini.
     COMPONENT = %i[scheme host port
                    path query fragment].freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentofu
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rory Dudley
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-07-29 00:00:00.000000000 Z
 dependencies: []
 description: |2
       OpenTOFU is a client and certificate pinning library for Geminispace, derived from
@@ -39,7 +39,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/pinecat/opentofu
   source_code_uri: https://github.com/pinecat/opentofu
-  changelog_uri: https://github.com/pinecat/opentofu
+  changelog_uri: https://github.com/pinecat/opentofu/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: