awesome_print 0.1.0 → 0.1.1

data/README.md

@@ -1,7 +1,7 @@
 ## Awesome Print ##
-    Awesome Print is Ruby library that pretty prints Ruby objects in full color
-    exposing their internal structure with proper indentation. Rails ActiveRecord
-    objects are supported via included mixin.
+Awesome Print is Ruby library that pretty prints Ruby objects in full color
+exposing their internal structure with proper indentation. Rails ActiveRecord
+objects are supported via included mixin.
 
 ### Installation ###
     $ # Installing as Ruby gem
@@ -20,6 +20,7 @@
     Default options:
       :miltiline => true,
       :plain  => false,
+      :indent => 4,
       :colors => {
         :array      => :white,
         :bignum     => :blue,
@@ -58,6 +59,12 @@
             :distance => 4.2e+43
         }
     ]
+    irb> ap data[3], :indent => -2 # Left align hash keys.
+    {
+      :class    => Time < Object,
+      :now      => Fri Apr 02 19:55:53 -0700 2010,
+      :distance => 4.2e+43
+    }
     irb> ap data, :multiline => false
     [ false, 42, [ "fourty", "two" ], { :class => Time < Object, :distance => 4.2e+43, :now => Fri Apr 02 19:44:52 -0700 2010 } ]
     irb>
@@ -120,15 +127,19 @@
     }
     rails>
 
+### Known Issues ###
+
+* Windows...
+
 ### Note on Patches/Pull Requests ###
-    * Fork the project on Github.
-    * Make your feature addition or bug fix.
-    * Add specs for it, making sure $ rake spec is all green.
-    * Commit, do not mess with rakefile, version, or history.
-    * Send me a pull request.
+* Fork the project on Github.
+* Make your feature addition or bug fix.
+* Add specs for it, making sure $ rake spec is all green.
+* Commit, do not mess with rakefile, version, or history.
+* Send me a pull request.
 
 ### License ###
-    Copyright (c) 2010 Michael Dvorkin  
-    %w(mike dvorkin.net) * "@" || %w(mike fatfreecrm.com) * "@"
+Copyright (c) 2010 Michael Dvorkin  
+%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.1.0
+0.1.1

data/lib/ap/awesome_print.rb

@@ -29,7 +29,7 @@ class AwesomePrint
       }.merge(options.delete(:color) || {})
     }.merge(options)
 
-    @indentation = @options[:indent]
+    @indentation = @options[:indent].abs
     Thread.current[AP] ||= []
   end
 
@@ -58,7 +58,7 @@ class AwesomePrint
     end
   end
 
-  # Format a hash.
+  # Format a hash. If @options[:indent] if negative left align hash keys.
   #------------------------------------------------------------------------------
   def awesome_hash(h)
     data = h.keys.inject([]) do |arr, key|
@@ -67,12 +67,17 @@ class AwesomePrint
       end
     end
       
-    width = data.map { |key, | key.size }.max + @indentation
+    width = data.map { |key, | key.size }.max
+    width += @indentation if @options[:indent] > 0
   
     data = data.inject([]) do |arr, (key, value)|
-      formatted_key = (@options[:multiline] ? key.rjust(width) : key) << colorize(" => ", :hash)
+      if @options[:multiline]
+        formatted_key = (@options[:indent] >= 0 ? key.rjust(width) : indent + key.ljust(width))
+      else
+        formatted_key = key
+      end
       indented do
-        arr << (formatted_key << awesome(value))
+        arr << (formatted_key << colorize(" => ", :hash) << awesome(value))
       end
     end
     if @options[:multiline]
@@ -175,20 +180,20 @@ class AwesomePrint
 
   #------------------------------------------------------------------------------
   def indented
-    @indentation += @options[:indent]
+    @indentation += @options[:indent].abs
     yield
   ensure
-    @indentation -= @options[:indent]
+    @indentation -= @options[:indent].abs
   end
 
   #------------------------------------------------------------------------------
   def indent
-    ' ' * @indentation
+    @indent = ' ' * @indentation
   end
 
   #------------------------------------------------------------------------------
   def outdent
-    ' ' * (@indentation - @options[:indent])
+    @outdent = ' ' * (@indentation - @options[:indent].abs)
   end
 
 end

data/lib/ap/mixin/rails.rb

@@ -38,7 +38,7 @@ module AwesomePrintRails
   # Format ActiveRecord class object.
   #------------------------------------------------------------------------------
   def awesome_active_record_class(object)
-    if object.table_exists?
+    if object.respond_to?(:columns)
       data = object.columns.inject(ActiveSupport::OrderedHash.new) do |hash, c|
         hash[c.name.to_sym] = c.type
         hash

data/spec/awesome_print_spec.rb

@@ -227,6 +227,23 @@ EOS
     end
   end
 
+  #------------------------------------------------------------------------------
+  describe "Negative options[:indent]" do
+    before(:each) do
+      @hash = { [0, 0, 255] => :yellow, :red => "rgb(255, 0, 0)", "magenta" => "rgb(255, 0, 255)" }
+    end
+
+    it "hash keys must be left aligned" do
+      ap = AwesomePrint.new(:plain => true, :indent => -4)
+      out = ap.send(:awesome, @hash)
+      out.start_with?("{\n").should == true
+      out.include?('    :red          => "rgb(255, 0, 0)"').should == true
+      out.include?('    "magenta"     => "rgb(255, 0, 255)"').should == true
+      out.include?('    [ 0, 0, 255 ] => :yellow').should == true
+      out.end_with?("\n}").should == true
+    end
+  end
+
   #------------------------------------------------------------------------------
   describe "Class" do
     it "shoud show superclass (plain)" do

data/spec/rails_spec.rb

@@ -13,10 +13,6 @@ if defined?(::Rails)
       columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
     end
 
-    def self.table_exists?
-      true
-    end
-
     column :id, :integer
     column :name, :string
     column :rank, :integer

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Michael Dvorkin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 -07:00
+date: 2010-04-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency