Dex_Rack 0.1.8 → 0.1.9

data/Dex_Rack.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/da99/Dex_Rack"
   s.summary     = %q{A Rack app to display Dex exceptions.}
   s.description = %q{
-It is a web-frontend for Dex. 
-Update and view exceptions logged with the Dex gem.
+    It is a web-frontend for Dex. 
+    Update and view exceptions logged with the Dex gem.
   }
 
   s.files         = `git ls-files`.split("\n")
@@ -22,9 +22,10 @@ Update and view exceptions logged with the Dex gem.
 
   s.add_development_dependency 'bacon'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'Bacon_Colored'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rack-test'
+  s.add_development_dependency 'Bacon_Colored'
+  s.add_development_dependency 'Bacon_Rack'
   
   # Specify any dependencies here; for example:
   s.add_runtime_dependency 'sinatra'
@@ -34,4 +35,5 @@ Update and view exceptions logged with the Dex gem.
   s.add_runtime_dependency 'chronic_duration'
   s.add_runtime_dependency 'Dex', ">= 0.2.2" 
   s.add_runtime_dependency 'escape_utils'
+  s.add_runtime_dependency 'Backtrace_Array'
 end

data/lib/Dex_Rack.rb

@@ -4,6 +4,7 @@ require 'markaby'
 require 'chronic_duration'
 require 'cgi'
 require 'escape_utils'
+require 'Backtrace_Array'
 
 class Dex_Rack 
   
@@ -51,7 +52,7 @@ class Dex_Rack
       vars[:status_class] = status.downcase
       vars[:status_word]  = status
       r[:human_time]   = human_time(r[:created_at])
-      r[:backtrace]    = backtrace_to_html(r[:backtrace])
+      r[:backtrace]    = Backtrace_Array(r[:backtrace])
       vars[:table_keys] << :human_time
       layout vars, :record 
     else
@@ -152,30 +153,6 @@ class Dex_Rack
       EscapeUtils.escape_html( str.encode('UTF-8') )
     end
 
-    def backtrace_to_html s
-      last_file = nil
-      str = ""
-      s.split("\n").each { |l|
-        
-        file, num, code = l.split(':')
-        
-        str.<< %!
-          <div class="file">#{escape_html file}</div>
-        ! if file != last_file
-
-        str.<< %!  
-          <div class="line">
-            <span class="num">#{num}</span> 
-            <span class="code">#{escape_html code}</span>
-          </div>!
-          
-        last_file = file
-        
-      }
-
-      str
-    end
-
     def human_time t
       target = Time.now.utc.to_i - t.to_i
       if target < 61

data/lib/Dex_Rack/version.rb

@@ -1,5 +1,5 @@
 require "sinatra/base"
 
 class Dex_Rack < Sinatra::Base
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/Dex_Rack/views/record.rb

@@ -34,19 +34,36 @@ div.content! {
     }
   end
 
-  div.toggle_backtrace! {
-    div {
-      a.button.show_backtrace!(:href=>"#show") { "Show Backtrace" }
-    }
-    div.omega {
-      a.button.hide_backtrace!(:href=>"#hide") { "Hide Backtrace" }
+  unless vars[:record][:backtrace].empty?
+    
+    div.toggle_backtrace! {
+      div {
+        a.button.show_backtrace!(:href=>"#show") { "Show Backtrace" }
+      }
+      div.omega {
+        a.button.hide_backtrace!(:href=>"#hide") { "Hide Backtrace" }
+      }
     }
-  }
 
-  h3 "Backtrace:"
-  div.backtrace! {
-    vars[:record][:backtrace] 
-  }
+
+    
+    div.backtrace! {
+      h3 "Backtrace:"
+      div.body {
+        vars[:record][:backtrace].each { |file, lines|
+          div.file file.to_s
+          div.lines {
+            lines.each { |l|
+              div.line {
+                span.num("#{l.first}:")
+                span.code l[1].to_s
+              }
+            }
+          }
+        }
+      }
+    }
+  end
 
 
 }

data/spec/Dex_App.rb

@@ -76,10 +76,22 @@ describe "get /:id" do
   
   behaves_like 'Test DB'
   
-  it "displays record" do
-      id = Dex.insert(except "rand err")
-      get "/#{id}"
-      should_render "rand err"
+  it "renders record" do
+    id = Dex.insert(except "rand err")
+    get "/#{id}"
+    renders 200, %r"rand err"
+  end
+
+  it "renders non-standard backtrace: <<< Rack App" do
+    id = Dex.insert(except("rand"), :backtrace=>"<<< Rack App")
+    get "/#{id}"
+    renders 200, %r"&lt;&lt;&lt; Rack App"
+  end
+
+  it "renders non-standard backtrace: file:13:code:1:2:3:" do
+    id = Dex.insert(except("rand"), :backtrace=>"file:13:code:1:2:3:")
+    get "/#{id}"
+    renders 200, %r">code:1:2:3"
   end
 
 end # === get /:id

data/spec/lib/main.rb

@@ -16,6 +16,7 @@ $LOAD_PATH.unshift( Gem_Dir + "/lib" )
 Bacon.summary_on_exit
 
 require 'Bacon_Colored'
+require 'Bacon_Rack'
 require 'pry'
 require 'rack/test'
 require 'Dex_Rack'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Dex_Rack
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: Bacon_Colored
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: Bacon_Colored
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: Bacon_Rack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -203,8 +219,24 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "\nIt is a web-frontend for Dex. \nUpdate and view exceptions logged
-  with the Dex gem.\n  "
+- !ruby/object:Gem::Dependency
+  name: Backtrace_Array
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "\n    It is a web-frontend for Dex. \n    Update and view exceptions
+  logged with the Dex gem.\n  "
 email:
 - i-hate-spam-45671204@mailinator.com
 executables: []