Merge pull request #60 from aufziehvogel/30-complete-resources

add missing features to existing resources

Author: Stefan Koch

lib/hcloud.rb

@@ -12,6 +12,7 @@ module Hcloud
   autoload :TyphoeusExt, 'hcloud/typhoeus_ext'
   autoload :AbstractResource, 'hcloud/abstract_resource'
   autoload :EntryLoader, 'hcloud/entry_loader'
+  autoload :ResourceLoader, 'hcloud/resource_loader'
 
   autoload :Server, 'hcloud/server'
   autoload :ServerResource, 'hcloud/server_resource'

lib/hcloud/entry_loader.rb

@@ -223,49 +223,17 @@ def _update_attribute(key, value)
       instance_variable_set("@#{key}", value)
     end
 
-    # rubocop: disable  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength, Metrics/AbcSize
     def _load(resource)
       return if resource.nil?
 
       @_attributes = {}.with_indifferent_access
 
-      resource.each do |key, value|
-        definition = self.class.schema[key]
-
-        if definition == :time
-          _update_attribute(key, value ? Time.parse(value) : nil)
-          next
-        end
-
-        if definition.is_a?(Class) && definition.include?(EntryLoader)
-          _update_attribute(key, value ? definition.new(client, value) : nil)
-          next
-        end
-
-        # if schema definition is [Class]
-        if definition.is_a?(Array) && definition.first.include?(EntryLoader)
-
-          # just set attribute to an empty array if value is no array or empty
-          if !value.is_a?(Array) || value.empty?
-            _update_attribute(key, [])
-            next
-          end
-
-          if value.first.is_a?(Integer)
-            # If value is an integer, this is the id of an object which's class can be
-            # retreived from definition. Load a future object that can on access retreive the
-            # data from the api and convert it to a proper object.
-            _update_attribute(key, value.map { |id| Future.new(client, definition.first, id) })
-          else
-            # Otherwise the value *is* the content of the object
-            _update_attribute(key, value.map { |item| definition.first.new(client, item) })
-          end
-          next
-        end
+      loader = Hcloud::ResourceLoader.new(self.class.schema, client: client)
+      loaded_data = loader.load(resource)
 
+      loaded_data.each do |key, value|
         _update_attribute(key, value.is_a?(Hash) ? value.with_indifferent_access : value)
       end
     end
-    # rubocop: enable  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength, Metrics/AbcSize
   end
 end

lib/hcloud/floating_ip.rb

@@ -12,7 +12,7 @@ class FloatingIP
     )
 
     protectable :delete
-    updatable :description
+    updatable :name, :description
     destructible
 
     has_actions

lib/hcloud/floating_ip_resource.rb

@@ -13,7 +13,7 @@ def [](arg)
       end
     end
 
-    def create(type:, server: nil, home_location: nil, description: nil, labels: {})
+    def create(type:, name: nil, server: nil, home_location: nil, description: nil, labels: {})
       raise Hcloud::Error::InvalidInput, 'no type given' if type.blank?
       if server.nil? && home_location.nil?
         raise Hcloud::Error::InvalidInput, 'either server or home_location must be given'

lib/hcloud/future.rb

@@ -4,10 +4,13 @@
 
 module Hcloud
   class Future < Delegator
+    attr_reader :raw_data
+
     # rubocop: disable Lint/MissingSuper
-    def initialize(client, target_class, id)
+    def initialize(client, target_class, id, raw_data: nil)
       @target_class = target_class
       @id = id
+      @raw_data = raw_data
       @__client = client
     end
     # rubocop: enable Lint/MissingSuper

lib/hcloud/image.rb

@@ -15,6 +15,8 @@ class Image
     updatable :description, :type
     destructible
 
+    has_actions
+
     def to_snapshot
       update(type: 'snapshot')
     end

lib/hcloud/image_resource.rb

@@ -2,7 +2,7 @@
 
 module Hcloud
   class ImageResource < AbstractResource
-    filter_attributes :type, :bound_to, :name, :label_selector
+    filter_attributes :type, :bound_to, :name, :label_selector, :status, :include_deprecated
 
     bind_to Image
 

lib/hcloud/network.rb

@@ -40,5 +40,11 @@ def del_route(destination:, gateway:)
 
       prepare_request('actions/delete_route', j: COLLECT_ARGS.call(__method__, binding))
     end
+
+    def change_ip_range(ip_range:)
+      raise Hcloud::Error::InvalidInput, 'no ip_range given' if ip_range.blank?
+
+      prepare_request('actions/change_ip_range', j: COLLECT_ARGS.call(__method__, binding))
+    end
   end
 end

lib/hcloud/placement_group_resource.rb

@@ -2,7 +2,7 @@
 
 module Hcloud
   class PlacementGroupResource < AbstractResource
-    filter_attributes :type, :name
+    filter_attributes :type, :name, :label_selector
 
     bind_to PlacementGroup
 

lib/hcloud/resource_loader.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'time'
+
+module Hcloud
+  class ResourceLoader
+    def initialize(schema, client:)
+      @schema = schema
+      @client = client
+    end
+
+    def load(data)
+      load_with_schema(@schema, data)
+    end
+
+    private
+
+    def load_with_schema(schema, data)
+      if schema.respond_to?(:call)
+        schema.call(data, @client)
+      elsif schema.is_a?(Array) && schema.count.positive? && data.is_a?(Array)
+        load_array(schema, data)
+      elsif schema.is_a?(Hash) && data.is_a?(Hash)
+        load_hash(schema, data)
+      else
+        load_single_item(schema, data)
+      end
+    end
+
+    def load_array(schema, data)
+      data.map do |item|
+        load_with_schema(schema[0], item)
+      end
+    end
+
+    def load_hash(schema, data)
+      data.map do |key, value|
+        [key, load_with_schema(schema[key], value)]
+      end.to_h
+    end
+
+    def load_single_item(definition, value)
+      if definition == :time
+        return value ? Time.parse(value) : nil
+      end
+
+      if definition.is_a?(Class) && definition.include?(EntryLoader)
+        return if value.nil?
+
+        # If value is an integer, this is the id of an object which's class can be
+        # retreived from definition. Load a future object that can on access retreive the
+        # data from the api and convert it to a proper object.
+        return Future.new(@client, definition, value) if value.is_a?(Integer)
+
+        # Otherwise the value *is* the content of the object
+        return definition.new(@client, value)
+      end
+
+      value
+    end
+  end
+end