table_print 1.0.0.rc3 → 1.0.0

data/.gitignore

@@ -0,0 +1,44 @@
+Gemfile.lock
+
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+#
+# For TextMate
+#*.tmproj
+#tmtags
+#
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+#*.swp

data/Gemfile

@@ -2,13 +2,3 @@ source :rubygems
 
 gemspec :name => 'table_print'
 
-gem 'bundler', "~> 1.1"
-
-group :development do
-  gem 'relish'
-end
-
-group :test do
-  gem 'cat', "~> 0.2.1"
-end
-

data/README.rdoc

@@ -11,10 +11,10 @@ it assumes the objects in your array all respond to the same methods.
 == Installation
 
   # Install as a standalone gem
-  $ gem install table_print
+  $ gem install table_print --pre
 
   # Install within rails
-  In your Gemfile: gem 'table_print'
+  In your Gemfile: gem "table_print", "~> 1.0.0.rc3
   $ bundle install
 
 == Usage

data/Rakefile

@@ -9,24 +9,6 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "table_print"
-  gem.homepage = "http://github.com/arches/table_print"
-  gem.license = "MIT"
-  gem.summary = %Q{Turn objects into nicely formatted columns for easy reading}
-  gem.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).}
-  gem.email = "archslide@gmail.com"
-  gem.authors = ["Chris Doyle"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'cucumber'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rspec/core/rake_task'
 
 desc 'Default: run specs and cucumber features.'

data/lib/table_print.rb

@@ -1,12 +1,13 @@
-require 'column'
-require 'config_resolver'
-require 'config'
-require 'fingerprinter'
-require 'formatter'
-require 'hash_extensions'
-require 'kernel_extensions'
-require 'printable'
-require 'row_group'
+require 'table_print/cattr'
+require 'table_print/column'
+require 'table_print/config_resolver'
+require 'table_print/config'
+require 'table_print/fingerprinter'
+require 'table_print/formatter'
+require 'table_print/hash_extensions'
+require 'table_print/printable'
+require 'table_print/row_group'
+require 'table_print/returnable'
 
 module TablePrint
   class Printer
@@ -47,3 +48,10 @@ module TablePrint
     end
   end
 end
+
+def tp(data=[], *options)
+  start = Time.now
+  printer = TablePrint::Printer.new(data, options)
+  puts printer.table_print unless data.is_a? Class
+  TablePrint::Returnable.new(Time.now - start) # we have to return *something*, might as well be execution time.
+end

data/lib/{config.rb → table_print/config.rb}

@@ -1,5 +1,3 @@
-require 'cattr'
-
 module TablePrint
   class Config
     cattr_accessor :max_width, :time_format

data/lib/{config_resolver.rb → table_print/config_resolver.rb}

@@ -1,6 +1,3 @@
-require 'column'
-require 'config'
-
 module TablePrint
   class ConfigResolver
     def initialize(klass, default_column_names, *options)

data/lib/{fingerprinter.rb → table_print/fingerprinter.rb}

@@ -1,6 +1,3 @@
-require 'row_group'
-require 'hash_extensions'
-
 module TablePrint
   class Fingerprinter
     def lift(columns, object)
@@ -35,8 +32,11 @@ module TablePrint
       cells = {}
       handleable_columns(hash).each do |method|
         display_method = (prefix == "" ? method : "#{prefix}.#{method}")
-        cell_value = method.call(target) if method.is_a? Proc
-        cell_value ||= target.send(method)
+        if method.is_a? Proc
+          cell_value = method.call(target)
+        else
+          cell_value ||= target.send(method)
+        end
         cells[@column_names_by_display_method[display_method]] = cell_value
       end
 

data/lib/{formatter.rb → table_print/formatter.rb}

@@ -1,5 +1,3 @@
-require 'config'
-
 module TablePrint
   class TimeFormatter
     def initialize(time_format=nil)

data/lib/{returnable.rb → table_print/returnable.rb}

@@ -14,6 +14,10 @@ module TablePrint
       "Cleared table_print config for #{klass}"
     end
 
+    def config_for(klass)
+      TablePrint::Config.for(klass)
+    end
+
     def to_s
       @string_value
     end

data/lib/{row_group.rb → table_print/row_group.rb}

@@ -1,6 +1,3 @@
-require 'formatter'
-require 'column'
-
 module TablePrint
 
   module RowRecursion
@@ -151,6 +148,10 @@ module TablePrint
 
       to_absorb.each do |absorbable_group|
         absorbable_row = absorbable_group.children.shift
+
+        # missing associations create groups with no rows
+        children.delete(absorbable_group) and next unless absorbable_row
+
         @cells.merge!(absorbable_row.cells)
 
         i = children.index(absorbable_group)

data/lib/table_print/version.rb

@@ -0,0 +1,4 @@
+module TablePrint
+  VERSION = "1.0.0"
+end
+

data/spec/column_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'column'
 
 include TablePrint
 

data/spec/config_resolver_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'config_resolver'
 
 describe TablePrint::ConfigResolver do
 

data/spec/config_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'config'
 
 describe TablePrint::Config do
   it "defaults max_width to 30" do

data/spec/fingerprinter_spec.rb

@@ -1,7 +1,4 @@
 require 'spec_helper'
-require 'ostruct'
-require 'fingerprinter'
-require 'column'
 
 class TablePrint::Row
   attr_accessor :groups, :cells
@@ -57,6 +54,14 @@ describe Fingerprinter do
       row.children.length.should == 0
       row.cells.should == {'name' => "dl crng"}
     end
+
+    it "doesn't puke if a lambda returns nil" do
+      rows = Fingerprinter.new.lift([Column.new(:name => "name", :display_method => lambda { |row| nil })], OpenStruct.new(:name => "dale carnegie"))
+      rows.length.should == 1
+      row = rows.first
+      row.children.length.should == 0
+      row.cells.should == {'name' => nil}
+    end
   end
 
   describe "#hash_to_rows" do

data/spec/formatter_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require "formatter"
 
 include TablePrint
 

data/spec/hash_extensions_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'hash_extensions'
 
 describe "#constructive_merge" do
   it "merges hashes without clobbering" do

data/spec/printable_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'printable'
 
 describe TablePrint::Printable do
   before(:each) do

data/spec/returnable_spec.rb

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require 'returnable'
-require 'config'
 
 describe TablePrint::Returnable do
   it "returns its initialized value from its to_s method" do
@@ -19,5 +17,11 @@ describe TablePrint::Returnable do
     r = TablePrint::Returnable.new
     r.clear(Object)
   end
+
+  it "passes #config_for through to TablePrint::Config.for" do
+    TablePrint::Config.should_receive(:for).with(Object)
+    r = TablePrint::Returnable.new
+    r.config_for(Object)
+  end
 end
 

data/spec/row_group_spec.rb

@@ -1,7 +1,4 @@
 require 'spec_helper'
-require 'ostruct'
-require 'cat'
-require "row_group"
 
 include TablePrint
 
@@ -270,6 +267,32 @@ describe TablePrint::Row do
       end
     end
 
+    # row: foo
+    #   group
+    #     row: bar
+    #   group
+    # => foo | bar |
+    context "for two groups, one of which has no rows (aka, we hit an empty association)" do
+      before(:each) do
+        @row = Row.new
+        @row.set_cell_values(:foo => "foo").add_children([
+                                                             RowGroup.new.add_child(
+                                                                 Row.new.set_cell_values(:bar => "bar")
+                                                             ),
+                                                             RowGroup.new
+                                                         ])
+        @row.collapse!
+      end
+
+      it "pulls the cells from both groups into the parent" do
+        @row.cells.should == {"foo" => "foo", "bar" => "bar"}
+      end
+
+      it "dereferences both now-defunct groups" do
+        @row.children.length.should == 0
+      end
+    end
+
     # row: foo
     #   group
     #     row: bar

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require 'cat'
 gem 'rspec'
+require 'table_print'
+require 'ostruct'
 
 RSpec.configure do |c|
   c.filter_run :focus => true

data/table_print.gemspec

@@ -1,91 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/table_print/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = "table_print"
-  s.version = "1.0.0.rc3"
+Gem::Specification.new do |gem|
+  gem.name                = "table_print"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Chris Doyle"]
-  s.date = "2012-06-25"
-  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"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    ".rvmrc",
-    ".travis.yml",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "features/adding_columns.feature",
-    "features/configuring_output.feature",
-    "features/excluding_columns.feature",
-    "features/sensible_defaults.feature",
-    "features/support/step_definitions/before.rb",
-    "features/support/step_definitions/steps.rb",
-    "lib/cattr.rb",
-    "lib/column.rb",
-    "lib/config.rb",
-    "lib/config_resolver.rb",
-    "lib/fingerprinter.rb",
-    "lib/formatter.rb",
-    "lib/hash_extensions.rb",
-    "lib/kernel_extensions.rb",
-    "lib/printable.rb",
-    "lib/returnable.rb",
-    "lib/row_group.rb",
-    "lib/table_print.rb",
-    "spec/column_spec.rb",
-    "spec/config_resolver_spec.rb",
-    "spec/config_spec.rb",
-    "spec/fingerprinter_spec.rb",
-    "spec/formatter_spec.rb",
-    "spec/hash_extensions_spec.rb",
-    "spec/printable_spec.rb",
-    "spec/returnable_spec.rb",
-    "spec/row_group_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/table_print_spec.rb",
-    "table_print.gemspec"
-  ]
-  s.homepage = "http://github.com/arches/table_print"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.19"
-  s.summary = "Turn objects into nicely formatted columns for easy reading"
+  gem.authors             = ["Chris Doyle"]
+  gem.email               = ["archslide@gmail.com"]
+  gem.email               = "archslide@gmail.com"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  gem.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)."
+  gem.summary             = "Turn objects into nicely formatted columns for easy reading"
+  gem.homepage            = "http://tableprintgem.com"
+  gem.version             = TablePrint::VERSION
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bundler>, ["~> 1.1"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<relish>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-    else
-      s.add_dependency(%q<bundler>, ["~> 1.1"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<relish>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<bundler>, ["~> 1.1"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<relish>, [">= 0"])
-  end
-end
+  gem.files               = `git ls-files`.split($\)
+  gem.test_files          = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths       = ["lib"]
 
+  gem.add_development_dependency 'cat', '~> 0.2.1'
+  gem.add_development_dependency 'cucumber', '~> 1.2.1'
+  gem.add_development_dependency 'rspec', '~> 2.11.0'
+  gem.add_development_dependency 'rake', '~> 0.9.2'
+end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: table_print
 version: !ruby/object:Gem::Version 
-  hash: 614046837
-  prerelease: 6
+  hash: 23
+  prerelease: 
   segments: 
   - 1
   - 0
   - 0
-  - rc
-  - 3
-  version: 1.0.0.rc3
+  version: 1.0.0
 platform: ruby
 authors: 
 - Chris Doyle
@@ -17,105 +15,83 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-25 00:00:00 Z
+date: 2012-08-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: cat
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 21
         segments: 
+        - 0
+        - 2
         - 1
-        - 1
-        version: "1.1"
-  type: :runtime
+        version: 0.2.1
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: cucumber
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 29
         segments: 
         - 1
+        - 2
         - 1
-        version: "1.1"
+        version: 1.2.1
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 35
         segments: 
+        - 2
+        - 11
         - 0
-        version: "0"
+        version: 2.11.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 63
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 2
+        version: 0.9.2
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: relish
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id006
 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: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
+- .gitignore
 - .rspec
 - .rvmrc
 - .travis.yml
@@ -123,25 +99,24 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - features/adding_columns.feature
 - features/configuring_output.feature
 - features/excluding_columns.feature
 - features/sensible_defaults.feature
 - features/support/step_definitions/before.rb
 - features/support/step_definitions/steps.rb
-- lib/cattr.rb
-- lib/column.rb
-- lib/config.rb
-- lib/config_resolver.rb
-- lib/fingerprinter.rb
-- lib/formatter.rb
-- lib/hash_extensions.rb
-- lib/kernel_extensions.rb
-- lib/printable.rb
-- lib/returnable.rb
-- lib/row_group.rb
 - lib/table_print.rb
+- lib/table_print/cattr.rb
+- lib/table_print/column.rb
+- lib/table_print/config.rb
+- lib/table_print/config_resolver.rb
+- lib/table_print/fingerprinter.rb
+- lib/table_print/formatter.rb
+- lib/table_print/hash_extensions.rb
+- lib/table_print/printable.rb
+- lib/table_print/returnable.rb
+- lib/table_print/row_group.rb
+- lib/table_print/version.rb
 - spec/column_spec.rb
 - spec/config_resolver_spec.rb
 - spec/config_spec.rb
@@ -154,9 +129,9 @@ files:
 - spec/spec_helper.rb
 - spec/table_print_spec.rb
 - table_print.gemspec
-homepage: http://github.com/arches/table_print
-licenses: 
-- MIT
+homepage: http://tableprintgem.com
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -174,14 +149,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -189,5 +162,21 @@ rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Turn objects into nicely formatted columns for easy reading
-test_files: []
-
+test_files: 
+- features/adding_columns.feature
+- features/configuring_output.feature
+- features/excluding_columns.feature
+- features/sensible_defaults.feature
+- features/support/step_definitions/before.rb
+- features/support/step_definitions/steps.rb
+- spec/column_spec.rb
+- spec/config_resolver_spec.rb
+- spec/config_spec.rb
+- spec/fingerprinter_spec.rb
+- spec/formatter_spec.rb
+- spec/hash_extensions_spec.rb
+- spec/printable_spec.rb
+- spec/returnable_spec.rb
+- spec/row_group_spec.rb
+- spec/spec_helper.rb
+- spec/table_print_spec.rb

data/VERSION

@@ -1 +0,0 @@
-1.0.0.rc3

data/lib/kernel_extensions.rb

@@ -1,12 +0,0 @@
-require 'returnable'
-
-module Kernel
-  def tp(data=[], *options)
-    start = Time.now
-    printer = TablePrint::Printer.new(data, options)
-    puts printer.table_print unless data.is_a? Class
-    TablePrint::Returnable.new(Time.now - start) # we have to return *something*, might as well be execution time.
-  end
-
-  module_function :tp
-end