table_display 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3013953f835a9c3948a8197eeebb9ffe9a53e8fb2ad14471a6802155205c03d
-  data.tar.gz: b569caed7b3c6b65327c6391b3fd63b68b0dd815b6068160fdfafed811fe76ed
+  metadata.gz: f2dcb76090971646e3996055028e3187823e4cf17d0fce5c9d90e5f4cc1cc034
+  data.tar.gz: 2ec5ea3c4d25ee8fc4034f6ed169c89cd0579cd2f45789195bffdc3bdac2c3a6
 SHA512:
-  metadata.gz: 3592665702f00ad8602e9a32a3c6e51fb8af848c302d2bd9220221cf116d315de2c3bbd705556266e3c4685055d1039f62f21a1479a2d22568aa6d1caabd0aec
-  data.tar.gz: f42df4ce0723ec6bdd8d4c18b323ca05b48c8c0579b6119edecb0117d41408ab1b856f19e5d4a7af44b3bbcb45ea74bb8c4cf71f7c156361c031f7a1553338e9
+  metadata.gz: e7a7e98fbb462c031501deafd35b8604dd1fcb72c41aa5958d8ac7b966ffacfa00e17cfb7afd64c003274697b1e66d74b6fc705c947678000380758c6972d7c3
+  data.tar.gz: 3d6fda3edeb0dcc3714e0d40a630e2743c0749c71625eb0e6b925fbf987cbf4955faf1c3a39d6cb7cecb4db1e1bd05792c0e8de34ccbccc3e1a88d93eca483fa

data/README.md

@@ -15,7 +15,7 @@ change what attributes/methods are output, like they do on the `#to_xml` method.
 
 The normal output uses `#inspect` on the data values to make them printable, so you can
 see what type the values had.  When that's inconvenient or you'd prefer direct display,
-you can pass the option `:inspect => false` to disable inspection.
+you can pass the option `inspect: false` to disable inspection.
 
 
 Example
@@ -45,7 +45,7 @@ Or equivalently, use `pt` (like `pp`, but in a table):
 Like `to_xml`, you can pass a `:methods` option to add the output methods on your models, and you
 can pass `:only` or `:except` to (respectively) show only certain columns or show all except certain columns:
 
-    >> puts Customer.find(31).purchases.to_table_display(:only => [:id, :description], :methods => [:met_due_date?])
+    >> puts Customer.find(31).purchases.to_table_display(only: [:id, :description], methods: [:met_due_date?])
     +----+------------------------+---------------+
     | id | description            | met_due_date? |
     +----+------------------------+---------------+
@@ -55,7 +55,7 @@ can pass `:only` or `:except` to (respectively) show only certain columns or sho
 
 `pt` accepts and passes on all options as well:
 
-    >> pt Customer.find(31).purchases, :only => [:id, :description], :methods => [:met_due_date?]
+    >> pt Customer.find(31).purchases, only: [:id, :description], methods: [:met_due_date?]
     +----+------------------------+---------------+
     | id | description            | met_due_date? |
     +----+------------------------+---------------+
@@ -74,9 +74,9 @@ which provides:
 resulting in the same output as above.
 
 
-If `:inspect => false` is used, the values will be shown in `#to_s` form rather than `#inspect` form:
+If `inspect: false` is used, the values will be shown in `#to_s` form rather than `#inspect` form:
 
-    >> pt Customer.find(31).purchases, :only => [:id, :description, :due_on, :completed_at]
+    >> pt Customer.find(31).purchases, only: [:id, :description, :due_on, :completed_at]
     +----+----------------------+------------+--------------------------------+
     | id | description          | due_on     | completed_at                   |
     +----+----------------------+------------+--------------------------------+

data/lib/table_display/version.rb

@@ -1,3 +1,3 @@
 module TableDisplay
-  VERSION = '2.1.0'
+  VERSION = '3.0.0'
 end

data/lib/table_display.rb

