nazar 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2689adb3080ba628ef27ab5ce71804352ccb02b2a90dbf363a50373210f7b2bd
-  data.tar.gz: e8a4f1954eb5d67a62e1f54d4a9983f7d2cb034903bd24d5a7d2dfed626d0808
+  metadata.gz: 0d6d959973fd00cf0d233b01f69c7cd4bbd08889bc2251427ab855d24e13ce42
+  data.tar.gz: 233302d7d8b97a7299763c8f3ef70bb7182f34094f22033cc22a0781fa08379b
 SHA512:
-  metadata.gz: ee1752541ac4356428bce4298bb5a6ff011b83943784ed0727adeec0c82b9763465944324dd8672d5cfb27e0a28e05e44f2dc796a9a28d5459086804b5c1a7c4
-  data.tar.gz: 7eb125d122b3c424251eb6ef76554d5737d24509659d12c1414cab0ad48fb59f790b63a0c8cf264273b10f3786efb7b1397db2549a3ef4dc8af6963ef4e7e62c
+  metadata.gz: ab38635347ebc90e8439b8a59af77b52c38f90a73a58dfd347506e6b2c1c923b4e0a8f890bad5de1d1554eb9612871b14577bc26ca264dd36db3b391b645841b
+  data.tar.gz: 0b0f71f05886d5b65728ab935c0ae3bbcce5ee3411e4eeadb7639e30ec0133a3c6e023127ca6b981ee075db1a60819c2a9f2cf9ea78c2174c6dd86fd021abbc8

data/.rubocop.yml

@@ -6,6 +6,8 @@ Style/SymbolArray:
   EnforcedStyle: brackets
 Style/WordArray:
   EnforcedStyle: brackets
+Style/OpenStructUse:
+  Enabled: false
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*_spec.rb'
@@ -15,3 +17,5 @@ Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
 Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
+Gemspec/DevelopmentDependencies:
+  Enabled: false

data/README.md

@@ -240,9 +240,10 @@ You can also configure behaviour of Nazar:
 | `Nazar.config.formatter.layout` | `:auto` | Determines which layout should be used. See <a href="#layouts">Layouts</a> for more details |
 | `Nazar.config.formatter.paginate` | `true` | Determines if results too long/wide should be printed directly, or paginated with `less`. Horizontal layout is always paginated.
 | `Nazar.config.formatter.boolean` | ['✓', '✗'] | First item in array is a character for `true`, second for `false` |
-| `Nazar.config.formatter.resize`  | `true` | Determines if the table should always be resized to take full width |
 | `Nazar.config.enable_shorthand_method` | true | Determines if shorthand method should be defined. See <a href="#opt-in-setup">Opt-in setup</a> for more details |
-
+| `Nazar.config.table.resize`  | `true` | Determines if the table should always be resized to take full width |
+| `Nazar.config.table.min_width`  | `nil` | Sets minimum width. By default uses the longest header length |
+| `Nazar.config.table.max_width`  | `nil` | Determines maximum table width. If `resize` is set to true, uses terminal width by default, otherwise uses content length |
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/krzyzak/nazar.

data/lib/nazar/base_table.rb

@@ -25,7 +25,7 @@ module Nazar
     end
 
     def resize
-      Nazar.config.formatter.resize
+      Nazar.config.table.resize
     end
 
     def summary_row(value)

data/lib/nazar/formatter/active_record_collection.rb

@@ -16,6 +16,8 @@ module Nazar
       end
 
       def self.valid?(data)
+        return false if data.is_a?(Struct) || (defined?(OpenStruct) && data.is_a?(OpenStruct))
+
         data.is_a?(ActiveRecord::Associations::CollectionProxy) ||
           data.is_a?(ActiveRecord::Relation) ||
           (data.is_a?(Enumerable) && data.first.is_a?(ActiveRecord::Base))

data/lib/nazar/formatter/generic.rb

@@ -27,10 +27,10 @@ module Nazar
       end
 
       def self.valid?(data)
-        item = data&.first
-        compatible = item.respond_to?(:keys) && item.respond_to?(:values)
+        return false unless data.is_a?(Enumerable)
 
-        data.is_a?(Enumerable) && (item.is_a?(Struct) || compatible)
+        item = data&.first
+        item.respond_to?(:keys) && item.respond_to?(:values)
       end
 
       def valid?

data/lib/nazar/formatter/struct.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Nazar
+  module Formatter
+    class Struct
+      def initialize(item)
+        @collection = Array(item)
+        @attributes = item.to_h.keys
+        @item = item
+      end
+
+      def self.valid?(data)
+        data.is_a?(::Struct) || data.is_a?(::OpenStruct)
+      end
+
+      def valid?
+        true
+      end
+
+      def headers
+        HeadersFormatter.new(attributes).format
+      end
+
+      def cells
+        @cells ||= @collection.map do |item|
+          item.each_pair do |_, value|
+            CellFormatter.new(value, type: nil).format
+          end
+        end
+      end
+    end
+  end
+end

