stbaldricks 12.12.0 → 12.13.0.alpha.1

data/lib/stbaldricks/entities/kid_institution.rb

@@ -11,8 +11,8 @@ module SBF
       blacklist_action :update
       blacklist_action :aggregate
 
-      entity_attr_accessor :kid, 'SBF::Client::FullKid', 'SBF::Client::PartialKid', true
-      entity_attr_accessor :institution, 'SBF::Client::FullInstitution', 'SBF::Client::PartialInstitution', true
+      entity_attr_accessor :kid, 'SBF::Client::FullKid', 'SBF::Client::PartialKid', optional: true
+      entity_attr_accessor :institution, 'SBF::Client::FullInstitution', 'SBF::Client::PartialInstitution', optional: true
     end
   end
 end

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

@@ -8,15 +8,12 @@ module SBF
         BUSINESS = 'business'.freeze
       end
 
-      attr_accessor :type
-      attr_accessor :business_name
-      attr_accessor :address1, :address2, :city, :state, :state_name, :zip, :country, :country_name
-      attr_accessor :latitude, :longitude
+      attr_accessor :type, :business_name, :address1, :address2, :city, :state, :state_name, :zip, :country, :country_name, :latitude, :longitude
 
       def city_state_zip
         csz = ''
-        csz += @city + ', ' unless @city.nil?
-        csz += @state + ' ' unless @state.nil?
+        csz += "#{@city}, " unless @city.nil?
+        csz += "#{@state} " unless @state.nil?
         csz += @zip unless @zip.nil?
         csz.strip
       end

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

@@ -8,9 +8,7 @@ module SBF
         BUSINESS = 'business'.freeze
       end
 
-      attr_accessor :type
-      attr_accessor :business_name
-      attr_accessor :address1, :address2, :city, :state, :state_name, :zip, :country, :country_name
+      attr_accessor :type, :business_name, :address1, :address2, :city, :state, :state_name, :zip, :country, :country_name
     end
   end
 end

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

@@ -25,14 +25,14 @@ module SBF
       @not_provided_attributes = nil
       @disallow_instantiation = nil
 
-      def initialize(data = {}, clear_changes = false)
+      def initialize(data = {}, clear_changes: false)
         # If disallow instantiation has been set, raise an error if someone is trying to call initilaize
         raise SBF::Client::Error, 'Initialize is not valid on a base object. Use the full or partial version' unless self.class.allow_instantiation?
 
         super()
 
         @errors = SBF::Client::Entity::Errors.new(self)
-        initialize_attributes(data)
+        initialize_attributes(**data)
         reload_recursive if clear_changes
       end
 
@@ -70,29 +70,30 @@ module SBF
       def to_partial
         base_class = self.class.name.gsub(/(.*::)(Full|Partial)(.*)/, '\1')
         base_name = self.class.name.gsub(/(.*::)(Full|Partial)(.*)/, '\3')
-        "#{base_class}Partial#{base_name}".to_class.new(to_hash)
+        "#{base_class}Partial#{base_name}".to_class.new(to_hash, clear_changes: false)
       end
 
       ## Returns a hash of changed data for the entity and its sub-entities
       # @param with_keys [Boolean] when true, include the keys of the current entity. (sub-entity keys will always be included if they are present)
       # @return [Hash] the changed data
-      def dirty_data(with_keys = false)
+      def dirty_data(with_keys: false)
         data = {}
         changes.each { |k, arr| data[k.to_sym] = arr[1] }
 
         instance_variables.each do |var|
           attribute_symbol = var.to_s.delete('@').to_sym
           attribute = instance_variable_get(var)
-          if attribute.is_a?(BaseEntity)
-            if attribute.dirty_data(true).empty?
+          case attribute
+          when BaseEntity
+            if attribute.dirty_data(with_keys: true).empty?
               next unless changed.map(&:to_sym).include?(attribute_symbol)
 
               data.merge!(attribute_symbol => attribute.keys_hash)
             else
-              data.merge!(attribute_symbol => attribute.dirty_data(true))
+              data.merge!(attribute_symbol => attribute.dirty_data(with_keys: true))
             end
-          elsif attribute.is_a?(Array)
-            next unless attribute.all? { |e| e.is_a?(BaseEntity) } && attribute.any? { |e| !e.dirty_data(true).empty? }
+          when Array
+            next unless attribute.all?(BaseEntity) && attribute.any? { |e| !e.dirty_data(with_keys: true).empty? }
 
             data.merge!(attribute_symbol => attribute)
           end
@@ -104,7 +105,7 @@ module SBF
       end
 
       def keys_hash
-        respond_to?(:id) && id ? {id: id} : {}
+        (respond_to?(:id) && id) ? {id: id} : {}
       end
 
       # Mimic ActiveRecord::AttributeAssignment alias
@@ -241,7 +242,7 @@ module SBF
           define_changing_attr_methods attribute
         end
 
-        add_boolean_methods(vars, true)
+        add_boolean_methods(vars, setter: true)
       end
 
       def self.attr_accessor(*vars)
@@ -250,10 +251,10 @@ module SBF
 
         vars.each do |attribute|
           define_attribute_methods attribute
-          define_changing_attr_methods attribute, false, true
+          define_changing_attr_methods attribute, is_boolean: false, define_reader: true
         end
 
-        add_boolean_methods(vars, true)
+        add_boolean_methods(vars, setter: true)
       end
       ###########################################################################################
 
@@ -261,24 +262,27 @@ module SBF
       # Multitype Attribute accessors. These methods take an array of type to class mappings.
       # Expected form is:
       # [[<lamda method which evals to true if this type should be used>, <full class>, <partial class>], [...]]
-      def self.multitype_attr_reader(attribute, class_mappings, optional = false)
+      def self.multitype_attr_reader(attribute, class_mappings, optional: false)
         entity_attributes << attribute
         optional_attributes << attribute if optional
         attr_reader(attribute)
-        add_multitype_setter_method(attribute, class_mappings, true)
+
+        add_multitype_setter_method(attribute, class_mappings, private_method: true)
       end
 
-      def self.multitype_attr_writer(attribute, class_mappings, optional = false)
+      def self.multitype_attr_writer(attribute, class_mappings, optional: false)
         entity_attributes << attribute
         optional_attributes << attribute if optional
         attr_writer(attribute)
+
         add_multitype_setter_method(attribute, class_mappings)
       end
 
-      def self.multitype_attr_accessor(attribute, class_mappings, optional = false)
+      def self.multitype_attr_accessor(attribute, class_mappings, optional: false)
         entity_attributes << attribute
         optional_attributes << attribute if optional
         attr_accessor(attribute)
+
         add_multitype_setter_method(attribute, class_mappings)
       end
       ###########################################################################################
@@ -286,19 +290,19 @@ module SBF
       ###########################################################################################
       # Entity attr accessors are simpler to define/easier to read but they really just create a type mapping
       # for the given inputs and then function the same as the multitype attribute accessors do.
-      def self.entity_attr_reader(attribute, full_class, partial_class = nil, optional = false)
+      def self.entity_attr_reader(attribute, full_class, partial_class = nil, optional: false)
         mapping_for_single_class = [[ELSE, full_class, partial_class]]
-        multitype_attr_reader(attribute, mapping_for_single_class, optional)
+        multitype_attr_reader(attribute, mapping_for_single_class, optional: optional)
       end
 
-      def self.entity_attr_writer(attribute, full_class, partial_class = nil, optional = false)
+      def self.entity_attr_writer(attribute, full_class, partial_class = nil, optional: false)
         mapping_for_single_class = [[ELSE, full_class, partial_class]]
-        multitype_attr_writer(attribute, mapping_for_single_class, optional)
+        multitype_attr_writer(attribute, mapping_for_single_class, optional: optional)
       end
 
-      def self.entity_attr_accessor(attribute, full_class, partial_class = nil, optional = false)
+      def self.entity_attr_accessor(attribute, full_class, partial_class = nil, optional: false)
         mapping_for_single_class = [[ELSE, full_class, partial_class]]
-        multitype_attr_accessor(attribute, mapping_for_single_class, optional)
+        multitype_attr_accessor(attribute, mapping_for_single_class, optional: optional)
       end
       ###########################################################################################
 
@@ -306,24 +310,27 @@ module SBF
       # Multitype Collection accessors. These methods take an array of type to class mappings.
       # Expected form is:
       # [[<lamda method which evals to true if this type should be used>, <full class>, <partial class>], [...]]
-      def self.multitype_collection_attr_reader(attribute, class_mappings, optional = false)
+      def self.multitype_collection_attr_reader(attribute, class_mappings, optional: false)
         collection_attributes << attribute
         optional_attributes << attribute if optional
         attr_reader(attribute)
-        add_multitype_collection_setter_method(attribute, class_mappings, true)
+
+        add_multitype_collection_setter_method(attribute, class_mappings, private_method: true)
       end
 
-      def self.multitype_collection_attr_writer(attribute, class_mappings, optional = false)
+      def self.multitype_collection_attr_writer(attribute, class_mappings, optional: false)
         collection_attributes << attribute
         optional_attributes << attribute if optional
         attr_writer(attribute)
+
         add_multitype_collection_setter_method(attribute, class_mappings)
       end
 
-      def self.multitype_collection_attr_accessor(attribute, class_mappings, optional = false)
+      def self.multitype_collection_attr_accessor(attribute, class_mappings, optional: false)
         collection_attributes << attribute
         optional_attributes << attribute if optional
         attr_accessor(attribute)
+
         add_multitype_collection_setter_method(attribute, class_mappings)
       end
       ###########################################################################################
@@ -331,19 +338,19 @@ module SBF
       ###########################################################################################
       # Entity attr accessors are simpler to define/easier to read but they really just create a type mapping
       # for the given inputs and then function the same as the multitype attribute accessors do.
-      def self.entity_collection_attr_reader(attribute, full_class, partial_class = nil, optional = false)
+      def self.entity_collection_attr_reader(attribute, full_class, partial_class = nil, optional: false)
         mapping_for_single_class = [[ELSE, full_class, partial_class]]
-        multitype_collection_attr_reader(attribute, mapping_for_single_class, optional)
+        multitype_collection_attr_reader(attribute, mapping_for_single_class, optional: optional)
       end
 
-      def self.entity_collection_attr_writer(attribute, full_class, partial_class = nil, optional = false)
+      def self.entity_collection_attr_writer(attribute, full_class, partial_class = nil, optional: false)
         mapping_for_single_class = [[ELSE, full_class, partial_class]]
-        multitype_collection_attr_writer(attribute, mapping_for_single_class, optional)
+        multitype_collection_attr_writer(attribute, mapping_for_single_class, optional: optional)
       end
 
-      def self.entity_collection_attr_accessor(attribute, full_class, partial_class = nil, optional = false)
+      def self.entity_collection_attr_accessor(attribute, full_class, partial_class = nil, optional: false)
         mapping_for_single_class = [[ELSE, full_class, partial_class]]
-        multitype_collection_attr_accessor(attribute, mapping_for_single_class, optional)
+        multitype_collection_attr_accessor(attribute, mapping_for_single_class, optional: optional)
       end
       ###########################################################################################
 
@@ -363,18 +370,18 @@ module SBF
         @collection_attributes ||= Set.new
       end
 
-      def self.add_boolean_methods(vars, setter = false)
+      def self.add_boolean_methods(vars, setter: false)
         vars.each do |attribute|
           split_attribute = attribute.to_s.split('is_')
           next if split_attribute.length <= 1
 
           define_method(:"#{split_attribute.last}?") { send(attribute) }
-          define_changing_attr_methods(attribute, true) if setter
+          define_changing_attr_methods(attribute, is_boolean: true) if setter
         end
       end
       private_class_method :add_boolean_methods
 
