stbaldricks 10.8.3 → 10.10.1.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de610d3d12ccd16a6a3080162c6106654e99ad7218b44c4b4f82c7fda773da65
-  data.tar.gz: ec7a326612153aa6665e7eace72035421f05d76705e3dfeffaba18ef602167bb
+  metadata.gz: 68139f1ffca2ac1e00f1c8ddb011a76116c53e3d0f535c69da379ad8c527785e
+  data.tar.gz: 8547d7ca5073a2f31f9af099e1bccd10231b9517935261fea8d3d1fde5b37bf2
 SHA512:
-  metadata.gz: 317d353fe5ab69f6eedbc36b3917ab850f603ad861a3a32cacb2a6981cc95388a8c3d5ca23f9ed53c1113431b34185412b3c7484b62fe225dd3a24fdf850dfb4
-  data.tar.gz: 79909f1beb3a55bda5950c05ac644ccf5a8b6e165db29c2bdc78b20dffe8b04ca93a21ca3a8ee0d972334baca1ef662d51bcf108c63ef3fc321cb953d0807e4a
+  metadata.gz: 3facdf398a27a0855c36d58f8490c88005449c10787a10d978c62e63f56a6e53ca454d898f24eb3a1337225914a124997384e59d647270fa9d7e9e8f9a6848e3
+  data.tar.gz: 5b99536bcb45d7eb1663c0a63caa468c2b8396457af2d856bf3bdd04b5eaecc630a02984b7666ef69d01abf9f2cce2bd0975f5fb391a04c8f02a7614dfaf1ebb

data/lib/stbaldricks/endpoints/lib/entity.rb

@@ -199,13 +199,19 @@ module SBF
       private :sanitize_entity
 
       def reconstitute_with(entity)
-        return {} if entity.nil?
+        return {} unless entity.class.respond_to?(:optional_attributes)
 
         {}.tap do |hsh|
           entity.class.optional_attributes.each do |attribute|
             next if entity.not_provided_attributes.include?(attribute)
 
             attribute_value = entity.send(attribute)
+
+            if attribute_value.is_a?(Array)
+              hsh[attribute] = attribute_value.inject({}) { |h, it| h.merge(reconstitute_with(it)) }
+              next
+            end
+
             next if attribute_value.class.demodulize.start_with?('Partial')
             next unless attribute_value.is_a? SBF::Client::BaseEntity
 

data/lib/stbaldricks/entities/event.rb

@@ -130,6 +130,7 @@ module SBF
             OTHER = 'other'.freeze
             LEGACY = 'legacy'.freeze
             VIRTUAL = 'virtual'.freeze
+            HYBRID = 'hybrid'.freeze
           end
 
           attr_accessor :type
@@ -198,6 +199,11 @@ module SBF
         status == SBF::Client::Event::Status::ACTIVE
       end
 
+      def venue_virtual?
+        [SBF::Client::Event::Venue::Location::Type::VIRTUAL,
+         SBF::Client::Event::Venue::Location::Type::HYBRID].include? venue.location.type
+      end
+
       def virtual?
         (id == 1) && (sub_type == SBF::Client::Event::SubType::VIRTUAL)
       end

data/lib/stbaldricks/entities/fundraiser.rb

@@ -109,32 +109,38 @@ module SBF
       def_delegator :@photos, :avatar, :avatar_photo_url
 
       attr_accessor :id
-      attr_accessor :status
-      attr_accessor :title
+
+      attr_reader :created_at, :modified_at
+      attr_reader :display_name
+
       attr_accessor :category
       attr_accessor :display_name_override
-      attr_reader :display_name
-      entity_attr_accessor :owner, 'SBF::Client::FullPerson', 'SBF::Client::PartialPerson'
+      attr_accessor :facebook_fundraiser_id
+      attr_accessor :fund_relationship_type
+      attr_accessor :fundraising_goal, :fundraising_message
+      attr_accessor :how_created
+      attr_accessor :modified_by
+      attr_accessor :offline_donation_uuid, :offline_donation_form
       attr_accessor :start_date, :end_date
       attr_accessor :start_time, :end_time
-      attr_accessor :offline_donation_uuid, :offline_donation_form
-      attr_accessor :fundraising_goal, :fundraising_message
-      entity_attr_accessor :fundraising_page, 'SBF::Client::FundraisingPage', nil, true
+      attr_accessor :status
+      attr_accessor :title
+
+      entity_attr_reader :permissions, 'SBF::Client::Permissions', nil, true
+      entity_attr_reader :rankings, 'SBF::Client::Fundraiser::Rankings', nil, true
+      entity_attr_reader :totals, 'SBF::Client::Fundraiser::Totals'
+
       entity_attr_accessor :event, 'SBF::Client::Fundraiser::FullEvent', 'SBF::Client::Fundraiser::PartialEvent', true
