awesome print 2.0

.gitignore

@@ -33,3 +33,4 @@ Gemfile.lock
 # PROJECT::RBENV
 .ruby-gemset
 .awesome-print/
+.byebug_history

.rspec

@@ -1 +1,2 @@
+--format Fuubar
 --color

.travis.yml

@@ -24,8 +24,8 @@ matrix:
   include:
     - rvm: ruby-head
       env: RUBYOPT="--enable-frozen-string-literal"
-  # allow_failures:
-  #   - rvm: ruby-head
+  allow_failures:
+    - rvm: ruby-head
 
 addons:
   code_climate:

Appraisals

@@ -29,20 +29,3 @@ end
 appraise 'mongoid-6.0' do
   gem 'mongoid', '~> 6.0.0'
 end
-
-# appraise 'mongo_mapper' do
-#   gem 'mongo_mapper'
-# end
-#
-# appraise 'ripple' do
-#   gem 'tzinfo'
-#   gem 'ripple'
-# end
-#
-# appraise 'nobrainer' do
-#   gem 'nobrainer'
-#
-#   # When activesupport 5 was released, it required ruby 2.2.2 as a minimum.
-#   # Locking this down to 4.2.6 allows our Ruby 1.9 tests to keep working.
-#   gem 'activesupport', '4.2.6', :platforms => :ruby_19
-# end

CHANGELOG.md

@@ -1,4 +1,10 @@
 ## master (unreleased)
+
+## 2.0.0-pre
+  - Massive overhaul in the way formatters work. Now they are registered with a factory pattern, which includes 
+    a simple method to determine if that formatter can handle the content. [@imajes]
+  - Remove support for mongo mapper, and ruby pre 2.x [@imajes]
+  - It's probably faster? :)
   - Fixes spec suite to properly work via travis, gets a clean build [@imajes, others]
   - Adds support for ActiveModel::Errors [@dshinzie] - [#301]
   - removes use of `strip_heredoc` from specs as it's a rails dep [@kstephens] - [#303]

README.md

@@ -333,20 +333,11 @@ AwesomePrint.defaults = {
 ```
 
 ## Versioning
-
 AwesomePrint follows the [Semantic Versioning](http://semver.org/) standard.
 
 ### Contributing ###
 See [CONTRIBUTING.md](CONTRIBUTING.md) for information.
 
-### License ###
-Copyright (c) 2010-2016 Michael Dvorkin and contributors
-
-http://www.dvorkin.net
-
-%w(mike dvorkin.net) * "@" || "twitter.com/mid"
-
-Released under the MIT license. See LICENSE file for details.
 
 [gem_version_badge]: https://img.shields.io/gem/v/awesome_print.svg?style=flat
 [gem_downloads_badge]: http://img.shields.io/gem/dt/awesome_print.svg?style=flat

awesome_print.gemspec

@@ -1,18 +1,11 @@
-# Copyright (c) 2010-2016 Michael Dvorkin and contributors
-#
-# Awesome Print is freely distributable under the terms of MIT license.
-# See LICENSE file or http://www.opensource.org/licenses/mit-license.php
-#------------------------------------------------------------------------------
-
 $:.push File.expand_path('../lib', __FILE__)
 require 'awesome_print/version'
 
 Gem::Specification.new do |s|
   s.name        = 'awesome_print'
   s.version     = AwesomePrint.version
-  s.authors     = 'Michael Dvorkin'
+  s.authors     = 'Michael Dvorkin, James Cox & contributors'
   s.date        = Time.now.strftime('%Y-%m-%d')
-  s.email       = 'mike@dvorkin.net'
   s.homepage    = 'https://github.com/awesome-print/awesome_print'
   s.summary     = 'Pretty print Ruby objects with proper indentation and colors'
   s.description = 'Great Ruby debugging companion: pretty print Ruby objects to visualize their structure. Supports custom object formatting via plugins'
@@ -24,7 +17,9 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'rspec',  '>= 3.0.0'
+  s.add_development_dependency 'fuubar'
   s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'byebug'
   s.add_development_dependency 'fakefs', '>= 0.2.1'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'nokogiri', '>= 1.6.5'

lib/ap.rb

@@ -1,10 +1,6 @@
-# Copyright (c) 2010-2016 Michael Dvorkin and contributors
-#
-# Awesome Print is freely distributable under the terms of MIT license.
-# See LICENSE file or http://www.opensource.org/licenses/mit-license.php
-#------------------------------------------------------------------------------
 #
 # Keeping this for backwards compatibility to allow
 # require "ap"
 #
 require File.dirname(__FILE__) + '/awesome_print'
+

lib/awesome_print.rb

@@ -1,41 +1,26 @@
-# Copyright (c) 2010-2016 Michael Dvorkin and contributors
-#
-# Awesome Print is freely distributable under the terms of MIT license.
-# See LICENSE file or http://www.opensource.org/licenses/mit-license.php
-#------------------------------------------------------------------------------
-#
-# AwesomePrint might be loaded implicitly through ~/.irbrc or ~/.pryrc
-# so do nothing for subsequent requires.
-#
-unless defined?(AwesomePrint::Inspector)
-  %w(awesome_method_array string method object class kernel).each do |file|
-    require "awesome_print/core_ext/#{file}"
-  end
+require 'awesome_print/formatters'
+require 'awesome_print/inspector'
+require 'awesome_print/formatter'
+require 'awesome_print/version'
+
+module AwesomePrint
+  class << self
+    attr_accessor :defaults, :force_colors
 
-  require 'awesome_print/custom_defaults'
-  require 'awesome_print/inspector'
-  require 'awesome_print/formatter'
-  require 'awesome_print/version'
-  require 'awesome_print/core_ext/logger' if defined?(Logger)
-  #
-  # Load the following under normal circumstances as well as in Rails
-  # console when required from ~/.irbrc or ~/.pryrc.
-  #
-  require 'awesome_print/ext/active_record'  if defined?(ActiveRecord)  || AwesomePrint.rails_console?
-  require 'awesome_print/ext/active_support' if defined?(ActiveSupport) || AwesomePrint.rails_console?
-  #
-  # Load remaining extensions.
-  #
-  if defined?(ActiveSupport.on_load)
-    ActiveSupport.on_load(:action_view) do
-      require 'awesome_print/ext/action_view'
+    # Class accessor to force colorized output (ex. forked subprocess where TERM
+    # might be dumb).
+    #---------------------------------------------------------------------------
+    def force_colors!(value = true)
+      @force_colors = value
     end
   end
-  require 'awesome_print/ext/mongo_mapper'   if defined?(MongoMapper)
-  require 'awesome_print/ext/mongoid'        if defined?(Mongoid)
-  require 'awesome_print/ext/nokogiri'       if defined?(Nokogiri)
-  require 'awesome_print/ext/nobrainer'      if defined?(NoBrainer)
-  require 'awesome_print/ext/ripple'         if defined?(Ripple)
-  require 'awesome_print/ext/sequel'         if defined?(Sequel)
-  require 'awesome_print/ext/ostruct'        if defined?(OpenStruct)
 end
+
+# CORE EXTENSIONS... now that ap is loaded, inject awesome behavior into ruby
+%w(awesome_method_array string object class kernel logger active_support).each do |file|
+  require "awesome_print/core_ext/#{file}"
+end
+
+# FIXME: not sure we need these, but..
+require 'awesome_print/custom_defaults'
+

lib/awesome_print/colorize.rb

@@ -6,6 +6,8 @@ module Colorize
     # Pick the color and apply it to the given string as necessary.
     #------------------------------------------------------------------------------
     def colorize(str, type)
+      # puts "[COLORIZING] - using #{options[:color][type]} for #{type}" if AwesomePrint.debug
+
       str = CGI.escapeHTML(str) if options[:html]
       if options[:plain] || !options[:color][type] || !inspector.colorize?
         str

lib/awesome_print/core_ext/active_support.rb

@@ -0,0 +1,7 @@
+#
+# Colorize Rails logs.
+#
+if defined?(ActiveSupport::LogSubscriber)
+  AwesomePrint.force_colors! ActiveSupport::LogSubscriber.colorize_logging
+end
+

lib/awesome_print/core_ext/awesome_method_array.rb

@@ -1,9 +1,3 @@
-# Copyright (c) 2010-2016 Michael Dvorkin and contributors
-#
-# Awesome Print is freely distributable under the terms of MIT license.
-# See LICENSE file or http://www.opensource.org/licenses/mit-license.php
-#------------------------------------------------------------------------------
-#
 # The following makes it possible to invoke awesome_print while performing
 # operations on method arrays, ex:
 #

lib/awesome_print/core_ext/class.rb

@@ -1,8 +1,3 @@
-# Copyright (c) 2010-2016 Michael Dvorkin and contributors
-#
-# 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:
   #
   # Intercept methods below to inject @__awesome_print__ instance variable

lib/awesome_print/core_ext/kernel.rb

@@ -1,8 +1,3 @@
-# Copyright (c) 2010-2016 Michael Dvorkin and contributors
-#
-# Awesome Print is freely distributable under the terms of MIT license.
-# See LICENSE file or http://www.opensource.org/licenses/mit-license.php
-#------------------------------------------------------------------------------
 module Kernel
 
   def ai(options = {})

lib/awesome_print/core_ext/logger.rb

@@ -1,8 +1,3 @@
-# Copyright (c) 2010-2016 Michael Dvorkin and contributors
-#
-# Awesome Print is freely distributable under the terms of MIT license.
-# See LICENSE file or http://www.opensource.org/licenses/mit-license.php
-#------------------------------------------------------------------------------
 module AwesomePrint
   module Logger
 
@@ -16,5 +11,5 @@ def ap(object, level = nil)
   end
 end
 
-Logger.send(:include, AwesomePrint::Logger)
+Logger.send(:include, AwesomePrint::Logger) if defined?(Logger)
 ActiveSupport::BufferedLogger.send(:include, AwesomePrint::Logger) if defined?(ActiveSupport::BufferedLogger)

lib/awesome_print/core_ext/object.rb

@@ -1,8 +1,3 @@
-# Copyright (c) 2010-2016 Michael Dvorkin and contributors
-#
-# 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:
   #
   # Intercept methods below to inject @__awesome_print__ instance variable

lib/awesome_print/core_ext/string.rb

@@ -1,8 +1,3 @@
-# Copyright (c) 2010-2016 Michael Dvorkin and contributors
-#
-# Awesome Print is freely distributable under the terms of MIT license.
-# See LICENSE file or http://www.opensource.org/licenses/mit-license.php
-#------------------------------------------------------------------------------
 class String
   #
   # ANSI color codes:

lib/awesome_print/custom_defaults.rb

@@ -1,13 +1,5 @@
 module AwesomePrint
   class << self
-    attr_accessor :defaults, :force_colors
-
-    # Class accessor to force colorized output (ex. forked subprocess where TERM
-    # might be dumb).
-    #---------------------------------------------------------------------------
-    def force_colors!(value = true)
-      @force_colors = value
-    end
 
     def console?
       boolean(defined?(IRB) || defined?(Pry))