hirb 0.3.5 → 0.3.6

data/.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = "gabriel.horner@gmail.com"
   s.homepage    = "http://tagaholic.me/hirb/"
   s.summary     = "A mini view framework for console/irb that's easy to use, even while under its influence."
-  s.description = "Hirb provides a mini view framework for console applications and uses it to improve irb's default inspect output. Given an object or array of objects, hirb renders a view based on the object's class and/or ancestry. Hirb offers reusable views in the form of helper classes. The two main helpers, Hirb::Helpers::Table and Hirb::Helpers::Tree, provide several options for generating ascii tables and trees. Using Hirb::Helpers::AutoTable, hirb has useful default views for at least ten popular database gems i.e. Rails' ActiveRecord::Base. Other than views, hirb offers a smart pager and a console menu. The smart pager only pages when the output exceeds the current screen size. The menu is used in conjunction with tables to offer two dimensional menus."
+  s.description = "Hirb provides a mini view framework for console applications and uses it to improve ripl(irb)'s default inspect output. Given an object or array of objects, hirb renders a view based on the object's class and/or ancestry. Hirb offers reusable views in the form of helper classes. The two main helpers, Hirb::Helpers::Table and Hirb::Helpers::Tree, provide several options for generating ascii tables and trees. Using Hirb::Helpers::AutoTable, hirb has useful default views for at least ten popular database gems i.e. Rails' ActiveRecord::Base. Other than views, hirb offers a smart pager and a console menu. The smart pager only pages when the output exceeds the current screen size. The menu is used in conjunction with tables to offer two dimensional menus."
   s.required_rubygems_version = ">= 1.3.5"
   s.rubyforge_project = 'tagaholic'
   s.add_development_dependency 'bacon', '>= 1.1.0'

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.3.6
+* Tweak ripl support
+* Allow override of :hirb_number thanks to asanghi.
+* Fix Hirb.add_view to work with class which inherits Hash
+
 == 0.3.5
 * Add ripl support
 * Fix Formatter#determine_output_class for IO and Hash

data/README.rdoc