-      entity_attr_accessor :team, 'SBF::Client::FullTeam', 'SBF::Client::PartialTeam', true
-      attr_accessor :facebook_fundraiser_id
       entity_attr_accessor :fund, 'SBF::Client::FullFund', 'SBF::Client::PartialFund', true
-      attr_accessor :fund_relationship_type
-      entity_attr_accessor :venue, 'SBF::Client::Venue'
+      entity_attr_accessor :fundraising_page, 'SBF::Client::FundraisingPage', nil, true
+      entity_attr_accessor :owner, 'SBF::Client::FullPerson', 'SBF::Client::PartialPerson'
       entity_attr_accessor :photos, 'SBF::Client::Fundraiser::Photos'
       entity_attr_accessor :policies, 'SBF::Client::Fundraiser::Policies'
-      entity_attr_reader :rankings, 'SBF::Client::Fundraiser::Rankings', nil, true
-      entity_attr_reader :totals, 'SBF::Client::Fundraiser::Totals'
-      attr_reader :created_at, :modified_at
-      attr_accessor :modified_by
-      attr_accessor :how_created
-      entity_attr_reader :permissions, 'SBF::Client::Permissions', nil, true
+      entity_attr_accessor :team, 'SBF::Client::FullTeam', 'SBF::Client::PartialTeam', true
       entity_attr_accessor :third_party_media, 'SBF::Client::ThirdPartyMedia', nil, true
+      entity_attr_accessor :venue, 'SBF::Client::Venue'
+
+      entity_collection_attr_accessor :milestones, 'SBF::Client::Milestone', nil, true
 
       def active?
         status == SBF::Client::Fundraiser::Status::ACTIVE

data/lib/stbaldricks/entities/kid_institution.rb

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

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

@@ -0,0 +1,12 @@
+require 'stbaldricks/entities/lib/base'
+
+module SBF
+  module Client
+    class Milestone < SBF::Client::BaseEntity
+      attr_reader :id
+      attr_accessor :amount
+      attr_accessor :description
+      attr_accessor :icon
+    end
+  end
+end

data/lib/stbaldricks/entities/participant.rb

@@ -207,33 +207,39 @@ module SBF
       def_delegator :@photos, :avatar, :avatar_photo_url
 
       attr_accessor :id
-      attr_accessor :status
-      attr_accessor :display_name_override
+
+      attr_reader :created_at, :modified_at
       attr_reader :display_name
-      entity_attr_accessor :person, 'SBF::Client::FullPerson'
-      entity_attr_accessor :event, 'SBF::Client::FullEvent', 'SBF::Client::PartialEvent', true
-      entity_attr_accessor :team, 'SBF::Client::FullTeam', 'SBF::Client::PartialTeam', true
+
+      attr_accessor :display_name_override
       attr_accessor :facebook_fundraiser_id
-      entity_attr_accessor :fund, 'SBF::Client::FullFund', 'SBF::Client::PartialFund', true
       attr_accessor :fund_relationship_type
-      attr_accessor :shirt_size
-      attr_accessor :offline_donation_uuid, :offline_donation_form
       attr_accessor :fundraising_goal, :fundraising_message
-      entity_attr_accessor :fundraising_page, 'SBF::Client::FundraisingPage', nil, true
-      entity_attr_reader :photos, 'SBF::Client::Participant::Photos'
-      entity_attr_accessor :policies, 'SBF::Client::Participant::Policies'
+      attr_accessor :how_created
       attr_accessor :is_virtual
-      entity_attr_accessor :shave_schedule, 'SBF::Client::Participant::ShaveSchedule'
-      entity_attr_accessor :roles, 'SBF::Client::Participant::Roles', nil, true
-      entity_attr_reader :rankings, 'SBF::Client::Participant::Rankings', nil, true
-      entity_attr_reader :totals, 'SBF::Client::Participant::Totals'
-      attr_reader :created_at, :modified_at
       attr_accessor :modified_by
-      attr_accessor :how_created
+      attr_accessor :offline_donation_uuid, :offline_donation_form
+      attr_accessor :shirt_size
+      attr_accessor :status
+
       entity_attr_reader :permissions, 'SBF::Client::Permissions', nil, true
       entity_attr_reader :permissions_at_event, 'SBF::Client::PermissionsAtEvent', nil, true
+      entity_attr_reader :photos, 'SBF::Client::Participant::Photos'
+      entity_attr_reader :rankings, 'SBF::Client::Participant::Rankings', nil, true
+      entity_attr_reader :totals, 'SBF::Client::Participant::Totals'
+
+      entity_attr_accessor :event, 'SBF::Client::FullEvent', 'SBF::Client::PartialEvent', true
+      entity_attr_accessor :fund, 'SBF::Client::FullFund', 'SBF::Client::PartialFund', true
+      entity_attr_accessor :fundraising_page, 'SBF::Client::FundraisingPage', nil, true
+      entity_attr_accessor :person, 'SBF::Client::FullPerson'
+      entity_attr_accessor :policies, 'SBF::Client::Participant::Policies'
+      entity_attr_accessor :roles, 'SBF::Client::Participant::Roles', nil, true
+      entity_attr_accessor :shave_schedule, 'SBF::Client::Participant::ShaveSchedule'
+      entity_attr_accessor :team, 'SBF::Client::FullTeam', 'SBF::Client::PartialTeam', true
       entity_attr_accessor :third_party_media, 'SBF::Client::ThirdPartyMedia', nil, true
 
+      entity_collection_attr_accessor :milestones, 'SBF::Client::Milestone', nil, true
+
       def active?
         status == SBF::Client::Participant::Status::ACTIVE
       end

data/lib/stbaldricks/version.rb

@@ -1,5 +1,5 @@
 module SBF
   module Client
-    VERSION = '10.8.3'.freeze
+    VERSION = '10.10.1.alpha.1'.freeze
   end
 end

data/spec/factories/event.rb

@@ -2,9 +2,7 @@ require_relative 'lib/helpers'
 
 FactoryBot.define do
   factory :event, class: SBF::Client::FullEvent do
-    # TODO: Hack - including organizers in the save's with should not be necessary. We should always include any dirty data
-    # we send to the api in the with so that we know we have the latest data. Fix and remove the with
-    to_create { |it| raise "Failed to create #{it.class}: #{it.errors.details}" unless it.save(organizers: nil) }
+    to_create { |it| raise "Failed to create #{it.class}: #{it.errors.details}" unless it.save }
 
     initialize_with do
       new(attributes)

data/spec/factories/kid_institution.rb

@@ -4,8 +4,7 @@ FactoryBot.define do
   # This is the relationship object between the kid and system institutions
   factory :kid_institution, class: SBF::Client::KidInstitution do
     to_create do |it|
-      it.kid = FactoryBot.create(:kid) if it.kid.nil?
-      raise "Failed to create #{it.class}: #{it.errors.details}" unless it.save(kid: {}, institution: {})
+      raise "Failed to create #{it.class}: #{it.errors.details}" unless it.save
     end
 
     initialize_with do
@@ -15,5 +14,10 @@ FactoryBot.define do
     after :build do |kid_institution, evaluator|
       kid_institution.institution = build(:institution) if unpopulated?(evaluator, :institution)
     end
+
+    before :create do |kid_institution, evaluator|
+      kid_institution.institution = create(:institution) if unpopulated?(evaluator, :institution)
+      kid_institution.kid = create(:kid) if unpopulated?(evaluator, :kid)
+    end
   end
 end

data/spec/factories/milestone.rb

@@ -0,0 +1,15 @@
+require 'faker'
+
+FactoryBot.define do
+  factory :milestone, class: SBF::Client::Milestone do
+    skip_create
+
+    initialize_with do
+      new(attributes)
+    end
+
+    description { Faker::Games::Pokemon.move }
+    amount { rand(1..10_000) }
+    icon { rand(1..10) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stbaldricks
 version: !ruby/object:Gem::Version
-  version: 10.8.3
+  version: 10.10.1.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -391,6 +391,7 @@ files:
 - lib/stbaldricks/entities/lib/fundraising_page.rb
 - lib/stbaldricks/entities/lib/geo_location.rb
 - lib/stbaldricks/entities/lib/location.rb
+- lib/stbaldricks/entities/lib/milestone.rb
 - lib/stbaldricks/entities/lib/name.rb
 - lib/stbaldricks/entities/lib/not_implemented_object.rb
 - lib/stbaldricks/entities/lib/opt_out_settings.rb
@@ -493,6 +494,7 @@ files:
 - spec/factories/memorial/totals.rb
 - spec/factories/memorial/tribute.rb
 - spec/factories/message.rb
+- spec/factories/milestone.rb
 - spec/factories/name_pieces.rb
 - spec/factories/newsletter_recipient.rb
 - spec/factories/organization.rb
@@ -552,9 +554,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 
@@ -614,6 +616,7 @@ test_files:
 - spec/factories/kid/custom_institution.rb
 - spec/factories/person.rb
 - spec/factories/search_participant.rb
+- spec/factories/milestone.rb
 - spec/factories/fundraising_page.rb
 - spec/factories/photos.rb
 - spec/factories/team/totals.rb