hirb 0.4.2 → 0.4.3

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 0.4.3
+* Remove Formatter::TO_A_EXCEPTIONS and replace with Formatter.to_a_classes
+
 == 0.4.2
 * Fix bug with Tempfile and to_a_exceptions
 

data/lib/hirb/formatter.rb

@@ -2,15 +2,17 @@ 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]
-    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.
       # This hash has the same format as Formatter.config.
       attr_accessor :dynamic_config
+
+      # Array of classes whose objects respond to :to_a and allow the first
+      # element of the converted array to determine the output class.
+      attr_accessor :to_a_classes
     end
     self.dynamic_config = {}
+    self.to_a_classes = %w{Array Set ActiveRecord::Relation}
 
     def initialize(additional_config={}) #:nodoc:
       @klass_config = {}
@@ -54,13 +56,11 @@ 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) }
+    #:stopdoc:
+    def to_a_classes
+      @to_a_classes ||= self.class.to_a_classes.map {|e| Util.any_const_get(e) }.compact
     end
 
-    #:stopdoc:
     def _format_output(output, options, &block)
       output = options[:output_method] ? (output.is_a?(Array) ?
         output.map {|e| call_output_method(options[:output_method], e) } :
@@ -84,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_classes.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.2'
+  VERSION = '0.4.3'
 end

data/test/formatter_test.rb

@@ -72,19 +72,9 @@ 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
-    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
+    it "#determine_output_class recognizes subclasses of to_a classes" do
+      class Array2 < Array; end
+      @formatter.determine_output_class(Array2.new(%w{ok dude})).should == String
     end
   end
 

metadata

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