radfish 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d6c54aeb9655a43ed2fddc650f5ad6ab7042ee36c6e28977b080033a7d66ad8
-  data.tar.gz: bd313932fe76b381a63d9b6ef1e8d91129cd61666ba0739c9629c45f3f198589
+  metadata.gz: 6da783b12d9a90873743161fff969aae700800a544b1223f488e9828964b3a97
+  data.tar.gz: f42f9b1ae0ffbf3d50ad13732895b82472839133ece168b1cfb06b015f1d07a7
 SHA512:
-  metadata.gz: 759f93847d982760321fd989f0aa3931f01602371b2485d276c8a57b623d210a47c2b791911e7d850e87360ae7d1f57b6ba697d06065a1377b73c977638ae3ae
-  data.tar.gz: 792d117f69fb50fe9c6f62ca271edadd7886e901d958e372ea052e55d4b38d4987bb4060f4e28336e67221a1df8dfb8b9885680cf1f85ecdad6722d6e07b508b
+  metadata.gz: 0edb45f482cd15f8d389064273572d158f195500c613f99a652b713438c16715703de07130f8421dd6e2d6b7d1b2a7df4eb066d1aa0d6625cfa2e2827572bc9b
+  data.tar.gz: f0ba4c5e3c0d07e0f06df7f2b15a56dc99b9349d537e71c3c48037bf1d757aae773ac1d5b5df671a6398656cb12a2b0d000a6d923876c8f37d5f5f74c1f4c14a

data/lib/radfish/client.rb

@@ -188,18 +188,31 @@ module Radfish
     private
 
     def build_controller(raw)
-      # Only extract friendly name/id if plainly available; keep raw in adapter_data
-      id = if raw.respond_to?(:[])
-             raw['id'] || raw[:id]
-           elsif raw.respond_to?(:id)
-             raw.id
-           end
-      name = if raw.respond_to?(:[])
-               raw['name'] || raw[:name]
-             elsif raw.respond_to?(:name)
-               raw.name
-             end
-      Controller.new(client: self, id: id, name: name, vendor: @vendor, adapter_data: raw)
+      # Expect adapters to provide normalized fields; keep mapping straightforward.
+      fetch = ->(key) do
+        if raw.respond_to?(:[])
+          raw[key.to_s] || raw[key.to_sym]
+        elsif raw.respond_to?(key.to_sym)
+          raw.public_send(key.to_sym)
+        end
+      end
+
+      Controller.new(
+        client: self,
+        id: fetch.call(:id),
+        name: fetch.call(:name),
+        model: fetch.call(:model),
+        firmware_version: fetch.call(:firmware_version),
+        encryption_mode: fetch.call(:encryption_mode),
+        encryption_capability: fetch.call(:encryption_capability),
+        controller_type: fetch.call(:controller_type),
+        pci_slot: fetch.call(:pci_slot),
+        status: fetch.call(:status),
+        drives_count: fetch.call(:drives_count),
+        battery_status: fetch.call(:battery_status),
+        vendor: @vendor,
+        adapter_data: raw
+      )
     end
   end
 end

data/lib/radfish/controller.rb

@@ -4,14 +4,28 @@ module Radfish
   # Lightweight value object representing a storage controller.
   # Holds a stable identifier and optional name.
   class Controller
-    attr_reader :id, :name, :vendor, :adapter_data
+    attr_reader :id, :name, :model, :vendor, :adapter_data, :firmware_version,
+                :encryption_mode, :encryption_capability, :controller_type,
+                :pci_slot, :status, :drives_count, :battery_status
 
-    def initialize(client:, id:, name: nil, vendor: nil, adapter_data: nil)
+    def initialize(client:, id:, name: nil, model: nil, vendor: nil, adapter_data: nil,
+                   firmware_version: nil, encryption_mode: nil, encryption_capability: nil,
+                   controller_type: nil, pci_slot: nil, status: nil, drives_count: nil,
+                   battery_status: nil)
       @client = client
       @id = id
       @name = name
+      @model = model
       @vendor = vendor
       @adapter_data = adapter_data
+      @firmware_version = firmware_version
+      @encryption_mode = encryption_mode
+      @encryption_capability = encryption_capability
+      @controller_type = controller_type
+      @pci_slot = pci_slot
+      @status = status
+      @drives_count = drives_count
+      @battery_status = battery_status
     end
 
     # Convenience accessors delegate to the client wrappers
@@ -24,11 +38,25 @@ module Radfish
     end
 
     def to_h
-      { id: id, name: name, vendor: vendor }
+      {
+        id: id,
+        name: name,
+        model: model,
+        vendor: vendor,
+        firmware_version: firmware_version,
+        encryption_mode: encryption_mode,
+        encryption_capability: encryption_capability,
+        controller_type: controller_type,
+        pci_slot: pci_slot,
+        status: status,
+        drives_count: drives_count,
+        battery_status: battery_status
+      }.compact
     end
 
     def ==(other)
       other.is_a?(Controller) && other.id == id && other.vendor.to_s == vendor.to_s
     end
+
   end
 end

data/lib/radfish/core/storage.rb

@@ -18,6 +18,7 @@ module Radfish
       def storage_summary
         raise NotImplementedError, "Adapter must implement #storage_summary"
       end
+
     end
   end
 end

data/lib/radfish/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Radfish
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radfish
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Jonathan Siegel