Refactor attributes and to_row

We should be using the superclass version of these rather than repeating
the same reference repeatedly.

Since `Api#attributes` returns an `IndifferentAccessHash` which the
`hirb` table code fails with, it is better to use `#merge` to assemble
the table `#to_row` contents.

Author: tokengeek

lib/brightbox-cli/accounts.rb

@@ -13,7 +13,11 @@ def lb_limit
     end
 
     def to_row
-      attributes.merge(:ram_free => ram_free, :cloud_ip_limit => cloud_ip_limit, :lb_limit => lb_limit)
+      attributes.to_h.merge(
+        :ram_free => ram_free,
+        :cloud_ip_limit => cloud_ip_limit,
+        :lb_limit => lb_limit
+      )
     end
 
     def self.all

lib/brightbox-cli/api.rb

@@ -72,6 +72,10 @@ def exists?
       false
     end
 
+    def to_row
+      attributes.to_h
+    end
+
     def to_s
       @id
     end
@@ -175,7 +179,7 @@ def self.cached_get(id)
       if value
         value
       else
-        Brightbox.config.cache_id id
+        Brightbox.config.cache_id id if Brightbox.config.respond_to?(:cache_id)
         @cache[id] = get(id)
       end
     end

lib/brightbox-cli/cloud_ips.rb

@@ -33,15 +33,15 @@ def self.format_translators_for_api(translators)
     end
 
     def attributes
-      a = fog_model.attributes
-      a[:destination] = destination_id
-      a
+      fog_attributes.tap do |attrs|
+        attrs[:destination] = destination_id
+      end
     end
 
     def to_row
-      o = attributes
-      o[:port_translators] = translators(o)
-      o
+      attributes.merge(
+        port_translators: translators(attributes),
+      ).to_h
     end
 
     def mapped?

lib/brightbox-cli/collaboration.rb

@@ -31,14 +31,10 @@ def to_s
 
     attr_reader :id
 
-    def attributes
-      fog_model.attributes
-    end
-
     def to_row
-      row_attributes = attributes
-      row_attributes[:name] = invitee_name
-      row_attributes
+      attributes.merge(
+        name: invitee_name
+      ).to_h
     end
 
     def invitee_name

lib/brightbox-cli/database_server.rb

@@ -70,34 +70,34 @@ def self.detailed_fields
     end
 
     def type_identifier
-      return unless fog_model.attributes.key?("database_server_type")
+      return unless fog_attributes.key?("database_server_type")
 
-      fog_model.attributes["database_server_type"]["id"]
+      fog_attributes["database_server_type"]["id"]
     end
 
     def zone_handle
-      return unless fog_model.attributes.key?("zone")
+      return unless fog_attributes.key?("zone")
 
-      fog_model.attributes["zone"]["handle"]
+      fog_attributes["zone"]["handle"]
     end
 
     def to_row
-      a = fog_model.attributes
-      a[:status] = fog_model.state
-      a[:locked] = locked?
-      a[:type] = type_identifier
-      a[:db_engine] = engine_version
-      a[:engine] = database_engine
-      a[:version] = database_version
-      a[:maintenance_weekday] = maintenance_weekday
-      a[:maintenance_hour] = maintenance_hour
-      a[:maintenance_window] = maintenance_window
-      a[:zone] = zone_handle
-      a[:created_on] = created_on
-      a[:allow_access] = allow_access
-      a[:cloud_ip_ids] = cloud_ip_ids
-      a[:cloud_ips] = cloud_ip_addresses
-      a
+      attributes.merge(
+        status: fog_model.state,
+        locked: locked?,
+        type: type_identifier,
+        db_engine: engine_version,
+        engine: database_engine,
+        version: database_version,
+        maintenance_weekday: maintenance_weekday,
+        maintenance_hour: maintenance_hour,
+        maintenance_window: maintenance_window,
+        zone: zone_handle,
+        created_on: created_on,
+        allow_access: allow_access,
+        cloud_ip_ids: cloud_ip_ids,
+        cloud_ips: cloud_ip_addresses
+      )
     end
 
     def engine_version

lib/brightbox-cli/database_snapshot.rb

@@ -27,11 +27,11 @@ def self.default_field_order
     end
 
     def to_row
-      a = fog_model.attributes
-      a[:status] = fog_model.state
-      a[:locked] = locked?
-      a[:created_on] = fog_model.created_at.strftime("%Y-%m-%d")
-      a
+      fog_attributes.merge(
+        status: fog_model.state,
+        locked: locked?,
+        created_on: fog_model.created_at.strftime("%Y-%m-%d")
+      )
     end
   end
 end

lib/brightbox-cli/database_type.rb

@@ -3,10 +3,10 @@ class DatabaseType < Api
     def self.require_account?; true; end
 
     def attributes
-      o = fog_model.attributes
-      o[:ram] = ram
-      o[:disk] = disk
-      o
+      fog_attributes.tap do |attrs|
+        attrs[:ram] = ram
+        attrs[:disk] = disk
+      end
     end
 
     def ram
@@ -17,10 +17,6 @@ def disk
       fog_model.disk.to_i
     end
 
-    def to_row
-      attributes
-    end
-
     def self.all
       conn.database_types
     end

lib/brightbox-cli/detailed_server.rb

@@ -1,40 +1,38 @@
 module Brightbox
   class DetailedServer < Server
     def to_row
-      row_attributes = attributes
+      attributes.tap do |attrs|
+        attrs[:compatibility_mode] = attrs["compatibility_mode"]
 
-      row_attributes[:compatibility_mode] = row_attributes["compatibility_mode"]
-
-      if server_type
-        row_attributes[:type] = server_type["id"]
-        row_attributes[:type_handle] = server_type["handle"]
-        row_attributes[:type_name] = server_type["name"]
-        row_attributes[:ram] = server_type["ram"]
-        row_attributes[:cores] = server_type["cores"]
-        row_attributes[:disk] = server_type["disk_size"].to_i
-      end
-
-      if image
-        row_attributes[:image_name] = image.name
-        row_attributes[:arch] = image.arch
-        row_attributes[:image_username] = image.username
-      end
+        if server_type
+          attrs[:type] = server_type["id"]
+          attrs[:type_handle] = server_type["handle"]
+          attrs[:type_name] = server_type["name"]
+          attrs[:ram] = server_type["ram"]
+          attrs[:cores] = server_type["cores"]
+          attrs[:disk] = server_type["disk_size"].to_i
+        end
 
-      row_attributes[:private_ips] = interfaces.map { |i| i["ipv4_address"] }.join(", ")
-      row_attributes[:ipv6_address] = interfaces.map { |i| i["ipv6_address"] }.join(", ")
+        if image
+          attrs[:image_name] = image.name
+          attrs[:arch] = image.arch
+          attrs[:image_username] = image.username
+        end
 
-      row_attributes[:cloud_ip_ids] = cloud_ips.map { |i| i["id"] }.join(", ")
-      row_attributes[:cloud_ipv4s] = cloud_ips.map { |i| i["public_ipv4"] }.join(", ")
-      row_attributes[:cloud_ipv6s] = cloud_ips.map { |i| i["public_ipv6"] }.join(", ")
-      row_attributes[:snapshots] = snapshots.map { |i| i["id"] }.join(", ")
+        attrs[:private_ips] = interfaces.map { |i| i["ipv4_address"] }.join(", ")
+        attrs[:ipv6_address] = interfaces.map { |i| i["ipv6_address"] }.join(", ")
 
-      if server_groups
-        row_attributes[:server_groups] = server_groups.map { |sg| sg["id"] }.join(", ")
-      end
+        attrs[:cloud_ip_ids] = cloud_ips.map { |i| i["id"] }.join(", ")
+        attrs[:cloud_ipv4s] = cloud_ips.map { |i| i["public_ipv4"] }.join(", ")
+        attrs[:cloud_ipv6s] = cloud_ips.map { |i| i["public_ipv6"] }.join(", ")
+        attrs[:snapshots] = snapshots.map { |i| i["id"] }.join(", ")
 
-      row_attributes[:volumes] = volume_ids if volumes
+        if server_groups
+          attrs[:server_groups] = server_groups.map { |sg| sg["id"] }.join(", ")
+        end
 
-      row_attributes
+        attrs[:volumes] = volume_ids if volumes
+      end.to_h
     end
 
     def volume_ids

lib/brightbox-cli/detailed_server_group.rb

@@ -1,9 +1,9 @@
 module Brightbox
   class DetailedServerGroup < ServerGroup
     def to_row
-      row_attributes = super
+      row_attributes = attributes
       row_attributes[:firewall_policy] = firewall_policy && firewall_policy.id
-      row_attributes
+      row_attributes.to_h
     end
 
     def self.default_field_order

lib/brightbox-cli/firewall_policy.rb

@@ -15,15 +15,11 @@ def self.all
     end
 
     def attributes
-      t = fog_model.attributes
-      t[:name] = name
-      t[:description] = description
-      t[:server_group] = server_group_id
-      t
-    end
-
-    def to_row
-      attributes
+      fog_attributes.tap do |attrs|
+        attrs[:name] = name
+        attrs[:description] = description
+        attrs[:server_group] = server_group_id
+      end
     end
 
     def self.default_field_order