lib/bindata/sanitize.rb in bindata-2.4.15 vs lib/bindata/sanitize.rb in bindata-2.5.0

@@ -47,20 +47,16 @@
     def initialize(name, field_type, field_params, hints)
       @name      = name
       @prototype = SanitizedPrototype.new(field_type, field_params, hints)
     end
 
-    attr_reader :prototype
+    attr_reader :prototype, :name
 
     def name_as_sym
-      @name.nil? ? nil : @name.to_sym
+      @name&.to_sym
     end
 
-    def name
-      @name
-    end
-
     def has_parameter?(param)
       @prototype.has_parameter?(param)
     end
 
     def instantiate(value = nil, parent = nil)
@@ -72,15 +68,11 @@
   class SanitizedFields < SanitizedParameter
     include Enumerable
 
     def initialize(hints, base_fields = nil)
       @hints = hints
-      if base_fields
-        @fields = base_fields.raw_fields
-      else
-        @fields = []
-      end
+      @fields =  base_fields ? base_fields.raw_fields : []
     end
 
     def add_field(type, name, params)
       name = nil if name == ""
 
@@ -177,11 +169,10 @@
   #
   # SanitizedParameters is a hash-like collection of parameters.  Its purpose
   # is to recursively sanitize the parameters of an entire BinData object chain
   # at a single time.
   class SanitizedParameters < Hash
-
     # Memoized constants
     BIG_ENDIAN    = SanitizedBigEndian.new
     LITTLE_ENDIAN = SanitizedLittleEndian.new
 
     class << self
@@ -208,11 +199,11 @@
       end
 
       sanitize!
     end
 
-    alias_method :has_parameter?, :key?
+    alias has_parameter? key?
 
     def has_at_least_one_of?(*keys)
       keys.each do |key|
         return true if has_parameter?(key)
       end
@@ -255,11 +246,13 @@
         self[new_key] = delete(old_key)
       end
     end
 
     def sanitize_object_prototype(key)
-      sanitize(key) { |obj_type, obj_params| create_sanitized_object_prototype(obj_type, obj_params) }
+      sanitize(key) do |obj_type, obj_params|
+        create_sanitized_object_prototype(obj_type, obj_params)
+      end
     end
 
     def sanitize_fields(key, &block)
       sanitize(key) do |fields|
         sanitized_fields = create_sanitized_fields
@@ -304,11 +297,11 @@
       ensure_mandatory_parameters_exist
       ensure_mutual_exclusion_of_parameters
     end
 
     def needs_sanitizing?(key)
-      has_key?(key) && ! self[key].is_a?(SanitizedParameter)
+      has_parameter?(key) && !self[key].is_a?(SanitizedParameter)
     end
 
     def ensure_no_nil_values
       each do |key, value|
         if value.nil?
@@ -318,10 +311,10 @@
       end
     end
 
     def merge_default_parameters!
       @the_class.default_parameters.each do |key, value|
-        self[key] = value unless has_key?(key)
+        self[key] = value unless has_parameter?(key)
       end
     end
 
     def ensure_mandatory_parameters_exist
       @the_class.mandatory_parameters.each do |key|