crashlog 1.0.0.rc1 → 1.0.0.rc2

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+script: bundle exec rake spec
 rvm:
   - 1.9.3
   - 1.9.2
@@ -9,3 +10,7 @@ rvm:
   - rbx-19mode
   - jruby-head
   - ree
+branches:
+  only:
+    - master
+    - develop

data/Gemfile.lock

@@ -10,7 +10,7 @@ PATH
   specs:
     crashlog (1.0.0.rc1)
       activesupport
-      crashlog-auth-hmac (~> 1.1.5)
+      crashlog-auth-hmac (~> 1.1.6)
       faraday
       hashr
       rabl (>= 0.6.14)
@@ -50,7 +50,7 @@ GEM
     arel (3.0.2)
     builder (3.0.0)
     chronic (0.6.7)
-    crashlog-auth-hmac (1.1.5)
+    crashlog-auth-hmac (1.1.6)
     delorean (2.0.0)
       chronic
     diff-lcs (1.1.3)
@@ -86,7 +86,7 @@ GEM
     multipart-post (1.1.5)
     pg (0.14.0)
     polyglot (0.3.3)
-    rabl (0.7.1)
+    rabl (0.7.2)
       activesupport (>= 2.3.14)
       multi_json (~> 1.0)
     rack (1.4.1)

data/crashlog.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("activesupport")
   gem.add_dependency("faraday")
-  gem.add_dependency("crashlog-auth-hmac", '~> 1.1.5')
+  gem.add_dependency("crashlog-auth-hmac", '~> 1.1.6')
   gem.add_dependency("yajl-ruby")
   gem.add_dependency("rabl", '>= 0.6.14')
   gem.add_dependency("uuid")

data/generators/crashlog/templates/initializer.rb

@@ -2,5 +2,6 @@
 require 'crash_log/rails'
 <% end -%>
 CrashLog.configure do |config|
-  config.api_key = <%= api_key_expression %>
+  config.api_key  = <%= api_key_expression %>
+  config.secret   = <%= secret_expression %>
 end

data/lib/crash_log.rb

@@ -66,7 +66,7 @@ module CrashLog
 
     # Sends the notice unless it is one of the default ignored exceptions.
     def notify_or_ignore(exception, context = {})
-      send_notification(exception, context = {}) unless ignored?(exception)
+      notify(exception, context = {}) unless ignored?(exception)
     end
 
     # Print a message at the top of the applciation's logs to say we're ready.
@@ -82,12 +82,16 @@ module CrashLog
 
     # Configure the gem to send notifications, at the very least an api_key is
     # required.
-    def configure(&block)
+    def configure(announce = false, &block)
       if block_given?
         yield(configuration)
 
         if configuration.valid?
-          report_for_duty!
+          if announce.eql?(true)
+            report_for_duty!
+          else
+            info("Configuration updated")
+          end
         elsif !configuration.invalid_keys.include?(:api_key)
           error("Not configured correctly. Missing the following keys: #{configuration.invalid_keys.join(', ')}")
         end

data/lib/crash_log/backtrace/line.rb