-      def self.define_changing_attr_methods(attribute, is_boolean = false, define_reader = false)
+      def self.define_changing_attr_methods(attribute, is_boolean: false, define_reader: false)
         if define_reader
           define_method(:"#{attribute}") do
             instance_variable_get("@#{attribute}".to_sym)
@@ -503,12 +510,12 @@ module SBF
         value = value.to_hash if !value.is_a?(Hash) && value.respond_to?(:to_hash)
 
         # Convert to an instance of the appropriate entity class.
-        entity_class.new(value)
+        entity_class.new(value, clear_changes: false)
       end
       private :convert_value
 
       # Base entity setter. Allows for the property to be an array of types.
-      def self.add_multitype_setter_method(attribute, class_mappings, private_method = false)
+      def self.add_multitype_setter_method(attribute, class_mappings, private_method: false)
         add_class_selector_method(attribute, class_mappings)
 
         method_name = :"#{attribute}="
@@ -523,7 +530,7 @@ module SBF
       private_class_method :add_multitype_setter_method
 
       # Base collection setter. Allows for the collection to be an array types of types.
-      def self.add_multitype_collection_setter_method(attribute, class_mappings, private_method = false)
+      def self.add_multitype_collection_setter_method(attribute, class_mappings, private_method: false)
         add_class_selector_method(attribute, class_mappings)
 
         define_method(:"#{attribute}=") do |values|
@@ -583,6 +590,7 @@ module SBF
       end
 
       def self.inherited(base)
+        super
         # Add all of our attributes to the class that is inheriting us.
         base.defined_attributes.merge(defined_attributes) unless defined_attributes.empty?
         base.optional_attributes.merge(optional_attributes) unless optional_attributes.empty?

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

@@ -4,10 +4,10 @@ module SBF
   module Client
     class EntityCollection < Array
       include EntityResponseConcern
-      attr_reader :total_count
-      attr_reader :errors
+      attr_reader :total_count, :errors
 
       def initialize(entities = [], total_count = 0, errors = nil)
+        super()
         concat(entities)
         @total_count = total_count
         @errors = errors || SBF::Client::Entity::Errors.new(self)

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

@@ -8,8 +8,7 @@ module SBF
         BUSINESS = 'business'.freeze
       end
 
-      attr_accessor :type
-      attr_accessor :email_address
+      attr_accessor :type, :email_address
     end
   end
 end

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

@@ -3,8 +3,7 @@ require 'stbaldricks/entities/lib/base'
 module SBF
   module Client
     class FundraisingPage < SBF::Client::BaseEntity
