deepsecurity 0.0.18 → 0.0.19

data/.yardopts

@@ -1,2 +1,3 @@
 --markup-provider=redcarpet
 --markup=markdown
+--files dsc.md,CHANGELOG.md

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# deepsecurity
+
+## CHANGELOG (notable new features or fixes)
+
+### 0.0.18
+
+* Added automatic build of Windows Installer

data/README.md

@@ -1,6 +1,7 @@
-# Deepsecurity
+# deepsecurity
 
-TODO: Write a gem description
+Provide a Ruby Wrapper for Trend Micro's DeepSecurity SOAP API. Also includes a command line binary `dsc` which exposes
+some of the functionality to shell scripts.
 
 ## Installation
 

data/dsc.md

@@ -0,0 +1,157 @@
+# dsc
+
+`dsc` (Deep Security Client) is a command line client for Trend Micro's Deep Security product.
+In its current version it allows you to query a Deep Security Manager for Host Status and Malware Event information.
+
+## SYNOPSIS
+    dsc [global options] command [command options] [arguments...]
+
+### GLOBAL OPTIONS
+    -P                      - Show progressbar
+    -d, --debug=debug       - Enable client debug output. (One of debug, info, warn, error, fatal) (default: none)
+    --help                  - Show this message
+    -m, --manager=hostname  - Deep Security Manager Host (default: none)
+    -o, --outfile=arg       - Output filename (default: --)
+    -p, --password=password - Password (default: none)
+    --port=port             - Webservice Port (default: 4119)
+    -t, --tenant=tenat      - Tenat Name (default: )
+    -u, --username=username - Username (default: MasterAdmin)
+    --version               -
+
+## COMMANDS
+
+Most commands provide multiple subcommands. The most usefull are:
+
+* `schema`
+* `list`
+
+
+### SUBCOMMANDS
+
+#### `schema`
+
+The `schema` subcommand displays a list of all known attributes with types and descriptions for the given command. E.g.:
+
+    $ dsc host_detail schema
+    anti_malware_classic_pattern_version (String): Current version of the classic Anti-Malware pattern
+    anti_malware_engine_version (String): Current version of the Anti-Malware engine
+    anti_malware_intelli_trap_exception_version (String): Current version of the IntelliTrap exception pattern
+    anti_malware_intelli_trap_version (String): Current version of the IntelliTrap pattern
+    anti_malware_smart_scan_pattern_version (String): Current version of the Smart Scan pattern
+    anti_malware_spyware_pattern_version (String): Current version of the Spyware pattern
+    [...]
+    security_profile_id (int): Assigned SecurityProfileTransport ID
+    security_profile_name (String): Name of the security profile assigned to the computer
+    virtual_name (String): Internal virtual name (only populated if this is a computer provisioned through vCenter)
+    virtual_uuid (String): Internal virtual UUID (only populated if this is a computer provisioned through vCenter)
+
+These fields can be used in manual `--fields` definitions.
+
+#### list
+
+The `list` subcommand displays a list of entries for the given command - optionally filtered by additional filters.
+
+### `host_detail list`
+
+The `host_detail list` command dislays a list of host details.
+
+    NAME
+        list - List Host Details
+
+    SYNOPSIS
+        dsc [global options] host_detail list [command options]
+
+    COMMAND OPTIONS
+        --fields=arg - A comma separated list of fields to display. (Available fields: anti_malware_classic_pattern_version, anti_malware_engine_version, anti_malware_intelli_trap_exception_version, anti_malware_intelli_trap_version,
+                       anti_malware_smart_scan_pattern_version, anti_malware_spyware_pattern_version, cloud_object_image_id, cloud_object_instance_id, cloud_object_internal_unique_id, cloud_object_security_group_ids, cloud_object_type,
+                       component_klasses, component_names, component_types, component_versions, description, display_name, external, external_id, host_group_id, host_group_name, host_interfaces, host_light, host_type, id,
+                       last_anit_malware_scheduled_scan, last_anti_malware_event, last_anti_malware_manual_scan, last_dpi_event, last_firewall_event, last_integrity_monitoring_event, last_ip_used, last_log_inspection_event,
+                       last_web_reputation_event, light, locked, name, overall_anti_malware_status, overall_dpi_status, overall_firewall_status, overall_integrity_monitoring_status, overall_last_recommendation_scan,
+                       overall_last_successful_communication, overall_last_successful_update, overall_last_update_required, overall_log_inspection_status, overall_status, overall_version, overall_web_reputation_status, platform,
+                       security_profile_id, security_profile_name, virtual_name, virtual_uuid) (default:
+                       name,display_name,anti_malware_classic_pattern_version,anti_malware_engine_version,anti_malware_intelli_trap_exception_version,anti_malware_intelli_trap_version,anti_malware_smart_scan_pattern_version,anti_malware_spyware_pattern_version,overall_last_successful_communication,platform,host_type,host_group_id)
+
+If you don't specify an explicit list of fields, the following fields are used by default:
+
+* name
+* display_name
+* anti_malware_classic_pattern_version
+* anti_malware_engine_version
+* anti_malware_intelli_trap_exception_version
+* anti_malware_intelli_trap_version
+* anti_malware_smart_scan_pattern_version
+* anti_malware_spyware_pattern_version
+* overall_last_successful_communication
+* platform
+* host_type
+* host_group_id
+
+### `anti_malware_event list`
+
+The `anti_malware_event list`command displays a list of AntiMalware events.
+
+    NAME
+        list - List Anti Malware Events
+
+    SYNOPSIS
+        dsc [global options] anti_malware_event list [command options]
+
+    COMMAND OPTIONS
+        --fields=arg      - A comma separated list of fields to display. (Available fields: anti_malware_config_id, anti_malware_event_id, end_time, error_code, host, host_id, infected_file_path, infection_source, log_date, malware_name,
+                            malware_type, protocol, quarantine_record_id, scan_action1, scan_action2, scan_result_action1, scan_result_action2, scan_type, spyware_items, start_time, summary_scan_result, tags) (default:
+                            host.name,host.display_name,log_date,start_time,end_time,scan_action1,scan_action2,summary_scan_result,scan_result_action1,scan_result_action2,malware_name,malware_type,infected_file_path,infection_source)
+        --time_filter=arg - A filter specifying the time interval to query (One of last_hour, last_24_hours, last_7_days, last_day) (default: last_day)
+
+If you don't specify an explicit list of fields, the following fields are used by default:
+
+* host.name
+* host.display_name
+* log_date
+* start_time
+* end_time
+* scan_action1
+* scan_action2
+* summary_scan_result
+* scan_result_action1
+* scan_result_action2
+* malware_name
+* malware_type
+* infected_file_path
+* infection_source
+
+Please note that if you don't specify a time filter all events of the previous day (00:00:00UTC-23:59:59UTC).
+
+
+## COMMAND OPTIONS
+
+### FIELDS
+
+The `--fields` option takes a list of comma-separated values of fields to display. You can check available fields usind the `schema` subcommand.
+You can also get further output by separating method calls with a dot `.`. E.g.: If the field itself is called `host_name` you can also
+specify `host_name.size` which would call the `size()` method returning the length of the String.
+
+### TIME FILTER
+
+The `--time_filter` option allows you to specify the time to be queried. One of
+
+* last_hour
+* last_24_hours
+* last_7_days
+* last_day
+
+Please note the difference between `last_24_hours` and `last_day`. `last_24_hours` returns events from the current time yesterday to now.
+`last_day` returns events from yesterday 00:00:00UTC to 23:59:59UTC.
+
+# TIPS & TRICKS
+
+## DEFINE ROLE/USER FOR SOAP ACCESS
+
+TODO
+
+## UNLOCK A LOCKED ACCOUNT
+
+[How to unlock a username that has been locked out](http://esupport.trendmicro.com/solution/en-us/1055084.aspx)
+
+
+
+

data/lib/deepsecurity/transport_objects/anti_malware_event.rb

@@ -68,7 +68,7 @@ module DeepSecurity
     end
 
     def host
-      Host.find_by_id(host_id)
+      Host.find(host_id)
     end
     # @!endgroup
 

data/lib/deepsecurity/transport_objects/host.rb

@@ -33,6 +33,10 @@ module DeepSecurity
     attr_integer_accessor :security_profile_id,
                           'Assigned SecurityProfileTransport ID'
 
+    hint_object_accessor :host_group,
+                         HostGroup,
+                         'The host group this host belongs to'
+
     cache_by_aspect :id, :name
 
     # @!group High-Level Screenscraping Wrapper
@@ -84,7 +88,7 @@ module DeepSecurity
     # Retrieves a Host by ID.
     # @param [Integer] id Host ID
     # @return [Host]
-    def self.find_by_id(id)
+    def self.find(id)
       dsm.hostRetrieve(id)
     end
 
@@ -94,6 +98,11 @@ module DeepSecurity
     def self.find_by_name(hostname)
       dsm.hostRetrieveByName(hostname)
     end
+
+    def host_group
+      HostGroup.find(host_group_id)
+    end
+
     #@!endgroup
   end
 

data/lib/deepsecurity/transport_objects/host_detail.rb

@@ -24,6 +24,11 @@ module DeepSecurity
                          'Computer platform'
     attr_integer_accessor :security_profile_id,
                           'Assigned SecurityProfileTransport ID'
+
+    hint_object_accessor :host_group,
+                         HostGroup,
+                         'The host group this host belongs to'
+
     # ABOVE is duplicates from Host!
 
     attr_string_accessor :anti_malware_classic_pattern_version,
@@ -119,7 +124,7 @@ module DeepSecurity
     array_object_accessor :host_interfaces,
                           HostInterface
 
-    # cache_by_aspect :id, :name
+    cache_by_aspect :id, :name
 
     # @!group High-Level SOAP Wrapper
 
@@ -131,6 +136,11 @@ module DeepSecurity
       dsm.hostDetailRetrieve(host_filter, detail_level)
     end
 
+    def host_group
+      return nil if host_group_id.nil?
+      HostGroup.find(host_group_id)
+    end
+
     # @!endgroup
 
   end

data/lib/deepsecurity/transport_objects/host_filter.rb

@@ -17,12 +17,19 @@ module DeepSecurity
                        EnumHostFilterType,
                        "EnumHostFilterType to filter computers by"
 
+    # @!group High-Level SOAP Wrapper
+
+    # Return a new instance for all hosts.
+    # @return [HostFilter]
     def self.all_hosts
       instance = self.new()
       instance.type = :all_hosts
       instance
     end
 
+    # Return a new instance for hosts in the group defined by the given host_group_id.
+    # @param [Integer] host_group_id
+    # @return [HostFilter]
     def self.hosts_in_group(host_group_id)
       instance = self.new()
       instance.type = :hosts_in_group
@@ -30,6 +37,9 @@ module DeepSecurity
       instance
     end
 
+    # Return a new instance for hosts in the security profile defined by the given security_profile_id.
+    # @param [Integer] security_profile_id
+    # @return [HostFilter]
     def self.hosts_using_security_profile(security_profile_id)
       instance = self.new()
       instance.type = :hosts_using_security_profile
@@ -37,6 +47,9 @@ module DeepSecurity
       instance
     end
 
+    # Return a new instance for hosts in the group and their subgroups defined by the given host_group_id.
+    # @param [Integer] host_group_id
+    # @return [HostFilter]
     def self.hosts_in_group_and_all_subgroups(host_group_id)
       instance = self.new()
       instance.type = :hosts_in_group_and_all_subgroups
@@ -44,6 +57,9 @@ module DeepSecurity
       instance
     end
 
+    # Return a new instance for hosts defined by the given host_id.
+    # @param [Integer] host_id
+    # @return [HostFilter]
     def self.specific_host(host_id)
       instance = self.new()
       instance.type = :specific_host
@@ -51,12 +67,16 @@ module DeepSecurity
       instance
     end
 
+    # Return a new instance for "my" hosts.
+    # @return [HostFilter]
     def self.my_hosts
       instance = self.new()
       instance.type = :my_hosts
       instance
     end
 
+    # @!endgroup
+
   end
 
 end

data/lib/deepsecurity/transport_objects/host_group.rb

@@ -1,41 +1,119 @@
 module DeepSecurity
 
+  # Represents a computer group folder that computers can be assigned to for organizational purposes.
   class HostGroup < TransportObject
 
-    attr_integer_accessor :id
-    attr_string_accessor :name
-    attr_string_accessor :description
-    attr_boolean_accessor :external
-    attr_string_accessor :external_id
-    attr_integer_accessor :parent_group_id
+    attr_integer_accessor :id,
+                          "ID"
+    attr_string_accessor :name,
+                         "Name"
+    attr_string_accessor :description,
+                         "Description"
+    attr_boolean_accessor :external,
+                          "Administrative external boolean for integration purposes"
+    attr_string_accessor :external_id,
+                         "Administrative external ID for integration purposes"
+    attr_integer_accessor :parent_group_id,
+                          "If the group belongs to a parent group, then this ID will be set and used to retrieve the parent group"
+
+    hint_object_accessor :parent_group,
+                         HostGroup,
+                         'The paren group if existent'
+
+    cache_by_aspect :id, :name
+
+    # @!group High-Level SOAP Wrapper
 
     def parent_group
       return nil if @parent_group_id.nil?
       @dsm.host_group(@parent_group_id)
     end
 
+    # Retrieves HostGroups.
+    # @return [Array<HostGroup>]
+    def self.all
+      dsm.hostGroupRetrieveAll()
+    end
+
+    # Retrieves a HostGroup by ID.
+    # @param [Integer] id HostGroup ID
+    # @return [HostGroup]
+    def self.find(id)
+      dsm.hostGroupRetrieve(id)
+    end
+
+    # Retrieves a HostGroup by name.
+    # @param [String] hostname hostname
+    # @return [HostGroup]
+    def self.find_by_name(hostname)
+      dsm.hostGroupRetrieveByName(hostname)
+    end
+    #@!endgroup
+
   end
 
   class Manager
 
-    def host_groups
+    # @!group Low-Level SOAP Wrapper
+
+    # Retrieves all Host Groups.
+    #
+    # SYNTAX
+    #   HostGroupTransport[] hostGroupRetrieveAll(String sID)
+    #
+    # PARAMETERS
+    #   sID Authentication session identifier ID.
+    #
+    # RETURNS
+    #   HostGroupTransport object array.
+    def hostGroupRetrieveAll(sID = dsm.sID)
       cache.fetch(HostGroup.cache_key(:all, :all)) do
-        request_array("host_group_retrieve_all", HostGroup)
+        request_array(:host_group_retrieve_all, HostGroup, nil,
+                      :sID => sID)
       end
     end
 
-    def host_group(id)
+    # Retrieves a Host Group by ID.
+    #
+    # SYNTAX
+    #   HostGroupTransport hostGroupRetrieve(int ID, String sID)
+    #
+    # PARAMETERS
+    #   ID  Identifying Host Group ID.
+    #   sID Authentication session identifier ID.
+    #
+    # RETURNS
+    #   HostGroupTransport object.
+    def hostGroupRetrieve(id, sID = dsm.sID)
       cache.fetch(HostGroup.cache_key(:id, id)) do
-        request_object("host_group_retrieve", HostGroup, {:id => id})
+        request_object(:host_group_retrieve, HostGroup,
+                       :id => id,
+                       :sID => sID)
       end
     end
 
-    def host_group_by_name(name)
+
+    # Retrieves a Host Group by name.
+    #
+    # SYNTAX
+    #   HostGroupTransport hostGroupRetrieveByName(String Name, String sID)
+    #
+    # PARAMETERS
+    #   Name  Identifying Host Group name.
+    #   sID Authentication session identifier ID.
+    #
+    # RETURNS
+    #   HostGroupTransport object.
+    def hostGroupRetrieveByName(name, sID = dsm.sID)
       cache.fetch(HostGroup.cache_key(:name, name)) do
-        request_object("host_group_retrieve_by_name", HostGroup, {:name => name})
+        request_object(:host_group_retrieve_by_name, HostGroup,
+                       :name => name,
+                       :sID => sID)
       end
     end
 
+    # @!endgroup
+
   end
 
 end

data/lib/deepsecurity/transport_objects/id_filter.rb

@@ -8,9 +8,17 @@ module DeepSecurity
   # uniquely identify which events have already been retrieved. This way retrieval of duplicate events can be avoided.
   class IDFilter < TransportObject
 
-    attr_integer_accessor :id
-    attr_enum_accessor :operator, EnumOperator
+    attr_integer_accessor :id,
+                          "Event transport objects ID to filter by."
+    attr_enum_accessor :operator,
+                       EnumOperator,
+                       "EnumOperator to used to apply the id property, e.g., greater than, less than, and equal."
 
+    # @!group High-Level SOAP Wrapper
+
+    # Return a new instance for events with the given event id.
+    # @param [Integer] id
+    # @return [IDFilter]
     def self.equals(id)
       instance = self.new()
       instance.operator = :equals
@@ -18,6 +26,9 @@ module DeepSecurity
       instance
     end
 
+    # Return a new instance for events with event ids less than the given event id.
+    # @param [Integer] id
+    # @return [IDFilter]
     def self.less_than(id)
       instance = self.new()
       instance.operator = :less_than
@@ -25,6 +36,9 @@ module DeepSecurity
       instance
     end
 
+    # Return a new instance for events with event ids greater than the given event id.
+    # @param [Integer] id
+    # @return [IDFilter]
     def self.greater_than(id)
       instance = self.new()
       instance.operator = :greater_than
@@ -32,6 +46,8 @@ module DeepSecurity
       instance
     end
 
+    # @!endgroup
+
   end
 
 end

data/lib/deepsecurity/transport_objects/time_filter.rb

@@ -5,40 +5,59 @@ module DeepSecurity
   # be required. If the EnumTimeFilterType SPECIFIC_TIME type is set, then the specifiicTime property will be required.
   class TimeFilter < TransportObject
 
-    attr_datetime_accessor :rangeFrom
-    attr_datetime_accessor :rangeTo
-    attr_datetime_accessor :specificTime
+    attr_datetime_accessor :rangeFrom,
+                           "Time range start to filter computers by."
+    attr_datetime_accessor :rangeTo,
+                           "Time range end to filter computers by."
+    attr_datetime_accessor :specificTime,
+                           "Specific time to filter computers by."
     # attr_integer_accessor :host_group_id
     # attr_integer_accessor :host_id
     # attr_integer_accessor :security_profile_id
-    attr_enum_accessor :type, EnumTimeFilterType
+    attr_enum_accessor :type, EnumTimeFilterType,
+                       "EnumTimeFilterType to filter computers by."
 
+    # @!group High-Level SOAP Wrapper
+
+    # Return a new instance for the last hour.
+    # @return [TimeFilter]
     def self.last_hour
       instance = self.new()
       instance.type = :last_hour
       instance
     end
 
+    # Return a new instance for the last 24 hours.
+    # @return [TimeFilter]
     def self.last_24_hours
       instance = self.new()
       instance.type = :last_24_hours
       instance
     end
 
+
+    # Return a new instance for the last 7 days.
+    # @return [TimeFilter]
     def self.last_7_days
       instance = self.new()
       instance.type = :last_7_days
       instance
     end
 
-    def self.custom_range(range)
+    # Return a new instance for the given datetime range.
+    # @param [Range] datetime_range A range of two datetimes
+    # @return [TimeFilter]
+    def self.custom_range(datetime_range)
       instance = self.new()
       instance.type = :custom_range
-      instance.rangeFrom = range.first
-      instance.rangeTo = range.last
+      instance.rangeFrom = datetime_range.first
+      instance.rangeTo = datetime_range.last
       instance
     end
 
+    # Return a new instance for the given datetime.
+    # @param [DateTime] datetime
+    # @return [TimeFilter]
     def self.specificTime(datetime)
       instance = self.new()
       instance.type = :specificTime
@@ -46,10 +65,15 @@ module DeepSecurity
       instance
     end
 
+
+    # Return a new instance for last day (yesterday 00:00:00UTC-23:59:59UTC).
+    # @return [TimeFilter]
     def self.last_day
       self.custom_range(((Date.today-1).to_time)..((Date.today).to_time-1))
     end
 
+    # @!endgroup
+
   end
 
 end

data/lib/deepsecurity/version.rb

@@ -1,3 +1,3 @@
 module DeepSecurity
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/lib/dsc/anti_malware_event_command.rb

@@ -68,7 +68,13 @@ module Dsc
           csv << fields
           anti_malware_events.each do |anti_malware_event|
             progressBar.inc(75/anti_malware_events.size) if @show_progress_bar
-            csv << fields.map { |attribute| anti_malware_event.instance_eval(attribute) }
+            csv << fields.map do |attribute|
+              begin
+                anti_malware_event.instance_eval(attribute)
+              rescue => e
+                "ERROR (#{e.message}"
+              end
+            end
           end
           progressBar.finish if @show_progress_bar
         end

data/lib/dsc/host_detail_command.rb

@@ -30,7 +30,7 @@ module Dsc
           :platform,
           :host_type,
           # system domain or system group
-          :host_group_id,
+          :host_group_name,
 
       # last/currently logged on account
       ]
