flail 0.0.1 → 0.0.2

data/README.md

@@ -24,23 +24,23 @@ Add an initializer to configure (or call configure during application startup):
 Flail.configure do
   # configure a custom handler for the error payload
   # don't call if you want to use the default http post handler
-  handler do |payload|
+  handle do |payload|
   end
 
   # endpoint for default handler
-  endpoint "https://flail.net/swing"
+  url "https://flail.net/swing"
 
   # environment of application, defaults to Rails.env
   # included in payload
-  env "production"
+  environment "production"
 
   # hostname to use of server, defaults to Socket.gethostname
   # included in payload
   host Socket.gethostname
 
-  # arbitrary api key which can identify
+  # arbitrary tag (api key) which can identify
   # your project or be anything else
-  api "custom_key"
+  tagged "custom_key"
 end
 ```
 

data/lib/flail/configuration.rb

@@ -1,5 +1,15 @@
 class Flail
   class Configuration
+    # for the default handler
+    HTTP_ERRORS = [Timeout::Error,
+                   Errno::EINVAL,
+                   Errno::ECONNRESET,
+                   EOFError,
+                   Net::HTTPBadResponse,
+                   Net::HTTPHeaderSyntaxError,
+                   Net::ProtocolError,
+                   Errno::ECONNREFUSED].freeze
+
     # custom handler for payloads
     attr_reader :handler
 
@@ -16,7 +26,7 @@ class Flail
     attr_reader :secure_endpoint
 
     # api key to use with payloads
-    attr_reader :api_key
+    attr_reader :tag
 
 
     def handle(&block)
@@ -39,8 +49,8 @@ class Flail
       @hostname = value
     end
 
-    def api(value)
-      @api_key = value
+    def tagged(value)
+      @tag = value
     end
 
     def defaults!
@@ -64,7 +74,7 @@ class Flail
         end
 
         begin
-          http.post(url.path, payload, HEADERS)
+          http.post(url.path, payload, {'Content-type' => 'application/json', 'Accept' => 'application/json'})
         rescue *HTTP_ERRORS => e
           nil
         end

data/lib/flail/exception.rb

@@ -11,7 +11,11 @@ class Flail
     # Helpers
     #
     def request
-      @request ||= ActionDispatch::Request.new(@env)
+      @request ||= if @env['flail.request']
+                     @env['flail.request']
+                   else
+                     ActionDispatch::Request.new(@env)
+                   end
     end
 
     def controller
@@ -37,27 +41,31 @@ class Flail
     end
 
     def extract
-      @extract ||= {}.tap do |info|
-        info[:class_name]  = @exception.class.to_s        # @exception class
-        info[:message]     = @exception.to_s              # error message
-        info[:trace]       = @exception.backtrace.to_json # backtrace of error
-        info[:target_url]  = request.url                  # url of request
-        info[:referer_url] = request.referer              # referer
-        info[:params]      = request.params.to_json       # request parameters
-        info[:user_agent]  = request.user_agent           # user agent
-        info[:user]        = self.user.to_json            # current user
+      @extract ||= begin
+                     info = {}
 
-        # special variables
-        info[:environment] = Flail.configuration.env
-        info[:hostname]    = Flail.configuration.hostname
-        info[:api_key]    = Flail.configuration.api_key
-      end
+                     info[:class_name]  = @exception.class.to_s        # @exception class
+                     info[:message]     = @exception.to_s              # error message
+                     info[:trace]       = @exception.backtrace.to_json # backtrace of error
+                     info[:target_url]  = request.url                  # url of request
+                     info[:referer_url] = request.referer              # referer
+                     info[:parameters]  = request.params.to_json       # request parameters
+                     info[:user_agent]  = request.user_agent           # user agent
+                     info[:user]        = self.user.to_json            # current user
+
+                     # special variables
+                     info[:environment] = Flail.configuration.env
+                     info[:hostname]    = Flail.configuration.hostname
+                     info[:tag]    = Flail.configuration.tag
+
+                     info
+                   end
     end
 
     def ignore?
       # Ignore requests with user agent string matching
       # this regxp as they are surely made by bots
-      if @request.user_agent =~ /\b(Baidu|Gigabot|Googlebot|libwww-perl|lwp-trivial|msnbot|SiteUptime|Slurp|WordPress|ZIBB|ZyBorg|Yandex|Jyxobot|Huaweisymantecspider|ApptusBot)\b/i
+      if request.user_agent =~ /\b(Baidu|Gigabot|Googlebot|libwww-perl|lwp-trivial|msnbot|SiteUptime|Slurp|WordPress|ZIBB|ZyBorg|Yandex|Jyxobot|Huaweisymantecspider|ApptusBot)\b/i
         return true
       end
 

data/lib/flail/rack.rb

@@ -1,24 +1,22 @@
 class Flail
-  module Handlers
-    class Middleware
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        begin
-          response = @app.call(env)
-        rescue Exception => exception
-          Flail::Exception.new(env, exception).handle!
-          raise
-        end
+  class Rack
+    def initialize(app)
+      @app = app
+    end
 
-        if env['rack.exception']
-          Flail::Exception.new(env, env['rack.exception']).handle!
-        end
+    def call(env)
+      begin
+        response = @app.call(env)
+      rescue Exception => exception
+        Flail::Exception.new(env, exception).handle!
+        raise
+      end
 
-        response
+      if env['rack.exception']
+        Flail::Exception.new(env, env['rack.exception']).handle!
       end
+
+      response
     end
   end
 end

data/lib/flail/rails/rescue_action.rb

@@ -13,6 +13,7 @@ class Flail
       # but uses any custom processing that is defined with
       # Rails 2's exception helpers.
       def rescue_action_in_public_with_flail(exception)
+        request.env['flail.request'] = request
         Flail::Exception.new(request.env, exception).handle!
         rescue_action_in_public_without_flail(exception)
       end

data/lib/flail/railtie.rb

@@ -1,7 +1,7 @@
 class Flail
   class Railtie < ::Rails::Railtie
     initializer "flail.use_rack_middleware" do |app|
-      app.config.middleware.insert 0, "Flail::Rack"
+      app.config.middleware.insert 0, Flail::Rack
     end
 
     config.after_initialize do

data/lib/flail/version.rb

@@ -1,3 +1,3 @@
 class Flail
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flail
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake