Merge branch 'master' into 0.1.4

README.md

@@ -23,7 +23,7 @@ Default options:
     :multiline => true,
     :plain  => false,
     :indent => 4,
-    :colors => {
+    :color => {
       :array      => :white,
       :bignum     => :blue,
       :class      => :yellow,
@@ -47,7 +47,7 @@ Supported color names:
 ### Examples ###
     $ cat > 1.rb
     require "ap"
-    data = [ false, 42, %w(fourty two), { :now => Time.now, :class => Time.now.class, :distance => 42e42 } ]
+    data = [ false, 42, %w(forty two), { :now => Time.now, :class => Time.now.class, :distance => 42e42 } ]
     ap data
     ^D
     $ ruby 1.rb
@@ -55,7 +55,7 @@ Supported color names:
         [0] false,
         [1] 42,
         [2] [
-            [0] "fourty",
+            [0] "forty",
             [1] "two"
         ],
         [3] {
@@ -79,12 +79,12 @@ Supported color names:
 
     $ cat > 3.rb
     require "ap"
-    data = [ false, 42, %w(fourty two) ]
+    data = [ false, 42, %w(forty two) ]
     data << data  # <-- Nested array.
     ap data, :multiline => false
     ^D
     $ ruby 3.rb
-    [ false, 42, [ "fourty", "two" ], [...] ]
+    [ false, 42, [ "forty", "two" ], [...] ]
 
 ### Example (Rails console) ###
     $ ruby script/console

lib/ap/awesome_print.rb

@@ -223,8 +223,8 @@ class AwesomePrint
     @@defaults ||= {}
   end
 
-  def self.defaults=(*args)
+  def self.defaults=(args = {})
-    @@defaults = *args
+    @@defaults = args
   end
 
 end

spec/awesome_print_spec.rb

@@ -1,6 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "AwesomePrint" do
+  before(:each) do
+    stub_dotfile!
+  end
 
   describe "Array" do
     before(:each) do

spec/rails_spec.rb

@@ -20,17 +20,22 @@ if defined?(::Rails)
     column :created_at, :datetime
   end
 
-  #------------------------------------------------------------------------------
+  describe "AwesomePrint/Rails" do
-  describe "ActiveRecord instance" do
     before(:each) do
-      @diana = User.new(:name => "Diana", :rank => 1, :admin => false, :created_at => "1992-10-10 12:30:00")
+      stub_dotfile!
-      @laura = User.new(:name => "Laura", :rank => 2, :admin => true,  :created_at => "2003-05-26 14:15:00")
-      @ap = AwesomePrint.new(:plain => true)
     end
 
-    it "display single record" do
+    #------------------------------------------------------------------------------
-      out = @ap.send(:awesome, @diana)
+    describe "ActiveRecord instance" do
-      out.gsub(/0x([a-f\d]+)/, "0x01234567").should == <<-EOS.strip
+      before(:each) do
+        @diana = User.new(:name => "Diana", :rank => 1, :admin => false, :created_at => "1992-10-10 12:30:00")
+        @laura = User.new(:name => "Laura", :rank => 2, :admin => true,  :created_at => "2003-05-26 14:15:00")
+        @ap = AwesomePrint.new(:plain => true)
+      end
+
+      it "display single record" do
+        out = @ap.send(:awesome, @diana)
+        out.gsub(/0x([a-f\d]+)/, "0x01234567").should == <<-EOS.strip
 #<User:0x01234567> {
             :id => nil,
           :name => "Diana",
@@ -39,11 +44,11 @@ if defined?(::Rails)
     :created_at => Sat, 10 Oct 1992 12:30:00 UTC +00:00
 }
 EOS
-    end
+      end
 
-    it "display multiple records" do
+      it "display multiple records" do
-      out = @ap.send(:awesome, [ @diana, @laura ])
+        out = @ap.send(:awesome, [ @diana, @laura ])
-      out.gsub(/0x([a-f\d]+)/, "0x01234567").should == <<-EOS.strip
+        out.gsub(/0x([a-f\d]+)/, "0x01234567").should == <<-EOS.strip
 [
     [0] #<User:0x01234567> {
                 :id => nil,
@@ -61,14 +66,14 @@ EOS
     }
 ]
 EOS
+      end
     end
-  end
 
-  #------------------------------------------------------------------------------
+    #------------------------------------------------------------------------------
-  describe "ActiveRecord class" do
+    describe "ActiveRecord class" do
-    it "should" do
+      it "should" do
-      @ap = AwesomePrint.new(:plain => true)
+        @ap = AwesomePrint.new(:plain => true)
-      @ap.send(:awesome, User).should == <<-EOS.strip
+        @ap.send(:awesome, User).should == <<-EOS.strip
 class User < ActiveRecord::Base {
             :id => :integer,
           :name => :string,
@@ -77,7 +82,7 @@ class User < ActiveRecord::Base {
     :created_at => :datetime
 }
 EOS
+      end
     end
   end
-
 end

spec/spec_helper.rb

@@ -5,5 +5,9 @@ require 'spec'
 require 'spec/autorun'
 
 Spec::Runner.configure do |config|
-  
+end
+
+def stub_dotfile!
+  dotfile = File.join(ENV["HOME"], ".aprc")
+  File.should_receive(:readable?).at_least(:once).with(dotfile).and_return(false)
 end