ixtlan-error-handler 0.3.1 → 0.4.0

data/lib/ixtlan/errors/cuba.rb

@@ -25,6 +25,9 @@ module Ixtlan
   module Errors
     class Cuba < ::CubaAPI
       define do
+        on get, 'last' do
+          write Ixtlan::Errors::Error.last
+        end
         on get, :number do |number|
           write Ixtlan::Errors::Error.get!( number )
         end
@@ -34,4 +37,4 @@ module Ixtlan
       end
     end
   end
-end
+end

data/lib/ixtlan/errors/dumper.rb

@@ -68,7 +68,7 @@ module Ixtlan
                                   session, 
                                   params )
 
-        if not @to_emails.blank? and not @from_email.blank?
+        if not error.id.nil? and not @to_emails.blank? and not @from_email.blank?
           Mailer.error_notification( @from_email, 
                                      @to_emails, 
                                      exception, 
@@ -88,9 +88,7 @@ module Ixtlan
       def dump_environment( exception, request, response, session , params )
         dump = model.new
         
-        dump.request = dump_hashmap( request )
-
-        dump.response = dump_hashmap( response )
+        dump.request = dump_hashmap( request, '', true )
 
         dump.session = dump_hashmap( session )
 
@@ -101,13 +99,15 @@ module Ixtlan
         dump.clazz = exception.class.to_s
         
         dump.backtrace = exception.backtrace.join("\n") if exception.backtrace
-
-        dump if dump.save
+        
+        dump.save
+        dump
       end
 
-      def dump_hashmap(map, indent = '')
+      def dump_hashmap(map, indent = '', capital_keys_only = false )
         result = ''
         map.each do |key,value|
+          if !capital_keys_only || (key =~ /^[A-Z_]+$/) != nil
           if value.is_a? Hash
             result << "#{indent}#{key} => {\n"
             result << dump_hashmap(value, "#{indent}  ") 
@@ -115,7 +115,9 @@ module Ixtlan
           else
             result << "#{indent}#{key} => #{value.nil? ? 'nil': value}\n"
           end
+          end
         end
+        result.strip!
         result
       end
 

data/lib/ixtlan/errors/rack.rb

@@ -18,6 +18,7 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
+require 'rack/request'
 module Ixtlan
   module Errors
     class Rack
@@ -61,8 +62,9 @@ module Ixtlan
           @app.call(env)
         rescue Exception => e
           status = @map[ e.class ] || 500
-          if status >= 500 
-            @dumper.dump( e, env, {}, {}, {} )
+          if status >= 500
+            req = ::Rack::Request.new env
+            @dumper.dump( e, env, {}, req.session, req.params )
           end
           if @dump_to_console
             warn "[Ixtlan] #{e.class}: #{e.message}"
@@ -76,4 +78,4 @@ module Ixtlan
       
     end
   end
-end
+end

data/lib/ixtlan/errors/resource.rb

@@ -25,21 +25,29 @@ module Ixtlan
 
       include DataMapper::Resource
 
+      def self.storage_name(arg)
+        'ixtlan_errors'
+      end
+
       property :id, Serial
       
       property :clazz, String, :required => true, :length => 64
       property :message, String, :required => true, :length => 255
-      property :backtrace, Text, :required => true, :length => 32768
-      property :request, Text, :required => true, :length => 64536
-      property :response, Text, :required => true, :length => 32768
-      property :session, Text, :required => true, :length => 16384
-      property :parameters, Text, :required => true, :length => 32768
+      property :backtrace, Text, :required => false, :length => 32768
+      property :request, Text, :required => false, :length => 32768
+      property :session, Text, :required => false, :length => 16384
+      property :parameters, Text, :required => false, :length => 32768
+      #property :body, Text, :required => false, :length => 64536
       
       property :created_at, DateTime
       
       before :save do
         self.created_at = DateTime.now
       end
+
+      def to_s
+        "#{clazz}: #{message}"
+      end
     end
   end
-end
+end

data/spec/dumper_spec.rb

@@ -1,26 +1,9 @@
 require 'dm-core'
 require 'dm-migrations'
 require 'slf4r/ruby_logger'
+require 'ixtlan/errors/resource'
 
-class Error
-  include DataMapper::Resource
-
-  property :id, Serial
-
-  property :message, String
-  property :clazz, String
-  property :request, Text
-  property :response, Text
-  property :session, Text
-  property :parameters, Text
-  property :backtrace, Text
-
-  property :created_at, DateTime
-
-  before :save do
-    self.created_at = DateTime.now
-  end
-end
+Error = Ixtlan::Errors::Error
 
 require 'pony'
 Pony.options = { :via => :test }
@@ -55,36 +38,6 @@ class Controller < Hash
   end
 end
 
-class NilClass
-  def blank?
-    true
-  end
-end
-
-class String
-  def blank?
-    size == 0
-  end
-end
-
-class Fixnum
-  def days
-    self
-  end
-  def ago
-    DateTime.now - 86000 * self
-  end
-end
-
-class DateTime
-  def tv_sec
-    sec
-  end
-  def tv_usec
-    0
-  end
-end
-
 DataMapper.setup(:default, "sqlite3::memory:")
 DataMapper.finalize
 DataMapper.auto_migrate!
@@ -113,7 +66,7 @@ describe Ixtlan::Errors::Dumper do
   end
 
   it "should clean up error dumps" do
-    Error.create(:message => 'msg')
+    Error.create(:message => 'msg', :clazz => StandardError.to_s)
     Error.all.size.should > 0
     @dumper.keep_dumps = 0
     Error.all.size.should == 0

metadata

@@ -1,158 +1,151 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ixtlan-error-handler
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Christian Meier
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-12-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: slf4r
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.4.2
+    none: false
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
+    none: false
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 11
-        version: "2.11"
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 75
-        segments: 
-        - 10
-        - 0
-        - 2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.0.2
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 10.0.2
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: dm-core
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.2.0
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: dm-migrations
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.2.0
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.2.0
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: pony
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    none: false
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: copyright-header
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 0
-        - 7
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.7
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.0.7
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id008
 description: dump errors on filesystem and notify developers, map different errors to specific pages
-email: 
+email:
 - m.kristian@web.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - MIT-LICENSE
 - README.textile
 - lib/ixtlan-error-handler.rb
@@ -161,7 +154,6 @@ files:
 - lib/ixtlan/errors/cuba.rb
 - lib/ixtlan/errors/dumper.rb
 - lib/ixtlan/errors/error_handling.rb~
-- lib/ixtlan/errors/mailer/error_notification.erb
 - lib/ixtlan/errors/error.rb~
 - lib/ixtlan/errors/resource.rb~
 - lib/ixtlan/errors/rescue_module.rb~
@@ -178,44 +170,40 @@ files:
 - lib/ixtlan/errors/rack.rb~
 - lib/ixtlan/errors/rack.rb
 - lib/ixtlan/errors/serializer.rb
+- lib/ixtlan/errors/mailer/error_notification.erb
 - spec/error_handler_spec.rb
 - spec/dumper_spec.rb
 - spec/error_dumper_spec.rb~
 - spec/error_handler_spec.rb~
 homepage: http://github.com/mkristian/ixtlan-error-handler
-licenses: 
+licenses:
 - MIT
-post_install_message: 
-rdoc_options: 
-- --main
+post_install_message:
+rdoc_options:
+- "--main"
 - README.textile
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.15
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: dump errors on filesystem and notify developers
-test_files: 
+test_files:
 - spec/error_handler_spec.rb
 - spec/dumper_spec.rb