exceptional 2.0.2 → 2.0.3

data/exceptional.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name = %q{exceptional}
-  s.version = "2.0.2"
+  s.version = "2.0.3"
   s.authors = ["Contrast"]
   s.summary = %q{Exceptional is the core Ruby library for communicating with http://getexceptional.com (hosted error tracking service)}
   s.description = %q{Exceptional is the core Ruby library for communicating with http://getexceptional.com (hosted error tracking service). Use it to find out about errors that happen in your live app. It captures lots of helpful information to help you fix the errors.}

data/init.rb

@@ -1,20 +1,5 @@
 require 'exceptional'
 
-unless Object.const_defined?(:JSON)
-  begin
-    require 'json'
-  rescue LoadError
-    begin
-      require 'json-ruby'
-    rescue LoadError
-      require 'json_pure'
-    end
-  end
-end
-unless Object.const_defined?(:JSON)
-  raise "Could not load json gem; make sure you install one of json_pure, json-ruby, or the C-based json gem."
-end
-
 # If old plugin still installed then we don't want to install this one.
 # In production environments we should continue to work as before, but in development/test we should
 # advise how to correct the problem and exit

data/lib/exceptional.rb

@@ -11,7 +11,7 @@ require 'exceptional/remote'
 
 module Exceptional
   PROTOCOL_VERSION = 5
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
   CLIENT_NAME = 'getexceptional-rails-plugin'
 
   def self.logger

data/lib/exceptional/exception_data.rb

@@ -32,7 +32,16 @@ module Exceptional
     end
 
     def to_json
-      to_hash.to_json
+      begin
+        to_hash.to_json
+      rescue NoMethodError
+        begin
+          require 'json'
+          return to_hash.to_json
+        rescue StandardError
+          raise StandardError.new("You need a json gem/library installed to send errors to Exceptional (Object.to_json not defined). \nInstall json_pure, yajl-ruby, json-jruby, or the c-based json gem")
+        end
+      end
     end
 
     def uniqueness_hash

data/spec/exceptional/exception_data_spec.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'digest/md5'
-require 'json'
 
 class Exceptional::FunkyError < StandardError
   def backtrace
@@ -8,13 +7,28 @@ class Exceptional::FunkyError < StandardError
   end
 end
 
+describe Exceptional::ControllerExceptionData do
+  it "raises useful error when to_json isn't available on to_hash" do
+    begin
+      data = Exceptional::ExceptionData.new(Exceptional::FunkyError.new)
+      hash_without_json = {}
+      hash_without_json.stub!(:to_json).and_raise(NoMethodError)
+      data.stub!(:to_hash).and_return(hash_without_json)
+      data.to_json
+      fail 'expects to raise and error'
+    rescue StandardError => e
+      e.message.should =~ /to_json/
+    end
+  end
+end
+
 describe Exceptional::ControllerExceptionData, 'when no request/controller/params' do
   before :each do
     ENV['LOGNAME'] = 'bob'
     ENV['SOMEVAR'] = 'something'
     ENV['HTTP_SOMETHING'] = 'should be stripped'
     ::RAILS_ENV = 'test' unless defined?(RAILS_ENV)
-    Time.stub!(:now).and_return(Time.mktime(1970,1,1))
+    Time.stub!(:now).and_return(Time.mktime(1970, 1, 1))
     error = Exceptional::FunkyError.new('some message')
     @data = Exceptional::ControllerExceptionData.new(error)
     @hash = @data.to_hash
@@ -28,11 +42,12 @@ describe Exceptional::ControllerExceptionData, 'when no request/controller/param
     error_hash['occurred_at'].should == Time.now.strftime("%Y%m%d %H:%M:%S %Z")
     client_hash = @hash['client']
     client_hash['name'].should == Exceptional::CLIENT_NAME
-    client_hash['version'].should == Exceptional::VERSION    
+    client_hash['version'].should == Exceptional::VERSION
     client_hash['protocol_version'].should == Exceptional::PROTOCOL_VERSION
   end
 
   it "generates parseable json" do
+    require 'json'
     JSON.parse(@data.to_json)['exception']['exception_class'].should == 'Exceptional::FunkyError'
   end
 
@@ -53,13 +68,13 @@ end
 
 describe Exceptional::ControllerExceptionData, 'with request/controller/params' do
   class Exceptional::SomeController < ActionController::Base
-      filter_parameter_logging :filter_me
+    filter_parameter_logging :filter_me
   end
-  
+
   before :each do
     @controller = Exceptional::SomeController.new
     @request = ActionController::TestRequest.new({'action' => 'some_action' })
-    @request.request_uri = '/some_path?var1=abc' 
+    @request.request_uri = '/some_path?var1=abc'
     @request.stub!(:parameters).and_return({'var1' => 'abc', 'action' => 'some_action', 'filter_me' => 'private'})
     @request.stub!(:request_method).and_return(:get)
     @request.stub!(:remote_ip).and_return('1.2.3.4')
@@ -87,8 +102,8 @@ describe Exceptional::ControllerExceptionData, 'with request/controller/params'
       end
     end
     crazy = Crazy.new
-    input = {'crazy' => crazy, :simple => '123', :some_hash => {'1' => '2'}, :array => ['1','2']}
-    Exceptional::ControllerExceptionData.sanitize_hash(input).should == {'crazy' => crazy.to_s, :simple => '123', :some_hash => {'1' => '2'}, :array => ['1','2']}
+    input = {'crazy' => crazy, :simple => '123', :some_hash => {'1' => '2'}, :array => ['1', '2']}
+    Exceptional::ControllerExceptionData.sanitize_hash(input).should == {'crazy' => crazy.to_s, :simple => '123', :some_hash => {'1' => '2'}, :array => ['1', '2']}
   end
 
   it "to_strings regex because JSON.parse(/aa/.to_json) doesn't work" do

data/spec/rails_integration_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'exceptional', 'integrati
 
 describe Exceptional, 'version number' do
   it "be available proramatically" do
-    Exceptional::VERSION.should == '2.0.2'
+    Exceptional::VERSION.should == '2.0.3'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: exceptional
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Contrast
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 +00:00
+date: 2010-01-05 00:00:00 +00:00
 default_executable: 
 dependencies: []