Correctly handle structs

lib/nazar/formatter/active_record_collection.rb

@@ -16,7 +16,7 @@ def initialize(collection)
       end
 
       def self.valid?(data)
-        return false if data.is_a?(Struct) || (defined?(OpenStruct) && data.is_a?(OpenStruct))
+        return false if data.is_a?(::Struct) || (defined?(OpenStruct) && data.is_a?(OpenStruct))
 
         data.is_a?(ActiveRecord::Associations::CollectionProxy) ||
           data.is_a?(ActiveRecord::Relation) ||

lib/nazar/formatter/struct.rb

@@ -4,30 +4,37 @@ module Nazar
   module Formatter
     class Struct
       def initialize(item)
-        @collection = Array(item)
-        @attributes = item.to_h.keys
-        @item = item
+        @collection = item.is_a?(Array) ? item : [item]
+        @attributes = @collection.first.to_h.keys
       end
 
       def self.valid?(data)
+        valid_struct?(data) || (data.is_a?(Array) && data.all? { valid_struct?(_1) })
+      end
+
+      def self.valid_struct?(data)
         data.is_a?(::Struct) || data.is_a?(::OpenStruct)
       end
 
       def valid?
-        true
+        @attributes.any?
       end
 
       def headers
-        HeadersFormatter.new(attributes).format
+        HeadersFormatter.new(@attributes).format
       end
 
       def cells
         @cells ||= @collection.map do |item|
-          item.each_pair do |_, value|
+          item.to_h.values.map do |value|
             CellFormatter.new(value, type: nil).format
           end
         end
       end
+
+      def summary
+        false
+      end
     end
   end
 end

lib/nazar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nazar
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

spec/nazar/formatter/generic_spec.rb

@@ -5,7 +5,7 @@
 RSpec.describe Nazar::Formatter::Generic do
   subject { described_class.new(collection) }
 
-  let(:struct) { Struct.new(:name, :age) }
+  let(:struct) { ::Struct.new(:name, :age) }
 
   let(:john_hash) { { name: 'John', age: 18 } }
   let(:jane_hash) { { name: 'Jane', age: 25 } }

spec/nazar/view_spec.rb

@@ -64,7 +64,7 @@
     end
 
     context 'with Struct' do
-      let(:data) { Struct.new(:id, :name).new(1, 'foo') }
+      let(:data) { ::Struct.new(:id, :name).new(1, 'foo') }
 
       context 'without loaded extension' do
         it do
@@ -81,8 +81,26 @@
           unload_struct!
         end
 
-        it do
-          expect(subject).to be_supported_data
+        context 'with valid Struct' do
+          it do
+            expect(subject).to be_supported_data
+          end
+        end
+
+        context 'with valid OpenStruct' do
+          let(:data) { OpenStruct.new(id: 1, name: 'foo') }
+
+          it do
+            expect(subject).to be_supported_data
+          end
+        end
+
+        context 'with an empty OpenStruct' do
+          let(:data) { OpenStruct.new }
+
+          it do
+            expect(subject).not_to be_supported_data
+          end
         end
       end
     end