ixtlan-error-handler 0.3.0 → 0.3.1

data/lib/ixtlan/errors/dumper.rb

@@ -73,6 +73,9 @@ module Ixtlan
                                      @to_emails, 
                                      exception, 
                                      "#{@base_url}/#{error.id}" ).deliver
+          true
+        else
+          false
         end
       end
 
@@ -122,7 +125,7 @@ module Ixtlan
         if(@last_cleanup.nil? || @last_cleanup < (now - 1))
           @last_cleanup = now
           begin
-            delete_all( now - keep_logs )
+            delete_all( now - keep_dumps )
             logger.info "cleaned error dumps"
           rescue Exception => e
             logger.warn "error cleaning up error dumps: #{e.message}" 
@@ -143,4 +146,4 @@ module Ixtlan
       end
     end
   end
-end
+end

data/lib/ixtlan/errors/error_handler.rb

@@ -82,11 +82,11 @@ module Ixtlan
 
       def dump_error(exception)
         Rails.configuration.error_dumper.dump( exception, 
-                                               controller.request.env,
-                                               controller.response.headers,
-                                               controller.session,
-                                               controller.params )
+                                               request.env,
+                                               response.headers,
+                                               session,
+                                               params )
       end
     end
   end
-end
+end

data/spec/{error_dumper_spec.rb → dumper_spec.rb}

@@ -22,32 +22,14 @@ class Error
   end
 end
 
-module Ixtlan
-  module Errors
-    module ActionMailer
-      class Base
-        
-        def self.method_missing(method, *args)
-          self.new
-        end
-
-        def self.deliver(val = nul)
-          @delivered = val if val
-          @delivered
-        end
-        def deliver
-          self.class.deliver(true)
-        end
-      end
-    end
-  end
-end
+require 'pony'
+Pony.options = { :via => :test }
 
-require 'ixtlan/errors/error_dumper'
+require 'ixtlan/errors/dumper'
 require 'date'
 require 'logger'
 
-class Controller
+class Controller < Hash
 
   def request
     self
@@ -105,26 +87,29 @@ end
 
 DataMapper.setup(:default, "sqlite3::memory:")
 DataMapper.finalize
-DataMapper.repository.auto_migrate!
+DataMapper.auto_migrate!
 
-describe Ixtlan::Errors::ErrorDumper do
+describe Ixtlan::Errors::Dumper do
 
   before :each do
-    @dumper = Ixtlan::Errors::ErrorDumper.new
+    @dumper = Ixtlan::Errors::Dumper.new
+    @dumper.model = Error
     @dumper.base_url = "http://localhost"
     @controller = Controller.new
   end
 
   it "should dump env and not send notification" do
-    url = @dumper.dump(@controller, StandardError.new("dump it"))
-    url.should =~ /http:\/\/localhost\/[0-9]+/
+    send = @dumper.dump(StandardError.new("dump it"), @controller.request, @controller.response, @controller.session, @controller.params)
+    send.should be_false
+
     @dumper.from_email = "asd"
-    url = @dumper.dump(@controller, StandardError.new("dump it"))
-    url.should =~ /http:\/\/localhost\/[0-9]+/
+    send = @dumper.dump(StandardError.new("dump it"), @controller.request, @controller.response, @controller.session, @controller.params)
+    send.should be_false
+
     @dumper.from_email = nil
     @dumper.to_emails = "dsa"
-    url = @dumper.dump(@controller, StandardError.new("dump it"))
-    url.should =~ /http:\/\/localhost\/[0-9]+/
+    send = @dumper.dump(StandardError.new("dump it"), @controller.request, @controller.response, @controller.session, @controller.params)
+    send.should be_false
   end
 
   it "should clean up error dumps" do
@@ -132,16 +117,19 @@ describe Ixtlan::Errors::ErrorDumper do
     Error.all.size.should > 0
     @dumper.keep_dumps = 0
     Error.all.size.should == 0
-    @dumper.dump(@controller, StandardError.new("dump it"))
+
+    @dumper.dump(StandardError.new("dump it"), @controller.request, @controller.response, @controller.session, @controller.params)
     Error.all.size.should == 1
-    @dumper.dump(@controller, StandardError.new("dump it"))
+
+    @dumper.dump(StandardError.new("dump it"), @controller.request, @controller.response, @controller.session, @controller.params)
     Error.all.size.should == 2
   end
 
   it "should send notifications" do
     @dumper.to_emails = "das"
     @dumper.from_email = "asd"
-    @dumper.dump(@controller, StandardError.new("dump it"))
-    Ixtlan::Errors::ActionMailer::Base.delivered.should be_true
+    
+    send = @dumper.dump(StandardError.new("dump it"), @controller.request, @controller.response, @controller.session, @controller.params)
+    send.should be_true
   end
 end

data/spec/error_handler_spec.rb

@@ -46,7 +46,11 @@ class Rails
     self
   end
   
-  def self.dump(controller, exception)
+  def self.dump(exception, 
+                request, 
+                response, 
+                session, 
+                params)
     @dumped = exception
   end
 

metadata

@@ -1,101 +1,158 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ixtlan-error-handler
-version: !ruby/object:Gem::Version
-  version: 0.3.0
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
-authors:
+authors: 
 - Christian Meier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-12-29 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: slf4r
-  requirement: &13017120 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 4
+        - 2
         version: 0.4.2
   type: :runtime
-  prerelease: false
-  version_requirements: *13017120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &13014420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 2
+        - 11
+        version: "2.11"
   type: :development
-  prerelease: false
-  version_requirements: *13014420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &13013760 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 75
+        segments: 
+        - 10
+        - 0
+        - 2
         version: 10.0.2
   type: :development
-  prerelease: false
-  version_requirements: *13013760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: dm-core
-  requirement: &13013000 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
   type: :development
-  prerelease: false
-  version_requirements: *13013000
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: dm-migrations
-  requirement: &13012260 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
   type: :development
-  prerelease: false
-  version_requirements: *13012260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: dm-sqlite-adapter
-  requirement: &13011800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: pony
   prerelease: false
-  version_requirements: *13011800
-- !ruby/object:Gem::Dependency
+  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 
   name: copyright-header
-  requirement: &13011240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 0
+        - 7
         version: 1.0.7
   type: :development
-  prerelease: false
-  version_requirements: *13011240
-description: dump errors on filesystem and notify developers, map different errors
-  to specific pages
-email:
+  version_requirements: *id008
+description: dump errors on filesystem and notify developers, map different errors to specific pages
+email: 
 - m.kristian@web.de
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - MIT-LICENSE
 - README.textile
 - lib/ixtlan-error-handler.rb
@@ -122,37 +179,43 @@ files:
 - lib/ixtlan/errors/rack.rb
 - lib/ixtlan/errors/serializer.rb
 - spec/error_handler_spec.rb
+- spec/dumper_spec.rb
 - spec/error_dumper_spec.rb~
 - spec/error_handler_spec.rb~
-- spec/error_dumper_spec.rb
 homepage: http://github.com/mkristian/ixtlan-error-handler
-licenses:
+licenses: 
 - MIT
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.textile
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: dump errors on filesystem and notify developers
-test_files:
+test_files: 
 - spec/error_handler_spec.rb
-- spec/error_dumper_spec.rb
-has_rdoc: 
+- spec/dumper_spec.rb