application_insights 0.5.3 → 0.5.4

data/lib/application_insights/channel/contracts/exception_details.rb

@@ -1,129 +1,28 @@
-require_relative 'json_serializable'
-
-module ApplicationInsights
-  module Channel
-    module Contracts
-      # Data contract class for type ExceptionDetails.
-      class ExceptionDetails < JsonSerializable
-        # Initializes a new instance of the ExceptionDetails class.
-        def initialize(options={})
-          defaults = {
-            'id' => nil,
-            'outerId' => nil,
-            'typeName' => nil,
-            'message' => nil,
-            'hasFullStack' => true,
-            'stack' => nil,
-            'parsedStack' => []
-          }
-          values = {
-            'typeName' => nil,
-            'message' => nil,
-            'hasFullStack' => true
-          }
-          super defaults, values, options
-        end
-        
-        # Gets the id property.
-        def id
-          @values.fetch('id') { 
-            @values['id'] = nil
-          }
-        end
-        
-        # Sets the id property.
-        def id=(value)
-          if value == @defaults['id']
-            @values.delete 'id' if @values.key? 'id'
-          else
-            @values['id'] = value
-          end
-        end
-        
-        # Gets the outer_id property.
-        def outer_id
-          @values.fetch('outerId') { 
-            @values['outerId'] = nil
-          }
-        end
-        
-        # Sets the outer_id property.
-        def outer_id=(value)
-          if value == @defaults['outerId']
-            @values.delete 'outerId' if @values.key? 'outerId'
-          else
-            @values['outerId'] = value
-          end
-        end
-        
-        # Gets the type_name property.
-        def type_name
-          @values['typeName']
-        end
-        
-        # Sets the type_name property.
-        def type_name=(value)
-          @values['typeName'] = value
-        end
-        
-        # Gets the message property.
-        def message
-          @values['message']
-        end
-        
-        # Sets the message property.
-        def message=(value)
-          @values['message'] = value
-        end
-        
-        # Gets the has_full_stack property.
-        def has_full_stack
-          @values.fetch('hasFullStack') { 
-            @values['hasFullStack'] = true
-          }
-        end
-        
-        # Sets the has_full_stack property.
-        def has_full_stack=(value)
-          if value == @defaults['hasFullStack']
-            @values.delete 'hasFullStack' if @values.key? 'hasFullStack'
-          else
-            @values['hasFullStack'] = value
-          end
-        end
-        
-        # Gets the stack property.
-        def stack
-          @values.fetch('stack') { 
-            @values['stack'] = nil
-          }
-        end
-        
-        # Sets the stack property.
-        def stack=(value)
-          if value == @defaults['stack']
-            @values.delete 'stack' if @values.key? 'stack'
-          else
-            @values['stack'] = value
-          end
-        end
-        
-        # Gets the parsed_stack property.
-        def parsed_stack
-          @values.fetch('parsedStack') { 
-            @values['parsedStack'] = []
-          }
-        end
-        
-        # Sets the parsed_stack property.
-        def parsed_stack=(value)
-          if value == @defaults['parsedStack']
-            @values.delete 'parsedStack' if @values.key? 'parsedStack'
-          else
-            @values['parsedStack'] = value
-          end
-        end
-      end
-    end
-  end
-end
+require_relative 'json_serializable'
+
+module ApplicationInsights::Channel::Contracts
+  class ExceptionDetails
+    include JsonSerializable
+
+    attr_accessor :id, :outer_id, :type_name, :message, :has_full_stack, :stack,
+      :parsed_stack
+
+    attribute_mapping(
+      id: 'id',
+      outer_id: 'outerId',
+      type_name: 'typeName',
+      message: 'message',
+      has_full_stack: 'hasFullStack',
+      stack: 'stack',
+      parsed_stack: 'parsedStack'
+    )
+
+    def has_full_stack
+      @has_full_stack.nil? ? true : @has_full_stack
+    end
+
+    def parsed_stack
+      @parsed_stack ||= []
+    end
+  end
+end

data/lib/application_insights/channel/contracts/internal.rb

@@ -1,53 +1,14 @@
-require_relative 'json_serializable'
-
-module ApplicationInsights
-  module Channel
-    module Contracts
-      # Data contract class for type Internal.
-      class Internal < JsonSerializable
-        # Initializes a new instance of the Internal class.
-        def initialize(options={})
-          defaults = {
-            'ai.internal.sdkVersion' => nil,
-            'ai.internal.agentVersion' => nil
-          }
-          values = {
-          }
-          super defaults, values, options
-        end
-        
-        # Gets the sdk_version property.
-        def sdk_version
-          @values.fetch('ai.internal.sdkVersion') { 
-            @values['ai.internal.sdkVersion'] = nil
-          }
-        end
-        
-        # Sets the sdk_version property.
-        def sdk_version=(value)
-          if value == @defaults['ai.internal.sdkVersion']
-            @values.delete 'ai.internal.sdkVersion' if @values.key? 'ai.internal.sdkVersion'
-          else
-            @values['ai.internal.sdkVersion'] = value
-          end
-        end
-        
-        # Gets the agent_version property.
-        def agent_version
-          @values.fetch('ai.internal.agentVersion') { 
-            @values['ai.internal.agentVersion'] = nil
-          }
-        end
-        
-        # Sets the agent_version property.
-        def agent_version=(value)
-          if value == @defaults['ai.internal.agentVersion']
-            @values.delete 'ai.internal.agentVersion' if @values.key? 'ai.internal.agentVersion'
-          else
-            @values['ai.internal.agentVersion'] = value
-          end
-        end
-      end
-    end
-  end
-end
+require_relative 'json_serializable'
+
+module ApplicationInsights::Channel::Contracts
+  class Internal
+    include JsonSerializable
+
+    attr_accessor :sdk_version, :agent_version
+
+    attribute_mapping(
+      sdk_version: 'ai.internal.sdkVersion',
+      agent_version: 'ai.internal.agentVersion'
+    )
+  end
+end

data/lib/application_insights/channel/contracts/json_serializable.rb

@@ -1,59 +1,59 @@
-require 'json'
-
-module ApplicationInsights
-  module Channel
-    module Contracts     
-      class JsonSerializable
-        def initialize(defaults, values, options)
-          @defaults = defaults
-          @values = values
-          if options != nil
-            options.each do |key, value|
-              self.send key.to_s + '=', value
-            end
-          end
-        end
-
-        def to_h
-          output = {}
-          @defaults.each do |key, default|
-            if @values.key? key
-              value = @values[key]
-              value = default if value == nil
-            elsif default
-              value = default
-            else
-              next
-            end
-
-            if value.class == Array
-              value_copy = []
-              value.each do |item|
-                item.respond_to?(:to_h) ? value_copy.push(item.to_h) : value_copy.push(item)
-              end
-              output[key] = value_copy if value_copy.length > 0
-            elsif value.class == Hash
-              value_copy = {}
-              value.each do |item_key, item_value|
-                (item_value.respond_to? :to_h) ? value_copy[item_key] = item_value.to_h : value_copy[item_key] = item_value
-              end
-              output[key] = value_copy if value_copy.length > 0
-            elsif value.respond_to? :to_h
-              value_copy = value.to_h
-              output[key] = value_copy if value_copy.length > 0
-            else
-              output[key] = value
-            end
-          end
-          output
-        end
-
-        def to_json(*)
-          hash = self.to_h
-          hash.to_json
-        end
-      end
-    end
-  end
-end
-
+require 'json'
+
+module ApplicationInsights
+  module Channel
+    module Contracts
+      module JsonSerializable
+        module ClassMethods
+          attr_reader :json_mappings
+
+          def attribute_mapping(mappings)
+            @json_mappings = mappings
+          end
+        end
+
+        def self.included(klass)
+          klass.extend JsonSerializable::ClassMethods
+        end
+
+        def initialize(attributes = {})
+          attributes.each { |k, v| send(:"#{k}=", v) }
+        end
+
+        def to_h
+          output = {}
+          klass = self.class
+
+          klass.json_mappings.each do |attr, name|
+            value = visit self.send(attr)
+            is_empty = value.respond_to?(:empty?) && value.empty?
+
+            output[name] = value unless value.nil? || is_empty
+          end
+
+          output
+        end
+
+        def to_json(args = {})
+          JSON.generate self.to_h, args
+        end
+
+        private
+
+        def visit(object)
+          return if object.nil?
+
+          if object.is_a? Array
+            object.map { |e| visit e }
+          elsif object.is_a? Hash
+            Hash[object.map { |k, v| [k, visit(v)] }]
+          elsif object.respond_to? :to_h
+            object.to_h
+          else
+            object
+          end
+        end
+      end
+    end
+  end
+end

data/lib/application_insights/channel/contracts/location.rb

@@ -1,36 +1,16 @@
-require_relative 'json_serializable'
-
-module ApplicationInsights
-  module Channel
-    module Contracts
-      # Data contract class for type Location.
-      class Location < JsonSerializable
-        # Initializes a new instance of the Location class.
-        def initialize(options={})
-          defaults = {
-            'ai.location.ip' => nil
-          }
-          values = {
-          }
-          super defaults, values, options
-        end
-        
-        # Gets the ip property.
-        def ip
-          @values.fetch('ai.location.ip') { 
-            @values['ai.location.ip'] = nil
-          }
-        end
-        
-        # Sets the ip property.
-        def ip=(value)
-          if value == @defaults['ai.location.ip']
-            @values.delete 'ai.location.ip' if @values.key? 'ai.location.ip'
-          else
-            @values['ai.location.ip'] = value
-          end
-        end
-      end
-    end
-  end
-end
+require_relative 'json_serializable'
+
+module ApplicationInsights::Channel::Contracts
+  class Location
+    include JsonSerializable
+
+    attr_accessor :ip, :country, :province, :city
+
+    attribute_mapping(
+      ip: 'ai.location.ip',
+      country: 'ai.location.country',
+      province: 'ai.location.province',
+      city: 'ai.location.city'
+    )
+  end
+end

data/lib/application_insights/channel/contracts/message_data.rb

@@ -1,77 +1,24 @@
-require_relative 'json_serializable'
-
-module ApplicationInsights
-  module Channel
-    module Contracts
-      # Data contract class for type MessageData.
-      class MessageData < JsonSerializable
-        # Initializes a new instance of the MessageData class.
-        def initialize(options={})
-          defaults = {
-            'ver' => 2,
-            'message' => nil,
-            'severityLevel' => nil,
-            'properties' => {}
-          }
-          values = {
-            'ver' => 2,
-            'message' => nil
-          }
-          super defaults, values, options
-        end
-        
-        # Gets the ver property.
-        def ver
-          @values['ver']
-        end
-        
-        # Sets the ver property.
-        def ver=(value)
-          @values['ver'] = value
-        end
-        
-        # Gets the message property.
-        def message
-          @values['message']
-        end
-        
-        # Sets the message property.
-        def message=(value)
-          @values['message'] = value
-        end
-        
-        # Gets the severity_level property.
-        def severity_level
-          @values.fetch('severityLevel') { 
-            @values['severityLevel'] = nil
-          }
-        end
-        
-        # Sets the severity_level property.
-        def severity_level=(value)
-          if value == @defaults['severityLevel']
-            @values.delete 'severityLevel' if @values.key? 'severityLevel'
-          else
-            @values['severityLevel'] = value
-          end
-        end
-        
-        # Gets the properties property.
-        def properties
-          @values.fetch('properties') { 
-            @values['properties'] = {}
-          }
-        end
-        
-        # Sets the properties property.
-        def properties=(value)
-          if value == @defaults['properties']
-            @values.delete 'properties' if @values.key? 'properties'
-          else
-            @values['properties'] = value
-          end
-        end
-      end
-    end
-  end
-end
+require_relative 'json_serializable'
+
+module ApplicationInsights::Channel::Contracts
+  class MessageData
+    include JsonSerializable
+
+    attr_accessor :ver, :message, :severity_level, :properties
+
+    attribute_mapping(
+      ver: 'ver',
+      message: 'message',
+      severity_level: 'severityLevel',
+      properties: 'properties'
+    )
+
+    def ver
+      @ver ||= 2
+    end
+
+    def properties
+      @properties ||= {}
+    end
+  end
+end