yeller_ruby 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bee1785d04c635656df246e09d756d3791f46b5
-  data.tar.gz: 65305257a3f82db0f8dc6616e187fdfbda0fba9f
+  metadata.gz: 6ee207401005b37d98db0a62563af2fc23a29a17
+  data.tar.gz: 0a423f8b41680ca0be1493dfaa797076afa7e91d
 SHA512:
-  metadata.gz: 437a25a5f7f345861d44b4edc8d2fbf73f0a82a49ab21e369e2b453872743096f0171835e065bcfd6f4bb34cbd8c50ce05d50800df0fb6f4ce799a791dd23267
-  data.tar.gz: 859e43b237958738afb47db0d5cf9ec3777939722242e6e48a93b90baac7c93d6f87354aa64272e7216d838d19bc7ba18f49b6b09257c8a1123576f3458ea4be
+  metadata.gz: 4ce49b66ee1ab619bd2dbc52b007c3806fbbd71bb7b13fb3c485e2717955bed183d47819dfec4b8e85654e56dd22553ce140951d540a75c271ba84643f77f588
+  data.tar.gz: 5a28772bbc5226ad17d98ff7d4c277e1cdd81122601ccac027e00f74e949184d1a721d4092319006b94bb59273879036f2b76f7de668d0813acbfadf2caea85a

data/lib/yeller/rails/tasks.rb

@@ -1,76 +1,79 @@
-require 'action_controller/test_case'
-namespace :yeller do
-  task :enable_verify_log => [] do
-    Yeller::VerifyLog.enable!
-  end
+if defined?(::Rake) && defined?(::ActionController) && defined? (::ActiveSupport)
+  require 'action_controller/test_case'
+  require File.expand_path('../../../yeller/rails', __FILE__)
+  namespace :yeller do
+    task :enable_verify_log => [] do
+      Yeller::VerifyLog.enable!
+    end
 
-  desc "verify your yeller gem installation by sending a test exception to yeller's servers"
-  task :verify => [:enable_verify_log, :environment] do
-    Dir["app/controllers/application*.rb"].each { |file| require(File.expand_path(file)) }
+    desc "verify your yeller gem installation by sending a test exception to yeller's servers"
+    task :verify => [:enable_verify_log, :environment] do
+      Dir["app/controllers/application*.rb"].each { |file| require(File.expand_path(file)) }
 
-    catcher = Yeller::Rails::ActionControllerCatchingHooks
+      rails3_onwards_catcher = Yeller::Rails::Rails3AndFourCatchingHooks
 
-    if !([ActionController::Base, ActionDispatch::DebugExceptions, ActionDispatch::ShowExceptions, ApplicationController].any? {|x| x.included_modules.include?(catcher) })
-      puts "YELLER: NO RAILS INITIALIZATION DETECTED"
-      puts "this is likely our problem, email tcrayford@yellerapp.com"
-      exit 126
-    end
+      if !([ActionController::Base, ActionDispatch::DebugExceptions, ActionDispatch::ShowExceptions, ApplicationController].any? {|x| x.included_modules.include?(rails3_onwards_catcher) })
+        puts "YELLER: NO RAILS INITIALIZATION DETECTED"
+        puts "this is likely our problem, email tcrayford@yellerapp.com"
+        exit 126
+      end
 
-    client = Yeller::Rack.instance_variable_get('@client')
-    if client.token.nil? || client.token == 'YOUR_API_TOKEN_HERE'
-      puts "NO YELLER API TOKEN DETECTED: your api token was set to #{client.token.inspect}"
-      puts "Yeller needs an api key configured. Check the README: https://github.com/tcrayford/yeller_ruby to find out how to do that"
-      exit 126
-    end
+      client = Yeller::Rack.instance_variable_get('@client')
+      if client.token.nil? || client.token == 'YOUR_API_TOKEN_HERE'
+        puts "NO YELLER API TOKEN DETECTED: your api token was set to #{client.token.inspect}"
+        puts "Yeller needs an api key configured. Check the README: https://github.com/tcrayford/yeller_ruby to find out how to do that"
+        exit 126
+      end
 
-    class YellerVerifyException < RuntimeError; end
+      class YellerVerifyException < RuntimeError; end
 
-    Yeller::Rails.configure do |config|
-      config.development_environments = []
-    end
+      Yeller::Rails.configure do |config|
+        config.development_environments = []
+      end
 