data/lib/nazar/horizontal_table.rb

@@ -3,7 +3,7 @@
 module Nazar
   class HorizontalTable < BaseTable
     def render
-      table.render(:unicode, border: { separator: :each_row }, multiline: true, resize: resize)
+      table.render(:unicode, options)
     end
 
     private
@@ -11,5 +11,11 @@ module Nazar
     def summary_row(value)
       super.fill(nil, 3, table.columns_size - 3)
     end
+
+    def options
+      { border: { separator: :each_row }, multiline: true, resize: resize }.tap do |hash|
+        hash[:width] = Nazar.config.table.max_width if Nazar.config.table.max_width
+      end
+    end
   end
 end

data/lib/nazar/version.rb

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

data/lib/nazar/vertical_table.rb

@@ -23,7 +23,7 @@ module Nazar
     end
 
     def render
-      table.render_with(VerticalBorder, multiline: true, resize: resize) do |renderer|
+      table.render_with(VerticalBorder, options) do |renderer|
         renderer.border.style = :green if Nazar.config.colors.enabled
         renderer.border.separator = separators_around_each_item
       end
@@ -37,6 +37,15 @@ module Nazar
       @table ||= TTY::Table.new(rows: cells)
     end
 
+    def options
+      {
+        multiline: true,
+        resize: resize,
+        column_widths: column_widths,
+        width: max_width
+      }
+    end
+
     def cells
       @cells.flat_map do |cell|
         cell.map.with_index do |item, index|
@@ -50,5 +59,43 @@ module Nazar
         (i % headers.size).zero? || ((i + 1) % headers.size).zero?
       end
     end
+
+    def column_widths
+      [headers_width, values_width]
+    end
+
+    def max_width
+      Nazar.config.table.max_width || default_width
+    end
+
+    def default_width
+      Nazar.config.table.resize ? TTY::Screen.width : natural_width + padding
+    end
+
+    def natural_width
+      content_size = headers_width + content_width
+
+      [content_size, TTY::Screen.width].min
+    end
+
+    def content_width
+      cells.flatten.map(&:size).max
+    end
+
+    def headers_width
+      [headers.map(&:size).max + 1, Nazar.config.table.min_width].compact.min
+    end
+
+    def values_width
+      if Nazar.config.table.resize
+        TTY::Screen.width - headers_width
+      else
+        [content_width, TTY::Screen.width - headers_width].min
+      end
+    end
+
+    def padding
+      3
+    end
   end
 end

data/lib/nazar.rb

@@ -24,7 +24,12 @@ module Nazar # rubocop:disable Metrics/ModuleLength
     setting :boolean, default: ['✓', '✗']
     setting :layout, default: :auto
     setting :paginate, default: true
+  end
+
+  setting :table do
     setting :resize, default: true
+    setting :min_width, default: nil
+    setting :max_width, default: nil
   end
 
   setting :colors do
@@ -33,12 +38,12 @@ module Nazar # rubocop:disable Metrics/ModuleLength
 
   setting :enable_shorthand_method, default: true
 
-  class << self
+  class << self # rubocop:disable Metrics/ClassLength
     def formatters
       @formatters ||= Set.new
     end
 
-    def enable!(extensions: [:active_record, :csv])
+    def enable!(extensions: [:active_record, :csv, :struct])
       return if @enabled
 
       load_extensions!(extensions)
@@ -62,6 +67,12 @@ module Nazar # rubocop:disable Metrics/ModuleLength
       register_formatter!('CSVTable', 'nazar/formatter/csv_table')
     end
 
+    def load_struct!
+      require 'ostruct'
+
+      register_formatter!('Struct', 'nazar/formatter/struct')
+    end
+
     def load_active_record!
       require 'active_record'
 
@@ -108,6 +119,7 @@ module Nazar # rubocop:disable Metrics/ModuleLength
     def load_extensions!(extensions)
       load_active_record! if extensions.include?(:active_record)
       load_csv! if extensions.include?(:csv)
+      load_struct! if extensions.include?(:struct)
       load_sequel! if extensions.include?(:sequel)
     end
 

data/nazar.gemspec

@@ -25,9 +25,6 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.cert_chain  = ['certs/krzyzak.pem']
-  spec.signing_key = File.expand_path('~/.ssh/gem-private_key.pem') if $PROGRAM_NAME =~ /gem\z/
-
   spec.add_development_dependency 'activerecord', '>= 3.0', '< 6.2'
   spec.add_development_dependency 'rubocop', '~> 1.21'
   spec.add_development_dependency 'sequel', '~> 5.0'

metadata

@@ -1,42 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nazar
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Michał Krzyżanowski
 autorequire:
 bindir: exe
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEgjCCAuqgAwIBAgIBATANBgkqhkiG9w0BAQsFADA1MTMwMQYDVQQDDCptaWNo
-  YWwua3J6eXphbm93c2tpX2dpdGh1Yi9EQz1nbWFpbC9EQz1jb20wHhcNMjIwOTE5
-  MTQwNDQyWhcNMjMwOTE5MTQwNDQyWjA1MTMwMQYDVQQDDCptaWNoYWwua3J6eXph
-  bm93c2tpX2dpdGh1Yi9EQz1nbWFpbC9EQz1jb20wggGiMA0GCSqGSIb3DQEBAQUA
-  A4IBjwAwggGKAoIBgQC22POIs4KtFipZ5W1nYbBu2iUck//fJrhyssXVxnljkZr/
-  8P6/BH9SiWmyatDQ+LiYug72olUoMQ2wRoZzEn58ZllZlHfPJSQ5QnIjKjITWHJt
-  iBi/ou31T0/OU7KVnPzryMKBL9smbxhwRbBrQlT8nV5rfHXCrpvGdOElM3EvNWwR
-  HM7Klal/3zlr3q/X3BZQvOp8R8hmR6OYtgNrYclS6IkvqKpcD9Y3q8K4Snz6RZ3o
-  DGp0QW28cF5m6CJ+N7KpQkASPuFFMAjnqyhE6r5VsklxR7I083UI1JLVOq/+s6Yt
-  kbCBqscI55BwcYakszStNqJXiqrEOqUEdcg5tkzc0PFC+ZEzWbMU1RTox17N1pwG
-  VGtdE/3OxK2A/hm6GM/sFPR2ig7wRSBs6AI9bwbv259RzHvm4wr1yQDAQzuNWeyZ
-  Wd3/SkNDN3nEF9mTEF1pyRC4UO2+tvQc5YOoW66a6W/gNyhGQk4QFT39Pt1Mq/VX
-  Ec8+0b1uEAKvD+z9xPcCAwEAAaOBnDCBmTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-  sDAdBgNVHQ4EFgQUSu4g81ThKkq44UAqzDkZQAEi4eUwLwYDVR0RBCgwJoEkbWlj
-  aGFsLmtyenl6YW5vd3NraStnaXRodWJAZ21haWwuY29tMC8GA1UdEgQoMCaBJG1p
-  Y2hhbC5rcnp5emFub3dza2krZ2l0aHViQGdtYWlsLmNvbTANBgkqhkiG9w0BAQsF
-  AAOCAYEAfmM8QzJAfeZkmHonfleoiIIFNSeG84wK/MWBGKr0VMIalhNHpR6DQbao
-  5kAQh7PMWjPr0n3ZHUT4QU7lqp1/eiErEXtKAExnxRefzWSHNm0WjXT/dIyFUbYQ
-  rRnKtabxRNWtRIrK3GecPBDtAVTRtYQQkCaSwbwE37sHJhntS/Dvnl8pw2THq7ef
-  XbhPDcqmP+yWRCszn9Hzda19+8VA6Sn+fIwevXMUgvb3VHqLYcIO2amHtnCeM8Q5
-  caYBi+Tx9EDFh04EE4rbUGX25RcLO43j3ShLLqfW6QHFUtJIKS7WhgBVoEGvNA35
-  2KAZEiV7+ByRFKndeJmFtom0GMNBYPQW4l96aCrQJZyVhWSWGQZornxbH+hylJEp
-  on5yD3vJbVQXzwm0Z4I1IH5xc4YbEepCQRK6u/cT6NuiQqbqeW82BxjXMPu4HVBy
-  WXVb638bzH4OYBIYuGcw50jqBK1SyDx4exzThr6KxSiGwhAKj2xFqy51MIQjfUN0
-  TL5B7Buq
-  -----END CERTIFICATE-----
-date: 2022-10-12 00:00:00.000000000 Z
+cert_chain: []
+date: 2024-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -201,7 +173,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- certs/krzyzak.pem
 - lib/nazar.rb
 - lib/nazar/base_table.rb
 - lib/nazar/cell_formatter.rb
@@ -214,6 +185,7 @@ files:
 - lib/nazar/formatter/sequel_collection.rb
 - lib/nazar/formatter/sequel_interface.rb
 - lib/nazar/formatter/sequel_item.rb
