rack-var-dump 0.1.3 → 1.0.0

data/README.md

@@ -10,13 +10,13 @@ Writing now...
 
 rack-var-dumpはphpのvar_dump()のようなデバッグ用のメソッドを提供します
 
-Object Classにvar_dumpメソッドを提供し、レスポンスを返すまでにModel,Controller,View,
+Objectにvar_dumpメソッドを提供し、Rackがレスポンスを返すまでにModel,Controller,View,
 
-その他で実行されたすべてのレシーバーをviewに自動的に出力します
+その他コンテキストで実行されたすべてのレシーバーをviewに自動的に出力します
 
-var_dumpの返り値は常にselfです
+出力には michaeldv / awesome_print を使用しています。
 
-<img src="http://cdn-ak.f.st-hatena.com/images/fotolife/b/bunnyhop/20120127/20120127235528.png"/>
+<img src="http://cdn-ak.f.st-hatena.com/images/fotolife/b/bunnyhop/20120208/20120208182805.png"/>
 
 ## Supported versions
 

data/lib/rack/var_dump.rb

@@ -1,19 +1,29 @@
 require "rack/utils"
-require "rack/var_dump/object"
-require "rack/var_dump/version"
+require 'rack/var_dump/kernel'
+require 'rack/var_dump/version'
+require 'rack/var_dump/awesome_print'
 
 module Rack
   class VarDump
-    include Object
-
     @@var_aggregates = []
 
+    def self.reset!
+      @@var_aggregates = []
+    end
+
     def self.var_dump(var, subject)
-      @@var_aggregates << {:var => var.inspect, :subject => subject}
+      @@var_aggregates <<
+        { :var => ai(var, :html => true), :subject => subject }
     end
 
-    def self.reset!
-      @@var_aggregates = []
+    def self.ai(var, options = {})
+      ap = AwesomePrint::Inspector.new(options)
+      ap.instance_eval do
+        formatter = AwesomePrint::VarDump.new(self)
+        instance_variable_set(:@formatter, formatter)
+      end
+
+      ap.awesome(var)
     end
 
     def initialize(app)
@@ -30,21 +40,23 @@ module Rack
         response = [apply(body)] if body =~ /<body.*>/
         headers["Content-Length"] = response.join.bytesize.to_s
       end
+
       VarDump.reset!
       [status, headers, response]
     end
 
     private
-    def apply(body)
-      html =  '<div id="var_dump" style="display:block">'
-      html << '<pre style="background-color:#eee;padding:10px;font-size:11px;white-space:pre-wrap;color:black!important;">'
-      @@var_aggregates.each_with_index do |info, n|
-        html << "var_dump:#{n} #{info[:subject]}\n"
-        html << Rack::Utils.escape_html(info[:var])
-        html << "\n\n"
+      def apply(body)
+        html =  '<div id="var_dump" style="display:block">'
+        html << '<pre style="background-color:#eee;padding:10px;font-size:11px;white-space:pre-wrap;color:black!important;">'
+        @@var_aggregates.each_with_index do |info, n|
+          html << "var_dump:#{n} #{info[:subject]}\n"
+          html << info[:var]
+          html << "\n\n"
+        end
+        html << "</pre></div>"
+
+        body.sub(/<body.*>/, '\&' + html)
       end
-      html << "</pre></div>"
-      body.sub(/<body.*>/, '\&' + html)
-    end
   end
 end

data/lib/rack/var_dump/awesome_print.rb

@@ -0,0 +1,2 @@
+require 'ap'
+require 'rack/var_dump/awesome_print/ext/var_dump'

data/lib/rack/var_dump/awesome_print/ext/var_dump.rb

@@ -0,0 +1,14 @@
+module AwesomePrint
+  class VarDump < Formatter
+    def format(object, type = nil)
+      core_class = cast(object, type)
+
+      awesome = if core_class != :self
+        send(:"awesome_#{core_class}", object) # Core formatters.
+      else
+        awesome_self(object, type) # Catch all that falls back to object.inspect.
+      end
+    end
+  end
+end
+

