stbaldricks 10.4.0.alpha.2 → 10.6.1

data/lib/stbaldricks/entities/international_partner.rb

@@ -15,8 +15,8 @@ module SBF
       disallow_instantiation
 
       module Status
-        ACTIVE = 'active'
-        PENDING = 'pending'
+        ACTIVE = 'active'.freeze
+        PENDING = 'pending'.freeze
       end
 
       class WebPage < SBF::Client::BaseEntity

data/lib/stbaldricks/entities/kid.rb

@@ -16,43 +16,43 @@ module SBF
       attr_accessor :other
 
       module CancerType
-        ACUTE_LYMPHOBLASTIC_LEUKEMIA = 'acute_lymphoblastic_leukemia'
-        ACUTE_MYELOID_LEUKEMIA = 'acute_myeloid_leukemia'
-        BRAIN_OR_SPINAL_CORD_TUMOR = 'brain_or_spinal_cord_tumor'
-        KIDNEY_SARCOMA = 'kidney_sarcoma'
-        EWING_SARCOMA = 'ewing_sarcoma'
-        GERM_CELL_TUMOR = 'germ_cell_tumor'
-        HEPATOBLASTOMA = 'hepatoblastoma'
-        HODGKIN_LYMPHOMA = 'hodgkin_lymphoma'
-        LANGERHANS_CELL_HISTIOCYTOSIS = 'langerhans_cell_histiocytosis'
-        LYMPHOMA = 'lymphoma'
-        NEUROBLASTOMA = 'neuroblastoma'
-        NON_HODGKIN_LYMPHOMA = 'non_hodgkin_lymphoma'
-        OSTEOSARCOMA = 'osteosarcoma'
-        RETINOBLASTOMA = 'retinoblastoma'
-        RHABDOMYOSARCOMA = 'rhabdomyosarcoma'
-        WILMS_OR_OTHER_KIDNEY_TUMOR = 'wilms_or_other_kidney_tumor'
-        ADULT_WITH_CHILDHOOD_CANCER = 'adult_with_childhood_cancer'
-        OTHER_CHILDHOOD_CANCER = 'other_childhood_cancer'
+        ACUTE_LYMPHOBLASTIC_LEUKEMIA = 'acute_lymphoblastic_leukemia'.freeze
+        ACUTE_MYELOID_LEUKEMIA = 'acute_myeloid_leukemia'.freeze
+        BRAIN_OR_SPINAL_CORD_TUMOR = 'brain_or_spinal_cord_tumor'.freeze
+        KIDNEY_SARCOMA = 'kidney_sarcoma'.freeze
+        EWING_SARCOMA = 'ewing_sarcoma'.freeze
+        GERM_CELL_TUMOR = 'germ_cell_tumor'.freeze
+        HEPATOBLASTOMA = 'hepatoblastoma'.freeze
+        HODGKIN_LYMPHOMA = 'hodgkin_lymphoma'.freeze
+        LANGERHANS_CELL_HISTIOCYTOSIS = 'langerhans_cell_histiocytosis'.freeze
+        LYMPHOMA = 'lymphoma'.freeze
+        NEUROBLASTOMA = 'neuroblastoma'.freeze
+        NON_HODGKIN_LYMPHOMA = 'non_hodgkin_lymphoma'.freeze
+        OSTEOSARCOMA = 'osteosarcoma'.freeze
+        RETINOBLASTOMA = 'retinoblastoma'.freeze
+        RHABDOMYOSARCOMA = 'rhabdomyosarcoma'.freeze
+        WILMS_OR_OTHER_KIDNEY_TUMOR = 'wilms_or_other_kidney_tumor'.freeze
+        ADULT_WITH_CHILDHOOD_CANCER = 'adult_with_childhood_cancer'.freeze
+        OTHER_CHILDHOOD_CANCER = 'other_childhood_cancer'.freeze
       end
     end
 
     class Guardian < SBF::Client::BaseEntity
       module RelationshipType
-        SELF_ADULT = 'adult'
-        SELF_MINOR = 'minor'
-        MOTHER = 'mother'
-        FATHER = 'father'
-        SISTER = 'sister'
-        BROTHER = 'brother'
-        AUNT = 'aunt'
-        UNCLE = 'uncle'
-        GRANDMOTHER = 'grandmother'
-        GRANDFATHER = 'grandfather'
-        STEP_MOTHER = 'stepmother'
-        STEP_FATHER = 'stepfather'
-        FRIEND = 'friend'
-        COUSIN = 'cousin'
+        SELF_ADULT = 'adult'.freeze
+        SELF_MINOR = 'minor'.freeze
+        MOTHER = 'mother'.freeze
+        FATHER = 'father'.freeze
+        SISTER = 'sister'.freeze
+        BROTHER = 'brother'.freeze
+        AUNT = 'aunt'.freeze
+        UNCLE = 'uncle'.freeze
+        GRANDMOTHER = 'grandmother'.freeze
+        GRANDFATHER = 'grandfather'.freeze
+        STEP_MOTHER = 'stepmother'.freeze
+        STEP_FATHER = 'stepfather'.freeze
+        FRIEND = 'friend'.freeze
+        COUSIN = 'cousin'.freeze
       end
 
       attr_accessor :name
@@ -67,19 +67,19 @@ module SBF
       attr_accessor :other
 
       module SurvivorState
-        IN_TREATMENT = 'in_treatment'
-        IN_MAINTENANCE = 'in_maintenance'
-        IN_REMISSION = 'in_remission'
-        NED = 'no_evidence_of_disease'
-        CANCER_FREE = 'cancer_free'
-        OTHER_LIVING = 'other_living'
+        IN_TREATMENT = 'in_treatment'.freeze
+        IN_MAINTENANCE = 'in_maintenance'.freeze
+        IN_REMISSION = 'in_remission'.freeze
+        NED = 'no_evidence_of_disease'.freeze
+        CANCER_FREE = 'cancer_free'.freeze
+        OTHER_LIVING = 'other_living'.freeze
       end
 
       module DeceasedState
-        ANGEL = 'angel'
-        DECEASED = 'deceased'
-        PASSED_AWAY = 'passed_away'
-        OTHER_DECEASED = 'other_deceased'
+        ANGEL = 'angel'.freeze
+        DECEASED = 'deceased'.freeze
+        PASSED_AWAY = 'passed_away'.freeze
+        OTHER_DECEASED = 'other_deceased'.freeze
       end
     end
 
@@ -102,33 +102,33 @@ module SBF
       disallow_instantiation
 
       module Status
-        ACTIVE = 'active'
-        PENDING = 'pending'
-        SUSPENDED = 'suspended'
+        ACTIVE = 'active'.freeze
+        PENDING = 'pending'.freeze
+        SUSPENDED = 'suspended'.freeze
       end
 
       class Relationship < SBF::Client::BaseEntity
         module Type
-          SELF_ADULT = 'adult'
-          SELF_MINOR = 'minor'
-          MOTHER = 'mother'
-          FATHER = 'father'
-          SISTER = 'sister'
-          BROTHER = 'brother'
-          AUNT = 'aunt'
-          UNCLE = 'uncle'
-          GRANDMOTHER = 'grandmother'
-          GRANDFATHER = 'grandfather'
-          STEP_MOTHER = 'stepmother'
-          STEP_FATHER = 'stepfather'
-          FRIEND = 'friend'
-          COUSIN = 'cousin'
+          SELF_ADULT = 'adult'.freeze
+          SELF_MINOR = 'minor'.freeze
+          MOTHER = 'mother'.freeze
+          FATHER = 'father'.freeze
+          SISTER = 'sister'.freeze
+          BROTHER = 'brother'.freeze
+          AUNT = 'aunt'.freeze
+          UNCLE = 'uncle'.freeze
+          GRANDMOTHER = 'grandmother'.freeze
+          GRANDFATHER = 'grandfather'.freeze
+          STEP_MOTHER = 'stepmother'.freeze
+          STEP_FATHER = 'stepfather'.freeze
+          FRIEND = 'friend'.freeze
+          COUSIN = 'cousin'.freeze
         end
 
         module GuardianType
-          LEGAL_GUARDIAN = 'legal_guardian'
-          NONCUSTODIAL_GUARDIAN = 'non_custodial_guardian'
-          OTHER = 'other'
+          LEGAL_GUARDIAN = 'legal_guardian'.freeze
+          NONCUSTODIAL_GUARDIAN = 'non_custodial_guardian'.freeze
+          OTHER = 'other'.freeze
         end
 
         class Permissions < SBF::Client::BaseEntity

data/lib/stbaldricks/entities/kid_honor.rb

@@ -44,10 +44,10 @@ module SBF
       )
 
       module HonorerType
-        EVENT = 'event'
-        TEAM = 'team'
-        PARTICIPANT = 'participant'
-        FUNDRAISER = 'fundraiser'
+        EVENT = 'event'.freeze
+        TEAM = 'team'.freeze
+        PARTICIPANT = 'participant'.freeze
+        FUNDRAISER = 'fundraiser'.freeze
       end
 
       class PartialKid < SBF::Client::PartialKid

data/lib/stbaldricks/entities/lib/address.rb

@@ -4,8 +4,8 @@ module SBF
   module Client
     class Address < SBF::Client::BaseEntity
       module Type
-        HOME = 'home'
-        BUSINESS = 'business'
+        HOME = 'home'.freeze
+        BUSINESS = 'business'.freeze
       end
 
       attr_accessor :type

data/lib/stbaldricks/entities/lib/alternate_shipping_address.rb

@@ -4,8 +4,8 @@ module SBF
   module Client
     class AlternateShippingAddress < SBF::Client::BaseEntity
       module Type
-        HOME = 'home'
-        BUSINESS = 'business'
+        HOME = 'home'.freeze
+        BUSINESS = 'business'.freeze
       end
 
       attr_accessor :type

data/lib/stbaldricks/entities/lib/base.rb

@@ -1,6 +1,6 @@
 # Require all monkey patches
 patch_dir = File.expand_path('../../patches', __dir__)
-Dir["#{patch_dir}/*.rb"].each { |file| require file }
+Dir["#{patch_dir}/*.rb"].sort.each { |file| require file }
 
 require 'set'
 require 'stbaldricks/client'
@@ -11,12 +11,8 @@ require 'securerandom'
 module SBF
   module Client
     class BaseEntity
-      include ActiveModel::AttributeAssignment
-      include ActiveModel::Dirty
-      extend ActiveModel::Naming
-      extend ActiveModel::Translation
-      include ActiveModel::Conversion
-      include EntityResponseConcern
+      include EntityResponseConcern, ActiveModel::Conversion, ActiveModel::Dirty, ActiveModel::AttributeAssignment
+      extend ActiveModel::Translation, ActiveModel::Naming
 
       attr_reader :errors
 
@@ -42,7 +38,7 @@ module SBF
 
       # Overridden from ActiveModel::Naming to remove namespace and Full/Partial
       def model_name
-        @_model_name ||= ActiveModel::Name.new(self, SBF::Client, self.class.name.gsub(/::(Full|Partial)/, '::'))
+        @model_name ||= ActiveModel::Name.new(self, SBF::Client, self.class.name.gsub(/::(Full|Partial)/, '::'))
       end
 
       def persisted?
@@ -113,7 +109,7 @@ module SBF
 
       # Mimic ActiveRecord::AttributeAssignment alias
       alias_method :attributes=, :assign_attributes
-
+      # rubocop:disable Naming/MemoizedInstanceVariableName
       def initialize_attributes(data)
         data ||= {}
         data.each do |key, value|
