terminalwire 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7368802178d36d058c4502624e50e831358e6b4bc47bbb40a18a8837063443a7
-  data.tar.gz: eaeedd98707062d3a639250cb53e3dd619bcd3d63b1e2a6ee51d916edb5da9df
+  metadata.gz: 20d25d091ee29d5953cfc70935227461ed75ec3d52c5b4cbff96db9e4b30ea7a
+  data.tar.gz: 80325aea9d946a9050ab4d9a97003186aba8a826e04ccefa23783a6fcfeea4dc
 SHA512:
-  metadata.gz: e0fb8c62c74528e3de4701ebced6e3e794d973ca67eddfdc140a645e9ecc676ae994095a3d08b4da731f3c87bf258018818d55562325016b4f4eee6dd9f17a6f
-  data.tar.gz: d27e62fdcf8582293fb89395acd0e9e9282c616fbb8eb9b8592f95b1a931465011ab9d006b11afa23d1719e1c97e0a61b9ffcb74619aec03f3f1a2286b57e2b6
+  metadata.gz: cc79939e4328e469df0a13f5ec34ed0e99c5f7206712a8480916b55005b95fcf544de98884d33f306fcb16a02fa4868aa09f302087e3015c02c80d42c8429a75
+  data.tar.gz: 0e00b629b2ae76adddef05725f2f3fb8b1550e55b513fdd77317a978f2a416a0876af450ac47da4c0ee011fb8239623e37f7887bc0bd627ac2cb258b0779077a

data/lib/terminalwire/authority.rb

@@ -19,15 +19,10 @@ class Terminalwire::Authority
     if @url.port == @url.default_port
       @url.host
     else
-      "#{@url.host}:#{@url.port}"
+      "#{url.host}:#{url.port}"
     end
   end
 
-  # Useful for identifying the authority in UI without the protocol.
-  def name
-    [domain, path].join
-  end
-
   # Make sure there's always a / at the end of the path.
   def path
     path_keys.join(PATH_SEPERATOR).prepend(PATH_SEPERATOR)

data/lib/terminalwire/client/entitlement.rb

@@ -145,8 +145,7 @@ module Terminalwire::Client
       end
 
       def authority_path
-        # TODO: Change this so it's per endpoint and not domain
-        root_path.join("authorities/#{authority.domain}")
+        root_path.join("authorities/#{authority}")
       end
 
       def storage_path
@@ -159,7 +158,7 @@ module Terminalwire::Client
 
       def serialize
         {
-          authority: @authority.to_s,
+          authority: @authority,
           schemes: @schemes.serialize,
           paths: @paths.serialize,
           storage_path: storage_path.to_s,
@@ -204,13 +203,23 @@ module Terminalwire::Client
     end
 
     def self.from_url(url)
-      authority = Terminalwire::Authority.new(url:)
+      url = URI(url)
 
-      case authority.domain
+      case url.host
       when RootPolicy::HOST
-        RootPolicy.new authority:
+        RootPolicy.new
       else
-        Policy.new authority:
+        Policy.new authority: url_authority(url)
+      end
+    end
+
+    def self.url_authority(url)
+      # I had to lift this from URI::HTTP because `ws://` doesn't
+      # have an authority method.
+      if url.port == url.default_port
+        url.host
+      else
+        "#{url.host}:#{url.port}"
       end
     end
   end

data/lib/terminalwire/client.rb

@@ -53,6 +53,15 @@ module Terminalwire
       end
     end
 
+    # Extracted from HTTP. This is so we can
+    def self.authority(url)
+      if url.port == url.default_port
+        url.host
+      else
+        "#{url.host}:#{url.port}"
+      end
+    end
+
     def self.websocket(url:, arguments: ARGV, entitlement: nil)
       url = URI(url)
 

data/lib/terminalwire/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Terminalwire
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terminalwire
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Brad Gessler
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Ship a CLI for your web app. No API required.