@@ -48,7 +48,13 @@ module Dsc
           csv << fields
           hostDetails.each do |hostDetail|
             progressBar.inc(75/hostDetails.size) if @show_progress_bar
-            csv << fields.map { |attribute| hostDetail.instance_eval(attribute) }
+            csv << fields.map do |attribute|
+              begin
+                hostDetail.instance_eval(attribute)
+              rescue => e
+                "ERROR (#{e.message}"
+              end
+            end
           end
           progressBar.finish if @show_progress_bar
         end

data/lib/savon_helper/mapping_object.rb

@@ -17,13 +17,13 @@ module SavonHelper
     end
 
     # Helper Method deserializing the SOAP response into an object
-    def request_object(method_name, object_class, soap_body={})
-      object_class.from_savon_data(self, send_soap(method_name, soap_body))
+    def request_object(method_name, object_class, arguments={})
+      object_class.from_savon_data(send_soap(method_name, arguments))
     end
 
     # Helper Method deserializing the SOAP response into an object
-    def request_array(method_name, object_class, collection_name = nil, soap_body={})
-      data = send_soap(method_name, soap_body)
+    def request_array(method_name, object_class, collection_name = nil, arguments={})
+      data = send_soap(method_name, arguments)
       data = data[collection_name] unless collection_name.blank?
       SavonHelper::ArrayMapping.new(SavonHelper::ObjectMapping.new(object_class)).from_savon_data(data)
     end
@@ -374,9 +374,9 @@ module SavonHelper
     end
 
     # @macro [attach] hint_object_accessor
-    #   @!attribute [rw] $3
-    #     $2
-    #     @return [String]
+    #   @!attribute [rw] $4
+    #     $3
+    #     @return [$2]
     # Define a new "hint" for documentation purposes. Please note, that the method has to be define elsewhere!
     # @param accessor [Symbol] The accessor to be created
     # @param description [String] The description for this accessor

data/lib/savon_helper/type_mappings.rb

@@ -2,53 +2,81 @@
 
 module SavonHelper
 
+  # A TypeMappng class is responsible for converting between Savon primitive types and compound Ruby Types
   class TypeMapping
 
-    def logger
-      DeepSecurity::logger
-    end
-
+    # A new instance of TypeMapping with description
+    # @param [String] description
+    # @return [TypeMapping]
     def initialize(description='')
       @description = description
     end
 
+    # @!group Converting
+
+    # Convert from Savon data to Ruby value
+    # @param [Hash] data Savon data
+    # @return [Object]
     def from_savon_data(data)
       logger.error { "#{self.class}##{__method__}(#{data.inspect}) not implemented!" }
     end
 
+    # Convert from Ruby value type to Savon data
+    # @param [Object] value Ruby value
+    # @return [Object]
     def to_savon_data(value)
       logger.error { "#{self.class}##{__method__}(#{value.inspect}) not implemented!" }
     end
 
