awesome_print 0.3.0 → 0.4.0

data/CHANGELOG

@@ -1,3 +1,24 @@
+0.4.0
+  - 'ap object' now returns the object (Stephan Hagemann)
+  - Added :html => true option to enable HTML colors rather that ANSI (ex. Sinatra templates)
+  - Added AwesomePrint.force_colors! to allow color output on demand (Andrew O'Brien)
+  - Added MongoMapper formatter mixin (Elpizo Choi)
+  - Fixed formatting of methods array when object#method is overridden
+  - Fixed potential stack errors by checking whether AwesomePrint is already loaded
+  - Improved Ruby 1.8.6 and 1.8.7 compatibility
+  - Improved Windows compatibility (Viktar Basharymau)
+
+0.3.2
+  - Make sure Rails mixins get loaded in Rails console when required from .irbrc
+  - Fixed an issue with classes that define their own #send method (ex: Socket)
+  - Fixed compatibility issue with Liquid gem that defines Module#liquid_methods
+  - Fixed hash spec for Ruby < 1.9 where order of hash keys is not guaranteed
+  - Added :sorted_hash_keys option to sort hash keys (Ed Ruder)
+
+0.3.1 RubyConf X edition
+  - Fixed Ruby 1.8.6 compatibility issues (thanks, Tim!)
+  - Fixed stack overflow issue with Rails 2.3.x console
+
 0.3.0
   - Display object.methods and family in human readable format
   - Objects inherited from Array, Hash, File, Dir, and Struct are shown as their base class

data/LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2010 Michael Dvorkin
+Copyright (c) 2010-2011 Michael Dvorkin
+twitter.com/mid
 %w(mike dvorkin.net) * "@" || %w(mike fatfreecrm.com) * "@"
 
 Permission is hereby granted, free of charge, to any person obtaining

data/README.md

@@ -15,14 +15,17 @@ objects and usage within Rails templates are supported via included mixins.
 
 ### Usage ###
 
-    require "ap"
+    require "awesome_print"
     ap object, options = {}
 
 Default options:
 
-    :multiline => true,
-    :plain  => false,
-    :indent => 4,
+    :multiline => true,           # Display in multiple lines.
+    :plain     => false,          # Use colors.
+    :indent    => 4,              # Indent using 4 spaces.
+    :index     => true,           # Display array indices.
+    :html      => false,          # Use ANSI color codes rather than HTML.
+    :sorted_hash_keys => false,   # Do not sort hash keys.
     :color => {
       :array      => :white,
       :bignum     => :blue,
@@ -46,7 +49,7 @@ Supported color names:
 
 ### Examples ###
     $ cat > 1.rb
-    require "ap"
+    require "awesome_print"
     data = [ false, 42, %w(forty two), { :now => Time.now, :class => Time.now.class, :distance => 42e42 } ]
     ap data
     ^D
@@ -66,7 +69,7 @@ Supported color names:
     ]
 
     $ cat > 2.rb
-    require "ap"
+    require "awesome_print"
     data = { :now => Time.now, :class => Time.now.class, :distance => 42e42 }
     ap data, :indent => -2  # <-- Left align hash keys.
     ^D
@@ -78,7 +81,7 @@ Supported color names:
     }
 
     $ cat > 3.rb
-    require "ap"
+    require "awesome_print"
     data = [ false, 42, %w(forty two) ]
     data << data  # <-- Nested array.
     ap data, :multiline => false
@@ -87,7 +90,7 @@ Supported color names:
     [ false, 42, [ "forty", "two" ], [...] ]
 
     $ cat > 4.rb
-    require "ap"
+    require "awesome_print"
     class Hello
       def self.world(x, y, z = nil, &blk)
       end
@@ -100,7 +103,7 @@ Supported color names:
     ]
 
     $ cat > 5.rb
-    require "ap"
+    require "awesome_print"
     ap (''.methods - Object.methods).grep(/!/)
     ^D
     $ ruby 5.rb
@@ -127,10 +130,17 @@ Supported color names:
         [19]     upcase!()           String
     ]
 
+    $ cat > 6.rb
+    require "awesome_print"
+    ap 42 == ap(42)
+    ^D
+    $ ruby 6.rb
+    42
+    true
+
 ### Example (Rails console) ###
