hirb 0.7.0 → 0.7.1

data/.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   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.add_development_dependency 'bacon', '>= 1.1.0'
-  s.add_development_dependency 'mocha', '>= 0.9.8'
-  s.add_development_dependency 'mocha-on-bacon', '>= 0.1.1'
+  s.add_development_dependency 'mocha', '~> 0.12.1'
+  s.add_development_dependency 'mocha-on-bacon', '~> 0.2.1'
   s.add_development_dependency 'bacon-bits'
   s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} {.,test,spec}/deps.rip]) + %w{Rakefile .gemspec .travis.yml}
   s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]

data/.travis.yml

@@ -1,5 +1,5 @@
 before_install: bundle init --gemspec=.gemspec
-script: MOCHA_OPTIONS=skip_integration bacon -q -Ilib -I. test/*_test.rb
+script: bacon -q -Ilib -I. test/*_test.rb
 rvm:
 - 1.8.7
 - 1.9.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.7.1
+* Add :style option
+* Fix mocha dep issue
+
 == 0.7.0
 * Add github markdown table
 

data/README.rdoc

@@ -116,7 +116,7 @@ tables/views for any output object:
   1 row in set
 
   # Creates github-markdown
-  >> table [[:a, :b :c]], :markdown => true
+  >> table [[:a, :b, :c]], :markdown => true
   | 0 | 1 | 2 |
   |---|---|---|
   | a | b | c |
@@ -187,7 +187,7 @@ Table code from http://gist.github.com/72234 and {my console app's needs}[http:/
 * Chrononaut for vertical table helper.
 * janlelis for unicode table helper.
 * technogeeky and FND for markdown table helper.
-* hsume2, crafterm, spastorino, xaviershay, bogdan, asanghi, vwall and joshua for patches.
+* hsume2, crafterm, spastorino, xaviershay, bogdan, asanghi, vwall, maxmeyer, jimjh and joshua for patches.
 
 == Bugs/Issues
 Please report them {on github}[http://github.com/cldwalker/hirb/issues].

data/lib/hirb/helpers/table.rb

@@ -58,7 +58,7 @@ module Hirb
 # For a thorough example, see {Boson::Pipe}[http://github.com/cldwalker/boson/blob/master/lib/boson/pipe.rb].
 #--
 # derived from http://gist.github.com/72234
- class Helpers::Table
+class Helpers::Table
   BORDER_LENGTH = 3 # " | " and "-+-" are the borders
   MIN_FIELD_LENGTH = 3
   class TooManyFieldsForWidthError < StandardError; end
@@ -95,13 +95,17 @@ module Hirb
     # [*:filter_any*] When set to true, any cell defaults to being filtered by its class in :filter_classes.
     #                 Default Hirb::Helpers::Table.filter_any().
     # [*:filter_classes*] Hash which maps classes to filters. Default is Hirb::Helpers::Table.filter_classes().
-    # [*:vertical*] When set to true, renders a vertical table using Hirb::Helpers::VerticalTable. Default is false.
-    # [*:unicode*] When set to true, renders a unicode table using Hirb::Helpers::UnicodeTable. Default is false.
-    # [*:tab*] When set to true, renders a tab-delimited table using Hirb::Helpers::TabTable. Default is false.
     # [*:all_fields*] When set to true, renders fields in all rows. Valid only in rows that are hashes. Default is false.
     # [*:description*] When set to true, renders row count description at bottom. Default is true.
     # [*:escape_special_chars*] When set to true, escapes special characters \n,\t,\r so they don't disrupt tables. Default is false for
     #                           vertical tables and true for anything else.
+    # [*:vertical*] When set to true, renders a vertical table using Hirb::Helpers::VerticalTable. Default is false.
+    # [*:unicode*] When set to true, renders a unicode table using Hirb::Helpers::UnicodeTable. Default is false.
+    # [*:tab*] When set to true, renders a tab-delimited table using Hirb::Helpers::TabTable. Default is false.
+    # [*:style*] Choose style of table: :simple, :vertical, :unicode, :tab or :markdown. :simple
+    #            just uses the default render. Other values map to a capitalized namespace in format
+    #            Hirb::Helpers::OptionValTable.
+    #
     # Examples:
     #    Hirb::Helpers::Table.render [[1,2], [2,3]]
     #    Hirb::Helpers::Table.render [[1,2], [2,3]], :max_fields=>{0=>10}, :header_filter=>:capitalize
@@ -109,18 +113,37 @@ module Hirb
     #    Hirb::Helpers::Table.render [{:age=>10, :weight=>100}, {:age=>80, :weight=>500}]
     #    Hirb::Helpers::Table.render [{:age=>10, :weight=>100}, {:age=>80, :weight=>500}], :headers=>{:weight=>"Weight(lbs)"}
     #    Hirb::Helpers::Table.render [{:age=>10, :weight=>100}, {:age=>80, :weight=>500}], :filters=>{:age=>[:to_f]}
+    #    Hirb::Helpers::Table.render [{:age=>10, :weight=>100}, {:age=>80, :weight=>500}], :style=> :simple}
     def render(rows, options={})
-      options[:vertical] ? Helpers::VerticalTable.render(rows, options) :
-      options[:unicode]  ? Helpers::UnicodeTable.render(rows, options) :
-      options[:tab]      ? Helpers::TabTable.render(rows, options) :
-      options[:markdown] ? Helpers::MarkdownTable.render(rows, options) :
-                           new(rows, options).render
+      choose_style(rows, options)
     rescue TooManyFieldsForWidthError
       $stderr.puts "", "** Hirb Warning: Too many fields for the current width. Configure your width " +
         "and/or fields to avoid this error. Defaulting to a vertical table. **"
       Helpers::VerticalTable.render(rows, options)
     end
 
+    def choose_style(rows, options)
+      case options[:style]
+      when :vertical
+        Helpers::VerticalTable.render(rows, options)
+      when :unicode
+        Helpers::UnicodeTable.render(rows, options)
+      when :tab
+        Helpers::TabTable.render(rows, options)
+      when :markdown
+        Helpers::MarkdownTable.render(rows, options)
+      when :simple
+        new(rows, options).render
+      else
+        options[:vertical] ? Helpers::VerticalTable.render(rows, options) :
+          options[:unicode]  ? Helpers::UnicodeTable.render(rows, options) :
+          options[:tab]      ? Helpers::TabTable.render(rows, options) :
+          options[:markdown] ? Helpers::MarkdownTable.render(rows, options) :
+          new(rows, options).render
+      end
+    end
+    private :choose_style
+
     # A hash which maps a cell value's class to a filter. This serves to set a default filter per field if all of its
     # values are a class in this hash. By default, Array values are comma joined and Hashes are inspected.
     # See the :filter_any option to apply this filter per value.
@@ -132,6 +155,7 @@ module Hirb
   end
   self.filter_classes = { Array=>:comma_join, Hash=>:inspect }
 
+
   def chars
     self.class.const_get(:CHARS)
   end

data/lib/hirb/version.rb

@@ -1,3 +1,3 @@
 module Hirb
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/test/deps.rip

@@ -1,4 +1,4 @@
 bacon >=1.1.0
-mocha >=0.9.8
-mocha-on-bacon >=0.1.1
+mocha ~>0.12.1
+mocha-on-bacon ~>0.2.1
 bacon-bits >=0

data/test/table_test.rb

@@ -21,6 +21,19 @@ describe "Table" do
       table([{:a=>1, :b=>2}, {:a=>3, :b=>4}]).should == expected_table
     end
 
+    it "also renders to the same table with :simple style given" do
+      expected_table = <<-TABLE.unindent
+      +---+---+
+      | a | b |
+      +---+---+
+      | 1 | 2 |
+      | 3 | 4 |
+      +---+---+
+      2 rows in set
+      TABLE
+      table([{:a=>1, :b=>2}, {:a=>3, :b=>4}], :style => :simple).should == expected_table
+    end
+
     it "with no headers renders" do
       expected_table = <<-TABLE.unindent
       +---+---+

data/test/test_helper.rb

@@ -1,6 +1,5 @@
 require 'bacon'
 require 'bacon/bits'
-require 'mocha'
 require 'mocha-on-bacon'
 require 'hirb'
 include Hirb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hirb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -32,33 +32,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: mocha-on-bacon
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bacon-bits
   requirement: !ruby/object:Gem::Requirement