rack-var-dump 1.0.0 → 1.0.1

data/README.md

@@ -12,11 +12,11 @@ rack-var-dumpはphpのvar_dump()のようなデバッグ用のメソッドを提
 
 Objectにvar_dumpメソッドを提供し、Rackがレスポンスを返すまでにModel,Controller,View,
 
-その他コンテキストで実行されたすべてのレシーバーをviewに自動的に出力します
+その他コンテキストで実行されたvar_dump()のすべてのレシーバーをviewに自動的に出力します
 
 出力には michaeldv / awesome_print を使用しています。
 
-<img src="http://cdn-ak.f.st-hatena.com/images/fotolife/b/bunnyhop/20120208/20120208182805.png"/>
+<img src="http://cdn-ak.f.st-hatena.com/images/fotolife/b/bunnyhop/20120208/20120208183913.png"/>
 
 ## Supported versions
 
@@ -73,6 +73,12 @@ var_dumpの返り値は常にselfのため、チェーンが途切れずに使
 
     @first_name = User.find(3).var_dump('user.id(3)').first_name
 
+引数にハッシュを与えることで、awesome_printのオプションを使用することができます。
+
+    @users.var_dump("user.all")                 #=> 通常出力
+    @users.var_dump("user.all", :plain => true) #=> plain text(obj.inspect)の出力
+    @users.var_dump(:plain => true)             #=> subjectは省略してもok
+
 ## Copyright
 
 Copyright (c) 2012 Daichi Hirata. See LICENSE for details.

data/Rakefile

@@ -3,4 +3,16 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :default => :spec
+
+def app_task(name)
+  task name => [:load_app, "app:db:#{name}"]
+end
+
+desc "Debugging tasks for local development"
+task :debug do
+  rmdir "pkg"
+  sh "rake build"
+  sh "gem uninstall rack-var-dump"
+  sh "gem install pkg/rack-var-dump"
+end

data/lib/rack/var_dump.rb

@@ -2,28 +2,24 @@ require "rack/utils"
 require 'rack/var_dump/kernel'
 require 'rack/var_dump/version'
 require 'rack/var_dump/awesome_print'
+require 'rack/var_dump/response'
+require 'rack/var_dump/variable'
 
 module Rack
   class VarDump
     @@var_aggregates = []
 
-    def self.reset!
-      @@var_aggregates = []
+    def self.var_aggregates
+      @@var_aggregates
     end
 
-    def self.var_dump(var, subject)
-      @@var_aggregates <<
-        { :var => ai(var, :html => true), :subject => subject }
+    def self.reset!
+      @@var_aggregates = []
     end
 
-    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)
+    def self.var_dump(var, subject, options = {})
+      default = { :html => true, :plain => false }
+      @@var_aggregates << Variable.new(var, subject, default.merge(options))
     end
 
     def initialize(app)
@@ -31,32 +27,8 @@ module Rack
     end
 
     def call(env)
-      request = Rack::Request.new(env)
       status, headers, response = @app.call(env)
-
-      if headers["Content-Type"] =~ /^text\/html/ && !@@var_aggregates.empty?
-        body = ""
-        response.each {|org_body| body << org_body}
-        response = [apply(body)] if body =~ /<body.*>/
-        headers["Content-Length"] = response.join.bytesize.to_s
-      end
-
-      VarDump.reset!
-      [status, headers, response]
+      Response.call(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 << info[:var]
-          html << "\n\n"
-        end
-        html << "</pre></div>"
-
-        body.sub(/<body.*>/, '\&' + html)
-      end
   end
 end

data/lib/rack/var_dump/kernel.rb

@@ -1,6 +1,11 @@
 module Kernel
-  def var_dump(subject = nil)
-    Rack::VarDump.var_dump(self, subject)
+  def var_dump(subject = nil, options = {})
+    if subject.kind_of?(Hash)
+      options = subject
+      subject = nil
+    end
+
+    Rack::VarDump.var_dump(self, subject, options)
     self
   end
 end

data/lib/rack/var_dump/response.rb

@@ -0,0 +1,61 @@
+module Rack
+  class VarDump
+    class Response
+      def self.call(*args)
+        self.new(*args)._call
+      end
+
+      def initialize(status, headers, response)
+        @status   = status
+        @headers  = headers
+        @response = response
+        @content_body = ""
+        @var_aggregates = VarDump.var_aggregates
+      end
+
+      def _call
+        if @headers["Content-Type"] =~ /^text\/html/ && !@var_aggregates.empty?
+          @response.each do |orign_body|
+            @content_body << orign_body
+          end
+
+          @response = [apply_content_body] if @content_body =~ /<body.*>/
+          @headers["Content-Length"] = @response.join.bytesize.to_s
+        end
+
+        VarDump.reset!
+        [@status, @headers, @response]
+      end
+
+      private
+      def apply_content_body
+        html = <<-HTML
+<style type="text/css">
+<!--
+#raci-var-dump pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+  white-space: pre-wrap;
+  color: black!important;
+}
+-->
+</style>
+<div id="rack-var-dump" style="display:block">
+<pre>
+        HTML
+
+        @var_aggregates.each_with_index do |variable, index|
+          html << <<-EOH
+var_dump:#{index} #{variable.subject}
+#{variable.dump}
+
+          EOH
+        end
+
+        html << "</pre></div>"
+        @content_body.sub(/<body.*>/, '\&' + html)
+      end
+    end
+  end
+end

data/lib/rack/var_dump/variable.rb

@@ -0,0 +1,33 @@
+module Rack
+  class VarDump
+    class Variable
+      attr_reader :subject
+
+      def initialize(var, subject, options = {})
+        @variable = var
+        @subject  = subject
+        @options  = options
+      end
+
+      def dump
+        @options[:plain] ? inspect_dump : ai_dump
+      end
+
+      def inspect_dump
+        Rack::Utils.escape_html(@variable.inspect)
+      end
+      private :inspect
+
+      def ai_dump
+        ap = AwesomePrint::Inspector.new(@options)
+        ap.instance_eval do
+          formatter = AwesomePrint::VarDump.new(self)
+          instance_variable_set(:@formatter, formatter)
+        end
+
+        ap.awesome(@variable)
+      end
+      private :ai_dump
+    end
+  end
+end

data/lib/rack/var_dump/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-var-dump
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000Z
+date: 2012-02-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2158675240 !ruby/object:Gem::Requirement
+  requirement: &2154970300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2158675240
+  version_requirements: *2154970300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2158674720 !ruby/object:Gem::Requirement
+  requirement: &2154969520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2158674720
+  version_requirements: *2154969520
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2158674180 !ruby/object:Gem::Requirement
+  requirement: &2154968680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *2158674180
+  version_requirements: *2154968680
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2158673640 !ruby/object:Gem::Requirement
+  requirement: &2154968140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *2158673640
+  version_requirements: *2154968140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158673180 !ruby/object:Gem::Requirement
+  requirement: &2154967680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2158673180
+  version_requirements: *2154967680
 description: provides a method for debugging like var_dump() of php.
 email:
 - bunny.hop.md@gmail.com
@@ -85,8 +85,9 @@ files:
 - 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/response.rb
+- lib/rack/var_dump/variable.rb
 - lib/rack/var_dump/version.rb
 - lib/rails-var-dump.rb
 - lib/rails_var_dump.rb

data/lib/rack/var_dump/object.rb

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