-    $ ruby script/console
-    Loading development environment (Rails 2.3.5)
-    rails> require "ap"
+    $ rails console
+    rails> require "awesome_print"
     rails> ap Account.all(:limit => 2)
     [
         [0] #<Account:0x1033220b8> {
@@ -190,7 +200,7 @@ To use awesome_print as default formatter in irb and Rails console add the follo
 lines into your ~/.irbrc file:
 
 	require "rubygems"
-	require "ap"
+	require "awesome_print"
 
 	unless IRB.version.include?('DietRB')
 	  IRB::Irb.class_eval do
@@ -207,25 +217,30 @@ lines into your ~/.irbrc file:
 	end
 
 ### Logger Convenience Method ###
-awesome_print adds an ap method to the Logger and ActiveSupport::BufferedLogger classes,
-allowing you to call:
+awesome_print adds the 'ap' method to the Logger and ActiveSupport::BufferedLogger classes
+letting you call:
 
     logger.ap object
 
-By default, this logs at the :debug level. You can override that globally with
+By default, this logs at the :debug level. You can override that globally with:
 
     :log_level => :info
 
-in the custom defaults (see below), or you can override on a per call basis with
+in the custom defaults (see below). You can also override on a per call basis with:
 
     logger.ap object, :warn
 
 ### ActionView Convenience Method ###
-awesome_print adds an ap method to the ActionView::Base class making it available
+awesome_print adds the 'ap' method to the ActionView::Base class making it available
 within Rails templates. For example:
 
     <%= ap @accounts.first %>
 
+With other web frameworks (ex: in Sinatra templates) you can explicitly request HTML
+formatting:
+
+    <%= ap @accounts.first, :html => true %>
+
 ### Setting Custom Defaults ###
 You can set your own default options by creating ``.aprc`` file in your home
 directory. Within that file assign your  defaults to ``AwesomePrint.defaults``.
@@ -242,9 +257,9 @@ For example:
 
 ### Running Specs ###
 
-    $ rake spec                           # Entire spec suite.
-    $ ruby -rubygems spec/logger_spec.rb  # Individual spec file (Ruby 1.8.7 and RSpec 1.3+)
-    $ rspec spec/logger_spec.rb           # Individual spec file (Ruby 1.9.2 and RSpec 2.0+)
+    $ gem install rspec           # RSpec 2.x is the requirement.
+    $ rake spec                   # Run the entire spec suite.
+    $ rspec spec/logger_spec.rb   # Run individual spec file.
 
 ### Note on Patches/Pull Requests ###
 * Fork the project on Github.
@@ -255,14 +270,22 @@ For example:
 
 ### Contributors ###
 
+* Andrew O'Brien -- https://github.com/AndrewO
 * Daniel Bretoi -- http://github.com/danielb2
 * Eloy Duran -- http://github.com/alloy
+* Elpizo Choi -- https://github.com/fuJiin
 * Benoit Daloze -- http://github.com/eregon
 * Sean Gallagher -- http://github.com/torandu
+* Stephan Hagemann -- https://github.com/shageman
+* Tim Harper -- http://github.com/timcharper
 * Tobias Crawley -- http://github.com/tobias
+* Viktar Basharymau -- https://github.com/DNNX
 
 ### License ###
-Copyright (c) 2010 Michael Dvorkin  
+Copyright (c) 2010-2011 Michael Dvorkin
+
+twitter.com/mid
+
 %w(mike dvorkin.net) * "@" || %w(mike fatfreecrm.com) * "@"
 
-Released under the MIT license. See LICENSE file for details.
+Released under the MIT license. See LICENSE file for details.

data/Rakefile

@@ -11,13 +11,8 @@ begin
     gem.email = "mike@dvorkin.net"
     gem.homepage = "http://github.com/michaeldv/awesome_print"
     gem.authors = ["Michael Dvorkin"]
-    if RUBY_VERSION.to_f >= 1.9
-      gem.add_development_dependency "rspec", ">= 2.0.0"
-    else
-      gem.add_development_dependency "rspec", ">= 1.3.0"
-    end
+    gem.add_development_dependency "rspec", ">= 2.5.0"
     gem.files = FileList["[A-Z]*", "lib/**/*.rb", "rails/*.rb", "spec/*", "init.rb"]
-    gem.has_rdoc = false
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -25,30 +20,15 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-if RUBY_VERSION.to_f >= 1.9
-  require "rspec/core/rake_task" # RSpec 2.0
-  RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.pattern = 'spec/**/*_spec.rb'
-    spec.rspec_opts = ['--color']
-  end
-
-  RSpec::Core::RakeTask.new(:rcov) do |spec|
-    spec.rcov = true
-    spec.rcov_opts =  %q[--exclude "spec"]
-  end
-else
-  require 'spec/rake/spectask'
-  Spec::Rake::SpecTask.new(:spec) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.spec_opts = ['--color']
-    spec.spec_files = FileList['spec/**/*_spec.rb']
-  end
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rspec_opts = ['--color']
+end
 
-  Spec::Rake::SpecTask.new(:rcov) do |spec|
-    spec.libs << 'lib' << 'spec'
-    spec.pattern = 'spec/**/*_spec.rb'
-    spec.rcov = true
-  end
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.rcov = true
+  spec.rcov_opts =  %q[--exclude "spec"]
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/init.rb

@@ -1 +1 @@
-require File.join(File.dirname(__FILE__), "lib", "ap")
+require File.join(File.dirname(__FILE__), "lib", "awesome_print")

data/lib/ap/awesome_print.rb

@@ -1,20 +1,24 @@
-# Copyright (c) 2010 Michael Dvorkin
+# Copyright (c) 2010-2011 Michael Dvorkin
 #
 # Awesome Print is freely distributable under the terms of MIT license.
 # See LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
+require "cgi"
 require "shellwords"
 
 class AwesomePrint
   AP = :__awesome_print__ unless defined?(AwesomePrint::AP)
   CORE = [ :array, :hash, :class, :file, :dir, :bigdecimal, :rational, :struct, :method, :unboundmethod ] unless defined?(AwesomePrint::CORE)
+  @@force_colors = false
 
   def initialize(options = {})
     @options = { 
-      :multiline => true,
-      :plain     => false,
-      :indent    => 4,
-      :index     => true,
+      :multiline => true,           # Display in multiple lines.
+      :plain     => false,          # Use colors.
+      :indent    => 4,              # Indent using 4 spaces.
+      :index     => true,           # Display array indices.
+      :html      => false,          # Use ANSI color codes rather than HTML.
+      :sorted_hash_keys => false,   # Do not sort hash keys.
       :color     => { 
         :array      => :white,
         :bigdecimal => :blue,
@@ -42,7 +46,8 @@ class AwesomePrint
     @indentation = @options[:indent].abs
     Thread.current[AP] ||= []
   end
-  
+
+
   private
 
   # Format an array.
@@ -75,7 +80,8 @@ class AwesomePrint
   def awesome_hash(h)
     return "{}" if h == {}
 
-    data = h.keys.map do |key|
+    keys = @options[:sorted_hash_keys] ? h.keys.sort { |a, b| a.to_s <=> b.to_s } : h.keys
+    data = keys.map do |key|
       plain_single_line do
         [ awesome(key), h[key] ]
       end
@@ -101,7 +107,7 @@ class AwesomePrint
     end
   end
 
-  # Format a Struct. If @options[:indent] if negative left align hash keys.
+  # Format a Struct. If @options[:indent] is negative left align hash keys.
   #------------------------------------------------------------------------------
   def awesome_struct(s)
     h = {}
@@ -174,13 +180,15 @@ class AwesomePrint
   def methods_array(a)
     object = a.instance_variable_get('@__awesome_methods__')
     tuples = a.map do |name|
-      if object.respond_to?(name, true)           # Regular method?
-        method_tuple(object.method(name))
-      elsif object.respond_to?(:instance_method)  # Unbound method?
+      tuple = if object.respond_to?(name, true)         # Is this a regular method?
+        the_method = object.method(name) rescue nil     # Avoid potential ArgumentError if object#method is overridden.
+        if the_method && the_method.respond_to?(:arity) # Is this original object#method?
+          method_tuple(the_method)                      # Yes, we are good.
+        end
+      elsif object.respond_to?(:instance_method)        # Is this an unbound method?
         method_tuple(object.instance_method(name))
-      else                                        # WTF method.
-        [ name.to_s, '(?)', '' ]
       end
+      tuple || [ name.to_s, '(?)', '' ]                 # Return WTF default if all the above fails.
     end
 
     width = (tuples.size - 1).to_s.size
@@ -239,10 +247,11 @@ class AwesomePrint
   # Pick the color and apply it to the given string as necessary.
   #------------------------------------------------------------------------------
   def colorize(s, type)
-    if @options[:plain] || @options[:color][type].nil?
-      s
+    s = CGI.escapeHTML(s) if @options[:html]
+    if @options[:plain] || !@options[:color][type] || !colorize?
+      @options[:html] ? "<pre>#{s}</pre>" : s
     else
-      s.send(@options[:color][type])
+      s.send(@options[:color][type], @options[:html])
     end
   end
 
@@ -261,7 +270,7 @@ class AwesomePrint
         end
       end
     else # See http://ruby-doc.org/core/classes/Method.html#M001902
-      args = method.arity.abs.times.map { |i| "arg#{i+1}" }
+      args = (1..method.arity.abs).map { |i| "arg#{i}" }
       args[-1] = "*#{args[-1]}" if method.arity < 0
     end
 
@@ -317,6 +326,19 @@ class AwesomePrint
     $stderr.puts "Could not load #{dotfile}: #{e}"
   end
 
+  # Return true if we are to colorize the output.
+  #------------------------------------------------------------------------------
+  def colorize?
+    @@force_colors || (STDOUT.tty? && ((ENV['TERM'] && ENV['TERM'] != 'dumb') || ENV['ANSICON']))
+  end
+
+  # Class accessor to force colorized output (ex. forked subprocess where TERM
+  # might be dumb).
+  #------------------------------------------------------------------------------
+  def self.force_colors!(value = true)
+    @@force_colors = value
+  end
+
   # Class accessors for custom defaults.
   #------------------------------------------------------------------------------
   def self.defaults

data/lib/ap/core_ext/array.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010 Michael Dvorkin
+# Copyright (c) 2010-2011 Michael Dvorkin
 #
 # Awesome Print is freely distributable under the terms of MIT license.
 # See LICENSE file or http://www.opensource.org/licenses/mit-license.php
@@ -10,16 +10,17 @@
 #   ap [].methods - Object.methods
 #   ap ''.methods.grep(/!|\?/)
 #
-# If you could think of a better way please let me know: twitter.com/mid :-)
+# If you could think of a better way please let me know :-)
 #
 class Array #:nodoc:
   [ :-, :& ].each do |operator|
-    alias :"original_#{operator.object_id}" :"#{operator}"
+    original_operator = instance_method(operator)
+
     define_method operator do |*args|
-      arr = self.send(:"original_#{operator.object_id}", *args)
+      arr = original_operator.bind(self).call(*args)
       if self.instance_variable_defined?('@__awesome_methods__')
         arr.instance_variable_set('@__awesome_methods__', self.instance_variable_get('@__awesome_methods__'))
-        arr.sort!
+        arr.sort! { |a, b| a.to_s <=> b.to_s }  # Need the block since Ruby 1.8.x can't sort arrays of symbols.
       end
       arr
     end
@@ -44,7 +45,7 @@ class Array #:nodoc:
     # doesn't set $1 within the grep block which causes nil.to_sym failure.
     # The workaround below has been tested with Ruby 1.8.7/Rails 2.3.8 and
     # Ruby 1.9.2/Rails 3.0.0. For more info see the following thread dating
-    # back to 1993 when Ruby 1.8.0 was as fresh off the grill as Ruby 1.9.2
+    # back to 2003 when Ruby 1.8.0 was as fresh off the grill as Ruby 1.9.2
     # is in 2010 :-)
     #
     # http://www.justskins.com/forums/bug-when-rerouting-string-52852.html
@@ -56,7 +57,10 @@ class Array #:nodoc:
     arr = unless blk
       original_grep(pattern)
     else
-      original_grep(pattern) { |match| eval("%Q/#{match}/ =~ #{pattern.inspect}", blk.binding); yield match }
+      original_grep(pattern) do |match|
+        eval("%Q/#{match.to_s.gsub('/', '\/')}/ =~ #{pattern.inspect}", blk.binding)
+        yield match
+      end
     end
     if self.instance_variable_defined?('@__awesome_methods__')
       arr.instance_variable_set('@__awesome_methods__', self.instance_variable_get('@__awesome_methods__'))

data/lib/ap/core_ext/class.rb

@@ -1,13 +1,15 @@
-# Copyright (c) 2010 Michael Dvorkin
+# Copyright (c) 2010-2011 Michael Dvorkin
 #
 # Awesome Print is freely distributable under the terms of MIT license.
 # See LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Class #:nodoc:
-  methods.grep(/instance_methods$/) do |name|
-    alias :"original_#{name}" :"#{name}"
+  # Remaining public/private etc. '_methods' are handled in core_ext/object.rb.
+  %w(instance_methods private_instance_methods protected_instance_methods public_instance_methods).each do |name|
+    original_method = instance_method(name)
+
     define_method name do |*args|
-      methods = self.send(:"original_#{name}", *args)
+      methods = original_method.bind(self).call(*args)
       methods.instance_variable_set('@__awesome_methods__', self) # Evil?!
       methods.sort!
     end

data/lib/ap/core_ext/kernel.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010 Michael Dvorkin
+# Copyright (c) 2010-2011 Michael Dvorkin
 #
 # Awesome Print is freely distributable under the terms of MIT license.
 # See LICENSE file or http://www.opensource.org/licenses/mit-license.php
@@ -13,6 +13,7 @@ module Kernel
 
   def ap(object, options = {})
     puts object.ai(options)
+    object
   end
   alias :awesome_print :ap
 

data/lib/ap/core_ext/logger.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010 Michael Dvorkin
+# Copyright (c) 2010-2011 Michael Dvorkin
 #
 # Awesome Print is freely distributable under the terms of MIT license.
 # See LICENSE file or http://www.opensource.org/licenses/mit-license.php
@@ -14,5 +14,5 @@ module AwesomePrintLogger
 
 end
 
-Logger.send(:include, AwesomePrintLogger) if defined?(Logger)
+Logger.send(:include, AwesomePrintLogger)
 ActiveSupport::BufferedLogger.send(:include, AwesomePrintLogger) if defined?(::ActiveSupport::BufferedLogger)

data/lib/ap/core_ext/method.rb

@@ -0,0 +1,21 @@
+# Copyright (c) 2010-2011 Michael Dvorkin
+#
+# Awesome Print is freely distributable under the terms of MIT license.
+# See LICENSE file or http://www.opensource.org/licenses/mit-license.php
+#------------------------------------------------------------------------------
+#
+# Method#name was intorduced in Ruby 1.8.7 so we define it here as necessary.
+#
+unless nil.method(:class).respond_to?(:name)
+  class Method
+    def name
+      inspect.split(/[#.>]/)[-1]
+    end
+  end
+
+  class UnboundMethod
+    def name
+      inspect.split(/[#.>]/)[-1]
+    end
+  end
+end

data/lib/ap/core_ext/object.rb

@@ -1,17 +1,17 @@
-# Copyright (c) 2010 Michael Dvorkin
+# Copyright (c) 2010-2011 Michael Dvorkin
 #
 # Awesome Print is freely distributable under the terms of MIT license.
 # See LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class Object #:nodoc:
-  methods.grep(/methods$/) do |name|
-    next if name.to_s.include? 'instance' # Instance methods are trapped in Class.
+  # Remaining instance '_methods' are handled in core_ext/class.rb.
+  %w(methods private_methods protected_methods public_methods singleton_methods).each do |name|
+    original_method = instance_method(name)
 
-    alias :"original_#{name}" :"#{name}"
     define_method name do |*args|
-      methods = self.send(:"original_#{name}", *args)
+      methods = original_method.bind(self).call(*args)
       methods.instance_variable_set('@__awesome_methods__', self) # Evil?!
       methods.sort!
     end
   end
-end
+end

data/lib/ap/core_ext/string.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010 Michael Dvorkin
+# Copyright (c) 2010-2011 Michael Dvorkin
 #
 # Awesome Print is freely distributable under the terms of MIT license.
 # See LICENSE file or http://www.opensource.org/licenses/mit-license.php
@@ -11,13 +11,14 @@ class String
   #    1 => bright
   #    0 => normal
 
-  [ :gray, :red, :green, :yellow, :blue, :purple, :cyan, :white ].each_with_index do |color, i|
-    if STDOUT.tty? && ENV['TERM'] && ENV['TERM'] != 'dumb'
-      define_method color          do "\033[1;#{30+i}m#{self}\033[0m" end
-      define_method :"#{color}ish" do "\033[0;#{30+i}m#{self}\033[0m" end
-    else
-      define_method color do self end
-      alias_method :"#{color}ish", color 
+  %w(gray red green yellow blue purple cyan white).zip(
+  %w(black darkred darkgreen brown navy darkmagenta darkcyan slategray)).each_with_index do |(color, shade), i|
+    define_method color do |*html|
+      html[0] ? %Q|<pre style="color:#{color}">#{self}</pre>| : "\033[1;#{30+i}m#{self}\033[0m"
+    end
+
+    define_method "#{color}ish" do |*html|
+      html[0] ? %Q|<pre style="color:#{shade}">#{self}</pre>| : "\033[0;#{30+i}m#{self}\033[0m"
     end
   end
 

data/lib/ap/mixin/action_view.rb

@@ -1,38 +1,17 @@
-# Copyright (c) 2010 Michael Dvorkin
+# Copyright (c) 2010-2011 Michael Dvorkin
 #
 # Awesome Print is freely distributable under the terms of MIT license.
 # See LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 module AwesomePrintActionView
 
-  def self.included(base)
-    unless base.const_defined?(:AP_ANSI_TO_HTML)
-      hash = {} # Build ANSI => HTML color map.
-      [ :gray, :red, :green, :yellow, :blue, :purple, :cyan, :white ].each_with_index do |color, i|
-        hash["\033[1;#{30+i}m"] = color
-      end
-      [ :black, :darkred, :darkgreen, :brown, :navy, :darkmagenta, :darkcyan, :slategray ].each_with_index do |color, i|
-        hash["\033[0;#{30+i}m"] = color
-      end
-      base.const_set(:AP_ANSI_TO_HTML, hash.freeze)
-    end
-  end
-
+  # Use HTML colors and add default "debug_dump" class to the resulting HTML.
   def ap_debug(object, options = {})
-    formatted = h(object.ai(options))
-
-    unless options[:plain]
-      self.class::AP_ANSI_TO_HTML.each do |key, value|
-        formatted.gsub!(key, %Q|<font color="#{value}">|)
-      end
-      formatted.gsub!("\033[0m", "</font>")
-    end
-
-    content_tag(:pre, formatted, :class => "debug_dump")
+    object.ai(options.merge(:html => true)).sub(/^<pre([\s>])/, '<pre class="debug_dump"\\1')
   end
 
   alias_method :ap, :ap_debug
 
 end
 
-ActionView::Base.send(:include, AwesomePrintActionView) if defined?(::ActionView)
+ActionView::Base.send(:include, AwesomePrintActionView) if defined?(ActionView)

data/lib/ap/mixin/active_record.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010 Michael Dvorkin
+# Copyright (c) 2010-2011 Michael Dvorkin
 #
 # Awesome Print is freely distributable under the terms of MIT license.
 # See LICENSE file or http://www.opensource.org/licenses/mit-license.php
@@ -14,6 +14,8 @@ module AwesomePrintActiveRecord
   #------------------------------------------------------------------------------
   def printable_with_active_record(object)
     printable = printable_without_active_record(object)
+    return printable if !defined?(ActiveRecord::Base)
+
     if printable == :self
       if object.is_a?(ActiveRecord::Base)
         printable = :active_record_instance
@@ -27,6 +29,8 @@ module AwesomePrintActiveRecord
   # Format ActiveRecord instance object.
   #------------------------------------------------------------------------------
   def awesome_active_record_instance(object)
+    return object.inspect if !defined?(ActiveSupport::OrderedHash)
+
     data = object.class.column_names.inject(ActiveSupport::OrderedHash.new) do |hash, name|
       hash[name.to_sym] = object.send(name) if object.has_attribute?(name) || object.new_record?
       hash
@@ -37,17 +41,14 @@ module AwesomePrintActiveRecord
   # Format ActiveRecord class object.
   #------------------------------------------------------------------------------
   def awesome_active_record_class(object)
-    if object.respond_to?(:columns)
-      data = object.columns.inject(ActiveSupport::OrderedHash.new) do |hash, c|
-        hash[c.name.to_sym] = c.type
-        hash
-      end
-      "class #{object} < #{object.superclass} " << awesome_hash(data)
-    else
-      object.inspect
+    return object.inspect if !defined?(ActiveSupport::OrderedHash) || !object.respond_to?(:columns)
+
+    data = object.columns.inject(ActiveSupport::OrderedHash.new) do |hash, c|
+      hash[c.name.to_sym] = c.type
+      hash
     end
+    "class #{object} < #{object.superclass} " << awesome_hash(data)
   end
-  
 end
 
 AwesomePrint.send(:include, AwesomePrintActiveRecord)