stbaldricks 4.2.0 → 4.2.1.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c94c5f49f5f3c5fda4ed688cef55f67fdfad14d3
-  data.tar.gz: bc14f9659a826452313431588104d9bc517a187f
+  metadata.gz: 0784362d19e67df3927d5352bb4b8f736da8723b
+  data.tar.gz: bc015a08a87d033849587670fae45c652457e1b4
 SHA512:
-  metadata.gz: 32856f5b3cb6a973fcd8753304f76ce51c069ba8f86c2e60f803f34b6ed29a257959ec79431a632c1a81faecd0e907a5f474fea6a2e6e597dcd1a3dfc8f61aa7
-  data.tar.gz: 98e3052a8616492e38e080363444721b8cb2b3ac2b1370edf954aa97ced091d5e43b5d89319927777d7dbde65937f418180408d55f534a8b9b4ecc70c93f2187
+  metadata.gz: dba8fba1b0796641955d0bbb7ccc4c834638da1281c9093e30b24e45013833dcd8efa11c86468e0aa274c16f6ba2d48b2966ec8cec45b14ad22c94deecb41adb
+  data.tar.gz: e25f87c99fe3e5498f26c2480dd52c713b85789bd2c614e2fbbae1307ea122ea65b0cce1fc5287cb36945938d99205848da5aeacf2344c919adf1fd00c277c94

data/lib/stbaldricks/endpoints/event.rb

@@ -10,7 +10,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.year, entity_or_hash, with)
+          return update(entity_or_hash.id, entity_or_hash.year, entity_or_hash.update_data, with)
         else
           return create(entity_or_hash, with) if entity_or_hash[:id].nil?
           return update(entity_or_hash[:id], entity_or_hash[:year], entity_or_hash, with)

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

@@ -20,7 +20,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, with)
+          return update(entity_or_hash.id, entity_or_hash.update_data, with)
         else
           return create(entity_or_hash, with) if entity_or_hash[:id].nil?
           return update(entity_or_hash[:id], entity_or_hash, with)
@@ -229,6 +229,9 @@ module SBF
             data = entity_or_hash
           end
 
+          # Reload entity and its sub-entities so that no fields have a 'changed' state
+          data.reload_recursive
+
           return [data, nil]
         else
           data = entity_or_hash if entity_or_hash.is_a?(SBF::Client::BaseEntity)

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

@@ -11,6 +11,7 @@ require 'securerandom'
 module SBF
   module Client
     class BaseEntity
+      include ActiveModel::Dirty
       extend ActiveModel::Naming
       extend ActiveModel::Translation
       include ActiveModel::Conversion
@@ -45,6 +46,57 @@ module SBF
         true
       end
 
+      def reload!
+        # get the values from the persistence layer
+        clear_changes_information
+      end
+
+      def reload_recursive
+        instance_variables.each do |var|
+          attribute = instance_variable_get(var)
+          attribute.reload_recursive if attribute.is_a?(BaseEntity)
+          attribute.each { |a| a.reload_recursive if a.is_a?(BaseEntity) } if attribute.is_a?(Array)
+        end
+        reload!
+      end
+
+      def rollback!
+        restore_attributes
+      end
+
+      def update_data(with_keys = false)
+        data = {}
+        changes.each { |k, arr| data[k.to_sym] = arr[1] }
+
+        instance_variables.each do |var|
+          attribute = instance_variable_get(var)
+          if attribute.is_a?(BaseEntity)
+            if attribute.update_data.empty?
+              data.delete(var.to_s.gsub('@', '').to_sym)
+            else
+              data.merge!(var.to_s.gsub('@', '').to_sym => attribute.update_data(true))
+            end
+          elsif attribute.is_a?(Array)
+            selected = attribute.select { |a| a.is_a?(BaseEntity) || !attribute.update_data(true).empty? }
+            attributes = selected.map { |s| s.update_data(true) }.reject(&:empty?)
+            if attributes.empty?
+              data.delete(var.to_s.gsub('@', '').to_sym)
+            else
+              data.merge!(var.to_s.gsub('@', '').to_sym => attributes)
+            end
+          end
+        end
+
+        return data if data.empty?
+
+        with_keys ? keys_data.merge(data) : data
+      end
+
+      def keys_data
+        return {} unless respond_to?(:id)
+        is_a?(SBF::Client::Event) ? {id: id, year: year} : {id: id}
+      end
+
       def attributes=(data)
         data ||= {}
         data.each do |key, value|
@@ -174,13 +226,24 @@ module SBF
 
       def self.attr_writer(*vars)
         attributes.merge(vars)
-        super(*vars)
+
+        vars.each do |attribute|
+          define_attribute_methods attribute
+          define_changing_attr_methods attribute
+        end
+
         add_boolean_methods(vars, true)
       end
 
       def self.attr_accessor(*vars)
         attributes.merge(vars)
         super(*vars)
+
+        vars.each do |attribute|
+          define_attribute_methods attribute
+          define_changing_attr_methods attribute, false, true
+        end
+
         add_boolean_methods(vars, true)
       end
       ###########################################################################################
@@ -296,11 +359,23 @@ module SBF
           split_attribute = attribute.to_s.split('is_')
           next if split_attribute.length <= 1
           define_method(:"#{split_attribute.last}?") { send(attribute) }
-          define_method(:"#{attribute}=") { |val| instance_variable_set("@#{attribute}".to_sym, val.to_s.to_b) } if setter
+          define_changing_attr_methods(attribute, true) if setter
         end
       end
       private_class_method :add_boolean_methods
 
+      def self.define_changing_attr_methods(attribute, is_boolean = false, define_reader = false)
+        define_method(:"#{attribute}") do
+          instance_variable_get("@#{attribute}".to_sym)
+        end if define_reader
+
+        define_method(:"#{attribute}=") do |val|
+          send(:"#{attribute}_will_change!") unless val == instance_variable_get("@#{attribute}".to_sym)
+          instance_variable_set("@#{attribute}".to_sym, is_boolean ? val.to_s.to_b : val)
+        end
+      end
+      private_class_method :define_changing_attr_methods
+
       # Creates a private method which resolves the class type based on the class mappings and the value
       # rubocop:disable MethodLength
       def self.add_class_selector_method(attribute, class_mappings)

data/lib/stbaldricks/entities/recurring_gift.rb

@@ -46,6 +46,11 @@ module SBF
         ORGANIZATION_FOUNDATION = 'foundation'
       end
 
+      module FundingType
+        CREDIT_CARD = 'credit_card'
+        PAYPAL = 'paypal'
+      end
+
       class FullParticipant < SBF::Client::FullParticipant
         attr_reader :model_type
 
@@ -140,6 +145,7 @@ module SBF
       attr_accessor :display_name
       attr_accessor :is_unrecognized
       attr_accessor :promotional_code
+      attr_accessor :funding_type
       entity_collection_attr_accessor :donations, 'SBF::Client::FullDonation', 'SBF::Client::PartialDonation'
       attr_accessor :created_at, :modified_at, :modified_by, :how_created, :past_due_at
 

data/lib/stbaldricks/version.rb

@@ -1,5 +1,5 @@
 module SBF
   module Client
-    VERSION = '4.2.0'
+    VERSION = '4.2.1.alpha.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stbaldricks
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -210,9 +210,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: []
 rubyforge_project: 
 rubygems_version: 2.6.12