hirb 0.2.4 → 0.2.5

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.2.5
+* Added ability to use Hirb.enable with non-irb ruby shells.
+* Helper configs now recursively merge when inheriting from others via :ancestor option.
+
 == 0.2.4
 * Bug fix on UTF-8 support.
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 4
+:patch: 5

data/lib/hirb/formatter.rb

@@ -175,7 +175,7 @@ module Hirb
       @klass_config[output_class] ||= begin
         output_ancestors_with_config = output_class.ancestors.map {|e| e.to_s}.select {|e| @config.has_key?(e)}
         @klass_config[output_class] = output_ancestors_with_config.reverse.inject({}) {|h, klass|
-          (klass == output_class.to_s || @config[klass][:ancestor]) ? h.update(@config[klass]) : h
+          (klass == output_class.to_s || @config[klass][:ancestor]) ? Util.recursive_hash_merge(h, @config[klass]) : h
         }
       end
     end

data/lib/hirb/view.rb

@@ -14,25 +14,23 @@ module Hirb
       # In addition to the config keys mentioned in Hirb, the options also take the following keys:
       # Options:
       # * config_file: Name of config file to read.
+      # * output_method: Specify an object's class and instance method (separated by a period) to be realiased with
+      #   hirb's view system. The instance method should take a string to be output. Default is IRB::Irb.output_value
+      #   if using irb.
       # Examples:
       #   Hirb::View.enable
-      #   Hirb::View.enable :formatter=>false
+      #   Hirb::View.enable :formatter=>false, :output_method=>"Mini.output"
       #   Hirb::View.enable {|c| c.output = {'String'=>{:class=>'Hirb::Helpers::Table'}} }
       def enable(options={}, &block)
         return puts("Already enabled.") if @enabled
         @enabled = true
         Hirb.config_file = options.delete(:config_file) if options[:config_file]
+        output_method = "IRB::Irb.output_value" if Object.const_defined?(:IRB)
+        output_method = options.delete(:output_method) if options[:output_method]
         load_config(Util.recursive_hash_merge(options, HashStruct.block_to_hash(block)))
         resize(config[:width], config[:height])
-        if Object.const_defined?(:IRB)
-          ::IRB::Irb.class_eval do
-            alias :non_hirb_view_output  :output_value
-            def output_value #:nodoc:
-              Hirb::View.view_output(@context.last_value) || Hirb::View.page_output(@context.last_value.inspect, true) ||
-                non_hirb_view_output
-            end
-          end
-        end
+        alias_output_method(output_method) if output_method
+        true
       end
 
       # Indicates if Hirb::View is enabled.
@@ -113,6 +111,26 @@ module Hirb
       end
 
       #:stopdoc:
+      def alias_output_method(output_method)
+        klass, klass_method = output_method.split(".")
+        eval %[
+          ::#{klass}.class_eval do
+            alias :non_hirb_view_output :#{klass_method}
+            if '#{klass}' == "IRB::Irb"
+              def #{klass_method} #:nodoc:
+                Hirb::View.view_output(@context.last_value) || Hirb::View.page_output(@context.last_value.inspect, true) ||
+                  non_hirb_view_output
+              end
+            else
+              def #{klass_method}(output_string) #:nodoc:
+                Hirb::View.view_output(output_string) || Hirb::View.page_output(output_string.inspect, true) ||
+                  non_hirb_view_output(output_string)
+              end
+            end
+          end
+        ]
+      end
+
       def render_output(output, options={})
         if (formatted_output = formatter.format_output(output, options))
           render_method.call(formatted_output)

data/test/formatter_test.rb

@@ -9,9 +9,11 @@ class FormatterTest < Test::Unit::TestCase
 
     before(:all) { eval "module ::Dooda; end" }
 
-    test "klass_config merges ancestor options" do
-      set_formatter "String"=>{:args=>[1,2]}, "Object"=>{:method=>:object_output, :ancestor=>true}, "Kernel"=>{:method=>:default_output}
-      expected_result = {:method=>:object_output, :args=>[1, 2], :ancestor=>true}
+    test "klass_config recursively merges ancestor options" do
+      set_formatter "String"=>{:args=>[1,2], :options=>{:fields=>[:to_s]}},
+        "Object"=>{:method=>:object_output, :ancestor=>true, :options=>{:vertical=>true}},
+        "Kernel"=>{:method=>:default_output}
+      expected_result = {:method=>:object_output, :args=>[1, 2], :ancestor=>true, :options=>{:fields=>[:to_s], :vertical=>true}}
       @formatter.klass_config(::String).should == expected_result
     end
 

data/test/view_test.rb

@@ -47,6 +47,13 @@ module Hirb
         Hirb.enable :config_file=> 'test_file'
         Hirb.config_file.should == 'test_file'
       end
+
+      test "with output_method option realiases output_method" do
+        eval %[module ::Mini; extend self; def output(str); puts(str.inspect); end; end]
+        Hirb.enable :output_method=>"Mini.output", :output=>{"Symbol"=>{:output_method=>lambda {|e| e.to_s }}}
+        capture_stdout { ::Mini.output(:yoyo) }.should == "yoyo\n"
+        capture_stdout { ::Mini.output('blah') }.should == "\"blah\"\n"
+      end
     end
 
     context "resize" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hirb
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-08 00:00:00 -04:00
+date: 2009-08-01 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tagaholic
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A mini view framework for console/irb that's easy to use, even while under its influence.