+    # @!endgroup
+
+    # Return the description
+    # @return [String]
     def description
       @description
     end
 
+    # Return the class represented by the mapping.
+    # @return [Class]
     def object_klass
       logger.error { "#{self.class}##{__method__}() not implemented!" }
     end
 
+    # Return the class description represented by the mapping.
+    # @return [String]
     def type_string
       logger.error { "#{self.class}##{__method__}() not implemented!" }
     end
 
+    # The current logger
+    # @return [Logger]
+    def logger
+      DeepSecurity::logger
+    end
+
   end
 
+  # ArrayMapping maps Savon data to Ruby Arrays
   class ArrayMapping < TypeMapping
 
-    def self.from_savon_data(klass, data)
+
+    # Convert the given Savon data to an Array consisting of elements of class klass
+    # @param [TypeMapping] element_mapping TypeMapping for elements
+    # @param [Hash,Array] data Savon Data
+    # @return [Array<Object>]
+    def self.from_savon_data(element_mapping, data)
       return [] if data.blank?
       result = []
       if data.is_a?(Array)
         data.each do |element|
-          result << klass.from_savon_data(element)
+          result << element_mapping.from_savon_data(element)
         end
       elsif data.is_a?(Hash)
         item = data[:item]
         if item.nil?
-          result << klass.from_savon_data(data)
+          result << element_mapping.from_savon_data(data)
         else
