table_print 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/table_print.rb

@@ -1,6 +1,5 @@
 # future work:
 #
-#   handle multi-level includes like 'tp User.all, :include => "blogs.title"' and ActiveRecord associations
 #   allow other output venues besides 'puts'
 #   allow fine-grained formatting
 #   on-the-fly column definitions (pass a proc as an include, eg 'tp User.all, :include => {:column_name => "Zodiac", :display_method => lambda {|u| find_zodiac_sign(u.birthday)}}')
@@ -16,12 +15,12 @@ class TablePrint
 
   # We need this set of built-in types when we determine the default display methods for a given object
   OBJECT_CLASSES = [String, Bignum, Regexp, ThreadError, Numeric, SystemStackError, IndexError,
-                    SecurityError, SizedQueue, IO, Range, Object, Exception, NoMethodError, TypeError, Integer, Dir,
+                    SecurityError, IO, Range, Object, Exception, NoMethodError, TypeError, Integer, Dir,
                     ZeroDivisionError, Kernel, RegexpError, SystemExit, NotImplementedError, Hash,
                     Interrupt, SyntaxError, Enumerable, Struct, Class, Continuation, IOError, Proc,
                     RangeError, Data, Thread, Array, NoMemoryError, Time, MatchData,
-                    ConditionVariable, Method, Mutex, StopIteration, Comparable, ArgumentError, Float,
-                    FloatDomainError, UnboundMethod, ThreadGroup, Precision, RuntimeError, FalseClass, Fixnum, Queue,
+                    Method, StopIteration, Comparable, ArgumentError, Float,
+                    FloatDomainError, UnboundMethod, ThreadGroup, Precision, RuntimeError, FalseClass, Fixnum,
                     StandardError, EOFError, LoadError, NameError, NilClass, TrueClass, MatchingData,
                     LocalJumpError, Binding, SignalException, SystemCallError, File, ScriptError, Module, Symbol]
 
@@ -37,7 +36,7 @@ class TablePrint
 
     self.separator = options[:separator] || " | "
 
-    stack = wrap(data).compact
+    stack = Array(data).compact
 
     if stack.empty?
       return "No data."
@@ -122,12 +121,12 @@ class TablePrint
     #   :cascade - show all methods in child objects
 
     if options.has_key? :only
-      display_methods = wrap(options[:only]).map { |m| m.to_s }
+      display_methods = Array(options[:only]).map { |m| m.to_s }
       return display_methods if display_methods.length > 0
     else
       display_methods = get_default_display_methods(data_obj) # start with what we can deduce
-      display_methods.concat(wrap(options[:include])).map! { |m| m.to_s } # add the includes
-      display_methods = (display_methods - wrap(options[:except]).map! { |m| m.to_s }) # remove the excepts
+      display_methods.concat(Array(options[:include])).map! { |m| m.to_s } # add the includes
+      display_methods = (display_methods - Array(options[:except]).map! { |m| m.to_s }) # remove the excepts
     end
 
     display_methods.uniq.compact
@@ -151,23 +150,9 @@ class TablePrint
     methods
   end
 
-  # borrowed from rails
-  # turn objects into an array
-  # TODO: this method is duped, put it someplace everyone can see it
-  def wrap(object)
-    if object.nil?
-      []
-    elsif object.respond_to?(:to_ary)
-      object.to_ary
-    else
-      [object]
-    end
-  end
-
   class ColumnHelper
     attr_accessor :field_length, :max_field_length, :method, :name, :options
 
-    # method is a string
     def initialize(data, method, options = {})
       self.method = method
       self.options = options || {} # could have been passed an explicit nil
@@ -231,7 +216,7 @@ class TablePrint
 
       # TODO: probably a cool array method to do this
       # finally - update the stack with the object(s) we found
-      wrap(new_stack_objects).reverse_each do |stack_obj|
+      Array(new_stack_objects).reverse_each do |stack_obj|
         stack.unshift [stack_obj, new_method_chain]
       end
     end
@@ -266,18 +251,6 @@ class TablePrint
 
     private
 
-    # borrowed from rails
-    # turn objects into an array
-    def wrap(object)
-      if object.nil?
-        []
-      elsif object.respond_to?(:to_ary)
-        object.to_ary
-      else
-        [object]
-      end
-    end
-
     # cut off field_value based on our previously determined width
     def truncate(field_value)
       copy = String.new(field_value)
@@ -309,7 +282,7 @@ class TablePrint
       return if data.nil?
       return if self.field_length >= self.max_field_length
 
-      wrap(data).each do |data_obj|
+      Array(data).each do |data_obj|
         next_method = method.split(".").first
 
         return unless data_obj.respond_to? next_method
@@ -338,7 +311,7 @@ module Kernel
   def tp(data, options = {})
     start = Time.now
     table_print = TablePrint.new
-    puts table_print.tp(data, options)
+    puts table_print.tp(Array(data), options)
     Time.now - start # we have to return *something*, might as well be execution time.
   end
 

data/table_print.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{table_print}
-  s.version = "0.2.1"
+  s.name = "table_print"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Doyle"]
-  s.date = %q{2011-06-23}
-  s.description = %q{TablePrint formats an object or array of objects into columns for easy reading. To do this, it assumes the objects in your array all respond to the same methods (vs pretty_print or awesome_print, who can't create columns because your objects could be entirely different).}
-  s.email = %q{archslide@gmail.com}
+  s.date = "2011-09-22"
+  s.description = "TablePrint formats an object or array of objects into columns for easy reading. To do this, it assumes the objects in your array all respond to the same methods (vs pretty_print or awesome_print, who can't create columns because your objects could be entirely different)."
+  s.email = "archslide@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -30,11 +30,11 @@ Gem::Specification.new do |s|
     "test/test_column.rb",
     "test/test_table_print.rb"
   ]
-  s.homepage = %q{http://github.com/arches/table_print}
+  s.homepage = "http://github.com/arches/table_print"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Turn objects into nicely formatted columns for easy reading}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Turn objects into nicely formatted columns for easy reading"
   s.test_files = [
     "test/helper.rb",
     "test/test_column.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: table_print
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Chris Doyle
@@ -15,12 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -07:00
-default_executable: 
+date: 2011-09-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +27,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: shoulda
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  name: shoulda
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +43,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,11 +59,11 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  name: jeweler
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  name: jeweler
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,8 +73,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
   version_requirements: *id004
+  name: rcov
+  prerelease: false
+  type: :development
 description: TablePrint formats an object or array of objects into columns for easy reading. To do this, it assumes the objects in your array all respond to the same methods (vs pretty_print or awesome_print, who can't create columns because your objects could be entirely different).
 email: archslide@gmail.com
 executables: []
@@ -100,7 +99,6 @@ files:
 - test/helper.rb
 - test/test_column.rb
 - test/test_table_print.rb
-has_rdoc: true
 homepage: http://github.com/arches/table_print
 licenses: 
 - MIT
@@ -130,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Turn objects into nicely formatted columns for easy reading