-      attr_accessor :is_enabled
-      attr_accessor :custom_url_segment
+      attr_accessor :is_enabled, :custom_url_segment
       attr_reader :url
 
       HTTP_REGEX = %r{^https?://}.freeze

data/lib/stbaldricks/entities/lib/location.rb

@@ -5,6 +5,7 @@ module SBF
   module Client
     class Location < SBF::Client::BaseEntity
       attr_accessor :name
+
       entity_attr_accessor :address, 'SBF::Client::Address'
     end
   end

data/lib/stbaldricks/entities/lib/milestone.rb

@@ -4,9 +4,7 @@ module SBF
   module Client
     class Milestone < SBF::Client::BaseEntity
       attr_reader :id
-      attr_accessor :amount
-      attr_accessor :description
-      attr_accessor :icon
+      attr_accessor :amount, :description, :icon
     end
   end
 end

data/lib/stbaldricks/entities/lib/name.rb

@@ -5,8 +5,8 @@ module SBF
     class NamePiecesBase < SBF::Client::BaseEntity
       def combined_name
         name = ''
-        name += @first_name + ' ' unless @first_name.nil?
-        name += @middle_initial + '. ' unless @middle_initial.nil?
+        name += "#{@first_name} " unless @first_name.nil?
+        name += "#{@middle_initial}. " unless @middle_initial.nil?
         name += @last_name unless @last_name.nil?
         name.strip
       end

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

@@ -13,7 +13,7 @@ module SBF
           end
         end
 
-        super
+        super(attributes, clear_changes: false)
       end
 
       # rubocop:disable Style/MissingRespondToMissing

data/lib/stbaldricks/entities/lib/permissions.rb

@@ -5,8 +5,7 @@ require 'set'
 module SBF
   module Client
     class Permissions < SBF::Client::BaseEntity
-      attr_accessor :is_owner
-      attr_accessor :permission_ids
+      attr_accessor :is_owner, :permission_ids
 
       # rubocop:disable Style/MissingRespondToMissing
       def method_missing(method, *arguments, &block)
@@ -28,8 +27,7 @@ module SBF
     end
 
     class PermissionsAtEvent < SBF::Client::BaseEntity
-      attr_accessor :granted
-      attr_accessor :inherited_from_roles
+      attr_accessor :granted, :inherited_from_roles
     end
   end
 end

data/lib/stbaldricks/entities/lib/phone.rb

@@ -9,12 +9,11 @@ module SBF
         MOBILE = 'mobile'.freeze
       end
 
-      attr_accessor :type
-      attr_accessor :number, :extension
+      attr_accessor :type, :number, :extension
 
       # (402)555-5555 --> tel:4025555555
       def format_href
-        return 'tel:' + number.gsub(/\D/, '') unless number.nil?
+        return "tel:#{number.gsub(/\D/, '')}" unless number.nil?
 
         number
       end

data/lib/stbaldricks/entities/lib/third_party_media.rb

@@ -14,11 +14,7 @@ module SBF
         TWITCH = 'twitch'.freeze
       end
 
-      attr_accessor :id
-      attr_accessor :type
-      attr_accessor :identifier
-      attr_accessor :title
-      attr_accessor :caption
+      attr_accessor :id, :type, :identifier, :title, :caption
     end
   end
 end

data/lib/stbaldricks/entities/lib/top_level.rb

@@ -45,7 +45,7 @@ module SBF
           define_method(name) do |*args|
             result = endpoint.send(name, self, *args)
             result unless result.is_a?(SBF::Client::TopLevelEntity)
-            %i(save create).include?(name) && result.errors? ? false : result
+            (%i(save create).include?(name) && result.errors?) ? false : result
           end
         end
 

data/lib/stbaldricks/entities/matching_gift_company.rb

@@ -12,71 +12,48 @@ module SBF
         disallow_instantiation
 
         class Contact < SBF::Client::BaseEntity
-          attr_reader :title
-          attr_reader :name
+          attr_reader :title, :name, :websites
+
           entity_attr_reader :name_pieces, 'SBF::Client::NamePieces'
           entity_attr_reader :address, 'SBF::Client::Address'
           entity_attr_reader :phone, 'SBF::Client::Phone'
           entity_attr_reader :email, 'SBF::Client::EmailAddress'
-          attr_reader :websites
         end
 
         class GiftRatio < SBF::Client::BaseEntity
-          attr_reader :match_ratio
-          attr_reader :minimum_matched
-          attr_reader :maximum_matched
-          attr_reader :total_matched_per_employee
-          attr_reader :fiscal_year
-          attr_reader :deadline
+          attr_reader :match_ratio, :minimum_matched, :maximum_matched, :total_matched_per_employee, :fiscal_year, :deadline
         end
 
         class EmployeeEligibility < SBF::Client::BaseEntity
-          attr_reader :full_time
-          attr_reader :part_time
-          attr_reader :retired
-          attr_reader :spouse
-          attr_reader :board
+          attr_reader :full_time, :part_time, :retired, :spouse, :board
         end
 
         class Procedures < SBF::Client::BaseEntity
-          attr_reader :officer_certification
-          attr_reader :fax
-          attr_reader :website
-          attr_reader :phone
-          attr_reader :presenting_evidence
-          attr_reader :sending_check
-          attr_reader :sending_letter
+          attr_reader :officer_certification, :fax, :website, :phone, :presenting_evidence, :sending_check, :sending_letter
         end
 
         class Requirements < SBF::Client::BaseEntity
-          attr_reader :gift_receipt
-          attr_reader :ack_letter
+          attr_reader :gift_receipt, :ack_letter
         end
 
         class Restrictions < SBF::Client::BaseEntity
-          attr_reader :follow_donor_designation
-          attr_reader :match_unrestricted
+          attr_reader :follow_donor_designation, :match_unrestricted
         end
       end
 
       class PartialCompany < Company
-        attr_reader :name
-        attr_reader :id
+        attr_reader :name, :id
       end
 
       class FullCompany < Company
-        attr_reader :id
-        attr_reader :name
-        attr_reader :matching_gift_forms
-        attr_reader :special_comments
-        attr_reader :last_updated
-
-        entity_attr_reader :contact_info, 'SBF::Client::MatchingGift::Company::Contact', nil, true
-        entity_attr_reader :match_info, 'SBF::Client::MatchingGift::Company::GiftRatio', nil, true
-        entity_attr_reader :employee_eligibility, 'SBF::Client::MatchingGift::Company::EmployeeEligibility', nil, true
-        entity_attr_reader :procedures, 'SBF::Client::MatchingGift::Company::Procedures', nil, true
-        entity_attr_reader :requirements, 'SBF::Client::MatchingGift::Company::Requirements', nil, true
-        entity_attr_reader :restrictions, 'SBF::Client::MatchingGift::Company::Restrictions', nil, true
+        attr_reader :id, :name, :matching_gift_forms, :special_comments, :last_updated
+
+        entity_attr_reader :contact_info, 'SBF::Client::MatchingGift::Company::Contact', nil, optional: true
+        entity_attr_reader :match_info, 'SBF::Client::MatchingGift::Company::GiftRatio', nil, optional: true
+        entity_attr_reader :employee_eligibility, 'SBF::Client::MatchingGift::Company::EmployeeEligibility', nil, optional: true
+        entity_attr_reader :procedures, 'SBF::Client::MatchingGift::Company::Procedures', nil, optional: true
+        entity_attr_reader :requirements, 'SBF::Client::MatchingGift::Company::Requirements', nil, optional: true
+        entity_attr_reader :restrictions, 'SBF::Client::MatchingGift::Company::Restrictions', nil, optional: true
       end
     end
   end

data/lib/stbaldricks/entities/memorial.rb

@@ -21,14 +21,11 @@ module SBF
       end
 
       class Tribute < SBF::Client::BaseEntity
-        attr_accessor :birthday
-        attr_accessor :date_of_passing
-        attr_accessor :name
+        attr_accessor :birthday, :date_of_passing, :name
       end
 
       class Totals < SBF::Client::BaseEntity
-        attr_reader :amount_raised
-        attr_reader :donations
+        attr_reader :amount_raised, :donations
       end
 
       class Photos < SBF::Client::BaseEntity
@@ -41,20 +38,18 @@ module SBF
     end
 
     class FullMemorial < Memorial
-      attr_accessor :id
-      attr_accessor :status
-      attr_accessor :website_message
-      attr_reader :display_name
+      attr_accessor :id, :status, :website_message, :expires_at, :offline_donation_uuid, :offline_donation_form
+      attr_reader :display_name, :created_at, :modified_at
+
       entity_attr_accessor :address, 'SBF::Client::Address'
       entity_attr_accessor :tribute, 'SBF::Client::Memorial::Tribute'
       entity_attr_reader :totals, 'SBF::Client::Memorial::Totals'
       entity_collection_attr_accessor :donations, 'SBF::Client::FullDonation', 'SBF::Client::PartialDonation'
-      attr_reader :created_at, :modified_at
-      attr_accessor :expires_at
+
       entity_attr_accessor :photos, 'SBF::Client::Memorial::Photos'
-      entity_attr_accessor :third_party_media, 'SBF::Client::ThirdPartyMedia', nil, true
-      attr_accessor :offline_donation_uuid, :offline_donation_form
-      entity_attr_accessor :fundraising_page, 'SBF::Client::FundraisingPage', nil, true
+      entity_attr_accessor :third_party_media, 'SBF::Client::ThirdPartyMedia', nil, optional: true
+
+      entity_attr_accessor :fundraising_page, 'SBF::Client::FundraisingPage', nil, optional: true
 
       def active?
         status == SBF::Client::Memorial::Status::ACTIVE

data/lib/stbaldricks/entities/message.rb

@@ -32,30 +32,19 @@ module SBF
           DELETED = 'deleted'.freeze
         end
 
-        attr_accessor :id
-        attr_accessor :status
+        attr_accessor :id, :status, :message_id, :display_name, :email
 
-        attr_accessor :message_id
         entity_attr_reader :person, 'SBF::Client::FullPerson', 'SBF::Client::PartialPerson'
-        attr_accessor :display_name
-        attr_accessor :email
 
         attr_reader :modified_at
       end
 
-      attr_accessor :id
-      attr_accessor :type
-      attr_accessor :status
+      attr_accessor :id, :type, :status, :subject, :body
 
       entity_collection_attr_accessor :to, 'SBF::Client::Message::Recipient'
-      attr_reader :from_ip
-      entity_attr_reader :from_person, 'SBF::Client::FullPerson', 'SBF::Client::PartialPerson'
-      attr_reader :from_email
-      attr_reader :display_name
-      attr_accessor :subject
-      attr_accessor :body
+      attr_reader :from_ip, :from_email, :display_name, :created_at, :modified_at, :sent_at
 
-      attr_reader :created_at, :modified_at, :sent_at
+      entity_attr_reader :from_person, 'SBF::Client::FullPerson', 'SBF::Client::PartialPerson'
     end
   end
 end

data/lib/stbaldricks/entities/organization.rb

@@ -67,8 +67,7 @@ module SBF
       end
 
       class Totals < SBF::Client::BaseEntity
-        attr_reader :amount_raised
-        attr_reader :donations
+        attr_reader :amount_raised, :donations
       end
     end
 
@@ -79,28 +78,23 @@ module SBF
     class FullOrganization < SBF::Client::Organization
       class ContactName < SBF::Client::BaseEntity
         attr_reader :name
+
         entity_attr_accessor :name_pieces, 'SBF::Client::NamePieces'
       end
 
-      attr_accessor :id
-      attr_accessor :salesforce_id
-      attr_accessor :salesforce_account_id
-      attr_accessor :type
-      attr_accessor :status
-      attr_reader :display_name
-      attr_accessor :display_name_override
-      attr_accessor :name
+      attr_accessor :id, :salesforce_id, :salesforce_account_id, :type, :status, :display_name_override, :name,
+                    :selected_shipping_method, :modified_by, :how_created
+      attr_reader :display_name, :created_at, :modified_at
+
       entity_attr_accessor :contact, 'SBF::Client::FullOrganization::ContactName'
       entity_attr_accessor :addresses, 'SBF::Client::Organization::Addresses'
       entity_attr_accessor :phone_numbers, 'SBF::Client::Organization::PhoneNumbers'
       entity_attr_accessor :email_addresses, 'SBF::Client::Organization::EmailAddresses'
-      entity_attr_accessor :opt_out_settings, 'SBF::Client::OptOutSettings', nil, true
-      attr_accessor :selected_shipping_method
-      entity_attr_accessor :alternate_shipping_address, 'SBF::Client::AlternateShippingAddress', nil, true
-      attr_reader :created_at, :modified_at
-      attr_accessor :modified_by
-      attr_accessor :how_created
-      entity_attr_reader :totals, 'SBF::Client::Organization::Totals', nil, true
+      entity_attr_accessor :opt_out_settings, 'SBF::Client::OptOutSettings', nil, optional: true
+
+      entity_attr_accessor :alternate_shipping_address, 'SBF::Client::AlternateShippingAddress', nil, optional: true
+
+      entity_attr_reader :totals, 'SBF::Client::Organization::Totals', nil, optional: true
 
       def active?
         status == SBF::Client::Organization::Status::ACTIVE