@@ -1,4 +1,4 @@
-module TableDisplay
+module Enumerable
   def to_table_display(*args)
     options = args.last.is_a?(Hash) ? args.pop : {}
     extra_entries = args.collect { |arg| arg.respond_to?(:call) ? arg : arg.to_s }
@@ -6,11 +6,11 @@ module TableDisplay
     only_attributes = Array(options.delete(:only)) if options[:only]
     only_attributes ||= [] if args.length > 0
     except_attributes = Array(options.delete(:except)) if options[:except]
-    except_attributes = (except_attributes + except_attributes.collect(&:to_s)).uniq if except_attributes.present? # we have to keep string and symbol arguments separate for hashes, which may not have 'indifferent access'
+    except_attributes = (except_attributes + except_attributes.collect(&:to_s)).uniq if except_attributes && !except_attributes.empty? # we have to keep string and symbol arguments separate for hashes, which may not have 'indifferent access'
     display_inspect = options.nil? || !options.has_key?(:inspect) || options.delete(:inspect)
-    raise "unknown options passed to to_table_display: #{options.keys.to_sentence}" unless options.blank?
+    raise "unknown options passed to to_table_display: #{options.keys.to_sentence}" unless options.empty?
     
-    column_lengths = ActiveSupport::OrderedHash.new
+    column_lengths = {}
     
     if only_attributes
       # we've been given an explicit list of attributes to display
@@ -39,7 +39,7 @@ module TableDisplay
       
         if attribute_names.any? {|name| column_lengths[name].nil?} # optimisation, in most use cases all records will have the same type and the same attributes, so we needn't run this for each - but we do handle varying attribute lists, and attributes that are not columns on the model (calculated columns etc.)
           # for ActiveRecord classes, we look at the .columns explicitly so we can keep them in the right order
-          columns_to_check = record.is_a?(ActiveRecord::Base) ? ((record.class.columns.collect(&:name) & attribute_names) + attribute_names).uniq : attribute_names
+          columns_to_check = Module.const_defined?(:ActiveRecord) && record.is_a?(ActiveRecord::Base) ? ((record.class.columns.collect(&:name) & attribute_names) + attribute_names).uniq : attribute_names
           columns_to_check.each do |name|
             next if (only_attributes && !only_attributes.include?(name)) || (except_attributes && except_attributes.include?(name))
             column_lengths[name] = 0 # the values of columns are the maximum width of value seen; when we come to print out, if the max seen is zero then the attribute has never actually been seen (eg. when a find(:all, :select => ...) has been used to exclude some of the database columns from the resultset), and we hide the column.
@@ -62,7 +62,7 @@ module TableDisplay
                   record.send(attribute)
                 end
         string_value = display_inspect ? value.inspect : (value.is_a?(String) ? value : value.to_s)
-        column_lengths[attribute] = string_value.mb_chars.length if string_value.mb_chars.length > max_width
+        column_lengths[attribute] = string_value.length if string_value.length > max_width
         value.is_a?(Numeric) ? value : string_value # keep Numeric values as-is for now, so we can handle them specially in the output below
       end
     end
@@ -70,15 +70,15 @@ module TableDisplay
     return [] if data.empty?
     
     # build the table header
-    separator_string = "+"
-    heading_string   = "|"
+    separator_string = "+".dup
+    heading_string   = "|".dup
     column_lengths.each do |attribute, max_width|
       next unless max_width > 0 # skip any columns we never actually saw
       name = (attribute.respond_to?(:name) ? attribute.name : attribute).to_s
       
       # the column needs to fit the column header as well as the values
-      if name.mb_chars.length > max_width
-        column_lengths[attribute] = max_width = name.mb_chars.length
+      if name.length > max_width
+        column_lengths[attribute] = max_width = name.length
       end
       
       separator_string << '-'*(max_width + 2) << '+'
@@ -87,14 +87,14 @@ module TableDisplay
     
     rows = [separator_string, heading_string, separator_string]
     data.each do |data_row|
-      data_string = "|"
+      data_string = "|".dup
       column_lengths.each_with_index do |(_attribute, max_width), index|
         next unless max_width > 0 # skip any columns we never actually saw
         value = data_row[index]
         if value.is_a?(Numeric)
-          data_string << ' ' << (display_inspect ? value.inspect : value.to_s).mb_chars.rjust(max_width) << ' |'
+          data_string << ' ' << (display_inspect ? value.inspect : value.to_s).rjust(max_width) << ' |'
         else
-          data_string << ' ' << value.mb_chars.ljust(max_width) << ' |'
+          data_string << ' ' << value.ljust(max_width) << ' |'
         end
       end
       rows << data_string
@@ -108,12 +108,3 @@ module Kernel
     puts target.respond_to?(:to_table_display) ? target.to_table_display(*options) : target
   end
 end
-
-# all Enumerable classes should get TableDisplay functionality...
-Enumerable.send(:include, TableDisplay)
-
-# including those that have already included Enumerable by the time this plugin is loaded.
-# Ruby doesn't recursively update through the module tree, so although any new classes/modules
-# that include Enumerable will get TableDisplay, we have to do it ourself for older ones.
-ObjectSpace.each_object(Module) {|o| o.send(:include, TableDisplay) if o.ancestors.include?(Enumerable)}
-ObjectSpace.each_object(Class)  {|o| o.send(:include, TableDisplay) if o.ancestors.include?(Enumerable)}

data/table_display.gemspec

@@ -22,7 +22,6 @@ The normal output uses #inspect on the data values to make them printable, so yo
 see what type the values had.  When that's inconvenient or you'd prefer direct display,
 you can pass the option :inspect => false to disable inspection.
 EOF
-  gem.has_rdoc     = false
   gem.author       = "Will Bryant"
   gem.email        = "will.bryant@gmail.com"
   gem.homepage     = "http://github.com/willbryant/table_display"
@@ -36,4 +35,5 @@ EOF
   gem.add_development_dependency "sqlite3"
   gem.add_development_dependency "activerecord"
   gem.add_development_dependency "test-unit"
+  gem.add_development_dependency "ostruct"
 end

data/test/table_display_test.rb

@@ -4,6 +4,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'schema'))
 require 'ostruct'
 
 class Time
+  undef :to_s
+  undef :inspect
+
   def to_s(*args)
     return to_formatted_s(*args) unless args.empty?
     strftime("%Y-%m-%d %H:%M:%S %z")

data/test/test_helper.rb

@@ -12,8 +12,8 @@ FileUtils.mkdir File.join(File.dirname(__FILE__), "log") rescue nil
 RAILS_DEFAULT_LOGGER = ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "log", "#{ENV['RAILS_ENV']}.log"))
 
 ActiveRecord::Base.configurations = YAML::load(IO.read(File.join(File.dirname(__FILE__), "database.yml")))
-ActiveRecord::Base.establish_connection ActiveRecord::Base.configurations[ENV['RAILS_ENV']]
+ActiveRecord::Base.establish_connection ActiveRecord::Base.configurations.find_db_config(ENV['RAILS_ENV'])
 ActiveSupport::TestCase.send(:include, ActiveRecord::TestFixtures) if ActiveRecord.const_defined?('TestFixtures')
-ActiveSupport::TestCase.fixture_path = File.join(File.dirname(__FILE__), "fixtures")
+ActiveSupport::TestCase.fixture_paths = [File.join(File.dirname(__FILE__), "fixtures")]
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../init')) # load table_display

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: table_display
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Will Bryant
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,6 +65,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Adds support for displaying your ActiveRecord tables, named scopes, collections, or
   plain arrays in a table view when working in rails console, shell, or email template.
@@ -105,7 +118,6 @@ files:
 homepage: http://github.com/willbryant/table_display
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -120,9 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Adds support for displaying your ActiveRecord tables, named scopes, collections,
   or plain arrays in a table view when working in script/console, shell, or email