hirb 0.3.2 → 0.3.3

data/.gemspec

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+require 'rubygems' unless Object.const_defined?(:Gem)
+require File.dirname(__FILE__) + "/lib/hirb/version"
+ 
+Gem::Specification.new do |s|
+  s.name        = "hirb"
+  s.version     = Hirb::VERSION
+  s.authors     = ["Gabriel Horner"]
+  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.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project = 'tagaholic'
+  s.add_development_dependency 'bacon', '>= 1.1.0'
+  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'mocha-on-bacon'
+  s.add_development_dependency 'bacon-bits'
+  s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]
+  s.license = 'MIT'
+end

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.3.3
+* Added ignore_errors option to ignore view errors and continue with original view.
+* Added support for array menu items.
+* Added support to ObjectTable for objects with an undefined :send method.
+
 == 0.3.2
 * Added irb autocompletions for bond.
 * Fixed tests for ruby 1.9.

data/README.rdoc

@@ -1,3 +1,5 @@
+To read a linked version of this README, {click here}[http://tagaholic.me/hirb/doc/].
+
 == Description
 
 Hirb provides a mini view framework for console applications and uses it to improve irb's default inspect output.
@@ -8,8 +10,6 @@ i.e. Rails' ActiveRecord::Base. Other than views, hirb offers a smart pager and
 only pages when the output exceeds the current screen size. The menu is used in conjunction with tables to offer
 {two dimensional menus}[http://tagaholic.me/2010/02/16/two-dimensional-console-menus-with-hirb.html].
 
-Note: To read a linked version of this README, {click here}[http://tagaholic.me/hirb/doc/].
-
 == Install
 
 Install the gem with:
@@ -21,6 +21,16 @@ Install the gem with:
 * To create and configure views, see Hirb::View or {here if on the web}[http://tagaholic.me/hirb/doc/classes/Hirb/View.html].
 * To create dynamic views, see Hirb::DynamicView or {here if on the web}[http://tagaholic.me/hirb/doc/classes/Hirb/DynamicView.html].
 
+== Printing Ascii Tables
+
+To print ascii tables from an array of arrays, hashes or any objects:
+
+  puts Hirb::Helper::AutoTable.render(ARRAY_OF_OBJECTS)
+
+Hirb will intelligently pick up on field names from an array of hashes and create properly-aligned
+fields from an array of arrays. See
+{here}[http://tagaholic.me/2009/10/15/boson-and-hirb-interactions.html#hirbs_handy_tables] for examples.
+
 == Rails Example
 
 Let's load and enable the view framework:
@@ -156,7 +166,7 @@ Table code from http://gist.github.com/72234 and {my console app's needs}[http:/
 
 == Credits
 * Chrononaut for vertical table helper.
-* crafterm, spastorino, xaviershay and joshua for bug fixes.
+* crafterm, spastorino, xaviershay, bogdan and joshua for patches.
 
 == Bugs/Issues
 Please report them {on github}[http://github.com/cldwalker/hirb/issues].
@@ -169,4 +179,4 @@ Please report them {on github}[http://github.com/cldwalker/hirb/issues].
 == Todo
 * Consider generating views based on methods an object responds to.
 * Provide helper methods to all views.
-* Consider adding a template helper.
+* Consider adding a template helper.

data/Rakefile

@@ -2,12 +2,12 @@ require 'rake'
 require 'fileutils'
 
 def gemspec
-  @gemspec ||= eval(File.read('gemspec'), binding, 'gemspec')
+  @gemspec ||= eval(File.read('.gemspec'), binding, '.gemspec')
 end
 
 desc "Build the gem"
 task :gem=>:gemspec do
-  sh "gem build gemspec"
+  sh "gem build .gemspec"
   FileUtils.mkdir_p 'pkg'
   FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", 'pkg'
 end
@@ -32,4 +32,4 @@ task :test do |t|
   sh 'bacon -q -Ilib -I. test/*_test.rb'
 end
 
-task :default => :test
+task :default => :test

data/lib/hirb.rb

@@ -26,6 +26,8 @@ require 'hirb/version'
 # [*:pager*] Boolean which determines if the pager is enabled. Defaults to true.
 # [*:pager_command*] Command to be used for paging. Command can have options after it i.e. 'less -r'.
 #                    Defaults to common pagers i.e. less and more if detected.
+# [*:ignore_errors*] Boolean which ignores internal view errors and continues with original view
+#                    (i.e. #inspect for irb). Defaults to false.
 module Hirb
   class <<self
     attr_accessor :config_files, :config

data/lib/hirb/helpers/object_table.rb

@@ -7,7 +7,7 @@ class Hirb::Helpers::ObjectTable < Hirb::Helpers::Table
     options[:fields] ||= [:to_s]
     options[:headers] ||= {:to_s=>'value'} if options[:fields] == [:to_s]
     item_hashes = options[:fields].empty? ? [] : Array(rows).inject([]) {|t,item|
-      t << options[:fields].inject({}) {|h,f| h[f] = item.send(f); h}
+      t << options[:fields].inject({}) {|h,f| h[f] = item.__send__(f); h}
     }
     super(item_hashes, options)
   end

data/lib/hirb/menu.rb

@@ -126,7 +126,9 @@ module Hirb
     def map_tokens(tokens)
       if return_cell_values?
         @output[0].is_a?(Hash) ? tokens.map {|arr,f| arr.map {|e| e[f]} }.flatten :
-          tokens.map {|arr,f| arr.map {|e| e.send(f) } }.flatten
+          tokens.map {|arr,f|
+            arr.map {|e| e.is_a?(Array) && f.is_a?(Integer) ? e[f] : e.send(f) }
+          }.flatten
       else
         tokens.map {|e| e[0] }.flatten
       end

data/lib/hirb/version.rb

@@ -1,3 +1,3 @@
 module Hirb
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/lib/hirb/view.rb

@@ -125,9 +125,14 @@ module Hirb
       def view_output(output, options={})
         enabled? && config[:formatter] && render_output(output, options)
       rescue Exception=>e
-        index = (obj = e.backtrace.find {|f| f =~ /^\(eval\)/}) ? e.backtrace.index(obj) : e.backtrace.length
-        $stderr.puts "Hirb Error: #{e.message}", e.backtrace.slice(0,index).map {|e| "    " + e }
-        true
+        if config[:ignore_errors]
+          $stderr.puts "Hirb Error: #{e.message}"
+          false
+        else
+          index = (obj = e.backtrace.find {|f| f =~ /^\(eval\)/}) ? e.backtrace.index(obj) : e.backtrace.length
+          $stderr.puts "Hirb Error: #{e.message}", e.backtrace.slice(0,index).map {|e| "    " + e }
+          true
+        end
       end
 
       # Captures STDOUT and renders it using render_method(). The main use case is to conditionally page captured stdout.
@@ -276,4 +281,4 @@ module Hirb
       #:startdoc:
     end
   end
-end
+end

data/test/deps.rip

@@ -0,0 +1,4 @@
+bacon >=1.1.0
+mocha >=0
+mocha-on-bacon >=0
+bacon-bits >=0

data/test/menu_test.rb

@@ -187,6 +187,12 @@ describe "Menu" do
       capture_stderr { two_d_menu(:action=>true) }.should =~ /No command given/
     end
 
+    it "with array menu items" do
+      menu_input "p 1"
+      two_d_menu :action=>true, :output=>[['some', 'choice'], ['and', 'another']],
+        :invokes=>[[['some']]]
+    end
+
     it "with multi_action option invokes" do
       menu_input "p 1 2:bro"
       two_d_menu(:action=>true, :multi_action=>true, :invokes=>[[1], [4]])

data/test/object_table_test.rb

@@ -70,4 +70,10 @@ describe "object table" do
     TABLE
     table(@pets, :fields => []).should == expected_table
   end
+
+  it "doesn't raise error for objects that don't have :send defined" do
+    object = Object.new
+    class<<object; self; end.send :undef_method, :send
+    should.not.raise(NoMethodError) { table([object], :fields=>[:to_s]) }
+  end
 end

data/test/test_helper.rb

@@ -1,5 +1,5 @@
 require 'bacon'
-require File.dirname(__FILE__)+'/bacon_extensions'
+require 'bacon/bits'
 require 'mocha'
 require 'mocha-on-bacon'
 require 'hirb'
@@ -41,7 +41,6 @@ end
 
 class Bacon::Context
   include TestHelpers
-  include BaconExtensions
 end
 
 class String
@@ -59,4 +58,4 @@ module ::IRB
     end
     def output_value; end
   end
-end
+end

data/test/view_test.rb

@@ -98,6 +98,12 @@ describe "View" do
       capture_stdout { ::Mini.output(:yoyo) }.should == "yoyo\n"
       capture_stdout { ::Mini.output('blah') }.should == "\"blah\"\n"
     end
+
+    it "with ignore_errors enable option" do
+      Hirb.enable :ignore_errors => true
+      View.stubs(:render_output).raises(Exception, "Ex mesg")
+      capture_stderr { View.view_output("").should == false }.should =~ /Error: Ex mesg/
+    end
   end
 
   describe "resize" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hirb
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -04:00
+date: 2010-08-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,9 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
+        - 1
+        - 1
         - 0
-        version: "0"
+        version: 1.1.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -38,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -51,12 +56,27 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id003
-description: Hirb currently provides a mini view framework for console applications, designed to improve irb's default output.  Hirb improves console output by providing a smart pager and auto-formatting output. The smart pager detects when an output exceeds a screenful and thus only pages output as needed. Auto-formatting adds a view to an output's class. This is helpful in separating views from content (MVC anyone?). The framework encourages reusing views by letting you package them in classes and associate them with any number of output classes.
+- !ruby/object:Gem::Dependency 
+  name: bacon-bits
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        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.
 email: gabriel.horner@gmail.com
 executables: []
 
@@ -94,7 +114,6 @@ files:
 - lib/hirb/views.rb
 - lib/hirb.rb
 - test/auto_table_test.rb
-- test/bacon_extensions.rb
 - test/console_test.rb
 - test/dynamic_view_test.rb
 - test/formatter_test.rb
@@ -113,12 +132,13 @@ files:
 - LICENSE.txt
 - CHANGELOG.rdoc
 - README.rdoc
+- test/deps.rip
 - Rakefile
-- gemspec
+- .gemspec
 has_rdoc: true
 homepage: http://tagaholic.me/hirb/
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -129,6 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -137,6 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3

data/gemspec

@@ -1,20 +0,0 @@
-# -*- encoding: utf-8 -*-
-require 'rubygems' unless Object.const_defined?(:Gem)
-require File.dirname(__FILE__) + "/lib/hirb/version"
- 
-Gem::Specification.new do |s|
-  s.name        = "hirb"
-  s.version     = Hirb::VERSION
-  s.authors     = ["Gabriel Horner"]
-  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 currently provides a mini view framework for console applications, designed to improve irb's default output.  Hirb improves console output by providing a smart pager and auto-formatting output. The smart pager detects when an output exceeds a screenful and thus only pages output as needed. Auto-formatting adds a view to an output's class. This is helpful in separating views from content (MVC anyone?). The framework encourages reusing views by letting you package them in classes and associate them with any number of output classes." 
-  s.required_rubygems_version = ">= 1.3.6"
-  s.rubyforge_project = 'tagaholic'
-  s.add_development_dependency 'bacon'
-  s.add_development_dependency 'mocha'
-  s.add_development_dependency 'mocha-on-bacon'
-  s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c}]) + %w{Rakefile gemspec}
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]
-end

data/test/bacon_extensions.rb

@@ -1,26 +0,0 @@
-module BaconExtensions
-  def self.included(mod)
-    mod.module_eval do
-      # nested context methods automatically inherit methods from parent contexts
-      def describe(*args, &block)
-        context = Bacon::Context.new(args.join(' '), &block)
-        (parent_context = self).methods(false).each {|e|
-          class<<context; self end.send(:define_method, e) {|*args| parent_context.send(e, *args)}
-        }
-        @before.each { |b| context.before(&b) }
-        @after.each { |b| context.after(&b) }
-        context.run
-      end
-    end
-  end
-
-  def xit(*args); end
-  def xdescribe(*args); end
-  def before_all; yield; end
-  def after_all; yield; end
-  def assert(description, &block)
-    it(description) do
-      block.call.should == true
-    end
-  end
-end