awesome_print 0.3.0 → 0.3.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+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/README.md

@@ -259,10 +259,12 @@ For example:
 * Eloy Duran -- http://github.com/alloy
 * Benoit Daloze -- http://github.com/eregon
 * Sean Gallagher -- http://github.com/torandu
+* Tim Harper -- http://github.com/timcharper
 * Tobias Crawley -- http://github.com/tobias
 
 ### License ###
-Copyright (c) 2010 Michael Dvorkin  
+Copyright (c) 2010 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/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/ap.rb

@@ -3,16 +3,12 @@
 # Awesome Print is freely distributable under the terms of MIT license.
 # See LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-require File.dirname(__FILE__) + "/ap/core_ext/array"
-require File.dirname(__FILE__) + "/ap/core_ext/string"
-require File.dirname(__FILE__) + "/ap/core_ext/object"
-require File.dirname(__FILE__) + "/ap/core_ext/class"
-require File.dirname(__FILE__) + "/ap/core_ext/kernel"
-require File.dirname(__FILE__) + "/ap/awesome_print"
-
-require File.dirname(__FILE__) + "/ap/core_ext/logger" if defined?(::Logger) or defined?(::ActiveSupport::BufferedLogger)
+%w(array string method object class kernel).each do |file|
+  require File.dirname(__FILE__) + "/ap/core_ext/#{file}"
+end
 
-require File.dirname(__FILE__) + "/ap/mixin/action_view" if defined?(::ActionView)
-require File.dirname(__FILE__) + "/ap/mixin/active_record" if defined?(::ActiveRecord)
+require File.dirname(__FILE__) + "/ap/awesome_print"
+require File.dirname(__FILE__) + "/ap/core_ext/logger"      if defined?(::Logger)
+require File.dirname(__FILE__) + "/ap/mixin/action_view"    if defined?(::ActionView)
+require File.dirname(__FILE__) + "/ap/mixin/active_record"  if defined?(::ActiveRecord)
 require File.dirname(__FILE__) + "/ap/mixin/active_support" if defined?(::ActiveSupport)
-

data/lib/ap/awesome_print.rb

@@ -261,7 +261,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
 

data/lib/ap/core_ext/array.rb

@@ -10,7 +10,7 @@
 #   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|
@@ -44,7 +44,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

data/lib/ap/core_ext/logger.rb

@@ -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 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/awesome_print.rb

@@ -10,16 +10,12 @@
 # gem 'awesome_print', '>= 0.2.1', :require => 'ap'
 # gem 'awesome_print', '>= 3.0.0'
 #
-require File.dirname(__FILE__) + "/ap/core_ext/array"
-require File.dirname(__FILE__) + "/ap/core_ext/string"
-require File.dirname(__FILE__) + "/ap/core_ext/object"
-require File.dirname(__FILE__) + "/ap/core_ext/class"
-require File.dirname(__FILE__) + "/ap/core_ext/kernel"
-require File.dirname(__FILE__) + "/ap/awesome_print"
-
-require File.dirname(__FILE__) + "/ap/core_ext/logger" if defined?(::Logger) or defined?(::ActiveSupport::BufferedLogger)
+%w(array string method object class kernel).each do |file|
+  require File.dirname(__FILE__) + "/ap/core_ext/#{file}"
+end
 
-require File.dirname(__FILE__) + "/ap/mixin/action_view" if defined?(::ActionView)
-require File.dirname(__FILE__) + "/ap/mixin/active_record" if defined?(::ActiveRecord)
+require File.dirname(__FILE__) + "/ap/awesome_print"
+require File.dirname(__FILE__) + "/ap/core_ext/logger"      if defined?(::Logger)
+require File.dirname(__FILE__) + "/ap/mixin/action_view"    if defined?(::ActionView)
+require File.dirname(__FILE__) + "/ap/mixin/active_record"  if defined?(::ActiveRecord)
 require File.dirname(__FILE__) + "/ap/mixin/active_support" if defined?(::ActiveSupport)
-

data/rails/init.rb

@@ -1 +1,13 @@
-require File.join(File.dirname(__FILE__), "..", "init")
+# Copyright (c) 2010 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
+#------------------------------------------------------------------------------
+#
+# Load awesome_print when installed as Rails 2.3.x plugin.
+#
+# NOTE: After Rails 2.3.x console loads awesome_print/lib/ap.rb it attempts
+# to load this file as well.  Make sure to check whether the awesome_print
+# is already loaded to avoid Ruby stack overflow when extending core classes.
+#
+require File.join(File.dirname(__FILE__), "..", "init") unless defined?(AwesomePrint)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Michael Dvorkin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -08:00
+date: 2010-11-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,7 @@ files:
 - lib/ap/core_ext/class.rb
 - lib/ap/core_ext/kernel.rb
 - lib/ap/core_ext/logger.rb
+- lib/ap/core_ext/method.rb
 - lib/ap/core_ext/object.rb
 - lib/ap/core_ext/string.rb
 - lib/ap/mixin/action_view.rb