taql 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eab3ab0fca8b6a61702ba40f696b7df8f0405bd76d8352620e9d6aa23d78aa1
-  data.tar.gz: 1b5568b7ff3cfcc0ee2f8fb847ed3217c67b3163d8a9ea4e476485793e2c6bfe
+  metadata.gz: 106f6fd29eb626394dfcae398aaf2b79696574c3828b313ca528c60686fb7891
+  data.tar.gz: b578ac768cd8c7c8aa1e588619868d96c77eab2a67387fb254947b076243bd34
 SHA512:
-  metadata.gz: ac7fd1fd09179d0e1b367aee9330b54b0b4f0f0f54d3e83460314d99c88a3afa2390621525681e567255511964d556e757dc5f3ce79daf409d17cf5cde5991e2
-  data.tar.gz: 828d90c486a79da04be7acddabd360a3d08f433415bc4da379978d134909c93ab226331fb9f985d6f00c1728d2bef7f63773295340596238b34532941c446e8c
+  metadata.gz: 13b105a6407b067a0de7200f5fe2f650a877c6a98ef413962c5278fa84154867aec5960e14a56ab90d5c8a3cd4ca9448202a77eb9568282efca1a7192519acd8
+  data.tar.gz: 95a82e535d052293134f90d4b1827da6d1eb88bf999aae439b64bfcab40c08e7db5f9959792c02e8862a9bbf60eda8886f2ce0e3fc240f4a72d90da928dbb76a

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## [Unreleased]
 
+## [0.2.3] - 2025-04-17
+
+- Refactor table code
+
+## [0.2.2] - 2025-04-08
+
+- Fixed a bug displaying empty tables
+
 ## [0.2.1] - 2024-08-24
 
 - Fixed release

data/lib/taql/table.rb

@@ -1,82 +1,72 @@
 module Taql
   class Table
-    attr_reader :entries
+    DASH = "-".freeze
+    PLUS = "+".freeze
+    SPACE = " ".freeze
+    VERTICAL_BAR = "|".freeze
 
     def initialize(entries)
-      @entries = entries
-    end
-
-    def print
-      <<~OUTPUT
-        #{separator}
-        #{formatted_headers}
-        #{separator}
-        #{formatted_entries.join("\n")}
-        #{separator}
-      OUTPUT
+      @entries = entries.map { it.transform_values(&:to_s) }
     end
 
-    def to_s
-      print
+    def body
+      entries.map(&:values)
     end
 
-    def formatted_entries
-      entries.each_with_object([]) do |entry, result|
-        individual_entry = entry
-          .map { |key, value| value.to_s.ljust(rows_max_length[key]) }
-          .join(" | ")
-
-        result << "| #{individual_entry} |"
+    def columns
+      headers.map do |header|
+        [header, *entries.map { |entry| entry[header] }]
       end
     end
 
-    def formatted_headers
-      output = headers.map do |header|
-        header.upcase.ljust(rows_max_length[header])
-      end.join(" | ")
-
-      "| #{output} |"
+    def headers
+      entries.map(&:keys).uniq.flatten
     end
 
-    def headers
-      first.keys
+    def print
+      output if entries.any?
     end
 
     def rows
-      entries.each_with_object(
-        Hash.new { |hash, key| hash[key] = [] }
-      ) do |entry, result|
-        entry.each do |header, value|
-          result[header] << value
-        end
-      end
+      [headers, *body]
     end
 
-    def rows_max_length
-      rows_with_headers.each_with_object({}) do |(key, values), result|
-        result[key] = values.map { _1.to_s.length }.max
-      end
+    private
+
+    attr_reader :entries
+
+    def column_widths
+      columns.map { it.map(&:length).max }
     end
 
-    def rows_with_headers
-      headers.each_with_object({}) do |column, result|
-        result[column] = rows[column].unshift(column)
+    def formatted(segments)
+      segments.map do |segment|
+        cell_index = segments.index(segment)
+        max_length = column_widths[cell_index]
+        [SPACE, segment.ljust(max_length), SPACE].join
+      end.then do |segments|
+        [VERTICAL_BAR, segments.join(VERTICAL_BAR), VERTICAL_BAR].join
       end
     end
 
-    def separator
-      line = rows_with_headers.values.map do |values|
-        length = values.map { _1.to_s.length }.max + 2
-        Array.new(length, "-").join
-      end.join("+")
-
-      "+#{line}+"
+    def output
+      <<~OUTPUT
+        #{separator}
+        #{formatted(headers.map(&:upcase))}
+        #{separator}
+        #{body.map(&method(:formatted)).join("\n")}
+        #{separator}
+      OUTPUT
     end
 
-    private
-
-    def first
-      entries.first
+    def separator
+      columns.map do |column|
+        column_index = columns.index(column)
+        max_length = column_widths[column_index]
+        Array.new(max_length + 2, DASH).join
+      end.then do |columns|
+        [PLUS, columns.join(PLUS), PLUS].join
+      end
     end
   end
 end

data/lib/taql/version.rb

@@ -1,3 +1,3 @@
 module Taql
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/lib/taql.rb

@@ -7,7 +7,9 @@ module Taql
 
   def self.execute(query)
     ActiveRecord::Base.connection.execute(query).tap do |result|
-      $stdout.puts Table.new(result.entries)
+      if (results = result.entries).any?
+        $stdout.puts Table.new(results)
+      end
     end
   end
 end

data/taql.gemspec

@@ -10,11 +10,11 @@ Gem::Specification.new do |spec|
   spec.description = "Taql allows you to pretty print SQL table queries in Rails."
   spec.homepage = "https://github.com/arzezak/taql"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = ">= 3.4"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "#{spec.homepage}/CHANGELOG.md"
+  spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/main/CHANGELOG.md"
 
   spec.files = Dir["*.gemspec", "*.{md,txt}", "Rakefile", "{bin,exe,lib}/**/*"]
   spec.bindir = "exe"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: taql
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Ariel Rzezak
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-24 00:00:00.000000000 Z
+date: 2025-04-17 00:00:00.000000000 Z
 dependencies: []
 description: Taql allows you to pretty print SQL table queries in Rails.
 email:
@@ -37,8 +36,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/arzezak/taql
   source_code_uri: https://github.com/arzezak/taql
-  changelog_uri: https://github.com/arzezak/taql/CHANGELOG.md
-post_install_message:
+  changelog_uri: https://github.com/arzezak/taql/blob/main/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -46,15 +44,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Tableize Rails SQL queries
 test_files: []