appsignal-moped 1.0.0.beta.1 → 1.0.1.beta.0

data/lib/appsignal/middleware/moped_event_sanitizer.rb

@@ -0,0 +1,36 @@
+module Appsignal
+  module Middleware
+    class MopedEventSanitizer
+      WHITELISTED_KEYS = %w{fields flags}
+
+      def call(event)
+        if target?(event)
+          event.payload[:ops].each do |operation|
+            operation.each_value do |parameters|
+              selected(parameters).each_value do |value|
+                scrub!(value)
+              end
+            end
+          end
+        end
+        yield
+      end
+
+      protected
+
+      def target?(event)
+        event.name == Appsignal::Moped::Instrumentation::EVENT_NAME
+      end
+
+      def selected(parameters)
+        parameters.reject { |key, value| WHITELISTED_KEYS.include?(key) }
+      end
+
+      def scrub!(value)
+        if value.is_a?(Hash) || value.is_a?(Array)
+          Appsignal::ParamsSanitizer.scrub!(value)
+        end
+      end
+    end
+  end
+end

data/lib/appsignal/middleware/moped_event_sanitizer.rb~

@@ -0,0 +1,36 @@
+module Appsignal
+  module Middleware
+    class MopedEventSanitizer
+      WHITELISTED_KEYS = %w{fields flags}
+
+      def call(event)
+        if target?(event)
+          event.payload[:ops].each do |operation|
+            operation.each_value do |parameters|
+              selected(parameters).each_value do |value|
+                scrub!(value)
+              end
+            end
+          end
+        end
+        yield
+      end
+
+      protected
+
+      def target?(event)
+        true
+      end
+
+      def selected(parameters)
+        parameters.reject { |key, value| WHITELISTED_KEYS.include?(key) }
+      end
+
+      def scrub!(value)
+        if value.is_a?(Hash) || value.is_a?(Array)
+          Appsignal::ParamsSanitizer.scrub!(value)
+        end
+      end
+    end
+  end
+end

data/lib/appsignal/moped/instrumentation.rb

@@ -0,0 +1,40 @@
+module Appsignal
+  module Moped
+    module Instrumentation
+      EVENT_NAME = 'query.moped'
+
+      private
+
+      def logging_with_appsignal_instrumentation(operations, &block)
+        ActiveSupport::Notifications.instrument(
+          EVENT_NAME, :ops => appsignal_log_operations(operations)
+        ) do
+          logging_without_appsignal_instrumentation(operations, &block)
+        end
+      end
+
+      def appsignal_log_operations(ops)
+        ops.map do |op|
+          {
+            operation_name(op) => {}.tap do |hash|
+              op.instance_variables.reject do |o|
+                o == :@full_collection_name
+              end.each do |attr|
+                value = op.instance_variable_get(attr)
+                hash[attr.to_s.gsub('@', '')] = value unless value.nil?
+              end
+            end
+          }
+        end
+      end
+
+      def operation_name(operation)
+        operation.class.name.split('::').last.tap do |class_name|
+          class_name.gsub!(/([a-z])([A-Z])/,'\1_\2')
+          class_name.downcase!
+        end
+      end
+
+    end
+  end
+end

data/lib/appsignal/moped/instrumentation.rb~

@@ -0,0 +1,39 @@
+module Appsignal
+  module Moped
+    module Instrumentation
+
+      private
+
+      def logging_with_appsignal_instrumentation(operations, &block)
+        ActiveSupport::Notifications.instrument(
+          'query.moped', :ops => appsignal_log_operations(operations)
+        ) do
+          logging_without_appsignal_instrumentation(operations, &block)
+        end
+      end
+
+      def appsignal_log_operations(ops)
+        ops.map do |op|
+          {
+            operation_name(op) => {}.tap do |hash|
+              op.instance_variables.reject do |o|
+                o == :@full_collection_name
+              end.each do |attr|
+                value = op.instance_variable_get(attr)
+                hash[attr.to_s.gsub('@', '')] = value unless value.nil?
+              end
+            end
+          }
+        end
+      end
+
+      def operation_name(operation)
+        operation.class.name.split('::').last.tap do |class_name|
+          class_name.gsub!(/([a-z])([A-Z])/,'\1_\2')
+          class_name.downcase!
+        end
+      end
+
+    end
+  end
+end

data/lib/appsignal/moped/version.rb

@@ -0,0 +1,5 @@
+module Appsignal
+  module Moped
+    VERSION = '1.0.1.beta.0'
+  end
+end

data/lib/appsignal-moped.rb

@@ -0,0 +1,16 @@
+require 'moped'
+require 'rails'
+require 'appsignal'
+require 'appsignal/moped/instrumentation'
+require 'appsignal/middleware/moped_event_sanitizer'
+
+::Moped::Node.class_eval do
+  include Appsignal::Moped::Instrumentation
+
+  private
+
+  alias_method :logging_without_appsignal_instrumentation, :logging
+  alias_method :logging, :logging_with_appsignal_instrumentation
+end
+
+Appsignal.post_processing_middleware.add Appsignal::Middleware::MopedEventSanitizer

data/lib/appsignal-moped.rb~

@@ -0,0 +1,16 @@
+require 'moped'
+require 'rails'
+require 'appsignal'
+require 'appsignal/moped/instrumentation'
+require 'appsignal/middleware/moped_event_sanitizer'
+
+::Moped::Node.class_eval do
+  include Appsignal::Moped::Instrumentation
+
+  private
+
+  alias_method :logging_without_appsignal_instrumentation, :logging
+  alias_method :logging, :logging_with_appsignal_instrumentation
+end
+
+Appsignal.post_processing_middleware.add Appsignal::Moped::MopedEventSanitizer

metadata

@@ -1,105 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: appsignal-moped
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.1
   prerelease: 6
+  version: 1.0.1.beta.0
 platform: ruby
 authors:
 - Steven Weller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0.beta1
+    none: false
+  prerelease: false
   name: appsignal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0.beta1
+    none: false
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: '1.0'
+    none: false
+  prerelease: false
   name: moped
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: '1.0'
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Log your moped queries with ActiveSupport::Notifications.insturment calls
+    none: false
+  type: :development
+description: Log your moped queries with ActiveSupport::Notifications.instrument calls
 email:
 - steven@80beans.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/appsignal_moped/version.rb
-- lib/appsignal_moped.rb
+- lib/appsignal/middleware/moped_event_sanitizer.rb
+- lib/appsignal/middleware/moped_event_sanitizer.rb~
+- lib/appsignal/moped/instrumentation.rb
+- lib/appsignal/moped/instrumentation.rb~
+- lib/appsignal/moped/version.rb
+- lib/appsignal/moped/version.rb~
+- lib/appsignal-moped.rb
+- lib/appsignal-moped.rb~
 - README.md
 homepage: https://github.com/80beans/appsignal-moped
 licenses: []
@@ -108,23 +114,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -48578723216372670
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 3384813339710934242
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Add instrument calls to mongodb queries made with moped(or mongoid). For

data/lib/appsignal_moped.rb

@@ -1,42 +0,0 @@
-require 'moped'
-require 'active_support'
-
-module Appsignal
-  module Moped
-    module Instrumentation
-
-      private
-
-      def logging_with_appsignal_instrumentation(operations, &block)
-        ActiveSupport::Notifications.instrument(
-          'query.moped', :operations => appsignal_log_operations(operations)
-        ) do
-          logging_without_appsignal_instrumentation(operations, &block)
-        end
-      end
-
-      def appsignal_log_operations(ops)
-        ops.map do |op|
-          {}.tap do |hash|
-            op.instance_variables.reject do |o|
-              o == :@full_collection_name
-            end.each do |attr|
-              value = op.instance_variable_get(attr)
-              hash[attr.to_s.gsub('@', '')] = value unless value.nil?
-            end
-          end
-        end
-      end
-
-    end
-  end
-end
-
-::Moped::Node.class_eval do
-  include Appsignal::Moped::Instrumentation
-
-  private
-
-  alias_method :logging_without_appsignal_instrumentation, :logging
-  alias_method :logging, :logging_with_appsignal_instrumentation
-end