hyperdock 0.17.2 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63871912a12abea8df840ea5747142414eb862bb
-  data.tar.gz: db21f72589316c54a6561faee46f38d4a5ee7397
+  metadata.gz: 7ec46235f6d4db465a60a6138f72e744a9d670c4
+  data.tar.gz: 03f86a66ba6899cc5f9a44efa2579939c09c61d0
 SHA512:
-  metadata.gz: 0273ce7bca9f7e48c82a28eec8a952e3a7f81ae5ef2d25cdce82cb519a5fb1b520872da40d6a76f54b312fd76c133336a6d80d7d8ee2170bb79954979f26007d
-  data.tar.gz: a70acebd9544318667c372436026b4f184de1cbc2247e4db518a2882327cfd5f92d57123ba61a433cba2290b2639dfc026f755462dbe1320b497d443aed64dd9
+  metadata.gz: 58621532d09f16fda798cca212beeb99f156c27103f4127b4e61b6deaa7cadbaa2391a4bcf6512deebf40aea97bf09f5745f9250bd75aeae21830709e496d162
+  data.tar.gz: 2acad595e0becd32c96c5b328e15819e811f973401d0cc0028c177eeb09b62c185caf552bf6898f5f973b2a3e80cf0424a952cd6a65e58ca0e3cf9d1c00b8901

data/bin/hyperdock-api

@@ -7,7 +7,6 @@ Webmachine.application.routes do
   add [], HyperDock::Resource::Root
   add ['projects'], HyperDock::Resource::Projects
   add ['project', :project], HyperDock::Resource::Project
-  add ['project', :project, 'services'], HyperDock::Resource::ProjectServices
   add ['project', :project, 'service', :service], HyperDock::Resource::ProjectService
   add ['containers'], HyperDock::Resource::Containers
   add ['container', :container], HyperDock::Resource::Container

data/lib/hyperdock/resource/project.rb

@@ -4,22 +4,52 @@ require_relative 'core'
 module HyperDock
   module Resource
     class Project < Core
-      Contract None => ArrayOf[String]
-      def projects
-        @projects ||= ::Docker::Container.all.map do |container|
-          container.info.dig 'Labels', 'com.docker.compose.project'
+      Contract None => String
+      def project
+        @project ||= request.path_info[:project]
+      end
+
+      Contract None => ArrayOf[::Docker::Container]
+      def containers
+        @containers ||= ::Docker::Container.all.select do |container|
+          container.info.dig('Labels', 'com.docker.compose.project') == project
         end
       end
 
       Contract None => Bool
       def resource_exists?
-        projects.include? request.path_info[:project]
+        !containers.empty?
+      end
+
+      Contract None => ArrayOf[String]
+      def services
+        @services ||= containers.map do |container|
+          container.info.dig('Labels', 'com.docker.compose.service')
+        end.uniq
+      end
+
+      Contract None => ArrayOf[Hash]
+      def service_links
+        @service_links ||= services.map do |service|
+          { name: service, href: "/project/#{project}/service/#{service}" }
+        end
+      end
+
+      Contract None => Hash
+      def named_links
+        @named_links ||= service_links.map do |service|
+          { "service:#{service[:name]}" => service }
+        end.reduce(&:merge)
       end
 
       def links
         @links ||= {
-          services: { href: "/#{request.disp_path}/services" }
-        }
+          services: service_links
+        }.merge(named_links)
+      end
+
+      def attributes
+        { names: services }
       end
     end
   end

data/lib/hyperdock/resource/project_service.rb

@@ -26,15 +26,32 @@ module HyperDock
       def containers
         @containers ||= ::Docker::Container.all.select do |container|
           matches_project?(container) && matches_service?(container)
-        end.map(&:id)
+        end
+      end
+
+      def container_links
+        @container_links ||= containers.flat_map do |container|
+          # TODO: Determine how this should be presented.
+          [container.info.fetch('Names').first].map do |name|
+            { name: name, href: "/container/#{container.id}" }
+          end
+        end
+      end
+
+      def named_links
+        @named_links ||= container_links.map do |container|
+          { "container:#{container[:name]}" => container }
+        end.reduce(&:merge)
       end
 
       def links
         @links ||= {
-          'containers' => containers.map do |container|
-            { href: "/container/#{container}" }
-          end
-        }
+          containers: container_links
+        }.merge(named_links)
+      end
+
+      def attributes
+        { name: service }
       end
     end
   end

data/lib/hyperdock/resources.rb

@@ -5,7 +5,6 @@ require_relative 'resource/networks'
 require_relative 'resource/network'
 require_relative 'resource/project'
 require_relative 'resource/project_service'
-require_relative 'resource/project_services'
 require_relative 'resource/projects'
 require_relative 'resource/root'
 require_relative 'resource/volumes'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperdock
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.1
 platform: ruby
 authors:
 - Chris Olstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rakuna
@@ -91,7 +91,6 @@ files:
 - lib/hyperdock/resource/networks.rb
 - lib/hyperdock/resource/project.rb
 - lib/hyperdock/resource/project_service.rb
-- lib/hyperdock/resource/project_services.rb
 - lib/hyperdock/resource/projects.rb
 - lib/hyperdock/resource/root.rb
 - lib/hyperdock/resource/volume.rb

data/lib/hyperdock/resource/project_services.rb

@@ -1,47 +0,0 @@
-require 'docker-api'
-require_relative 'core'
-
-module HyperDock
-  module Resource
-    class ProjectServices < Core
-      Contract None => String
-      def project
-        @project ||= request.path_info[:project]
-      end
-
-      Contract None => ArrayOf[::Docker::Container]
-      def containers
-        @containers ||= ::Docker::Container.all.select do |container|
-          container.info.dig('Labels', 'com.docker.compose.project') == project
-        end
-      end
-
-      Contract None => Bool
-      def resource_exists?
-        !containers.empty?
-      end
-
-      Contract None => ArrayOf[String]
-      def services
-        @services ||= containers.map do |container|
-          container.info.dig('Labels', 'com.docker.compose.service')
-        end.uniq
-      end
-
-      Contract None => HashOf[RespondTo[:to_s], Hash]
-      def links
-        @links ||= services.map do |service|
-          {
-            "service:#{service}" => {
-              href: "/project/#{project}/service/#{service}"
-            }
-          }
-        end.reduce(&:merge)
-      end
-
-      def attributes
-        { services: services }
-      end
-    end
-  end
-end