@@ -2,7 +2,7 @@ To read a linked version of this README, {click here}[http://tagaholic.me/hirb/d
 
 == Description
 
-Hirb provides a mini view framework for console applications and uses it to improve irb's default inspect output.
+Hirb provides a mini view framework for console applications and uses it to improve ripl(irb)'s default inspect output.
 Given an object or array of objects, hirb renders a view based on the object's class and/or ancestry. Hirb offers reusable
 views in the form of helper classes. The two main helpers, Hirb::Helpers::Table and Hirb::Helpers::Tree, provide several options
 for generating ascii tables and trees. Using Hirb::Helpers::AutoTable, hirb has useful default views for at least ten popular database gems
@@ -14,7 +14,7 @@ only pages when the output exceeds the current screen size. The menu is used in
 
 Install the gem with:
 
-    sudo gem install hirb
+    gem install hirb
 
 == View Tutorials
 
@@ -159,14 +159,14 @@ views for certain classes, put them under lib/hirb/views. Please submit views fo
 number of users.
 
 == Limitations
-If using Wirble, you should call Hirb after it since they both override irb's default output.
+If using Wirble and irb, you should call Hirb after it since they both override irb's default output.
 
 == Motivation
 Table code from http://gist.github.com/72234 and {my console app's needs}[http://github.com/cldwalker/tag-tree].
 
 == Credits
 * Chrononaut for vertical table helper.
-* crafterm, spastorino, xaviershay, bogdan and joshua for patches.
+* crafterm, spastorino, xaviershay, bogdan, asanghi and joshua for patches.
 
 == Bugs/Issues
 Please report them {on github}[http://github.com/cldwalker/hirb/issues].

data/lib/hirb/formatter.rb

@@ -2,7 +2,7 @@ module Hirb
   # A Formatter object formats an output object (using Formatter.format_output) into a string based on the views defined
   # for its class and/or ancestry.
   class Formatter
-    TO_A_EXCEPTIONS = ['Hash', 'IO']
+    TO_A_EXCEPTIONS = [Hash, IO]
 
     class<<self
       # This config is used by Formatter.format_output to lazily load dynamic views defined with Hirb::DynamicView.
@@ -77,7 +77,7 @@ module Hirb
     end
 
     def determine_output_class(output)
-      output.respond_to?(:to_a) && !TO_A_EXCEPTIONS.include?(output.class.to_s) ?
+      output.respond_to?(:to_a) && !TO_A_EXCEPTIONS.any? {|e| output.is_a?(e) } ?
         Array(output)[0].class : output.class
     end
 

data/lib/hirb/helpers/table.rb

@@ -128,7 +128,7 @@ module Hirb
     @rows = set_rows(rows)
     @headers = set_headers
     if @options[:number]
-      @headers[:hirb_number] = "number"
+      @headers[:hirb_number] ||= "number"
       @fields.unshift :hirb_number
     end
     Helpers::Table.last_table = self

data/lib/hirb/version.rb

@@ -1,3 +1,3 @@
 module Hirb
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/lib/ripl/hirb.rb

@@ -1,8 +1,9 @@
+require 'hirb'
+
 module Ripl::Hirb
   def before_loop
     super
-    require 'hirb'
-    Hirb.enable(Ripl.config[:hirb] || {}) unless Hirb::View.enabled?
+    Hirb.enable(Ripl.config[:hirb] || {})
   end
 
   def format_result(result)

data/test/formatter_test.rb

@@ -72,10 +72,15 @@ describe "Formatter" do
       @formatter.parse_console_options(options).should == expected_options
     end
 
-    it "#determine_output_class has exceptions for to_a" do
+    it "#determine_output_class bypasses exceptions for to_a" do
       @formatter.determine_output_class(STDOUT).should == IO
       @formatter.determine_output_class({:a=>1}).should == Hash
     end
+
+    it "#determine_output_class bypasses subclasses of exceptions for to_a" do
+      class Hash2 < Hash; end
+      @formatter.determine_output_class(Hash2[1=>2]).should == Hash2
+    end
   end
 
   describe "format_output" do

data/test/table_test.rb

@@ -361,6 +361,19 @@ describe "Table" do
       table([['a','b'], ['c', 'd']], :number=>true).should == expected_table
     end
 
+    it "number option renders with header that can be overridden" do
+      expected_table = <<-TABLE.unindent
+      +----+---+---+
+      | SR | 0 | 1 |
+      +----+---+---+
+      | 1  | a | b |
+      | 2  | c | d |
+      +----+---+---+
+      2 rows in set
+      TABLE
+      table([['a','b'], ['c', 'd']], :number=>true, :headers => {:hirb_number => "SR"}).should == expected_table
+    end
+
     it "description option false renders" do
       expected_table = <<-TABLE.unindent
       +---+---+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hirb
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 -05:00
+date: 2011-01-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,7 +76,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
-description: Hirb provides a mini view framework for console applications and uses it to improve irb's default inspect output. Given an object or array of objects, hirb renders a view based on the object's class and/or ancestry. Hirb offers reusable views in the form of helper classes. The two main helpers, Hirb::Helpers::Table and Hirb::Helpers::Tree, provide several options for generating ascii tables and trees. Using Hirb::Helpers::AutoTable, hirb has useful default views for at least ten popular database gems i.e. Rails' ActiveRecord::Base. Other than views, hirb offers a smart pager and a console menu. The smart pager only pages when the output exceeds the current screen size. The menu is used in conjunction with tables to offer two dimensional menus.
+description: Hirb provides a mini view framework for console applications and uses it to improve ripl(irb)'s default inspect output. Given an object or array of objects, hirb renders a view based on the object's class and/or ancestry. Hirb offers reusable views in the form of helper classes. The two main helpers, Hirb::Helpers::Table and Hirb::Helpers::Tree, provide several options for generating ascii tables and trees. Using Hirb::Helpers::AutoTable, hirb has useful default views for at least ten popular database gems i.e. Rails' ActiveRecord::Base. Other than views, hirb offers a smart pager and a console menu. The smart pager only pages when the output exceeds the current screen size. The menu is used in conjunction with tables to offer two dimensional menus.
 email: gabriel.horner@gmail.com
 executables: []