yeller_ruby 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bc4dfe4cdd8c6603b2d69c726871777fd36f993
-  data.tar.gz: d20de3a957643e0104836a088b06114db1bcbfaf
+  metadata.gz: 5853d9f2c5962d8699ee7fed01219c03b80cd630
+  data.tar.gz: 7fb9baee25cf724a77c8f009204226987e99d1cc
 SHA512:
-  metadata.gz: 4b2a330661919869d5aea4b0087623972efb09d0633fa614e835b60edcb54c2a5cfd5770d019b248afa916481b9ce4ad4727509be2c5d3cd80788979852d9863
-  data.tar.gz: e1c9d17782072e4e273b89614ae130e60ea28c8b8f373b99c891fb02ea4d9bcfb5ae1c5c7c8acb730763559ece461f05052892ac3387bdeaafb0fade10aa9537
+  metadata.gz: f6f42956eeb821511c14cb9b505011a0e2792870e7f642005e15016e3ab1e5508524b8751029ff712d7569b0e2cb362e906fa089808b96d851a096ddb39c2c1a
+  data.tar.gz: 5b3e9c26c3e0a9ab9f56605ce254c52bded934e80bd4efe7c0c72353ff2df15520ed55de49d46c3acdc615f9b0016284a55bd08b3852c6af7d7358a2d38b6a7e

data/lib/yeller/backtrace_filter.rb

@@ -20,6 +20,7 @@ module Yeller
     end
 
     def filter_method(method)
+      return '' if method.nil?
       method_filters.each do |filter|
         method.gsub!(filter[0], filter[1])
       end

data/lib/yeller/configuration.rb

@@ -1,4 +1,4 @@
-require_relative 'server'
+require File.expand_path('../server', __FILE__)
 
 module Yeller
   class Configuration

data/lib/yeller/exception_formatter.rb

@@ -41,9 +41,9 @@ module Yeller
 
     def to_hash
       result = {
-        message: message,
-        stacktrace: formatted_backtrace,
-        type: type,
+        :message => message,
+        :stacktrace => formatted_backtrace,
+        :type => type,
         :"custom-data" => options.fetch(:custom_data, {})
       }
       result[:url] = options[:url] if options.key?(:url)

data/lib/yeller/rack.rb

@@ -1,5 +1,5 @@
 require 'rack/request'
-require_relative '../yeller'
+require File.expand_path('../../yeller', __FILE__)
 
 module Yeller
   class Rack

data/lib/yeller/rails.rb

@@ -1,13 +1,16 @@
-require 'rails'
-require 'yeller'
-require 'yeller/rack'
+require File.expand_path('../../yeller', __FILE__)
+require File.expand_path('../../yeller/rack', __FILE__)
 
 module Yeller
   class Rails
     def self.configure(&block)
       Yeller::Rack.configure do |config|
-        config.error_handler = Yeller::LogErrorHandler.new(::Rails.logger)
-        config.environment = ::Rails.env.to_s
+        if defined?(::Rails)
+          config.error_handler = Yeller::LogErrorHandler.new(::Rails.logger)
+          config.environment = ::Rails.env.to_s
+        elsif ENV['RAILS_ENV']
+          config.environment = ENV['RAILS_ENV']
+        end
         block.call(config)
       end
     end
@@ -24,7 +27,7 @@ module Yeller
       def _yeller_custom_data
         out = {
           :params => params,
-          :session => env.fetch('rack.session', {})
+          :session => request.env.fetch('rack.session', {})
         }
         out.merge!(yeller_user_data || {})
         if respond_to?(:yeller_custom_data)
@@ -42,13 +45,12 @@ module Yeller
       end
     end
 
-    module ActionControllerCatchingHooks
+    module Rails3AndFourCatchingHooks
       def self.included(base)
         base.send(:alias_method, :render_exception_without_yeller, :render_exception)
         base.send(:alias_method, :render_exception, :render_exception_with_yeller)
       end
 
-      protected
       def render_exception_with_yeller(env, exception)
         Yeller::VerifyLog.render_exception_with_yeller!
         begin
@@ -65,35 +67,75 @@ module Yeller
             )
           else
             Yeller::VerifyLog.action_controller_instance_not_in_env!
-            Yeller::Rack.report(
-              exception,
-              :url => request.url
-            )
+            Yeller::Rack.rescue_rack_exception(exception, env)
           end
         rescue => e
           Yeller::VerifyLog.error_reporting_rails_error!(e)
         end
-
         render_exception_without_yeller(env, exception)
       end
     end
 
-    class Railtie < ::Rails::Railtie
-      initializer "yeller.use_rack_middleware" do |app|
-        app.config.middleware.insert 0, "Yeller::Rack"
+    module Rails2CatchingHooks
+      def self.included(base)
+        Yeller::VerifyLog.monkey_patching_rails!("ActionController::Base.rescue_action_in_public")
+        base.send(:alias_method, :rescue_action_in_public_without_yeller, :rescue_action_in_public)
+        base.send(:alias_method, :rescue_action_in_public, :rescue_public_exception_with_yeller)
+
+        Yeller::VerifyLog.monkey_patching_rails!("ActionController::Base.rescue_action_locally")
+        base.send(:alias_method, :rescue_action_locally_without_yeller, :rescue_action_locally)
+        base.send(:alias_method, :rescue_action_locally, :rescue_local_exception_with_yeller)
       end
 
-      config.after_initialize do
-        if defined?(::ActionDispatch::DebugExceptions)
-          Yeller::VerifyLog.monkey_patching_rails!("ActionDispatch::DebugExceptions")
-          ::ActionDispatch::DebugExceptions.send(:include, Yeller::Rails::ActionControllerCatchingHooks)
-        end
-        if defined?(::ActionDispatch::ShowExceptions)
-          Yeller::VerifyLog.monkey_patching_rails!("ActionDispatch::ShowExceptions")
-          ::ActionDispatch::ShowExceptions.send(:include, Yeller::Rails::ActionControllerCatchingHooks)
+      protected
+      def rescue_public_exception_with_yeller(exception)
+        _send_to_yeller(exception)
+        rescue_action_in_public_without_yeller(exception)
+      end
+
+      def rescue_local_exception_with_yeller(exception)
+        _send_to_yeller(exception)
+        rescue_action_locally_without_yeller(exception)
+      end
+
+      def _send_to_yeller(exception)
+        Yeller::VerifyLog.render_exception_with_yeller!
+        controller = self
+        params = controller.send(:params)
+        Yeller::Rack.report(
+          exception,
+          :url => request.url,
+          :location => "#{controller.class.to_s}##{params[:action]}",
+          :custom_data => controller._yeller_custom_data
+        )
+      end
+    end
+
+    def self.monkeypatch_rails3!
+      if defined?(::ActionDispatch::DebugExceptions)
+        ::ActionDispatch::DebugExceptions.send(:include, Yeller::Rails::Rails3AndFourCatchingHooks)
+      elsif defined?(::ActionDispatch::ShowExceptions)
+        ::ActionDispatch::ShowExceptions.send(:include, Yeller::Rails::Rails3AndFourCatchingHooks)
+      end
+
+      if defined?(::ActionController)
+        ::ActionController::Base.send(:include, Yeller::Rails::ControllerMethods)
+      end
+    end
+
+    if defined?(::Rails) && defined?(::Rails::Railtie)
+      class Railtie < ::Rails::Railtie
+        initializer "yeller.use_rack_middleware" do |app|
+          app.config.middleware.insert 0, "Yeller::Rack"
         end
-        ActionController::Base.send(:include, Yeller::Rails::ControllerMethods)
+
+        config.after_initialize do
+          Yeller::Rails.monkeypatch_rails3!
+       end
       end
+    elsif defined?(ActionController::Base)
+      ActionController::Base.send(:include, Yeller::Rails::Rails2CatchingHooks)
+      ActionController::Base.send(:include, Yeller::Rails::ControllerMethods)
     end
   end
 end

data/lib/yeller/server.rb

@@ -15,7 +15,9 @@ module Yeller
       http = Net::HTTP.new(host, port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      http.ciphers = "DEFAULT:!aNULL:!eNULL:!LOW:!EXPORT:!SSLv2"
+      if http.respond_to?(:ciphers=)
+        http.ciphers = "DEFAULT:!aNULL:!eNULL:!LOW:!EXPORT:!SSLv2"
+      end
       http
     end
   end

data/lib/yeller/startup_params.rb

@@ -1,4 +1,4 @@
-require_relative 'version'
+require File.expand_path('../version', __FILE__)
 
 module Yeller
   class StartupParams

data/lib/yeller/version.rb

@@ -1,3 +1,3 @@
 module Yeller
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/yeller.rb

@@ -1,24 +1,16 @@
 require 'net/http'
 require 'yajl/json_gem'
 
-require_relative 'yeller/backtrace_filter'
-require_relative 'yeller/client'
-require_relative 'yeller/ignoring_client'
-require_relative 'yeller/configuration'
-require_relative 'yeller/exception_formatter'
-require_relative 'yeller/server'
-require_relative 'yeller/version'
-require_relative 'yeller/startup_params'
-require_relative 'yeller/log_error_handler'
-require_relative 'yeller/verify_log'
-
-if defined?(::Rails)
-  require 'yeller/rails'
-end
-
-if defined?(::Rails) && defined?(::Rake)
-  require 'yeller/rails/tasks'
-end
+require File.expand_path('../yeller/backtrace_filter', __FILE__)
+require File.expand_path('../yeller/client', __FILE__)
+require File.expand_path('../yeller/ignoring_client', __FILE__)
+require File.expand_path('../yeller/configuration', __FILE__)
+require File.expand_path('../yeller/exception_formatter', __FILE__)
+require File.expand_path('../yeller/server', __FILE__)
+require File.expand_path('../yeller/version', __FILE__)
+require File.expand_path('../yeller/startup_params', __FILE__)
+require File.expand_path('../yeller/log_error_handler', __FILE__)
+require File.expand_path('../yeller/verify_log', __FILE__)
 
 module Yeller
   def self.client(*blocks, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yeller_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Tom Crayford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler