avishekjana · Oct 26, 2016 · Oct 27, 2016 · Oct 27, 2016 · Oct 27, 2016 · Jan 6, 2017
diff --git a/app/assets/fonts/rscratch/iconfont/MaterialIcons-Regular.eot b/app/assets/fonts/rscratch/iconfont/MaterialIcons-Regular.eot
diff --git a/app/assets/fonts/rscratch/iconfont/MaterialIcons-Regular.svg b/app/assets/fonts/rscratch/iconfont/MaterialIcons-Regular.svg
diff --git a/app/assets/fonts/rscratch/iconfont/MaterialIcons-Regular.ttf b/app/assets/fonts/rscratch/iconfont/MaterialIcons-Regular.ttf
diff --git a/app/assets/fonts/rscratch/iconfont/MaterialIcons-Regular.woff b/app/assets/fonts/rscratch/iconfont/MaterialIcons-Regular.woff
diff --git a/app/assets/fonts/rscratch/iconfont/MaterialIcons-Regular.woff2 b/app/assets/fonts/rscratch/iconfont/MaterialIcons-Regular.woff2
diff --git a/app/assets/fonts/rscratch/roboto/Roboto-Bold.ttf b/app/assets/fonts/rscratch/roboto/Roboto-Bold.ttf
diff --git a/app/assets/fonts/rscratch/roboto/Roboto-Light.ttf b/app/assets/fonts/rscratch/roboto/Roboto-Light.ttf
diff --git a/app/assets/fonts/rscratch/roboto/Roboto-Medium.ttf b/app/assets/fonts/rscratch/roboto/Roboto-Medium.ttf
diff --git a/app/assets/fonts/rscratch/roboto/Roboto-Regular.ttf b/app/assets/fonts/rscratch/roboto/Roboto-Regular.ttf
diff --git a/app/assets/fonts/rscratch/roboto/Roboto-Thin.ttf b/app/assets/fonts/rscratch/roboto/Roboto-Thin.ttf
diff --git a/app/assets/images/rscratch/rscratch_logo.png b/app/assets/images/rscratch/rscratch_logo.png
diff --git a/app/assets/javascripts/rscratch/dashboard.js b/app/assets/javascripts/rscratch/dashboard.js
@@ -8,15 +8,15 @@ function load_dashboard_UI_components() {
 
   // AJAX Request
   var request = $.ajax({
-    url: "/rscratch/dashboard/index.json",
+    url: location.pathname + "/dashboard/index.json",
     method: "GET",
     dataType: "json",
   });
   request.done(function( data, textStatus, jqXHR ) {
     load_exception_line_chart(data);
   });
   request.fail(function( jqXHR, textStatus ) {
-    alert("Sorry Something Went Wrong");
+    alert("Sorry something went wrong!");
     // Materialize.toast('Sorry somethnig went wrong while crunching data, please try after sometime!', 5000);
   });
 }

diff --git a/app/assets/javascripts/rscratch/exceptions.js b/app/assets/javascripts/rscratch/exceptions.js
@@ -51,7 +51,7 @@ $(document).ready(function() {
     var request;
     request = $.ajax({
       type: 'POST',
-      url: "/rscratch/exceptions/" + exception_id + "/resolve.json",
+      url: location.pathname + "/" + exception_id + "/resolve.json",
       dataType: "json"
     });    
     request.done(function(rData, textStatus, jqXHR) {
@@ -69,7 +69,7 @@ $(document).ready(function() {
     var request;
     request = $.ajax({
       type: 'POST',
-      url: "/rscratch/exceptions/" + exception_id + "/toggle_ignore.json",
+      url: location.pathname + "/" + exception_id + "/toggle_ignore.json",
       dataType: "json"
     });    
     request.done(function(rData, textStatus, jqXHR) {
@@ -103,7 +103,7 @@ $(document).ready(function() {
     var request;
     request = $.ajax({
       type: 'GET',
-      url: "/rscratch/exceptions/" + exception_id + ".json?page=" + page,
+      url: location.pathname + "/" + exception_id + ".json?page=" + page,
       dataType: "json"
     });
     request.done(function(rData, textStatus, jqXHR) {
@@ -133,7 +133,9 @@ $(document).ready(function() {
       $(".current-log").html(page);
 
       // Setting log data
-      $(".ex-backtrace").html(rData.data.log.backtrace);
+      btr = rData.data.log.backtrace;
+      btr = btr.replace(/\\n/g,"<br>");
+      $(".ex-backtrace").html(btr);
       $(".ex-params").html(rData.data.log.parameters);
       rData.response = rData.data;
       over_data = JST['rscratch/templates/exception_overview'](rData);

diff --git a/app/assets/javascripts/rscratch/materialize.min.js b/app/assets/javascripts/rscratch/materialize.min.js
diff --git a/app/assets/stylesheets/rscratch/materialize.min.css b/app/assets/stylesheets/rscratch/materialize.min.css
diff --git a/app/models/rscratch/exception.rb b/app/models/rscratch/exception.rb
@@ -13,8 +13,8 @@ class Exception < ActiveRecord::Base
     ### => Model Validations
     validates :exception       , presence: true
     validates :message         , presence: true
-    validates :controller      , presence: true
-    validates :action          , presence: true
+    validates :controller      , presence: false
+    validates :action          , presence: false
     validates :app_environment , presence: true
     validates :status          , presence: true, :inclusion => {:in => STATUS}
 
@@ -38,6 +38,10 @@ class Exception < ActiveRecord::Base
 
     # Log an exception
     def self.log(_exception,_request) 
+      if _request.nil?
+          _request = OpenStruct.new
+          _request.filtered_parameters = { "controller" => "", "action" => "" }
+      end
       _exc = self.find_or_create(_exception,_request.filtered_parameters["controller"].camelize,_request.filtered_parameters["action"],Rails.env.camelize)
       unless _exc.ignored?
         _log = ExceptionLog.new

diff --git a/app/views/layouts/rscratch/application.html.haml b/app/views/layouts/rscratch/application.html.haml
@@ -2,34 +2,23 @@
 %html
   %head
     %title Rscratch | Track Exceptions and Bugs of your Rails application
-    / Import Google Icon Font
-    %link{:href => "http://fonts.googleapis.com/icon?family=Material+Icons", :rel => "stylesheet"}
-    / Import materialize.css
-    %link{:href => "https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/css/materialize.min.css", :rel => "stylesheet"}
-    / Compiled and minified JavaScript
     = stylesheet_link_tag "rscratch/application", :media => "all"
     = javascript_include_tag "rscratch/application"
-    %script{:src => "https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/js/materialize.min.js"}
     = csrf_meta_tags
   %body
     .navbar-fixed
       %nav.white
         .nav-wrapper
           %ul.left
             %li
-              %h1.logo-wrapper{:style => ""}
+              %h1.logo-wrapper
                 %a{:href => "/rscratch"}
-                  %img{:alt => "Rscratch", :height => "55", :src => "http://rscratch.github.io/rscratch_logo.png"}
+                  =image_tag 'rscratch/rscratch_logo.png', :alt => "Rscratch", :height => "55"
                   %span.logo-text RScratch
           %ul#nav-mobile.left.hide-on-med-and-down.grey-text
             %li{:class => "#{'active' if current_page?(root_path)}"}
-              %a.grey-text.text-darken-2{:href => root_path} DASHBOARD          
+              %a.grey-text.text-darken-2{:href => root_path} DASHBOARD
             %li{:class => "#{'active' if current_page?(exceptions_path)}"}
               %a.grey-text.text-darken-2{:href => exceptions_path} EXCEPTIONS
-            / %li
-            /   %a.grey-text.text-darken-2{:href => "#"} CONFIGURATIONS
-          %ul.right.hide-on-med-and-down
-            %li
-              %a.waves-effect.waves-light.btn.green.darken-1{:href => "https://github.com/avishekjana/rscratch", :target => "_blank"}
-                Fork on Github
-    = yield    
+
+    = yield
diff --git a/lib/rscratch.rb b/lib/rscratch.rb
@@ -10,7 +10,7 @@ def self.configuration
     @configuration ||= Configuration.new
   end  
 
-  def self.log_exception(exception, request)
+  def self.log_exception(exception, request=nil)
     log = Rscratch::Exception.log(exception, request)
   end
 end
diff --git a/lib/rscratch/engine.rb b/lib/rscratch/engine.rb
@@ -6,5 +6,8 @@
 module Rscratch
   class Engine < ::Rails::Engine
     isolate_namespace Rscratch
+    config.assets.precompile += %w( rscratch/rscratch_logo.png )
+    config.assets.precompile += %w( rscratch/roboto/*.ttf )
+    config.assets.precompile += %w( rscratch/iconfont/* )
   end
 end