@@ -7,7 +7,7 @@ module CrashLog
       INPUT_FORMAT = %r{^((?:[a-zA-Z]:)?[^:]+):(\d+)(?::in `([^']+)')?$}
 
       # The file portion of the line (such as app/models/user.rb)
-      attr_reader :file
+      attr_reader :file, :original_file
 
       # The line number portion of the line
       attr_reader :number
@@ -25,9 +25,10 @@ module CrashLog
       end
 
       def initialize(file, number, method)
-        self.file   = file
-        self.number = number.to_i
-        self.method = method
+        self.file           = file
+        self.original_file  = file
+        self.number         = number.to_i
+        self.method         = method
       end
 
       # Reconstructs the line in a readable fashion
@@ -51,18 +52,20 @@ module CrashLog
       end
 
       def context_line
-        Backtrace::LineCache::getline(file, number)
+        Backtrace::LineCache::getline(original_file, number)
       end
 
+      alias :line_context :context_line
+
       def pre_context
         (number-context_lines..number-1).map {|i|
-          Backtrace::LineCache.getline(file, i)
+          Backtrace::LineCache.getline(original_file, i)
         }.select { |line| line }
       end
 
       def post_context
         (number+1..number+context_lines).map {|i|
-          Backtrace::LineCache.getline(file, i)
+          Backtrace::LineCache.getline(original_file, i)
         }.select { |line| line }
       end
 
@@ -98,7 +101,7 @@ module CrashLog
 
     private
 
-      attr_writer :file, :number, :method
+      attr_writer :file, :number, :method, :original_file
 
     end
   end

data/lib/crash_log/configuration.rb

@@ -2,6 +2,7 @@ require 'hashr'
 module CrashLog
   class Configuration < Hashr
     DEFAULT_PARAMS_FILTERS = %w(password password_confirmation).freeze
+    DEFAULT_USER_ATTRIBUTES = %w(id name full_name username email created_at).freeze
 
     DEFAULT_BACKTRACE_FILTERS = [
       lambda { |line|
@@ -125,6 +126,8 @@ module CrashLog
 
       :params_filters => DEFAULT_PARAMS_FILTERS.dup,
 
+      :user_attributes => DEFAULT_USER_ATTRIBUTES.dup,
+
       # Internal
       # Do not change unless you know what this does.
       :service_name => 'CrashLog',
@@ -171,7 +174,7 @@ module CrashLog
     end
 
     def ignored?(exception)
-      ignore.include?(error_class(exception))
+      ignore.include?(error_class(exception).to_s)
     end
 
     def secure?

data/lib/crash_log/rack.rb

@@ -30,14 +30,12 @@ module CrashLog
       begin
         response = @app.call(env)
       rescue Exception => exception
-        error_id = CrashLog.notify(exception, :rack_env => env)
-        env['crash_log.error_id'] = error_id
+        CrashLog.notify(exception, :rack_env => env)
         raise
       end
 
       if env['rack.exception']
-        error_id = CrashLog.notify(env['rack.exception'], :rack_env => env)
-        env['crash_log.error_id'] = error_id
+        CrashLog.notify(env['rack.exception'], :rack_env => env)
       end
 
       response

data/lib/crash_log/rails.rb

@@ -19,7 +19,7 @@ module CrashLog
         rails_logger = RAILS_DEFAULT_LOGGER
       end
 
-      CrashLog.configure do |config|
+      CrashLog.configure(true) do |config|
         config.logger = rails_logger
         config.stage = RAILS_ENV  if defined?(RAILS_ENV)
         config.project_root = RAILS_ROOT if defined?(RAILS_ROOT)

data/lib/crash_log/rails/action_controller_rescue.rb

@@ -16,13 +16,15 @@ module CrashLog
 
       # crash_log_context is defined in controller_methods.rb
       def rescue_action_in_public_with_crash_log(exception)
-        crash_log.auto_notify(exception, crash_log_context)
+        CrashLog.notify_or_ignore(exception, crash_log_context)
+      ensure
         rescue_action_in_public_without_crash_log(exception)
       end
 
       # crash_log_context is defined in controller_methods.rb
       def rescue_action_locally_with_crash_log(exception)
-        crash_log.auto_notify(exception, crash_log_context)
+        CrashLog.notify_or_ignore(exception, crash_log_context)
+      ensure
         rescue_action_locally_without_crash_log(exception)
       end
     end

data/lib/crash_log/rails/controller_methods.rb

@@ -8,7 +8,8 @@ module CrashLog
           :controller       => params[:controller],
           :action           => params[:action],
           :url              => crash_log_request_url,
-          :cgi_data         => crash_log_filter_if_filtering(request.env)
+          :cgi_data         => crash_log_filter_if_filtering(request.env),
+          :current_user     => crash_log_current_user
         }
       end
 
@@ -40,6 +41,17 @@ module CrashLog
         url
       end
 
+      def crash_log_current_user
+        user = begin current_user rescue current_member end
+        user.attributes.select do |k, v|
+          CrashLog.configuration.
+            user_attributes.map(&:to_sym).
+            include?(k.to_sym) unless v.blank?
+        end.symbolize_keys
+      rescue NoMethodError, NameError
+        {}
+      end
+
     end
   end
 end

data/lib/crash_log/rails/middleware/debug_exception_catcher.rb

@@ -12,8 +12,8 @@ module CrashLog
         def render_exception_with_crash_log(env, exception)
           controller = env['action_controller.instance']
 
-          env['crash_log.error_id'] = CrashLog.notify(exception) #,
-                                                      # crash_log_context(controller, env))
+          CrashLog.notify_or_ignore(exception) #,
+                                     # crash_log_context(controller, env))
 
           if defined?(controller.rescue_action_in_public_without_crash_log)
             controller.rescue_action_in_public_without_crash_log(exception)

data/lib/crash_log/railtie.rb

@@ -6,7 +6,7 @@ module CrashLog
   class Railtie < ::Rails::Railtie
 
     config.after_initialize do
-      CrashLog.configure do |config|
+      CrashLog.configure(true) do |config|
         config.logger           = ::Rails.logger
         config.stage            = ::Rails.env
         config.project_root     = ::Rails.root

data/lib/crash_log/reporter.rb

@@ -72,7 +72,7 @@ module CrashLog
     def post(endpoint, body)
       connection.post do |req|
         req.url(endpoint)
-        req.headers['Content-Type'] = 'application/json'
+        req.headers['Content-Type'] = 'application/json; charset=UTF-8'
         req.body = body
       end
     end

data/lib/crash_log/version.rb

@@ -1,3 +1,3 @@
 module CrashLog
-  VERSION = "1.0.0.rc1"
+  VERSION = "1.0.0.rc2"
 end

data/lib/rails/generators/crashlog/crashlog_generator.rb

@@ -3,6 +3,7 @@ require 'rails/generators'
 class CrashlogGenerator < Rails::Generators::Base
 
   class_option :api_key, :aliases => "-k", :type => :string, :desc => "Your CrashLog API key"
+  class_option :secret, :aliases => "-s", :type => :string, :desc => "Your CrashLog API secret"
 
   def self.source_root
     @_crashlog_source_root ||= File.expand_path("../../../../../generators/crashlog/templates", __FILE__)
@@ -17,8 +18,10 @@ class CrashlogGenerator < Rails::Generators::Base
   private
 
   def ensure_api_key_was_configured
-    if !options[:api_key] && !api_key_configured?
-      puts "Must pass --api-key or create config/initializers/crashlog.rb"
+    if !options[:api_key] &&
+       !options[:secret] &&
+       !api_key_configured?
+      puts "Must pass --api-key and --secret or create config/initializers/crashlog.rb"
       exit
     end
   end
@@ -27,6 +30,10 @@ class CrashlogGenerator < Rails::Generators::Base
     "'#{options[:api_key]}'"
   end
 
+  def secret_expression
+    "'#{options[:secret]}'"
+  end
+
   def generate_initializer
     template 'initializer.rb', 'config/initializers/crashlog.rb'
   end

data/script/integration_test

@@ -2,6 +2,7 @@
 
 require 'logger'
 require 'fileutils'
+require "uri"
 
 RAILS_ENV = "production"
 RAILS_ROOT = FileUtils.pwd
@@ -18,17 +19,27 @@ host ||= "stdin.crashlog.io"
 
 secure = (ARGV[2] == "secure")
 
-exception = begin
-              raise "Testing crashlog notifier with secure = #{secure}. If you can see this, it works."
-            rescue => foo
-              foo
-            end
+class SimulatedExceptionRaiser
+  attr_reader :secure
+
+  def initialize(secure)
+    @secure = secure
+    break_things
+  rescue => e
+    CrashLog.notify(e)
+  end
+
+  def break_things
+    raise "Testing crashlog notifier with secure = #{secure}. If you can see this, it works."
+  end
+end
 
 CrashLog.configure do |config|
   config.api_key = ARGV[0]
   config.secret  = ARGV[1]
   config.scheme  = secure ? 'https' : 'http'
-  config.host    = host
+  config.host    = URI.parse(host).host
+  config.port    = URI.parse(host).port
   config.service_name = 'Staging'
 end
 
@@ -37,4 +48,5 @@ CrashLog.configuration.each do |key, value|
   puts sprintf("%25s: %s", key.to_s, value.inspect.slice(0, 55))
 end
 puts "Sending #{secure ? "" : "in"}secure notification to project with key #{ARGV.first}"
-CrashLog.notify(exception)
+
+SimulatedExceptionRaiser.new(secure)

data/spec/crash_log/backtrace_spec.rb

@@ -55,6 +55,16 @@ describe CrashLog::Backtrace do
         ""
       ]
     end
+
+    it 'does not filter context file path' do
+      CrashLog.configuration.project_root = File.expand_path('../../', __FILE__)
+      filters = CrashLog.configuration.backtrace_filters
+      backtrace = CrashLog::Backtrace.parse(raised_error.backtrace, :filters => filters)
+      line = backtrace.lines.first
+
+      line.file.should match /\[PROJECT_ROOT\]/
+      line.context_line.should match /raise RuntimeError/
+    end
   end
 
   describe 'filters' do

data/spec/crash_log_spec.rb

@@ -149,5 +149,15 @@ describe CrashLog do
 
       CrashLog.ignored?(ActiveRecord::RecordNotFound).should be_true
     end
+
+    it 'ignores ActionController::RoutingError' do
+      unless defined?(ActionController)
+        module ActionController
+          class RoutingError < RuntimeError
+          end
+        end
+      end
+      CrashLog.ignored?(ActionController::RoutingError).should be_true
+    end
   end
 end

data/spec/requests/rails_controller_rescue_spec.rb

@@ -6,7 +6,7 @@ describe 'Rescue from within a Rails 3.x controller' do
   include Rack::Test::Methods
 
   it 'is testing tails 3.x' do
-    Rails.version.should =~ /^3\./
+    Rails.version.should =~ /^3\.2\./
   end
 
   describe 'dummy app' do
@@ -18,14 +18,15 @@ describe 'Rescue from within a Rails 3.x controller' do
   end
 
   it 'should intercept error and notify crashlog' do
-    CrashLog.should_receive(:notify).with(kind_of(RuntimeError)).once
+    CrashLog.should_receive(:notify_or_ignore).with(kind_of(RuntimeError)).once
 
-    begin
+    # begin
       get '/broken'
       last_response.status.should == 500
       last_response.body.should match /We're sorry, but something went wrong/
-    rescue
-    end
+    # rescue => e
+      # nil
+    # end
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crashlog
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70309383792940 !ruby/object:Gem::Requirement
+  requirement: &70250400938220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309383792940
+  version_requirements: *70250400938220
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70309383792280 !ruby/object:Gem::Requirement
+  requirement: &70250400937800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309383792280
+  version_requirements: *70250400937800
 - !ruby/object:Gem::Dependency
   name: crashlog-auth-hmac
-  requirement: &70309383791780 !ruby/object:Gem::Requirement
+  requirement: &70250400937300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70309383791780
+  version_requirements: *70250400937300
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70309383791260 !ruby/object:Gem::Requirement
+  requirement: &70250400936880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309383791260
+  version_requirements: *70250400936880
 - !ruby/object:Gem::Dependency
   name: rabl
-  requirement: &70309383806820 !ruby/object:Gem::Requirement
+  requirement: &70250400936340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.6.14
   type: :runtime
   prerelease: false
-  version_requirements: *70309383806820
+  version_requirements: *70250400936340
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70309383806220 !ruby/object:Gem::Requirement
+  requirement: &70250400935920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309383806220
+  version_requirements: *70250400935920
 - !ruby/object:Gem::Dependency
   name: hashr
-  requirement: &70309383805760 !ruby/object:Gem::Requirement
+  requirement: &70250400935460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309383805760
+  version_requirements: *70250400935460
 description: CrashLog Exception reporter
 email:
 - support@crashlog.io