taql 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a347baf32a9b92dccb94907b40b42d35d00a5f8929f5938842e774d0dfe810a6
-  data.tar.gz: 261b1878bc277f27c9d803a675f7ccc085c71eea9639bcdcdd8e6d44b28d5c82
+  metadata.gz: 06cf2ffe64ba72577b6e68ca71d276a1470bba0660521d0df02e9aaff5722112
+  data.tar.gz: 452c4e96ea43fa3df92ee786d1b81116162c8ca97f067306e29cdfe44e98a6ab
 SHA512:
-  metadata.gz: f0aa1e50f2e9adfcc0013fe53d2a16d44f1b67cb3204c14f86cdff0c30a6e5b213eb5710c1573aa8be0cc1080f057b77e050882b762d23fb1f86b6f5f8e14cdb
-  data.tar.gz: 817431a4c417af5c022fc893e0e40b5c8501f0e1470f64e5049b0a916cf20c448d574b48e62562c5e4f2b15bf150724c8ad5aa0f72cc404c6cfd928bcc64c87b
+  metadata.gz: a9e418d460768051aefecb0445a4ae6233184099aed19f5295e9c709e755b0d02233136d0bdfdb514b8a397d8d0219ec4395ed0c6c65b13c85f33e556821eb61
+  data.tar.gz: 825def129c7a925b42b1656b10825928d6006ceb6be82e912cc40b34d594bf13316a0a9d0d80257ebf192f452a77b0db3520842707256635fb7d41763409f946

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.6.0] - 2026-07-18
+
+- Extract shared `Formatter` base class from `Table` and `List`
+- Unify ActiveRecord connection handling in `Taql.active_record_connection`
+- Fix CLI to avoid the Rails 7.2+ `connection` deprecation warning
+- Remove unused `Table#rows`, `#columns`, and `markdown` writer
+
 ## [0.5.0] - 2026-03-11
 
 - Auto-switch to vertical list layout when table exceeds terminal width

data/lib/taql/cli.rb

@@ -15,7 +15,7 @@ module Taql
     def run
       silence { require environment_path }
 
-      Taql.execute(*query, options, connection: ActiveRecord::Base.connection)
+      Taql.execute(*query, options, connection: Taql.active_record_connection)
     end
 
     private

data/lib/taql/formatter.rb

@@ -0,0 +1,23 @@
+module Taql
+  class Formatter
+    DASH = "-".freeze
+
+    def initialize(entries)
+      @entries = entries.map { |entry| entry.transform_values(&:to_s) }
+    end
+
+    def headers
+      @headers ||= entries.flat_map(&:keys).uniq
+    end
+
+    def print
+      output if entries.any?
+    end
+
+    alias_method :to_s, :print
+
+    private
+
+    attr_reader :entries
+  end
+end

data/lib/taql/list.rb

@@ -1,31 +1,22 @@
+require_relative "formatter"
+
 module Taql
-  class List
-    DASH = "-".freeze
+  class List < Formatter
     PIPE = " | ".freeze
 
     def initialize(entries, terminal_width: nil)
-      @entries = entries.map { |entry| entry.transform_values(&:to_s) }
+      super(entries)
       @terminal_width = terminal_width
     end
 
-    def print
-      output if entries.any?
-    end
-
     private
 
-    attr_reader :entries
-
-    def headers
-      @headers ||= entries.flat_map(&:keys).uniq
-    end
-
     def max_header_width
       @max_header_width ||= headers.map(&:length).max
     end
 
     def divider_width
-      @terminal_width&.finite? ? @terminal_width : 32
+      @terminal_width || 32
     end
 
     def output
@@ -35,7 +26,7 @@ module Taql
     end
 
     def separator
-      DASH * divider_width
+      @separator ||= DASH * divider_width
     end
 
     def rows(entry)
@@ -43,7 +34,5 @@ module Taql
         "#{header.upcase.rjust(max_header_width)}#{PIPE}#{entry[header]}"
       end
     end
-
-    alias_method :to_s, :print
   end
 end

data/lib/taql/railtie.rb

@@ -6,16 +6,8 @@ module Taql
 
     initializer "taql.initialize" do
       ActiveSupport.on_load(:active_record) do
-        Taql.default_connection = method(:connection)
+        Taql.default_connection = Taql.method(:active_record_connection)
       end
     end
-
-    def self.connection
-      pool.respond_to?(:lease_connection) ? pool.lease_connection : pool.connection
-    end
-
-    def self.pool
-      ActiveRecord::Base.connection_pool
-    end
   end
 end

data/lib/taql/table.rb

@@ -1,53 +1,36 @@
+require_relative "formatter"
+
 module Taql
-  class Table
-    DASH = "-".freeze
+  class Table < Formatter
     PLUS = "+".freeze
     SPACE = " ".freeze
     VERTICAL_BAR = "|".freeze
 
-    attr_accessor :markdown
+    attr_reader :markdown
 
     def initialize(entries, markdown: false)
-      @entries = entries.map { |entry| entry.transform_values(&:to_s) }
+      super(entries)
       @markdown = markdown
     end
 
     def table_width
-      column_widths.sum + (3 * columns.count) + 1
+      column_widths.sum + (3 * headers.count) + 1
     end
 
     def body
       entries.map(&:values)
     end
 
-    def columns
-      @columns ||= headers.map do |header|
-        [header, *entries.map { |entry| entry[header] }]
-      end
-    end
-
-    def headers
-      @headers ||= entries.flat_map(&:keys).uniq
-    end
-
-    def print
-      output if entries.any?
-    end
-
-    def rows
-      [headers, *body]
-    end
-
     private
 
-    attr_reader :entries
-
     def border
       separator unless markdown
     end
 
     def column_widths
-      @column_widths ||= columns.map { |column| column.map(&:length).max }
+      @column_widths ||= headers.map do |header|
+        [header, *entries.map { |entry| entry[header] }].map(&:length).max
+      end
     end
 
     def edge
@@ -73,13 +56,11 @@ module Taql
     end
 
     def separator
-      columns.map.with_index do |column, index|
-        Array.new(column_widths[index] + 2, DASH).join
-      end.then do |columns|
-        [edge, columns.join(edge), edge].join
+      column_widths.map do |width|
+        DASH * (width + 2)
+      end.then do |segments|
+        [edge, segments.join(edge), edge].join
       end
     end
-
-    alias_method :to_s, :print
   end
 end

data/lib/taql/version.rb

@@ -1,3 +1,3 @@
 module Taql
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/taql.rb

@@ -17,19 +17,26 @@ module Taql
       end
     end
 
+    def active_record_connection
+      pool = ActiveRecord::Base.connection_pool
+      pool.respond_to?(:lease_connection) ? pool.lease_connection : pool.connection
+    end
+
     private
 
-    def formatter(results, markdown: false)
+    def formatter(results, markdown:)
       table = Table.new(results, markdown: markdown)
-      if !markdown && table.table_width > terminal_width
-        List.new(results, terminal_width: terminal_width)
+      width = terminal_width
+
+      if !markdown && width && table.table_width > width
+        List.new(results, terminal_width: width)
       else
         table
       end
     end
 
     def terminal_width
-      IO.console&.winsize&.last || Float::INFINITY
+      IO.console&.winsize&.last
     end
 
     def default_connection

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taql
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ariel Rzezak
@@ -29,6 +29,7 @@ files:
 - exe/taql
 - lib/taql.rb
 - lib/taql/cli.rb
+- lib/taql/formatter.rb
 - lib/taql/list.rb
 - lib/taql/railtie.rb
 - lib/taql/table.rb
@@ -55,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.14
 specification_version: 4
 summary: Tableize Rails SQL queries
 test_files: []