-          result = from_savon_data(klass, item)
+          result = from_savon_data(element_mapping, item)
         end
       else
         raise "Unknown Array mapping"
@@ -56,42 +84,63 @@ module SavonHelper
       result
     end
 
+    # A new instance of TypeMapping with description
+    # @param [TypeMapping] element_mapping A TypeMapping for elements
+    # @param [String] description
+    # @return [ArrayMapping]
     def initialize(element_mapping, description='')
       super(description)
       @element_mapping = element_mapping
     end
 
+    # @!group Converting
+
+    # Convert from Savon data to Ruby value
+    # @param [Hash] data Savon data
+    # @return [Array]
     def from_savon_data(data)
       self.class.from_savon_data(@element_mapping, data)
     end
 
-    def _from_savon_data(data)
-      return @element_mapping.from_savon_data(data[:item]) if data[:item].is_a?(Hash)
-      data[:item].map do |each|
-        @element_mapping.from_savon_data(each)
-      end
-    end
+    # @!endgroup
 
+    # Return the class represented by the mapping.
+    # @return [Class]
     def object_klass
-       @element_mapping.object_klass
+      @element_mapping.object_klass
     end
 
+    # Return the class description represented by the mapping.
+    # @return [String]
     def type_string
       "Array<#{@element_mapping.type_string}>"
     end
 
   end
 
+    # BooleanMapping maps Savon data to Ruby Booleans.
   class BooleanMapping < TypeMapping
 
+    # @!group Converting
+
+    # Convert from Savon data to Ruby Boolean
+    # @param [Hash] data Savon data
+    # @return [Boolean]
     def from_savon_data(data)
       data.to_s == "true"
     end
 
+    # Convert from Ruby Boolean type to Savon data
+    # @param [Object] value Boolean
+    # @return [Hash]
     def to_savon_data(value)
       value.to_s
     end
 
+    # @!endgroup
+
+    # Return the class description represented by the mapping.
+    # @return [String]
     def type_string
       "bool"
     end
@@ -130,7 +179,7 @@ module SavonHelper
     end
 
     def type_string
-      "enum"
+      "enum<#{@enum.values.join(', ')}>"
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deepsecurity
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -149,12 +149,14 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .yardopts
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/dsc
 - deepsecurity.gemspec
+- dsc.md
 - lib/deepsecurity.rb
 - lib/deepsecurity/ds_object.rb
 - lib/deepsecurity/enums.rb