rulesio 0.9.3 → 0.9.6

data/README.md

@@ -26,6 +26,7 @@ You should create two incoming channels (event streams) in rules.io, and configu
     middleware :exceptions do      # automatically generate events for exceptions
       token 'ERROR_CHANNEL_TOKEN'  # separate channel for error-centric events
     end
+    disable_sending_events if Rails.env.test? || Rails.env.development?
     
 ###As general-purpose Rack middleware, with or without Rails
 
@@ -87,6 +88,7 @@ Options
 RulesIO::Rack accepts these options:
 
 * `token` -- the token for a rules.io channel
+* `disable_sending_events` -- you probably want to include this directive for your test and development environments
 * `webhook_url` -- defaults to 'https://www.rules.io/events'
 * `middleware` -- takes the symbol for a middleware and a block, configuring it
 * `queue` -- takes the class used for queuing (default: RulesIO::MemoryQueue), and an optional hash; see the section on girl_friday for examples

data/lib/rulesio/railtie.rb

@@ -3,10 +3,11 @@ require 'active_record'
 
 module RulesIO
   class RailsConfigurator
-    attr_accessor :token, :webhook_url, :middlewares, :queue, :controller_data, :queue_options
+    attr_accessor :token, :webhook_url, :middlewares, :queue, :controller_data, :queue_options, :disable
     def initialize
       @webhook_url = 'https://www.rules.io/events/'
       @middlewares = {}
+      @disable = false
     end
 
     def token(token)
@@ -25,6 +26,10 @@ module RulesIO
       @queue = queue
       @queue_options = options
     end
+    
+    def disable_sending_events
+      @disable = true
+    end
 
     def controller_data(data)
       @controller_data = data
@@ -75,6 +80,7 @@ module RulesIO
           if defined?(::Rails.configuration) && ::Rails.configuration.respond_to?(:middleware)
             ::Rails.configuration.middleware.insert_after 'ActionDispatch::Static', 'RulesIO::Rack',
                 :webhook_url => @webhook_url,
+                :disable_sending_events => @disable,
                 :token => @token,
                 :queue => @queue,
                 :queue_options => @queue_options,
@@ -84,6 +90,8 @@ module RulesIO
             ::Rails.configuration.middleware.use('RulesIO::Exceptions', @middlewares[:exceptions].configuration) if @middlewares.has_key?(:exceptions)
           end
         end
+      else
+        puts 'Warning: rulesio configuration file not found in config/rulesio.rb'
       end
     end
 

data/lib/rulesio/users.rb

@@ -46,8 +46,13 @@ module RulesIO
     end
 
     def event(env, status, duration)
+      domain = if (status.to_i >= 400)
+        'pageerror'
+      else
+        (env['rulesio.request_method'] == 'GET') ? 'pageview' : 'formpost'
+      end
       event = {
-        :_domain => (status.to_i >= 400) ? 'pageerror' : 'pageview',
+        :_domain => domain,
         :status => status,
         :duration => "%.2f" % (duration * 1000)
       }
@@ -55,6 +60,9 @@ module RulesIO
         event[:_xactor] = actor_for_exception(exception)
         event[:_message] = exception.to_s
       end
+      if domain == 'pageerror' && status.to_i < 500
+        event[:_message] = "#{status}: #{::Rack::Utils::HTTP_STATUS_CODES[status.to_i]}"
+      end
       event.merge!(@options[:custom_data].call(env))
       event
     end

data/lib/rulesio/version.rb

@@ -1,3 +1,3 @@
 module RulesIO
-  VERSION = '0.9.3'
+  VERSION = '0.9.6'
 end

data/lib/rulesio.rb

@@ -11,7 +11,7 @@ require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/hash/indifferent_access'
 
 module RulesIO
-  mattr_accessor :filter_parameters, :buffer, :token, :webhook_url, :queue, :queue_options, :controller_data, :logger
+  mattr_accessor :filter_parameters, :buffer, :token, :webhook_url, :queue, :queue_options, :controller_data, :logger, :disable_sending_events
 
   def self.default_ignored_crawlers
     %w(Baidu Gigabot Googlebot libwww-perl lwp-trivial msnbot SiteUptime Slurp WordPress ZIBB ZyBorg Yandex Jyxobot Huaweisymantecspider ApptusBot NewRelicPinger)
@@ -29,6 +29,7 @@ module RulesIO
   end
   
   def self.post_payload_to_token(payload, token)
+    return if RulesIO.disable_sending_events
     uri = URI(RulesIO.webhook_url + token)
     req = Net::HTTP::Post.new(uri.path)
     req.body = payload.to_json
@@ -98,14 +99,16 @@ module RulesIO
       params = request.params
       action = page_event_name(request, params)
       
+      event[:_domain] = 'JSON' if event[:_domain] == 'pageview' && params['format'] == 'json'
+      event[:_domain] = 'XML' if event[:_domain] == 'pageview' && params['format'] == 'xml'
       event[:_name] ||= action
       event[:_from] ||= current_user.email if current_user && current_user.respond_to?(:email) && current_user.email != event[:_actor]
       event[:action] = action
       event[:request_url] = env['rulesio.request_url']
-      event[:request_method] = request.request_method
+      event[:request_method] = env['rulesio.request_method']
       event[:user_agent] = request.user_agent
       event[:referer_url] = request.referer
-      event[:params] = params.except(*RulesIO.filter_parameters)
+      event[:params] = params.except(*RulesIO.filter_parameters).reject{|k,v|k =~ /password/}
       event[:session] = request.session
     end
 
@@ -124,11 +127,14 @@ module RulesIO
       RulesIO.queue = options[:queue] || RulesIO::MemoryQueue
       RulesIO.queue_options = options[:queue_options] || {}
       RulesIO.controller_data = options[:controller_data] || '{}'
+      RulesIO.disable_sending_events = options[:disable_sending_events] || false
     end
 
     def call(env)
       RulesIO.buffer = []
-      env['rulesio.request_url'] = ::Rack::Request.new(env).url
+      request = ::Rack::Request.new(env)
+      env['rulesio.request_url'] = request.url
+      env['rulesio.request_method'] = request.request_method
       @app.call(env)
     ensure
       RulesIO.flush(env)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rulesio
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport