stbaldricks 4.6.1.alpha.2 → 4.6.1.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 729dd2886644b077da55b584e8df252b0f87a2ee015f009a9821c8aba34fce29
-  data.tar.gz: 758177a82556aca324dc57308e524f2be344d89ffa88180924e81ed61d545ecd
+  metadata.gz: b7ccd3a68b118457b042e75fd6d5c526399a6e0f35e9fcfd6cac082d95ed3063
+  data.tar.gz: 87d3031eb1d377ab100cccb502b0fc3dd2b29642d82589bc8b0fd12a46862c1d
 SHA512:
-  metadata.gz: d78a667f4f08186b97a1e3f4025be5ac8658c7e241366478e0f1894bff871dfc2c41fb8283462a023ddc86831dbdb92b3c70f0da88b956890874043e08c6b4b5
-  data.tar.gz: 64b682e791d38752e6d812820feeadff6155653930300a91156236f1cca123732b334757bd5531575dd9d6f887c62a86ca773a3b6c3d1367aac561f8f2176e6a
+  metadata.gz: 13cb348aa8bc10d14ca5bce929672d55f3ba5dcc25da7731d4141e6ce2f5672e625005c7172796071c095b084413cfa25112b1443c6adf70af3afe1799db2b7e
+  data.tar.gz: 023b058a3fdab154c491ad6a120ec7866ff04351b7205ccf6b3226e8264a950154af149ad959f5cb4913f06d552ba08c7bf40ff1b11aa9c26f2083f244b7445e

data/lib/stbaldricks/endpoints/fundraiser.rb

@@ -0,0 +1,36 @@
+require 'stbaldricks/endpoints/lib/entity'
+
+module SBF
+  module Client
+    class FundraiserEndpoint < EntityEndpoint
+      def join_team(fundraiser_id, new_team_id)
+        response = SBF::Client::Api::Request.post_request("#{base_uri}/move_to_different_team", id: fundraiser_id, new_team_id: new_team_id)
+
+        if ok?(response)
+          data = SBF::Client::FullFundraiser.new(JSON.parse(response.body).symbolize!)
+        else
+          error = SBF::Client::ErrorEntity.new(JSON.parse(response.body).symbolize!)
+        end
+
+        SBF::Client::Api::Response.new(http_code: response.code, data: data, error: error)
+      end
+
+      def leave_team(fundraiser_id)
+        join_team(fundraiser_id, 0)
+      end
+
+      def join_event(fundraiser_id, new_event_id)
+        response = SBF::Client::Api::Request.post_request("#{base_uri}/move_to_different_event",
+                                                          id: fundraiser_id, new_event_id: new_event_id)
+
+        error = SBF::Client::ErrorEntity.new(JSON.parse(response.body).symbolize!) unless ok?(response)
+
+        SBF::Client::Api::Response.new(http_code: response.code, data: nil, error: error)
+      end
+
+      def leave_event(fundraiser_id)
+        join_event(fundraiser_id, 0)
+      end
+    end
+  end
+end

data/lib/stbaldricks/endpoints/kid.rb

@@ -1,4 +1,5 @@
 require 'stbaldricks/endpoints/lib/entity'
+require 'stbaldricks/entities/lib/collection'
 
 module SBF
   module Client
@@ -12,12 +13,15 @@ module SBF
 
         if ok?(response)
           parsed_response_body[:results].map! { |entity_data| target_class.new(entity_data) }
-          data = parsed_response_body
+          SBF::Client::EntityCollection.new(parsed_response_body[:results], parsed_response_body[:total_count])
         else
+          parsed_response_body = JSON.parse(response.body).symbolize!
           error = SBF::Client::ErrorEntity.new(parsed_response_body)
+          collection = SBF::Client::EntityCollection.new
+          collection.add_errors(error)
+          collection.errors_http_code = response.code
+          collection
         end
-
-        SBF::Client::Api::Response.new(http_code: response.code, data: data, error: error)
       end
     end
   end

data/lib/stbaldricks/endpoints/kid_institution.rb

@@ -0,0 +1,17 @@
+require 'stbaldricks/endpoints/lib/entity'
+
+module SBF
+  module Client
+    class KidInstitutionEndpoint < EntityEndpoint
+      def delete(params)
+        response = SBF::Client::Api::Request.post_request("#{base_uri}/delete", params)
+
+        unless ok?(response)
+          error = SBF::Client::ErrorEntity.new(JSON.parse(response.body).symbolize!)
+        end
+
+        SBF::Client::Api::Response.new(http_code: response.code, data: nil, error: error)
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 require 'stbaldricks/version'
 require 'stbaldricks/api'
+require 'stbaldricks/entities/lib/collection'
 require 'stbaldricks/entities/lib/error'
 require 'stbaldricks/entities/response'
 require 'stbaldricks/patches/hash'
@@ -20,7 +21,7 @@ module SBF
       def save(entity_or_hash, with = {})
         if entity_or_hash.is_a?(SBF::Client::BaseEntity)
           return create(entity_or_hash, with) if entity_or_hash.id.nil?
-          return update(entity_or_hash.id, entity_or_hash.dirty_data, with)
+          return update(entity_or_hash.id, entity_or_hash, with)
         else
           return create(entity_or_hash, with) if entity_or_hash[:id].nil?
           return update(entity_or_hash[:id], entity_or_hash, with)
