stbaldricks 10.9.0.alpha.1 → 10.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa230bbfc318391cdc5bb83807cce11dce54fa0c6d00b499decc86b47aa4a509
-  data.tar.gz: 80aaedbab68985a75a123e51ed95049fe3ce0292bd6f7e9f229b744dfebc361d
+  metadata.gz: 443ed0baebb669698471fd40ec7402a3b6140413868949185c067c0caad94a23
+  data.tar.gz: 50d4ecb85a779af9cf6dc6e34cd736270b4aacd4a6fb8264a58b4ca1f5d9853b
 SHA512:
-  metadata.gz: d035919921ec2d0983954f6de090b62ff2dc2d7490d406f336a4eddb77833edb7474d216042473316c841d0a854165f56e79b95f31b213a378893074014dc7f2
-  data.tar.gz: a4d08e309ea086c025bfff0f1635ba94cdf4065970e2265e8d5cd8f2ceab436014740fc27ad21caa69c3c448cb55d513b7cde6de81f2877be80d418c2358c2ce
+  metadata.gz: a0586f77cc00f363aa189bf7354a2251a368df531f52ce7d12b04e10fe8f15c6fbde09ad45139673352de47919f4127000b0cccf8a0195cf3c1eafd98131f59b
+  data.tar.gz: da502b8739690bd0b2c2fde38d074a6bc74d29dbcbe314122817d0ed7b1a3e11440a586a24195ccdb97cda56e79b77870054bf1a86bc2a36fff6b00854795101

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
@@ -199,7 +200,8 @@ module SBF
       end
 
       def venue_virtual?
-        venue.location.type == SBF::Client::Event::Venue::Location::Type::VIRTUAL
+        [SBF::Client::Event::Venue::Location::Type::VIRTUAL,
+         SBF::Client::Event::Venue::Location::Type::HYBRID].include? venue.location.type
       end
 
       def virtual?

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.9.0.alpha.1'.freeze
+    VERSION = '10.10.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.9.0.alpha.1
+  version: 10.10.1
 platform: ruby
 authors:
 - Firespring
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-03-22 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: 1.3.1
+      version: '0'
 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