data/lib/rack/var_dump/awesome_print/ext/var_dump.rb.old

@@ -0,0 +1,21 @@
+module AwesomePrint
+  module VarDump
+    def self.included(base)
+      base.send :alias_method, :format_without_var_dump, :format
+      base.send :alias_method, :format, :format_with_var_dump
+    end
+
+    def format_with_var_dump(object, type = nil)
+      core_class = cast(object, type)
+      awesome = if core_class != :self
+        send(:"awesome_#{core_class}", object)
+      else
+        awesome_self(object, type)
+      end
+    end
+  end
+end
+
+AwesomePrint::Formatter.send(:include, AwesomePrint::VarDump)
+
+

data/lib/rack/var_dump/kernel.rb

@@ -0,0 +1,6 @@
+module Kernel
+  def var_dump(subject = nil)
+    Rack::VarDump.var_dump(self, subject)
+    self
+  end
+end

data/lib/rack/var_dump/object.rb

@@ -1,17 +1,7 @@
-module Rack
-  class VarDump
-    module Object
-      def self.included(obj)
-        ::Object.send(:include, Method)
-        ::Object.extend(Method)
-      end
-    end
+module Object
+  def var_dump(subject = nil)
+    Rack::VarDump.var_dump(self, subject)
 
-    module Method
-      def var_dump(subject = nil)
-        Rack::VarDump.var_dump(self, subject)
-        self
-      end
-    end
+    self
   end
 end

data/lib/rack/var_dump/railtie.rb

@@ -0,0 +1,12 @@
+require 'rails'
+require 'rack/var_dump'
+
+module Rack
+  class VarDump
+    class Railtie < Rails::Railtie
+      initializer "rack_var_dump.use_middleware" do |app|
+        app.middleware.use ::Rack::VarDump if ENV['RAILS_ENV'] == "development"
+      end
+    end
+  end
+end

data/lib/rack/var_dump/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class VarDump
-    VERSION = "0.1.3"
+    VERSION = "1.0.0"
   end
 end

data/lib/rails-var-dump.rb

@@ -1 +1 @@
-require 'rack/railtie' if defined?(Rails)
+require 'rack/var_dump/railtie' if defined?(Rails)

data/lib/rails_var_dump.rb

@@ -1 +1 @@
-require 'rack/railtie' if defined?(Rails)
+require 'rails-var-dump'

data/rack-var-dump.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Dach_h"]
   s.email       = ["bunny.hop.md@gmail.com"]
   s.homepage    = ""
-  s.summary     = %q{rack-var-dump provides a method for debugging like var_dump() of php.}
+  s.summary     = %q{provides a method for debugging like var_dump() of php.}
   s.description = s.summary
   s.rubyforge_project = "rack-var-dump"
   s.files         = `git ls-files`.split("\n")
@@ -16,8 +16,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency 'awesome_print',         '= 1.0.2'
+
   s.add_development_dependency 'rake',      '>= 0.9.2.2'
-  s.add_development_dependency 'rdoc',      '>= 3.11'
   s.add_development_dependency "rack",      '>= 1.3.5'
   s.add_development_dependency 'rack-test', '>= 0.5.3'
   s.add_development_dependency 'rspec',     '>= 2.7.0'

data/spec/middleware_spec.rb

@@ -8,7 +8,7 @@ describe 'VarDump' do
   describe "when var_dump is performed" do
     before { 'sample-text'.var_dump }
     let(:insert_html) do
-      %Q[var_dump:0 \n&quot;sample-text&quot;\n\n</pre></div>]
+      %Q(var_dump:0 \n<kbd style=\"color:brown\">&quot;sample-text&quot;</kbd>)
     end
 
     it "it is inserted when a status code is 200." do
@@ -25,7 +25,7 @@ describe 'VarDump' do
   describe "when an argument is given" do
     before { 'sample-text'.var_dump('Rspec:String') }
     let(:insert_html) do
-      %Q[var_dump:0 Rspec:String\n&quot;sample-text&quot;\n\n</pre></div>]
+      %Q(var_dump:0 Rspec:String\n<kbd style=\"color:brown\">&quot;sample-text&quot;</kbd>)
     end
 
     it "It displays with subject." do
@@ -37,7 +37,7 @@ describe 'VarDump' do
   describe "when the two or more sets value is carried out" do
     before{'sample-text'.var_dump; 'sample-text-2'.var_dump('Rspec:String2')}
     let(:insert_html) do
-      %Q[var_dump:0 \n&quot;sample-text&quot;\n\nvar_dump:1 Rspec:String2\n&quot;sample-text-2&quot;\n\n</pre></div>]
+      %Q(var_dump:0 \n<kbd style=\"color:brown\">&quot;sample-text&quot;</kbd>\n\nvar_dump:1 Rspec:String2\n<kbd style=\"color:brown\">&quot;sample-text-2&quot;</kbd>)
     end
 
     it "more than one are outputted." do
@@ -47,7 +47,7 @@ describe 'VarDump' do
   end
 
   describe "not insert responses" do
-    it "nothing is outputted when the value is not set to var_dumo." do
+    it "nothing is outputted when the value is not set to var_dump." do
       get '/'
       last_response.body.should eql(DummyBody)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-var-dump
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-29 00:00:00.000000000Z
+date: 2012-02-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70325150464780 !ruby/object:Gem::Requirement
+  name: awesome_print
+  requirement: &2158675240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
-  type: :development
+        version: 1.0.2
+  type: :runtime
   prerelease: false
-  version_requirements: *70325150464780
+  version_requirements: *2158675240
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70325150463780 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &2158674720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70325150463780
+  version_requirements: *2158674720
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70325150462780 !ruby/object:Gem::Requirement
+  requirement: &2158674180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70325150462780
+  version_requirements: *2158674180
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70325150462020 !ruby/object:Gem::Requirement
+  requirement: &2158673640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70325150462020
+  version_requirements: *2158673640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70325150461480 !ruby/object:Gem::Requirement
+  requirement: &2158673180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,8 +65,8 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70325150461480
-description: rack-var-dump provides a method for debugging like var_dump() of php.
+  version_requirements: *2158673180
+description: provides a method for debugging like var_dump() of php.
 email:
 - bunny.hop.md@gmail.com
 executables: []
@@ -80,9 +80,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/rack/railtie.rb
 - lib/rack/var_dump.rb
+- lib/rack/var_dump/awesome_print.rb
+- lib/rack/var_dump/awesome_print/ext/var_dump.rb
+- lib/rack/var_dump/awesome_print/ext/var_dump.rb.old
+- lib/rack/var_dump/kernel.rb
 - lib/rack/var_dump/object.rb
+- lib/rack/var_dump/railtie.rb
 - lib/rack/var_dump/version.rb
 - lib/rails-var-dump.rb
 - lib/rails_var_dump.rb
@@ -113,7 +117,7 @@ rubyforge_project: rack-var-dump
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: rack-var-dump provides a method for debugging like var_dump() of php.
+summary: provides a method for debugging like var_dump() of php.
 test_files:
 - spec/middleware_spec.rb
 - spec/object_spec.rb

data/lib/rack/railtie.rb

@@ -1,16 +0,0 @@
-require 'rails'
-require 'rack/var_dump'
-require 'rack/var_dump/object'
-require 'rack/var_dump/version'
-
-module Rack
-  class VarDump
-    include Object
-  end
-
-  class Railtie < Rails::Railtie
-    initializer "rack_var_dump.use_middleware" do |app|
-      app.middleware.use Rack::VarDump if ENV['RAILS_ENV'] == "development"
-    end
-  end
-end