@@ -30,7 +31,8 @@ module SBF
       # Calls the create route for the entity. Uses the class name to generate the uri
       # @param with [Hash] The optional entity fields to include in the response
       # @return entity [SBF::Client::BaseEntity]
-      def create(entity, with = {})
+      def create(entity_or_hash, with = {})
+        entity = entity_or_hash.is_a?(Hash) ? target_class.new(entity_or_hash) : entity_or_hash
         raise SBF::Client::Error, 'Invalid Entity' unless entity.is_a?(SBF::Client::BaseEntity)
 
         with = normalize_with(with, entity)
@@ -39,9 +41,7 @@ module SBF
 
         response = SBF::Client::Api::Request.post_request("#{base_uri}/create", create_data)
 
-        entity, error = hydrate_entity(response, create_data, entity)
-
-        SBF::Client::Api::Response.new(http_code: response.code, data: entity, error: error)
+        hydrated_entity(response, create_data, entity)
       end
 
       # Calls the update route for the entity. Uses the class name to generate the uri
@@ -50,7 +50,7 @@ module SBF
       def update(id = nil, entity_or_hash = nil, with = {})
         if entity_or_hash.is_a?(SBF::Client::BaseEntity)
           # If someone has passed in an entity, just convert it to a hash
-          data = entity_or_hash.to_hash
+          data = entity_or_hash.dirty_data
         elsif entity_or_hash.is_a?(Hash)
           # If someone has passed in a hash, make sure all of it's values match fields in the entity class
           data = sanitize(entity_or_hash)
@@ -64,9 +64,7 @@ module SBF
         uri = id ? "#{base_uri}/update/#{id}" : "#{base_uri}/update"
         response = SBF::Client::Api::Request.post_request(uri, data)
 
-        data, error = hydrate_entity(response, data, entity_or_hash)
-
-        SBF::Client::Api::Response.new(http_code: response.code, data: data, error: error)
+        hydrated_entity(response, data, entity_or_hash)
       end
 
       # Calls the get route for the entity. Uses the class name to generate the uri.
@@ -77,9 +75,15 @@ module SBF
 
         response = SBF::Client::Api::Request.get_request("#{base_uri}/get/#{id}", with: with)
 
-        data, error = hydrate_entity(response, {}, nil)
-
-        SBF::Client::Api::Response.new(http_code: response.code, data: data, error: error)
+        if ok?(response)
+          hydrated_entity(response, {}, nil)
+        elsif (response.code == 404)
+          nil
+        else
+          parsed_response_body = JSON.parse(response.body).symbolize!
+          error = SBF::Client::ErrorEntity.new(parsed_response_body)
+          SBF::Client::Api::Response.new(http_code: response.code, data: parsed_response_body[:data], error: error)
+        end
       end
 
       # Calls the find route for the entity.
@@ -92,20 +96,27 @@ module SBF
         parsed_response_body = JSON.parse(response.body).symbolize!
 
         if ok?(response)
-          parsed_response_body[:results].map! { |entity_data| target_class.new(entity_data) }
-          data = parsed_response_body
+          parsed_response_body[:results].map! { |entity_data| target_class.new(entity_data, true) }
+          SBF::Client::EntityCollection.new(parsed_response_body[:results], parsed_response_body[:total_count])
         else
+          parsed_response_body = JSON.parse(response.body).symbolize!
           error = SBF::Client::ErrorEntity.new(parsed_response_body)
+          SBF::Client::Api::Response.new(http_code: response.code, data: parsed_response_body[:data], error: error)
+          collection = SBF::Client::EntityCollection.new
+          collection.add_errors(error)
+          collection.errors_http_code = response.code
+          collection
         end
-
-        SBF::Client::Api::Response.new(http_code: response.code, data: data, error: error)
       end
 
       # Calls the find route for the entity.
       def find_first(filter = [], order = {}, with = {})
-        api_response = find(filter, order, 1, 0, with)
-        api_response.data = api_response.data[:results].first unless api_response.error?
-        api_response
+        response = find(filter, order, 1, 0, with)
+        if response.is_a?(SBF::Client::EntityCollection)
+          response.empty? ? nil : response.first
+        else
+          response
+        end
       end
 
       # Calls the aggregate route for the entity.
@@ -211,7 +222,7 @@ module SBF
       end
       private :normalize_with
 
-      def hydrate_entity(response, data, entity_or_hash)
+      def hydrated_entity(response, data, entity_or_hash)
         parsed_response_body = JSON.parse(response.body).symbolize!
 
         entity_or_hash.errors.clear if entity_or_hash.is_a?(SBF::Client::BaseEntity)
@@ -222,29 +233,28 @@ module SBF
 
           new_data = parsed_response_body
           new_data = data.merge(parsed_response_body) if data.is_a?(Hash)
-          data = target_class.new(new_data)
 
           if entity_or_hash.is_a?(SBF::Client::BaseEntity)
             entity_or_hash.send(:initialize_attributes, new_data)
-            data = entity_or_hash
+            entity = entity_or_hash
+          else
+            entity = target_class.new(new_data)
           end
 
           # Reload entity and its sub-entities so that no fields have a 'changed' state
-          data.reload_recursive
+          entity.reload_recursive
 
-          return [data, nil]
+          entity
         else