+- lib/nazar/formatter/struct.rb
 - lib/nazar/headers_formatter.rb
 - lib/nazar/horizontal_table.rb
 - lib/nazar/renderer.rb
@@ -242,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Nazar is a tool that enhances default IRB/Pry inspect output

data/certs/krzyzak.pem

@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEgjCCAuqgAwIBAgIBATANBgkqhkiG9w0BAQsFADA1MTMwMQYDVQQDDCptaWNo
-YWwua3J6eXphbm93c2tpX2dpdGh1Yi9EQz1nbWFpbC9EQz1jb20wHhcNMjIwOTE5
-MTQwNDQyWhcNMjMwOTE5MTQwNDQyWjA1MTMwMQYDVQQDDCptaWNoYWwua3J6eXph
-bm93c2tpX2dpdGh1Yi9EQz1nbWFpbC9EQz1jb20wggGiMA0GCSqGSIb3DQEBAQUA
-A4IBjwAwggGKAoIBgQC22POIs4KtFipZ5W1nYbBu2iUck//fJrhyssXVxnljkZr/
-8P6/BH9SiWmyatDQ+LiYug72olUoMQ2wRoZzEn58ZllZlHfPJSQ5QnIjKjITWHJt
-iBi/ou31T0/OU7KVnPzryMKBL9smbxhwRbBrQlT8nV5rfHXCrpvGdOElM3EvNWwR
-HM7Klal/3zlr3q/X3BZQvOp8R8hmR6OYtgNrYclS6IkvqKpcD9Y3q8K4Snz6RZ3o
-DGp0QW28cF5m6CJ+N7KpQkASPuFFMAjnqyhE6r5VsklxR7I083UI1JLVOq/+s6Yt
-kbCBqscI55BwcYakszStNqJXiqrEOqUEdcg5tkzc0PFC+ZEzWbMU1RTox17N1pwG
-VGtdE/3OxK2A/hm6GM/sFPR2ig7wRSBs6AI9bwbv259RzHvm4wr1yQDAQzuNWeyZ
-Wd3/SkNDN3nEF9mTEF1pyRC4UO2+tvQc5YOoW66a6W/gNyhGQk4QFT39Pt1Mq/VX
-Ec8+0b1uEAKvD+z9xPcCAwEAAaOBnDCBmTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-sDAdBgNVHQ4EFgQUSu4g81ThKkq44UAqzDkZQAEi4eUwLwYDVR0RBCgwJoEkbWlj
-aGFsLmtyenl6YW5vd3NraStnaXRodWJAZ21haWwuY29tMC8GA1UdEgQoMCaBJG1p
-Y2hhbC5rcnp5emFub3dza2krZ2l0aHViQGdtYWlsLmNvbTANBgkqhkiG9w0BAQsF
-AAOCAYEAfmM8QzJAfeZkmHonfleoiIIFNSeG84wK/MWBGKr0VMIalhNHpR6DQbao
-5kAQh7PMWjPr0n3ZHUT4QU7lqp1/eiErEXtKAExnxRefzWSHNm0WjXT/dIyFUbYQ
-rRnKtabxRNWtRIrK3GecPBDtAVTRtYQQkCaSwbwE37sHJhntS/Dvnl8pw2THq7ef
-XbhPDcqmP+yWRCszn9Hzda19+8VA6Sn+fIwevXMUgvb3VHqLYcIO2amHtnCeM8Q5
-caYBi+Tx9EDFh04EE4rbUGX25RcLO43j3ShLLqfW6QHFUtJIKS7WhgBVoEGvNA35
-2KAZEiV7+ByRFKndeJmFtom0GMNBYPQW4l96aCrQJZyVhWSWGQZornxbH+hylJEp
-on5yD3vJbVQXzwm0Z4I1IH5xc4YbEepCQRK6u/cT6NuiQqbqeW82BxjXMPu4HVBy
-WXVb638bzH4OYBIYuGcw50jqBK1SyDx4exzThr6KxSiGwhAKj2xFqy51MIQjfUN0
-TL5B7Buq
------END CERTIFICATE-----

data.tar.gz.sig

@@ -1 +0,0 @@
-�s�/>��p���띡׺"�:y��s1�)F���3#$w7a�S�t�ϩH̑P	�!�0O�)�΀��Jl��JX��Q�H���S��������bh]Т
���*Tk���e�����8�#[���ð�N���y�%+c:@Nҟ��,mgÕ� �'�.;V�4ɍ5�s��sm-հ�Rb�Rwh�1�/GE��d�|TA����>|��1���ܒ�2V����x	��@�<�������ermF�xS�fCئ��SY��\R��W�琲O���AG�v�,��(��g���j��C�t�yW�P��xo᥏ȫ��"��K�<n����;�O�H���d�)����