hyperdock 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3199bd98c6e433616b7f93f2ebc5cc563bf5245b
-  data.tar.gz: f7e9f3b3766168c5346644a12edd1ce113a8d2ad
+  metadata.gz: eadebb2c8c8687e53e78bcfea870323b5f439816
+  data.tar.gz: d7d9a58cac8f941cc409c62ebebc02800ee77be2
 SHA512:
-  metadata.gz: 0524fa9d17bd4795df39fc9f4c387b22bd0a5b9c92ea1a1261adf4cf405276199411313185b7cc10dc10d5ebd7802399a3ea0ef47bdedc7a2a0d044846f7c4b1
-  data.tar.gz: 39a028023a305107825a1106f62e4400aba42e1fcaf362d512e0f8e03a5814a67ec1ec82ea0af105f794d670b1cf16ad0088e9fb0ee0db85efd2ce8d20aa30bc
+  metadata.gz: 66fdfab3468bf520587f966e878eb10fd55c879a0508a312546c2067a2a2b6881fe562a0961379750191f67c68f372ca149d0d8458d937d175f7241e307833e0
+  data.tar.gz: c6b360a7e348a953efd79df830993152ebfb7384ca6eb42529ead6c4af994ab24a0aca5ea46dcf31e5dfe5bea6bf959646e3586cd0a806351c47ea2cf3e869f9

data/lib/hyperdock/resource/container.rb

@@ -19,32 +19,50 @@ module HyperDock
         false
       end
 
-      Contract None => ArrayOf[HashOf[RespondTo[:to_s], String]]
+      def attributes
+        @attributes ||= container.info
+      end
+
+      Contract None => Hash
       def networks
-        @networks ||= (container.info.dig('NetworkSettings', 'Networks') || {})
-                      .values
-                      .map { |network| network['NetworkID'] }
-                      .compact
-                      .map { |network| { href: "/network/#{network}" } }
+        @networks ||= attributes.dig('NetworkSettings', 'Networks') || {}
       end
 
+      Contract None => ArrayOf[Hash]
+      def network_links
+        @network_links ||= networks.flat_map do |name, network|
+          { name: name, href: "/network/#{network['NetworkID']}" }
+        end
+      end
+
+      Contract None => ArrayOf[Hash]
       def volumes
-        @volumes ||= container
-                     .info
-                     .fetch('Mounts') { [] }
-                     .map { |volume| { href: "/volume/#{volume.fetch('Name')}" } }
+        @volumes ||= attributes.fetch('Mounts') { [] }
+      end
+
+      Contract None => ArrayOf[Hash]
+      def volume_links
+        @volume_links ||= volumes.map do |volume|
+          { name: volume['Destination'], href: "/volume/#{volume['Name']}" }
+        end
+      end
+
+      def named_links
+        @named_links ||= [
+          network_links
+            .map { |network| { "network:#{network[:name]}" => network } },
+          volume_links
+            .map { |volume| { "volume:#{volume[:name]}" => volume } }
+        ].flatten.reduce(&:merge)
       end
 
+      Contract None => HashOf[RespondTo[:to_s], Or[Hash, ArrayOf[Hash]]]
       def links
         @links ||= {
-          networks: networks,
-          volumes: volumes,
+          networks: network_links,
+          volumes: volume_links,
           ports: { href: "/#{request.disp_path}/ports" }
-        }
-      end
-
-      def attributes
-        { info: container.info }
+        }.merge(named_links)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyperdock
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Chris Olstrom