-          data = entity_or_hash if entity_or_hash.is_a?(SBF::Client::BaseEntity)
-          data = nil if data == {}
-          data = target_class.new(entity_or_hash) if entity_or_hash.is_a?(Hash)
-
-          error = SBF::Client::ErrorEntity.new(parsed_response_body)
-          data.add_errors(error) if data.is_a?(SBF::Client::BaseEntity)
+          error = SBF::Client::ApiErrorEntity.new(parsed_response_body.merge(http_code: response.code))
+          entity = entity_or_hash.is_a?(SBF::Client::BaseEntity) ? entity_or_hash : target_class.new(entity_or_hash)
+          entity.add_errors(error)
+          entity.errors_http_code = response.code
 
-          [data, error]
+          entity
         end
       end
-      private :hydrate_entity
+      private :hydrated_entity
     end
   end
 end

data/lib/stbaldricks/endpoints/photo.rb

@@ -3,7 +3,8 @@ require 'stbaldricks/endpoints/lib/entity'
 module SBF
   module Client
     class PhotoEndpoint < SBF::Client::EntityEndpoint
-      def create(entity, with = {})
+      def create(entity_or_hash, with = {})
+        entity = entity_or_hash.is_a?(Hash) ? target_class.new(entity_or_hash) : entity_or_hash
         raise SBF::Client::Error, 'Invalid Entity' unless entity.is_a?(SBF::Client::BaseEntity)
 
         with = normalize_with(with)
@@ -15,9 +16,7 @@ module SBF
 
         response = SBF::Client::Api::Request.file_post_request(path: "#{base_uri}/create", params: create_data, file: file, filename: filename)
 
-        entity, error = hydrate_entity(response, create_data, entity)
-
-        SBF::Client::Api::Response.new(http_code: response.code, data: entity, error: error)
+        hydrated_entity(response, create_data, entity)
       end
 
       def update(id = nil, entity_or_hash = nil, with = {})
@@ -44,9 +43,7 @@ module SBF
                      SBF::Client::Api::Request.post_request("#{base_uri}/update", data)
                    end
 
-        data, error = hydrate_entity(response, data, entity_or_hash)
-
-        SBF::Client::Api::Response.new(http_code: response.code, data: data, error: error)
+        hydrated_entity(response, data, entity_or_hash)
       end
 
       def upload(image_data_url, data = {}, with = {})
@@ -60,11 +57,7 @@ module SBF
           file.seek(0)
 
           photo = photo_for_upload(file, data)
-          if photo.id.nil?
-            create(photo, with)
-          else
-            update(photo.id, photo, with)
-          end
+          photo.id.nil? ? create(photo, with) : update(photo.id, photo, with)
         end
       end
 

data/lib/stbaldricks/endpoints/user.rb

@@ -36,7 +36,7 @@ module SBF
       def list_entities_user_has_permission(permission_id, event_years)
         raise SBF::Client::Error, 'User not logged in' if  SBF::Client::Configuration.user_token.nil?
 
-        event_years = [event_years] if event_years.is_a? Fixnum
+        event_years = [event_years] if event_years.is_a? Integer
 
         response = SBF::Client::Api::Request.post_request(
           "/#{SBF::Client::Api::VERSION}/security/list_entities_user_has_permission",

data/lib/stbaldricks/entities/campaign.rb

@@ -7,6 +7,7 @@ module SBF
     class Campaign < SBF::Client::TopLevelEntity
       action :get
       action :find
+      action :find_first
 
       disallow_instantiation
 

data/lib/stbaldricks/entities/concerns/entity_response_concern.rb

@@ -0,0 +1,66 @@
+require 'active_support/concern'
+require 'stbaldricks/entities/lib/error'
+
+module EntityResponseConcern
+  extend ActiveSupport::Concern
+
+  def add_errors(error)
+    errors.clear
+    unless error.fields.nil?
+      count = error.fields.length
+      error.fields.each do |field|
+        field = field.gsub('_id', '') # Hacky, since API returns DB field that errored instead of View Field
+        errors.add(field, error.details) if respond_to?(field.to_sym)
+        errors.add(:base, "#{field}: #{error.details}") unless respond_to?(field.to_sym)
+      end
+    end
+    errors.instance_variable_set(:@code, error.code)
+    errors.instance_variable_set(:@type, error.type)
+    errors.add(:base, "#{error.type}: #{error.details}") if count == 0
+  end
+
+  def errors_http_code=(http_code)
+    errors.instance_variable_set(:@http_code, http_code)
+  end
+
+  def error?
+    !success?
+  end
+
+  def success?
+    !errors?
+  end
+
+  def errors?
+    errors.count > 0
+  end
+
+  ############ Deprecated Methods ############
+
+  def http_code
+    log_deprecated('http_code', caller)
+    errors.http_code
+  end
+
+  def data
+    log_deprecated('data', caller)
+    self
+  end
+
+  private
+
+  def single_active_model_error
+    return if errors.empty?
+    return [:base, errors[:base].first] if errors[:base].any?
+    errors.first
+  end
+
+  def log_deprecated(method_name, method_caller = nil)
+    SBF::Client::Configuration.logger.warn do
+      caller_message = method_caller.nil? ? '' : " Called from #{method_caller.first}"
+
+      "[DEPRECATION] Use of the SBF::Client::Api::Response Interface (including the `#{method_name}` method) is deprecated"\
+          " for #{self.class}. Please update your code to use the #{self.class} interface accordingly. #{caller_message}"
+    end
+  end
+end

data/lib/stbaldricks/entities/concerns/event_year_concern.rb

@@ -1,3 +1,5 @@
+require 'active_support/concern'
+
 module EventYearConcern
   extend ActiveSupport::Concern
 

data/lib/stbaldricks/entities/concerns/fundraising_page_concern.rb

@@ -1,3 +1,5 @@
+require 'active_support/concern'
+
 module FundraisingPageConcern
   extend ActiveSupport::Concern
 

data/lib/stbaldricks/entities/concerns/model_type_concern.rb

@@ -1,3 +1,5 @@
+require 'active_support/concern'
+
 module ModelTypeConcern
   extend ActiveSupport::Concern
 

data/lib/stbaldricks/entities/concerns/type_concern.rb

@@ -1,3 +1,5 @@
+require 'active_support/concern'
+
 module TypeConcern
   extend ActiveSupport::Concern
 

data/lib/stbaldricks/entities/concerns/venue_concern.rb

@@ -1,3 +1,5 @@
+require 'active_support/concern'
+
 module VenueConcern
   extend ActiveSupport::Concern
 

data/lib/stbaldricks/entities/donation.rb

@@ -398,7 +398,6 @@ module SBF
           [->(v) { v[:type] == SBF::Client::Payment::Type::MONEY_ORDER }, 'SBF::Client::Payment::MoneyOrderDetails'],
           [->(v) { v[:type] == SBF::Client::Payment::Type::NONCE }, 'SBF::Client::Payment::NonceDetails'],
           [->(v) { v[:type] == SBF::Client::Payment::Type::WIRE_TRANSFER }, 'SBF::Client::Payment::WireTransferDetails'],
-          [->(v) { v[:type] == SBF::Client::Payment::Type::RECURRING_GIFTS }, 'SBF::Client::Payment::BraintreeSubscriptionDetails'],
           [->(v) { v[:type] == SBF::Client::Payment::Type::UNKNOWN }, 'SBF::Client::Payment::UnknownDetails'],
           [->(v) { v[:type] == SBF::Client::Payment::Type::PAYPAL }, 'SBF::Client::Payment::PaypalDetails']
         ]

data/lib/stbaldricks/entities/donation/payment_type.rb

@@ -10,7 +10,6 @@ module SBF
         CASH = 'cash'
         MONEY_ORDER = 'money_order'
         WIRE_TRANSFER = 'wire_transfer'
-        RECURRING_GIFTS = 'recurring'
         PAYPAL = 'paypal'
       end
     end

data/lib/stbaldricks/entities/event.rb

@@ -43,7 +43,7 @@ module SBF
       end
 
       class Photos < SBF::Client::BaseEntity
-        attr_reader :avatar, :default
+        attr_reader :avatar, :default, :icon
       end
 
       class Contacts < SBF::Client::BaseEntity
@@ -203,6 +203,12 @@ module SBF
       def open_for_fast_registration?
         is_open_for_fast_registration
       end
+
+      def past?
+        Date.today > Date.parse(date)
+      rescue
+        nil
+      end
     end
   end
 end

data/lib/stbaldricks/entities/event_application.rb

@@ -1,4 +1,3 @@
-require 'stbaldricks/endpoints/event_application'
 require 'stbaldricks/entities/fund'
 require 'stbaldricks/entities/campaign'
 require 'stbaldricks/entities/event'
@@ -14,7 +13,6 @@ require 'stbaldricks/entities/concerns/model_type_concern'
 module SBF
   module Client
     class EventApplication < SBF::Client::TopLevelEntity
-      endpoint SBF::Client::EventApplicationEndpoint
       actions DEFAULT_CRUD_ACTIONS
       blacklist_action :delete
 

data/lib/stbaldricks/entities/fundraiser.rb

@@ -1,4 +1,5 @@
 require 'stbaldricks/entities/lib/top_level'
+require 'stbaldricks/endpoints/fundraiser'
 require 'stbaldricks/entities/person'
 require 'stbaldricks/entities/fund'
 require 'stbaldricks/entities/event'
@@ -18,7 +19,12 @@ module SBF
       include EventYearConcern
       include FundraisingPageConcern
       include VenueConcern
+      endpoint SBF::Client::FundraiserEndpoint
       actions DEFAULT_CRUD_ACTIONS
+      action :join_team
+      action :leave_team
+      action :join_event
+      action :leave_event
 
       disallow_instantiation
 
@@ -55,7 +61,7 @@ module SBF
       end
 
       class Photos < SBF::Client::BaseEntity
-        attr_reader :avatar, :default
+        attr_reader :avatar, :default, :icon
       end
 
       class Policies < SBF::Client::BaseEntity
@@ -134,6 +140,17 @@ module SBF
       def active?
         status == SBF::Client::Fundraiser::Status::ACTIVE
       end
+
+      def past?
+        return Date.today > Date.parse(end_date) if end_date
+        Date.today > Date.parse(start_date) if start_date
+      rescue
+        nil
+      end
+
+      def event?
+        event && !event.id.nil?
+      end
     end
   end
 end

data/lib/stbaldricks/entities/grant.rb

@@ -62,7 +62,6 @@ module SBF
       attr_accessor :web_message
       attr_accessor :article_url
       attr_accessor :amount
-      attr_accessor :description
       entity_attr_accessor :researcher, 'SBF::Client::Grant::FullResearcher', 'SBF::Client::Grant::PartialResearcher', true
       entity_attr_accessor :institution, 'SBF::Client::Grant::FullInstitution', 'SBF::Client::Grant::PartialInstitution', true
       entity_attr_accessor :funding_type, 'SBF::Client::Grant::FullFundingType', 'SBF::Client::Grant::PartialFundingType', true

data/lib/stbaldricks/entities/kid.rb

@@ -91,8 +91,6 @@ module SBF
       attr_reader :avatar, :default
     end
 
-    class KidInstitution < SBF::Client::FullInstitution; end
-
     class Kid < SBF::Client::TopLevelEntity
       include Entities::DefaultCacheable
       endpoint SBF::Client::KidEndpoint
@@ -144,6 +142,8 @@ module SBF
         attr_accessor :is_submitter
         entity_attr_accessor :permissions, 'SBF::Client::Kid::Relationship::Permissions'
       end
+
+      class CustomInstitution < SBF::Client::FullInstitution; end
     end
 
     class PartialKid < SBF::Client::Kid
@@ -170,7 +170,8 @@ module SBF
       entity_attr_accessor :guardian, 'SBF::Client::Guardian'
       entity_collection_attr_accessor :relationships, 'SBF::Client::Kid::Relationship'
       entity_collection_attr_accessor :urls, 'SBF::Client::KidURL'
-      entity_collection_attr_reader :institutions, 'SBF::Client::KidInstitution'
+      entity_collection_attr_reader :custom_institutions, 'SBF::Client::Kid::CustomInstitution', nil, true
+      entity_attr_accessor :third_party_media, 'SBF::Client::ThirdPartyMedia', nil, true
 
       attr_accessor :created_at
       attr_accessor :modified_at

data/lib/stbaldricks/entities/kid_institution.rb

@@ -0,0 +1,19 @@
+require 'stbaldricks/endpoints/kid_institution'
+require 'stbaldricks/entities/kid'
+require 'stbaldricks/entities/institution'
+require 'stbaldricks/entities/lib/top_level'
+
+module SBF
+  module Client
+    class KidInstitution < SBF::Client::TopLevelEntity
+      endpoint SBF::Client::KidInstitutionEndpoint
+      actions DEFAULT_CRUD_ACTIONS
+      blacklist_action :get
+      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'
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ Dir["#{patch_dir}/*.rb"].each { |file| require file }
 
 require 'set'
 require 'stbaldricks/client'
-require 'stbaldricks/entities/lib/error'
+require 'stbaldricks/entities/concerns/entity_response_concern'
 require 'active_model'
 require 'securerandom'
 
@@ -16,6 +16,7 @@ module SBF
       extend ActiveModel::Naming
       extend ActiveModel::Translation
       include ActiveModel::Conversion
+      include EntityResponseConcern
 
       attr_reader :errors
 
@@ -28,14 +29,15 @@ module SBF
       @not_provided_attributes = nil
       @disallow_instantiation = nil
 
-      def initialize(data = {})
+      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 = ActiveModel::Errors.new(self)
+        @errors = SBF::Client::Entity::Errors.new(self)
         initialize_attributes(data)
+        reload_recursive if clear_changes
       end
 
       # Overridden from ActiveModel::Naming to remove namespace and Full/Partial
@@ -65,6 +67,10 @@ module SBF
         restore_attributes
       end
 
+      def destroyed?
+        @destroyed
+      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
@@ -83,11 +89,8 @@ module SBF
               data.merge!(attribute_symbol => attribute.dirty_data(true))
             end
           elsif attribute.is_a?(Array)
-            entities = attribute.all? { |e| e.is_a?(BaseEntity) } ? attribute : false
-            next unless entities
-            dirty_data_hashes = entities.map { |e| e.dirty_data(true) }.reject(&:empty?)
-            next if dirty_data_hashes.empty?
-            data.merge!(attribute_symbol => dirty_data_hashes)
+            next unless attribute.all? { |e| e.is_a?(BaseEntity) } && attribute.any? { |e| !e.dirty_data(true).empty? }
+            data.merge!(attribute_symbol => attribute)
           end
         end
 
@@ -112,28 +115,24 @@ module SBF
             send(setter, value)
 
           else
-            instance_variable_set("@#{key}".to_sym, value)
-
+            if respond_to?(key.to_sym)
+              instance_variable_set("@#{key}".to_sym, value)
+              attribute_will_change!(key.to_sym)
+            end
           end
         end
 
         # For each attribute that may be optional, call mark_attribute_not_provided
         # if the data set does not contain a key with the optional attribute's name
         self.class.optional_attributes.each { |name| mark_attribute_not_provided(name) unless data.key?(name) }
+        @attributes ||= Set.new
+        @optional_attributes ||= Set.new
+        @not_provided_attributes ||= Set.new
+        @entity_attributes ||= Set.new
+        @collection_attributes ||= Set.new
       end
       private :initialize_attributes
 
-      def add_errors(error)
-        errors.clear
-        count = error.fields.length
-        error.fields.each do |field|
-          field = field.gsub('_id', '') # Hacky, since API returns DB field that errored instead of View Field
-          errors.add(field, error.details) if count > 1
-          errors.add(:base, "#{field}: #{error.details}") if count == 1
-        end
-        errors.add(:base, "#{error.type}: #{error.details}") if count == 0
-      end
-
       def mark_attribute_not_provided(name)
         return if not_provided_attributes.include?(name)
 
@@ -584,6 +583,23 @@ module SBF
         base.optional_attributes.merge(optional_attributes) unless optional_attributes.empty?
         base.entity_attributes.merge(entity_attributes) unless entity_attributes.empty?
       end
+
+      ############ Deprecated Methods ############
+
+      # Attempt to return an ErrorEntity similar to or exactly like the original
+      def error
+        log_deprecated('error', caller)
+        return nil if single_active_model_error.nil?
+        details = single_active_model_error.find { |x| x.is_a?(String) } if single_active_model_error.is_a?(Array)
+        details ||= single_active_model_error.is_a?(String) ? single_active_model_error : nil
+        field = single_active_model_error.is_a?(Array) ? single_active_model_error.find { |x| x.is_a?(Symbol) && x != :base } : nil
+
+        fields = errors.keys.reject { |k| k == :base }.empty? ? nil : errors.keys.reject { |k| k == :base }.map(&:to_s)
+        details = details["#{errors.type}: ".length..(details.length - 1)] if details.start_with?("#{errors.type}: ")
+        details = details["#{field}: ".length..(details.length - 1)] if details.start_with?("#{field}: ")
+
+        SBF::Client::ErrorEntity.new(code: errors.code, type: errors.type, details: details, errors: fields)
+      end
     end
   end
 end

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

@@ -0,0 +1,38 @@
+require 'stbaldricks/entities/concerns/entity_response_concern'
+
+module SBF
+  module Client
+    class EntityCollection < Array
+      include EntityResponseConcern
+      attr_reader :total_count
+      attr_reader :errors
+
+      def initialize(entities = [], total_count = 0, errors = nil)
+        concat(entities)
+        @total_count = total_count
+        @errors = errors || SBF::Client::Entity::Errors.new(self)
+      end
+
+      ############ Deprecated Methods ############
+
+      # Attempt to return an ErrorEntity similar to or exactly like the original
+      def error
+        log_deprecated('error', caller)
+        return nil if single_active_model_error.nil?
+        details = single_active_model_error.find { |x| x.is_a?(String) } if single_active_model_error.is_a?(Array)
+        details ||= single_active_model_error.is_a?(String) ? single_active_model_error : ''
+        details = details["#{errors.type}: ".length..(details.length - 1)] if details.start_with?("#{errors.type}: ")
+
+        SBF::Client::ErrorEntity.new(code: errors.code, type: errors.type, details: details)
+      end
+
+      def [](*args)
+        log_deprecated('[]', caller) if args == [:results] || args == [:total_count]
+        return self if args == [:results]
+        return @total_count if args == [:total_count]
+        result = super
+        result.is_a?(Array) ? self.class.new(result, total_count) : result
+      end
+    end
+  end
+end

data/lib/stbaldricks/entities/lib/error.rb

@@ -1,4 +1,5 @@
 require 'stbaldricks/errors'
+require 'active_model'
 
 module SBF
   module Client
@@ -20,6 +21,10 @@ module SBF
         @fields = Set.new(data[:errors].empty? ? [] : data[:errors]).freeze
       end
 
+      def empty?
+        [@code, @type, @details].all?(&:nil?) && @fields.empty?
+      end
+
       def to_hash
         {code: @code, type: @type, details: @details, fields: @fields.to_a}
       end
@@ -34,5 +39,25 @@ module SBF
         error_message
       end
     end
+
+    class ApiErrorEntity < ErrorEntity
+      attr_reader :http_code
+
+      def initialize(data)
+        super(data)
+        @http_code = data[:http_code].freeze
+      end
+    end
+
+    module Entity
+      class Errors < ActiveModel::Errors
+        attr_reader :http_code, :code, :type
+
+        def initialize(obj, http_code = nil)
+          super(obj)
+          @http_code = http_code
+        end
+      end
+    end
   end
 end

data/lib/stbaldricks/entities/lib/opt_out_settings.rb

@@ -3,7 +3,7 @@ require 'stbaldricks/entities/lib/base'
 module SBF
   module Client
     class OptOutSettings < SBF::Client::BaseEntity
-      attr_reader :email_activity, :email_members_communication, :email_mass_online, :email_mass_print, :email_reply, :email_contact_us
+      attr_accessor :email_activity, :email_members_communication, :email_mass_online, :email_mass_print, :email_reply, :email_contact_us
 
       # Setting Types
       NOTIFICATION_TYPE = 1

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

@@ -12,7 +12,6 @@ module SBF
         MONEY_ORDER = 'money_order'
         NONCE = 'nonce'
         WIRE_TRANSFER = 'wire_transfer'
-        RECURRING_GIFTS = 'recurring'
         PAYPAL = 'paypal'
       end
 
@@ -32,19 +31,19 @@ module SBF
         end
       end
 
-      class CreditCardDetails < SBF::Client::Payment::Details
-        attr_accessor :gateway, :authorization_id, :cardholder_name, :card_type, :expiration_date, :card_number
+      class SubscriptionCreditCardDetails < SBF::Client::Payment::Details
+        attr_accessor :cardholder_name, :card_type, :expiration_date, :card_number
 
         def type
           SBF::Client::Payment::Type::CREDIT_CARD
         end
       end
 
-      class BraintreeSubscriptionDetails < SBF::Client::Payment::Details
-        attr_accessor :gateway, :subscription_id, :customer_id, :cardholder_name, :card_type, :expiration_date, :card_number
+      class CreditCardDetails < SBF::Client::Payment::Details
+        attr_accessor :gateway, :authorization_id, :cardholder_name, :card_type, :expiration_date, :card_number
 
         def type
-          SBF::Client::Payment::Type::RECURRING_GIFTS
+          SBF::Client::Payment::Type::CREDIT_CARD
         end
       end
 

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

@@ -15,6 +15,8 @@ module SBF
       attr_accessor :id
       attr_accessor :type
       attr_accessor :identifier
+      attr_accessor :title
+      attr_accessor :caption
     end
   end
 end

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

@@ -42,7 +42,9 @@ module SBF
 
         def instance_action(name)
           define_method(name) do |*args|
-            endpoint.send(name, self, *args)
+            result = endpoint.send(name, self, *args)
+            result unless result.is_a?(SBF::Client::TopLevelEntity)
+            [:save, :create].include?(name) && result.errors? ? false : result
           end
         end
 
@@ -59,13 +61,23 @@ module SBF
 
           if name == :update
             define_method(name) do |*args|
-              endpoint.update(id, self, *args)
+              result = endpoint.update(id, self, *args)
+              result unless result.is_a?(SBF::Client::TopLevelEntity)
+              result.errors? ? false : result
             end
           end
 
           if name == :delete
             define_method(:delete) do |*_args|
-              endpoint.delete(id)
+              response = endpoint.delete(id)
+              if response.error?
+                add_errors(response.error)
+                errors.instance_variable_set(:@http_code, response.http_code)
+                false
+              else
+                @destroyed = true
+                freeze
+              end
             end
           end
 

data/lib/stbaldricks/entities/page.rb

@@ -44,6 +44,39 @@ module SBF
       def draft_content
         content.select { |x| x.is_draft == true }
       end
+
+      def editor_content
+        published_content.map do |published|
+          draft_content.find { |d| published.id == d.id } || published
+        end
+      end
+
+      def lock_expired?(ttl = 300)
+        locked_at.nil? || Time.now >= Time.parse(locked_at) + ttl
+      end
+
+      def add_draft_sections(sections)
+        sections.each do |cid, data|
+          #convert symbol to integer
+          cid = cid.to_s.to_i
+
+          content = published_content.find { |c| c.id == cid }
+          update_draft_content_section(content, data, cid) unless content.nil?
+        end
+      end
+
+      private
+
+      def update_draft_content_section(content, data, cid)
+        # update or create draft version of content
+        draft = draft_content.find { |d| d.id == cid }
+        if draft.nil?
+          self.content << SBF::Client::Page::Content.new(content.to_hash.merge(is_draft: true, title: data[:title], text: data[:text]))
+        else
+          draft.title = data[:title]
+          draft.text = data[:text]
+        end
+      end
     end
   end
 end

data/lib/stbaldricks/entities/participant.rb

@@ -70,7 +70,7 @@ module SBF
       end
 
       class Photos < SBF::Client::BaseEntity
-        attr_reader :before, :after, :avatar, :default
+        attr_reader :before, :after, :avatar, :default, :icon
       end
 
       class Policies < SBF::Client::BaseEntity

data/lib/stbaldricks/entities/photo.rb

@@ -18,7 +18,8 @@ module SBF
       actions DEFAULT_CRUD_ACTIONS
 
       def upload(image_data_url, with = {})
-        endpoint.upload(image_data_url, self, with)
+        photo = endpoint.upload(image_data_url, self, with)
+        photo.errors? ? false : photo
       end
 
       def self.upload(*args)

data/lib/stbaldricks/entities/recurring_gift.rb

@@ -157,19 +157,21 @@ module SBF
       attr_accessor :is_unrecognized
       attr_accessor :promotional_code
       attr_accessor :funding_type
+      attr_accessor :customer_id
+      attr_accessor :subscription_id
       entity_collection_attr_accessor :donations, 'SBF::Client::FullDonation', 'SBF::Client::PartialDonation'
       attr_accessor :created_at, :modified_at, :modified_by, :how_created, :past_due_at
 
       multitype_attr_accessor(
         :payment_details,
         [
-          [
-            ->(v) { v[:type] == SBF::Client::Payment::Type::RECURRING_GIFTS },
-            'SBF::Client::Payment::BraintreeSubscriptionDetails'
-          ],
           [
             ->(v) { v[:type] == SBF::Client::Payment::Type::NONCE },
             'SBF::Client::Payment::NonceDetails'
+          ],
+          [
+            ->(v) { v[:type] == SBF::Client::Payment::Type::CREDIT_CARD },
+            'SBF::Client::Payment::SubscriptionCreditCardDetails'
           ]
         ]
       )

data/lib/stbaldricks/entities/response.rb

@@ -10,16 +10,15 @@ module SBF
           @http_code = http_code
           @data = data
           @error = error || SBF::Client::ErrorEntity.new(nil)
+          @errors = SBF::Client::Entity::Errors.new(self, http_code)
+          add_errors(@error) unless @error.nil? || @error.empty?
+          @errors.instance_variable_set(:@http_code, http_code)
         end
 
         def success?
           http_code.to_s.start_with?('2')
         end
 
-        def error?
-          !success?
-        end
-
         def to_json
           to_hash.to_json
         end

data/lib/stbaldricks/entities/search.rb

@@ -69,6 +69,7 @@ module SBF
         attr_reader :website_url
         attr_reader :total_donations
         attr_reader :total_participants
+        attr_reader :icon
       end
 
       class Team < SBF::Client::BaseEntity
@@ -91,6 +92,7 @@ module SBF
         attr_reader :status_id
         attr_reader :total_donations
         attr_reader :total_participants
+        attr_reader :icon
       end
 
       class Participant < SBF::Client::BaseEntity
@@ -120,6 +122,7 @@ module SBF
         attr_reader :team_id
         attr_reader :virtual_participation_date
         attr_reader :total_donations
+        attr_reader :icon
       end
 
       class Fundraiser < SBF::Client::BaseEntity
@@ -150,6 +153,7 @@ module SBF
         attr_reader :country
         attr_reader :country_full
         attr_reader :total_donations
+        attr_reader :icon
       end
 
       class Kid < SBF::Client::BaseEntity

data/lib/stbaldricks/entities/team.rb

@@ -23,6 +23,7 @@ module SBF
       module Status
         ACTIVE = 'active'
         PENDING = 'pending'
+        SUSPENDED = 'suspended'
       end
 
       module HowCreated
@@ -43,7 +44,7 @@ module SBF
       end
 
       class Photos < SBF::Client::BaseEntity
-        attr_reader :avatar, :default
+        attr_reader :avatar, :default, :icon
       end
 
       class Totals < SBF::Client::BaseEntity
@@ -90,6 +91,14 @@ module SBF
       def active?
         status == SBF::Client::Team::Status::ACTIVE
       end
+
+      def pending?
+        status == SBF::Client::Team::Status::PENDING
+      end
+
+      def suspended?
+        status == SBF::Client::Team::Status::SUSPENDED
+      end
     end
   end
 end

data/lib/stbaldricks/version.rb

@@ -1,5 +1,5 @@
 module SBF
   module Client
-    VERSION = '4.6.1.alpha.2'
+    VERSION = '4.6.1.alpha.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stbaldricks
 version: !ruby/object:Gem::Version
-  version: 4.6.1.alpha.2
+  version: 4.6.1.alpha.3
 platform: ruby
 authors:
 - Firespring
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -84,11 +90,12 @@ files:
 - lib/stbaldricks/endpoints/config.rb
 - lib/stbaldricks/endpoints/contact.rb
 - lib/stbaldricks/endpoints/event.rb
-- lib/stbaldricks/endpoints/event_application.rb
 - lib/stbaldricks/endpoints/facebook/user.rb
 - lib/stbaldricks/endpoints/fund.rb
+- lib/stbaldricks/endpoints/fundraiser.rb
 - lib/stbaldricks/endpoints/kid.rb
 - lib/stbaldricks/endpoints/kid_honor.rb
+- lib/stbaldricks/endpoints/kid_institution.rb
 - lib/stbaldricks/endpoints/lib/entity.rb
 - lib/stbaldricks/endpoints/matching_gift_company.rb
 - lib/stbaldricks/endpoints/message.rb
@@ -105,6 +112,7 @@ files:
 - lib/stbaldricks/entities/challenger.rb
 - lib/stbaldricks/entities/challenger/model_type.rb
 - lib/stbaldricks/entities/communicate.rb
+- lib/stbaldricks/entities/concerns/entity_response_concern.rb
 - lib/stbaldricks/entities/concerns/event_year_concern.rb
 - lib/stbaldricks/entities/concerns/fundraising_page_concern.rb
 - lib/stbaldricks/entities/concerns/model_type_concern.rb
@@ -148,9 +156,11 @@ files:
 - lib/stbaldricks/entities/international_partner.rb
 - lib/stbaldricks/entities/kid.rb
 - lib/stbaldricks/entities/kid_honor.rb
+- lib/stbaldricks/entities/kid_institution.rb
 - lib/stbaldricks/entities/lib/address.rb
 - lib/stbaldricks/entities/lib/base.rb
 - lib/stbaldricks/entities/lib/cacheable.rb
+- lib/stbaldricks/entities/lib/collection.rb
 - lib/stbaldricks/entities/lib/default_cacheable.rb
 - lib/stbaldricks/entities/lib/email_address.rb
 - lib/stbaldricks/entities/lib/error.rb
@@ -224,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: St. Baldrick's Foundation Ruby Client Library

data/lib/stbaldricks/endpoints/event_application.rb

@@ -1,32 +0,0 @@
-require 'stbaldricks/endpoints/lib/entity'
-
-module SBF
-  module Client
-    class EventApplicationEndpoint < SBF::Client::EntityEndpoint
-      def create(entity, with = {})
-        raise SBF::Client::Error, 'Invalid Entity' unless entity.is_a?(SBF::Client::BaseEntity)
-
-        with = normalize_with(with)
-
-        create_data = entity.to_hash
-        create_data.store(:with, with)
-
-        entity.errors.clear
-
-        response = SBF::Client::Api::Request.post_request("#{base_uri}/create", create_data)
-        parsed_response_body = JSON.parse(response.body).symbolize!
-
-        if ok?(response)
-          # Re-initialize the entity using the existing data as a base and overwriting with all data returned from the response
-          # This will populate fields that have been auto-populated (e.g. id) into the original object
-          entity.send(:initialize_attributes, create_data.merge(parsed_response_body))
-        else
-          error = SBF::Client::ErrorEntity.new(parsed_response_body)
-          entity.add_errors(error)
-        end
-
-        SBF::Client::Api::Response.new(http_code: response.code, data: entity, error: error)
-      end
-    end
-  end
-end