@@ -138,6 +134,7 @@ module SBF
         @collection_attributes ||= Set.new
       end
       private :initialize_attributes
+      # rubocop:enable Naming/MemoizedInstanceVariableName
 
       def mark_attribute_not_provided(name)
         return if not_provided_attributes.include?(name)
@@ -157,18 +154,18 @@ module SBF
 
         # If we set the value in a not_provided method, that means we now have requested the data and we
         # should replace the original getter/setter and set the value using the original method
-        define_singleton_method(setter) { |v|
+        define_singleton_method(setter) do |v|
           unmark_attribute_not_provided(name)
           super(v)
-        }
+        end
 
         # If we try to get the value in a not_provided method, we should raise an error
-        define_singleton_method(getter) {
+        define_singleton_method(getter) do
           raise(
             SBF::Client::DataNotProvidedError,
             "Data not provided for the #{name} attribute. This is usually due to the attribute not being requested in the 'with' declaration"
           )
-        }
+        end
       end
       private :mark_attribute_not_provided
 
@@ -392,7 +389,7 @@ module SBF
       private_class_method :define_changing_attr_methods
 
       # Creates a private method which resolves the class type based on the class mappings and the value
-      # rubocop:disable MethodLength
+      # rubocop:disable Metrics/MethodLength
       def self.add_class_selector_method(attribute, class_mappings)
         method_name = :"select_#{attribute}_class"
 
@@ -418,8 +415,8 @@ module SBF
 
           else
             # No class conversion if the value is already an entity
-            return nil if parsed_class_mappings.any? { |_, c1, c2|
-              [c1, c2].compact.any? { |allowed_class|
+            return nil if parsed_class_mappings.any? do |_, c1, c2|
+              [c1, c2].compact.any? do |allowed_class|
                 if allowed_class.instance_of?(Class)
                   # Otherwise, return true if the value is an instance of the allowed class
                   value.is_a?(allowed_class)
@@ -430,15 +427,15 @@ module SBF
                   allowed_class.constants.any? { |const_name| allowed_class.const_get(const_name) == value }
 
                 end
-              }
-            }
+              end
+            end
 
             # Convert to child class if given class is a parent of the same name
-            parsed_class_mappings.each { |_, c1, c2|
-              [c1, c2].compact.each { |allowed_class|
+            parsed_class_mappings.each do |_, c1, c2|
+              [c1, c2].compact.each do |allowed_class|
                 return allowed_class if allowed_class.ancestors.find { |a| a == value.class && a.demodulize == value.class.demodulize }
-              }
-            }
+              end
+            end
 
             # Don't know how to handle whatever the user entered. Raise an error.
             # (Nil and Hash are always valid values)
@@ -454,7 +451,7 @@ module SBF
 
         private_class_method method_name
       end
-      # rubocop:enable MethodLength
+      # rubocop:enable Metrics/MethodLength
       private_class_method :add_class_selector_method
 
       def self.get_mappings(attribute, class_mappings)
@@ -544,7 +541,7 @@ module SBF
       # Recursively converts an entity into a Hash
       def to_hash
         entity_hash = {}
-        self.class.defined_attributes.each { |key|
+        self.class.defined_attributes.each do |key|
           # If the method was not retrieved, do not include it in the hash
           next if not_provided_attributes.include?(key)
 
@@ -557,11 +554,11 @@ module SBF
 
                              # If the value is an Array, need to try to call to_hash on each item
                              elsif value.is_a?(Array)
-                               value.map { |element|
+                               value.map do |element|
                                  next element.to_hash if element.is_a?(BaseEntity)
 
                                  next element
-                               }
+                               end
 
                              # Collections should return empty array rather than nil
                              elsif value.nil? && self.class.collection_attributes.include?(key)
@@ -572,7 +569,7 @@ module SBF
                                value
 
                              end
-        }
+        end
 
         # Return the hash
         entity_hash

data/lib/stbaldricks/entities/lib/cacheable.rb

@@ -31,9 +31,7 @@ module SBF
             id
           end
 
-          private
-
-          def cache_id_from_hash_func(proc)
+          private def cache_id_from_hash_func(proc)
             raise ArgumentError, "Unable to re-set cache_id_from_hash on #{name}" if @cache_id_proc
 
             @cache_id_proc = proc

data/lib/stbaldricks/entities/lib/collection.rb

@@ -27,7 +27,7 @@ module SBF
         SBF::Client::ErrorEntity.new(code: errors.code, type: errors.type, details: details)
       end
 
-      # rubocop:disable MultipleComparison
+      # rubocop:disable Style/MultipleComparison
       def [](*args)
         log_deprecated('[]', caller) if args == [:results] || args == [:total_count]
         return self if args == [:results]
@@ -36,7 +36,7 @@ module SBF
         result = super
         result.is_a?(Array) ? self.class.new(result, total_count) : result
       end
-      # rubocop:enable MultipleComparison
+      # rubocop:enable Style/MultipleComparison
     end
   end
 end

data/lib/stbaldricks/entities/lib/email_address.rb

@@ -4,8 +4,8 @@ module SBF
   module Client
     class EmailAddress < SBF::Client::BaseEntity
       module Type
-        PERSONAL = 'personal'
-        BUSINESS = 'business'
+        PERSONAL = 'personal'.freeze
+        BUSINESS = 'business'.freeze
       end
 
       attr_accessor :type

data/lib/stbaldricks/entities/lib/fundraising_page.rb

@@ -7,7 +7,7 @@ module SBF
       attr_accessor :custom_url_segment
       attr_reader :url
 
-      HTTP_REGEX = %r{^https?://}
+      HTTP_REGEX = %r{^https?://}.freeze
 
       def url_with_scheme
         url.insert(0, 'https:') unless url.empty? || HTTP_REGEX.match(url)

data/lib/stbaldricks/entities/lib/not_implemented_object.rb

@@ -7,11 +7,11 @@ module SBF
       attr_accessor :props
 
       def initialize(attributes = {})
-        @props = {}.tap { |hsh|
-          attributes.each { |k, v|
+        @props = {}.tap do |hsh|
+          attributes.each do |k, v|
             hsh[k.to_sym] = v
-          }
-        }
+          end
+        end
 
         super
       end

data/lib/stbaldricks/entities/lib/payment.rb

@@ -5,23 +5,23 @@ module SBF
   module Client
     class Payment
       module Type
-        UNKNOWN = 'unknown'
-        CREDIT_CARD = 'credit_card'
-        CHECK = 'check'
-        CASH = 'cash'
-        MONEY_ORDER = 'money_order'
-        NONCE = 'nonce'
-        WIRE_TRANSFER = 'wire_transfer'
-        PAYPAL = 'paypal'
-        FACEBOOK = 'facebook'
-        APPLEPAY = 'applepay'
+        UNKNOWN = 'unknown'.freeze
+        CREDIT_CARD = 'credit_card'.freeze
+        CHECK = 'check'.freeze
+        CASH = 'cash'.freeze
+        MONEY_ORDER = 'money_order'.freeze
+        NONCE = 'nonce'.freeze
+        WIRE_TRANSFER = 'wire_transfer'.freeze
+        PAYPAL = 'paypal'.freeze
+        FACEBOOK = 'facebook'.freeze
+        APPLEPAY = 'applepay'.freeze
       end
 
       module Gateway
-        NONE = 'none'
-        UNKNOWN = 'unknown'
-        BRAINTREE = 'braintree'
-        PAYMENTSPRING = 'paymentspring'
+        NONE = 'none'.freeze
+        UNKNOWN = 'unknown'.freeze
+        BRAINTREE = 'braintree'.freeze
+        PAYMENTSPRING = 'paymentspring'.freeze
       end
 
       class Details < SBF::Client::BaseEntity