-    class ApplicationController
-      prepend_before_filter :verify_yeller
+      class ApplicationController
+        prepend_before_filter :verify_yeller
 
-      def verify_yeller
-        Yeller::VerifyLog.about_to_raise_exception_in_controller!
-        raise YellerVerifyException.new("verifying that yeller works")
-      end
+        def verify_yeller
+          Yeller::VerifyLog.about_to_raise_exception_in_controller!
+          raise YellerVerifyException.new("verifying that yeller works")
+        end
 
-      def verify
-      end
+        def verify
+        end
 
-      def consider_all_requests_local
-        false
-      end
+        def consider_all_requests_local
+          false
+        end
 
-      def local_request?
-        false
+        def local_request?
+          false
+        end
       end
-    end
 
-    class YellerVerificationController < ApplicationController; end
+      class YellerVerificationController < ApplicationController; end
 
 
-    Rails.application.routes.draw do
-      get '/yeller_verify' => 'yeller_verification#verify'
-    end
+      Rails.application.routes.draw do
+        get '/yeller_verify' => 'yeller_verification#verify'
+      end
 
-    env = Rack::MockRequest.env_for('http://example.com/yeller_verify')
-    Rails.application.call(env)
+      env = Rack::MockRequest.env_for('http://example.com/yeller_verify')
+      Rails.application.call(env)
 
-    client = Yeller::Rack.instance_variable_get('@client')
-    if client.reported_error?
-      Kernel.puts "SUCCESS: yeller-verified token=\"#{client.token}\""
-    else
-      if !client.enabled?
-        Kernel.puts "ERROR: CLIENT NOT ENABLED yeller-verification-failed enabled=#{client.enabled?} token=\"#{client.token}\""
-        Kernel.puts "Yeller rails client not enabled, check development_environments setting"
+      client = Yeller::Rack.instance_variable_get('@client')
+      if client.reported_error?
+        Kernel.puts "SUCCESS: yeller-verified token=\"#{client.token}\""
       else
-        Yeller::StdoutVerifyLog.print_log!
-        Kernel.puts "ERROR yeller-verification-failed enabled=#{client.enabled?} token=\"#{client.token}\""
+        if !client.enabled?
+          Kernel.puts "ERROR: CLIENT NOT ENABLED yeller-verification-failed enabled=#{client.enabled?} token=\"#{client.token}\""
+          Kernel.puts "Yeller rails client not enabled, check development_environments setting"
+        else
+          Yeller::StdoutVerifyLog.print_log!
+          Kernel.puts "ERROR yeller-verification-failed enabled=#{client.enabled?} token=\"#{client.token}\""
+        end
+        exit 126
       end
-      exit 126
     end
   end
 end

data/lib/yeller/rails.rb

@@ -80,8 +80,7 @@ module Yeller
         base.send(:alias_method, :render_exception, :render_exception_with_yeller)
       end
 
-      def render_exception_with_yeller(env, exception)
-        Yeller::VerifyLog.render_exception_with_yeller!
+      def _capture_exception(env, exception, extra={})
         begin
           request = ::Rack::Request.new(env)
           controller = env['action_controller.instance']
@@ -92,7 +91,7 @@ module Yeller
               exception,
               :url => request.url,
               :location => "#{controller.class.to_s}##{params[:action]}",
-              :custom_data => controller._yeller_custom_data
+              :custom_data => controller._yeller_custom_data.merge(extra)
             )
           else
             Yeller::VerifyLog.action_controller_instance_not_in_env!
@@ -101,6 +100,15 @@ module Yeller
         rescue => e
           Yeller::VerifyLog.error_reporting_rails_error!(e)
         end
+      end
+
+      def report_exception_to_yeller(exception, extra={})
+        _capture_exception(request.env, exception, extra)
+      end
+
+      def render_exception_with_yeller(env, exception)
+        Yeller::VerifyLog.render_exception_with_yeller!
+        _capture_exception(env, exception)
         render_exception_without_yeller(env, exception)
       end
     end

data/lib/yeller/version.rb

@@ -1,3 +1,3 @@
 module Yeller
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/yeller.rb

@@ -12,6 +12,7 @@ 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__)
+require File.expand_path('../yeller/rails/tasks', __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.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Tom Crayford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler