hyperdock 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ece6869475b8063978c9ea067048e8cea3b07af8
-  data.tar.gz: a53ed407488432bea41bcaf47f81482523df94c6
+  metadata.gz: f18fab5f6544743ebaeb3a8061cc418a4a8030f8
+  data.tar.gz: ef7061d48ffc22d4dc49c3ed248b8f4862826c38
 SHA512:
-  metadata.gz: d0b6b9f5813a591456252fdd0f6c6a04e997f1d983e212fcd8a88cf8a973d44e989926c3749b71496852923564bbb95a2d9c321d7fd74803e9a6e4274a0e5fd4
-  data.tar.gz: cdb1bbad3acc14b62d78602656a194670d2803b852825c2321ad6ad3bcb6b850d30d1ebf979e39e4e1f617e2966b70789a8e2e7944e46e84c3fbbaec6131775f
+  metadata.gz: 7e59a04f4a7e159a11bcc1f62fb0272a7eb7616a90fb1885207449f64bdb526074af8b9784edcf87e089fdb01805fd5ae45a34f0d722e6af0a1d161d8fa5e960
+  data.tar.gz: 4fdaac1c7e388b62a708ba74fcdada742859e7de1fd1c996d75094a5617a028e271c68f1de799425c30a9abbcac7b983082207efcd47bdd7fa9a4292c85f9dca

data/bin/hyperdock-api

@@ -11,8 +11,8 @@ Webmachine.application.routes do
   add ['project', :project, 'service', :service], HyperDock::Resource::ProjectService
   add ['containers'], HyperDock::Resource::Containers
   add ['container', :container], HyperDock::Resource::Container
-  add ['container', :container, 'networks'], HyperDock::Resource::ContainerNetworks
   add ['container', :container, 'ports'], HyperDock::Resource::ContainerPorts
+  add ['networks'], HyperDock::Resource::Networks
 end
 
 Webmachine.application.run

data/lib/hyperdock/resource/container.rb

@@ -19,9 +19,18 @@ module HyperDock
         false
       end
 
+      Contract None => ArrayOf[HashOf[RespondTo[:to_s], String]]
+      def networks
+        @networks ||= (container.info.dig('NetworkSettings', 'Networks') || {})
+                      .values
+                      .map { |network| network['NetworkID'] }
+                      .compact
+                      .map { |network| { href: "/network/#{network}" } }
+      end
+
       def links
         @links ||= {
-          networks: { href: "/#{request.disp_path}/networks" },
+          networks: networks,
           ports: { href: "/#{request.disp_path}/ports" }
         }
       end

data/lib/hyperdock/resource/networks.rb

@@ -0,0 +1,22 @@
+require 'docker-api'
+require_relative 'core'
+
+module HyperDock
+  module Resource
+    class Networks < Core
+      def networks
+        @networks ||= ::Docker::Network.all.map(&:id)
+      end
+
+      def links
+        @links ||= networks.map do |network|
+          { "network:#{network}" => { href: "/network/#{network}" } }
+        end.reduce(&:merge)
+      end
+
+      def attributes
+        { networks: networks }
+      end
+    end
+  end
+end

data/lib/hyperdock/resource/root.rb

@@ -16,7 +16,8 @@ module HyperDock
           'project:services' => { href: '/project/{project}/services', templated: true },
           containers: { href: '/containers' },
           container: { href: '/container/{container}', templated: true },
-          'container:ports' => { href: '/container/{container}/ports', templated: true }
+          'container:ports' => { href: '/container/{container}/ports', templated: true },
+          networks: { href: '/networks' }
         }
       end
     end

data/lib/hyperdock/resources.rb

@@ -1,7 +1,7 @@
 require_relative 'resource/container'
-require_relative 'resource/container_networks'
 require_relative 'resource/container_ports'
 require_relative 'resource/containers'
+require_relative 'resource/networks'
 require_relative 'resource/project'
 require_relative 'resource/project_service'
 require_relative 'resource/project_services'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyperdock
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Chris Olstrom
@@ -83,10 +83,10 @@ files:
 - hyperdock.gemspec
 - lib/hyperdock.rb
 - lib/hyperdock/resource/container.rb
-- lib/hyperdock/resource/container_networks.rb
 - lib/hyperdock/resource/container_ports.rb
 - lib/hyperdock/resource/containers.rb
 - lib/hyperdock/resource/core.rb
+- lib/hyperdock/resource/networks.rb
 - lib/hyperdock/resource/project.rb
 - lib/hyperdock/resource/project_service.rb
 - lib/hyperdock/resource/project_services.rb

data/lib/hyperdock/resource/container_networks.rb

@@ -1,24 +0,0 @@
-require_relative 'container'
-
-module HyperDock
-  module Resource
-    class ContainerNetworks < Container
-      Contract None => ArrayOf[String]
-      def networks
-        @networks ||= (container.info.dig('NetworkSettings', 'Networks') || {} ).values.map do |network|
-          network['NetworkID']
-        end.compact
-      end
-
-      def links
-        @links ||= {
-          networks: networks.map { |network| { "network:#{network}" => "/network/#{network}" } }.reduce(&:merge)
-        }
-      end
-
-      def attributes
-        { networks: networks }
-      end
-    end
-  end
-end