hirb 0.4.1 → 0.4.2

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 0.4.2
+* Fix bug with Tempfile and to_a_exceptions
+
 == 0.4.1
 * Fix bug with rendering empty hash
 * Add missing yaml require

data/lib/hirb/formatter.rb

@@ -3,6 +3,7 @@ module Hirb
   # for its class and/or ancestry.
   class Formatter
     TO_A_EXCEPTIONS = [Hash, IO]
+    POSSIBLE_TO_A_EXCEPTIONS = %w{Tempfile}
 
     class<<self
       # This config is used by Formatter.format_output to lazily load dynamic views defined with Hirb::DynamicView.
@@ -53,6 +54,12 @@ module Hirb
       _format_output(output, options, &block)
     end
 
+    # Array of classes whose objects respond to :to_a and are exceptions to the Formatter's array algorithm.
+    def to_a_exceptions
+      @to_a_exceptions ||= TO_A_EXCEPTIONS + POSSIBLE_TO_A_EXCEPTIONS.select {|e|
+        Object.const_defined?(e) }.map {|e| Object.const_get(e) }
+    end
+
     #:stopdoc:
     def _format_output(output, options, &block)
       output = options[:output_method] ? (output.is_a?(Array) ?
@@ -77,7 +84,7 @@ module Hirb
     end
 
     def determine_output_class(output)
-      output.respond_to?(:to_a) && !TO_A_EXCEPTIONS.any? {|e| output.is_a?(e) } ?
+      output.respond_to?(:to_a) && !to_a_exceptions.any? {|e| output.is_a?(e) } ?
         Array(output)[0].class : output.class
     end
 

data/lib/hirb/version.rb

@@ -1,3 +1,3 @@
 module Hirb
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/lib/ripl/hirb.rb

@@ -12,4 +12,4 @@ module Ripl::Hirb
   end
 end
 
-Ripl::Shell.send :include, Ripl::Hirb
+Ripl::Shell.include Ripl::Hirb

data/test/formatter_test.rb

@@ -72,6 +72,11 @@ describe "Formatter" do
       @formatter.parse_console_options(options).should == expected_options
     end
 
+    it "#determine output_class bypasses optional exceptions for to_a" do
+      require 'tempfile'
+      @formatter.determine_output_class(Tempfile.new('')).should == Tempfile
+    end
+
     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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hirb
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 00:00:00 -04:00
+date: 2011-03-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency